Merge branch 'master' into num-handler. Not all tests pass.

260 files changed, 42019 insertions, 32833 deletions

diff --git a/ChangeLog b/ChangeLog
index ee54f79c..e0c6db92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,685 @@
+2015-04-05         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awkgram.y (install_builtins): If do_traditional is true, do not
+	install gawk extensions flagged with GAWKX.  Similarly, if do_posix
+	is true, do not install functions flagged with NOT_POSIX.
+	This fixes a problem with spurious lint complaints about shadowing
+	a global variable that is not valid in traditional or posix mode.
+	Thanks to Andrew Schorr for finding the problem and supplying
+	initial code; I did it slightly differently.
+
+2015-04-02         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* NEWS: Rename div to intdiv.
+
+2015-04-02         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Rename div() to intdiv().
+
+	* builtin.c (do_intdiv): Renamed from do_div.
+	* mfpr.c (do_mpfr_intdiv): Renamed from do_mpfr_div.
+	* awk.h: Update declarations.
+	* awkgram.y (tokentab, snode): Revise accordingly.
+
+2015-03-31         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awk.h (call_sub): Renamed from call_sub_func.
+	(call_match, call_split_func): Declare.
+	* builtin.c (call_sub): Renamed from call_sub_func.
+	(call_match, call_split_func): New functions.
+	* interpret.h (r_interpret): Call new functions as appropriate.
+	* node.c (r_unref): Revert change to handle Node_regex, not needed.
+
+2015-03-31         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awk.h (r_get_field): Declare.
+	* builtin.c (call_sub_func): Rearrange the stack to be what
+	the buitin function expects.
+	* eval.c (r_get_field): Make extern.
+
+2015-03-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* io.c (redirect): Change not_string from int to bool.
+	* gawkapi.c (api_get_file): Minor stylistic improvements.
+	* NEWS: Updated for retryable I/O and new API function.
+
+2015-03-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awkgram.y (make_regnode): Make extern.
+	* awk.h (make_regnode): Declare.
+	* builtin.c (call_sub_func): Start on reworking the stack to
+	be what do_sub() expects. Still needs work.
+	* interpret.h (r_interpret): Add a cast in comparison with do_sub().
+	* node.c (r_unref): Handle Node_regex nodes.
+
+2015-03-24         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* interpret.h (r_interpret): When Op_K_exit has an argument of
+	Nnull_string, do not update exit_val, since no value was supplied.
+
+2015-03-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awk.h, gawkapi.c, io.c: Minor code reformatting.
+
+2015-03-20         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Start on fixing indirect calls of builtins.
+
+	* awk.h (call_sub_func): Add declaration.
+	* awkgram.y (lookup_builtin): Handle length, sub functions.
+	(install_builtin): Handle length function.
+	* builtin.c (call_sub_func): New function.
+	* interpret.h (r_interpret): If calling do_sub, do it through
+	call_sub_func().
+
+2015-03-18         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* config.guess, config.sub: Updated, from libtool 2.4.6.
+
+2015-03-17         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* profile.c (pp_number): Allocate enough room to print the number
+	in all cases. Was a problem mixing -M with profiling with a really
+	big number. Thanks to Hermann Peifer for the bug report.
+
+2015-03-08         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* re.c (regexflags2str): Removed. It was redundant.
+
+	* io.c (devopen): Change the logic such that if nonfatal is true
+	for the socket, don't do retries.  Also clean up the formatting
+	some.  At strictopen, check if errno is ENOENT and if so, propagate
+	the error from getaddrinfo() up to the caller. Add explanatory
+	comments.
+
+2015-02-28         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* io.c (pty_vs_pipe): Remove check for NULL PROCINFO_node, since
+	this is now checked inside in_PROCINFO.
+
+2015-02-27         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* io.c (socketopen): New parameter hard_error; set it if
+	getaddrinfo() fails. Change fatals to warnings.
+	(devopen): Pass in address of boolean hard_error variable
+	and stop trying to open the file if hard_error is true.
+	Save and restore errno around call to socketopen() and
+	use restored errno if open() fails at strictopen.
+
+2015-02-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* symbol.c (check_param_names): Fix argument order in memset() call.
+	* configure.ac: Use AC_SEARCH_LIBS instead of AC_CHECK_LIB. This fixes
+	a long-standing problem where `-lm' was used twice in the final
+	compilation line.
+
+2015-02-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* POSIX.STD: Update copyright year.
+	* awkgram.y (yylex): Allow \r after \\ line continuation everywhere.
+	Thanks to Scott Rush <scott.rush@honeywell.com> for the report.
+
+2015-02-13         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awkgram.y (yylex): Be more careful about passing true to
+	nextc() when collecting a regexp.  Some systems' iscntrl()
+	are not as forgiving as GLIBC's. E.g., Solaris.
+	Thanks to Dagobert Michelsen <dam@baltic-online.de> for
+	the bug report and access to systems to check the fix.
+
+2015-02-12         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* POSIX.STD: Update with info about function parameters.
+	* configure.ac: Remove test for / use of dbug library.
+
+2015-02-11         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawkapi.h: Fix spelling error in comment.
+
+2015-02-10         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* profile.c (pprint): Restore printing of count for rules.
+	Bug report by Hermann Peifer.
+
+2015-02-08         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* io.c: Make it "NONFATAL" everywhere.
+
+2015-02-08         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* awk.h (RED_NON_FATAL): Removed.
+	(redirect): Add new failure_fatal parameter.
+	(is_non_fatal_redirect): Add declaration.
+	* builtin.c (efwrite): Rework check for non-fatal.
+	(do_printf): Adjust calls to redirect.
+	(do_print_rec): Ditto. Move check for redirection error up.
+	* io.c (redflags2str): Remove RED_NON_FATAL.
+	(redirect): Add new failure_fatal parameter. Simplify the code.
+	(is_non_fatal_redirect): New function.
+	(do_getline_redir): Adjust calls to redirect.
+
+2014-12-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awk.h (is_non_fatal_std): Declare new function.
+	* io.c (is_non_fatal_std): New function.
+	* builtin.c (efwrite): Call it.
+
+2015-02-07         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* regcomp.c, regex.c, regex.h, regex_internal.c, regex_internal.h,
+	regexec.c: Sync with GLIBC. Mostly copyright date updates.
+
+2015-02-05         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* eval.c (set_IGNORECASE): If IGNORECASE has a numeric value, try
+	using that before treating it as a string.  This fixes a problem
+	where setting -v IGNORECASE=0 on the command line was not working
+	properly.
+
+2015-02-01         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Move POSIX requirement for disallowing paramater names with the
+	same name as a function into --posix.
+
+	* NEWS: Document it.
+	* awkgram.y (parse_program): Check do_posix before calling
+	check_param_names().
+	* symbol.c (check_param_names): Set up a fake node and call
+	in_array() for function parameter names instead of linear
+	searching the function list a second time. Thanks to Andrew
+	Schorr for the motivation.
+
+2015-01-30         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Don't allow function parameter names to be the same as function
+	names - required by POSIX. Bug first reported in comp.lang.awk.
+
+	In addition, don't allow use of a parameter as a function name
+	in a call (but it's ok in indirect calls).
+
+	* NEWS: Updated.
+	* awk.h (check_param_names): Add declaration.
+	* awkgram.y (at_seen): New variable. Communicates between
+	yylex() and the parser.
+	(FUNC_CALL production): Check at_seen and check that the identifier
+	is a function name.
+	(parse_program): Call check_param_names() and set errcount.
+	(yylex): Set at_seen after seeing an at-sign.
+	* symbol.c (check_param_names): New function.
+
+2015-01-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Infrastructure updates.
+
+	Bison 3.0.4. Automake 1.15. Gettext 0.19.4.
+
+2015-01-20         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawkapi.c (api_set_array_element): Remove useless call to
+	make_aname.
+	* symbol.c (load_symbols): Ditto.
+	Thanks to Andrew Schorr for pointing out the problem.
+
+2015-01-19         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awkgram.c: Update to bison 3.0.3.
+	* command.c: Ditto.
+	* NEWS: Note same.
+
+2015-01-16         Stephen Davies        <sdavies@sdc.com.au>
+
+	* awkgram.y (rule): Set first_rule to false. Catches more cases
+	for gathering comments. Thanks to Hermann Peifer for the test case.
+
+2015-01-15         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* dfa.h, dfa.c: Sync with grep. Mainly copyright updates.
+	* getopt.c, getopt.h, getopt1.c getopt_int.h: Sync with GLIBC.
+	Mainly copyright updates, one minor code fix.
+
+2015-01-14         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Remove deferred variables.
+
+	* awk.h (register_deferred_variable): Remove declaration.
+	* awkgram.y (is_deferred_variable, process_deferred,
+	symtab_used, extensions_used, deferred_variables,
+	process_deferred): Remove declarations, bodies, and uses.
+	* builtin.c (do_length): Update comment.
+	* main.c (init_vars): Just call load_procinfo() and `load_environ()'.
+
+2015-01-08         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	Revert changes to API deferred variable creation -- these variables
+	should be created when lookup is called, not when update is called.
+	* awk.h (variable_create): Remove function declaration.
+	* awkgram.y (variable_create): Remove function.
+	(variable): Restore variable_create functionality inline.
+	* gawkapi.c (api_sym_update): Revert to using install_symbol, since the
+	deferred variable check should be done when lookup is called, not here.
+
+2015-01-07         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* gawkapi.c (api_set_array_element): Remove stray call to
+	make_aname.  I cannot see what purpose this served.  Maybe I am
+	missing something.
+
+2015-01-07         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* configure.ac: Update debug flags if developing.
+	* awkgram.y (yylex): Regex parsing bug fix for bracket expressions.
+	Thanks to Mike Brennan for the report.
+	* builtin.c (format_tree): Catch non-use of count$ for dynamic
+	field width or precision.
+
+	Unrelated:
+
+	Load deferred variables if extensions are used; they might
+	want to access PROCINFO and/or ENVIRON. Thanks to Andrew Schorr
+	for pointing out the issue.
+
+	* awkgram.y (extensions_used): New variable. Set it on @load.
+	(do_add_scrfile): Set it on -l.
+	(process_deferred): Check it also.
+
+2015-01-06         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* gawkapi.c (api_sym_update): If copying a subarray, must update
+	the parent_array pointer.  Also, call the astore hook if non-NULL.
+	(api_set_array_element): Call the astore hook if non-NULL.
+
+2015-01-06         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* awk.h (variable_create): Now takes a 3rd argument to tell caller
+	whether this is a deferred variable.
+	* awkgram.y (variable_create): Return indicator of whether this is
+	a deferred variable in a newly added 3rd arg.
+	(variable): Pass 3rd arg to variable_create.
+	* gawkapi.c (api_sym_update): If we triggered the creation of a deferred
+	variable, we must merge the extension's array elements into the deffered
+	array, not the other way around.  The ENVIRON array has special funcs
+	to call setenv and unsetenv.
+
+2015-01-06         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* awk.h (variable_create): Declare new function.
+	* awkgram.y (variable_create): New function to create a variable
+	taking the deferred variable list into consideration.
+	(variable): Call new function variable_create if the variable is
+	not found.
+	* gawkapi.c (api_sym_update): If an array is being created, then
+	call new function variable_create instead of install_symbol.  If this
+	is the first reference to a deferred variable, than the new array
+	may contain elements that must be merged into the array provided by
+	the extension.
+
+2015-01-05         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* io.c (wait_any): If the `interesting' argument is non-zero, then we
+	must not return until that child process has exited, since the caller
+	gawk_pclose depends on our returning its exit status.  So in that case,
+	do not pass WNOHANG to waitpid.
+
+2015-01-04         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* gawkapi.h: Fix another comment typo.
+
+2015-01-04         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* gawkapi.h: Fix typo in comment.
+
+2015-01-02         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* gawkapi.h (gawk_api): Modify api_get_file to remove the typelen
+	argument.
+	(get_file): Remove typelen argument from the macro.
+	* gawkapi.c (api_get_file): Remove typelen argument.
+
+2014-12-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* profile.c (pprint): Be sure to set ip2 in all paths
+	through the code. Thanks to GCC 4.9 for the warning.
+
+2014-12-20         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Enable non-fatal output on per-file or global basis,
+	via PROCINFO.
+
+	* awk.h (RED_NON_FATAL): New redirection flag.
+	* builtin.c (efwrite): If RED_NON_FATAL set, just set ERRNO and return.
+	(do_printf): Check errflg and if set, set ERRNO and return.
+	(do_print): Ditto.
+	(do_print_rec): Ditto.
+	* io.c (redflags2str): Update table.
+	(redirect): Check for global PROCINFO["nonfatal"] or for
+	PROCINFO[file, "nonfatal"] and don't fail on open if set.
+	Add RED_NON_FATAL to flags.
+	(in_PROCINFO): Make smarter and more general.
+
+2014-12-12        Stephen Davies         <sdavies@sdc.com.au>
+
+	Improve comment handling in pretty printing.
+
+	* awk.h (comment_type): New field in the node.
+	(EOL_COMMENT, FULL_COMMENT): New defines.
+	* awkgram.y (block_comment): New variable.
+	(check_comment): New function.
+	(grammar): Add code to handle comments as needed.
+	(get_comment): Now takes a flag indicating kind of comment.
+	(yylex): Collect comments appropriately.
+	(append_rule): Ditto.
+	* profile.c (pprint): Smarten up comment handling.
+	Have printing \n take comments into account.
+	(end_line): New function.
+	(pp_func): Better handling of function comments.
+
+2014-12-10         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* dfa.c: Sync with GNU grep.
+
+2014-11-26         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* builtin.c (do_sub): Improve wording of gensub warnings.
+
+2014-11-25         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* builtin.c (do_sub): For gensub, add more warnings for invalid
+	third argument.
+
+2014-11-23         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awk.h: Move all inline functions to the bottom of the file.
+	Keeps modern GCC happier.
+
+2014-11-22         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awk.h (emalloc, realloc): Redefine in terms of ...
+	(emalloc_real, eralloc_real): New static inline functions.
+	(fatal): Move definition up.
+	* gawkmisc.c (xmalloc): If count is zero, make it one for older
+	mallocs that require size > 0 (such as z/OS).
+
+2014-11-21         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* main.c: Remove a debugging // comment.
+	* NOTES: Removed.
+
+	Unrelated:
+
+	Revert changes of 2014-11-20 from Paul Eggert. Causes failures
+	on z/OS.
+
+	Unrelated: Avoid unnecessary copying of $0.
+
+	* interpret.h (UNFIELD): New macro.
+	(r_interpret): Use it where *lhs is assigned to.
+
+2014-11-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port to systems where malloc (0) and/or realloc(P, 0) returns NULL.
+	* gawkmisc.c (xmalloc):
+	* xalloc.h (realloc):
+	Do not fail if malloc(0) or realloc(P, 0) returns NULL.
+	Fail only when the allocator returns null when attempting to
+	allocate a nonzero number of bytes.
+
+2014-11-19         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Infrastructure upgrades:
+
+	* Automake 1.14.1, Gettext 0.19.3, Libtool 2.4.3.
+	* compile, extension/build-aux/compile: New files.
+
+2014-11-19  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.19.3.
+
+2014-11-16         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* interpret.h: Revert change of 2014-11-11 since it breaks
+	certain uses.
+
+	Unrelated:
+
+	* dfa.c: Sync with GNU grep.
+
+2014-11-15         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* array.c, awk.h, awkgram.y, builtin.c, dfa.c, eval.c, field.c,
+	interpret.h, io.c, main.c, mpfr.c, node.c, re.c, regex_internal.h,
+	replace.c: Remove all uses of MBS_SUPPORT.
+	* regex_internal.h: Disable wide characters on DJGPP.
+	* mbsupport.h: Rework to be needed only for DJGPP.
+
+2014-11-11         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Don't let memory used increase linearly in the size of
+	the input.  Problem reported by dragan legic
+	<dragan.legic@yandex.ru>.
+
+	* field.c (set_record): NUL-terminate the buffer.
+	* interpret.h (r_interpret): Op_field_spec: if it's $0, increment
+	the valref.  Op_store_var: if we got $0, handle it appropriately.
+
+2014-11-10         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Reorder main.c activities so that we can set a locale on the
+	command line with the new, for now undocumented, -Z option.
+
+	* main.c (parse_args, set_locale_stuff): New functions.
+	(stopped_early): Made file level static.
+	(optlist, optab): Add new argument.
+	(main): Adjust ordering and move inline code into new functions.
+
+2014-11-09         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* gawkapi.c (node_to_awk_value): When the type wanted is AWK_UNDEFINED
+	and a it's a Node_val set to Nnull_string, return AWK_UNDEFINED instead
+	of AWK_NUMBER 0.
+
+2014-11-06         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* awk.h (redirect_string): First argument should be const.  Add a new
+	extfd argument to enable extensions to create files with pre-opened
+	file descriptors.
+	(after_beginfile): Declare function used in both eval.c and gawkapi.c.
+	* eval.c (after_beginfile): Remove extern declaration now in awk.h.
+	* gawkapi.c (api_get_file): Implement API changes to return
+	awk_input_buf_t and/or awk_output_buf_t info, as well as accept an
+	fd for inserting an opened file into the table.
+	* gawkapi.h (gawk_api): Modify the api_get_file declaration to
+	return awk_bool_t and add 3 new arguments -- a file descriptor
+	for inserting an already opened file, and awk_input_buf_t and
+	awk_output_buf_t to return info about both input and output.
+	(get_file): Add new arguments to the macro.
+	* io.c (redirect_string): First arg should be const, and add a new
+	extfd arg so extensions can pass in a file that has already been
+	opened by the extension.  Use the passed-in fd when appropriate,
+	and pass it into two_way_open.
+	(redirect): Pass new fd -1 arg to redirect_string.
+	(two_way_open): Accept new extension fd parameter and open it
+	as a socket.
+
+2014-11-05         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* io.c (retryable): New function to indicate whether I/O can be
+	retried for this file instead of throwing a hard error.
+	(get_a_record) Check whether this file is configured for retryable
+	I/O before returning nonstandard -2.
+
+2014-11-03         Norihiro Tanaka       <noritnk@kcn.ne.jp>
+
+	* re.c (research): Use dfa superset to improve matching speed.
+
+2014-11-02         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* profile.c (div_on_left_mul_on_right): New function.
+	(parenthesize): Call it.
+
+2014-10-30         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* configure: Regenerated after fix to m4/readline.m4.
+
+	Unrelated; fixes to profiling. Thanks to Hermann Peifer and
+	Manuel Collado for pointing out problems:
+
+	* profile.c (pprint): For Op_unary_minus, parenthesize -(-x)
+	correctly.
+	(prec_level): Get the levels right (checked the grammar).
+	(is_unary_minus): New function.
+	(pp_concat): Add checks for unary minus; needs to be parenthesized.
+
+2014-10-30         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* NEWS: Mention installation of /etc/profile.d/gawk.{csh,sh}.
+
+2014-10-29         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* configure.ac (AC_CONFIG_FILES): Add extras/Makefile.
+	* Makefile.am (SUBDIRS): Add extras.
+	* extras: Add new subdirectory.
+
+2014-10-29         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* dfa.c: Sync with GNU grep. Again, again.
+
+2014-10-28         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* dfa.c: Sync with GNU grep. Again.
+
+2014-10-25         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* dfa.c: Sync with GNU grep.
+
+2014-10-17         John E. Malmberg      <wb8tyw@qsl.net>
+
+	* ext.c (close_extensions): Test for null pointer since
+	since this can be called by signal handler before the
+	pointers are initialized.
+
+2014-10-15         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Make sane the handling of AWKPATH and AWKLIBPATH:
+
+	1. Don't explicitly search "."; it must be in the path either
+	physically or as null element a la the shell's $PATH
+	2. If environment's value was empty, use built-in default value.
+	3. Set ENVIRON["AWK*PATH"] to the path used.
+
+	* io.c (path_info): Remove try_cwd member.
+	(get_cwd): Removed, not needed anymore.
+	(do_find_source): Don't do explicit check in current directory.
+	It must come from the AWKPATH or AWKLIBPATH variable.
+	* main.c (path_environ): If value from environment was empty,
+	set it to the default.  This is how gawk has behaved since 2.10.
+
+2014-10-13         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* regcomp.c (__re_error_msgid): Make error message for REG_EBRACK
+	more helpful - also used for unmatched [:, [., [=.
+	Thanks to Davide Brini for raising the issue.
+
+2014-10-12         KO Myung-Hun          <komh78@gmail.com>
+
+	Fixes for OS/2:
+
+	* Makefile.am (install-exec-hook, uninstall-links): Use $(EXEEXT).
+	* getopt.h: Redefinitions if using KLIBC.
+	* io.c (_S_IFDIR, _S_IRWXU): Define if the more standard versions
+	are available.
+
+2014-10-12         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* README: Remove Pat Rankin from VMS duties, per his request.
+
+2014-10-08         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* dfa.c: Sync with GNU grep.
+
+2014-10-05         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* profile.c (pprint): Fix typo in header. Sheesh.
+
+	Unrelated:
+
+	* awkgram.y (mk_program): Add a comment that we don't need to
+	clear the comment* variables.
+
+2014-10-04         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* profile.c (pp_string_fp): Fix breaklines case to actually
+	output the current letter. This broke at gawk 4.0.0. Sigh.
+	Thanks to Bert Bos (bert@w3.org) for the report.
+
+2014-10-03	Stephen Davies		<sdavies@sdc.com.au>
+
+	* awkgram.y (program_comment): Renamed from comment0.
+	(function_comment): Renamed from commentf.
+
+2014-10-02         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awkgram.y, profile.c: Minor white space cleanups.
+
+2014-10-01         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Fix a few compile warnings:
+
+	* awkgram.y (split_comment): Make static.
+	General: Remove some unused variables, clean up some whitepace nits.
+
+	* profile.c (indent): Add some braces to turn off compiler warnings.
+
+2014-09-29         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* main.c (main): In optlist, it should say "h", not "h:", since there
+	is no argument for the help option.  Thanks to Joep van Delft for
+	the bug report.
+
+2014-09-29         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawkapi.h: Minor edits to sync with documentation. Does not
+	influence the behavior of the API.
+
+2014-09-28         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* command.y (cmdtab): Add "where" as an alias for "backtrace".
+	Finally!
+
+	Unrelated:
+
+	* dfa.c: Sync with GNU grep.
+
+2014-09-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awkgram.y (check_for_bad): Bitwise-and the bad character with 0xFF
+	to avoid sign extension into a large integer.
+
+	Unrelated:
+
+	* configure.ac: Add an option to enable locale letters in identifiers.
+	Undocumented and subject to being rescinded at any time in the future.
+	* NEWS: Mention to look at configure --help.
+
+	Unrelated:
+
+	* profile.c (pprint): Use "rule(s)" instead of "block(s)" in the
+	header.
+
+2014-09-23         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awkgram.y (yylex): Don't check for junk characters inside
+	quoted strings.  Caused issues on DJGPP and Solaris.
+
+	Unrelated:
+
+	* io.c (devopen): Straighten things out with respect to
+	compatibility with BWK awk.
+
+2014-09-19         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awkgram.y: Further commentary as to the treacherousness
+	of isalnum and isalpha.
+
 2014-09-16         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* mpfr.c (cleanup_mpfr): Removed.
@@ -26,6 +708,45 @@
 	since use of isalnum() let non-ASCII letters slip through into
 	identifiers.
 
+2014-09-13	Stephen Davies		<sdavies@sdc.com.au>
+
+	When doing pretty-printing (but not profiling), include the original
+	comments in the output.
+
+	General rules:
+
+	Pretty printing:
+		- Do NOT indent by a tab
+		- Do NOT print the header comments ("# BEGIN rules", etc.)
+		- DO print the comments that are in the program
+
+	Profiling:
+		- DO indent by a tab
+		- DO print the header comments
+		- Do NOT print the program's original comments
+
+	* awkgram.y (comment0, commentf): New varibles that are  pointers to
+	program and function comments.
+	(get_comment): New function that retrieves consecutive comment lines
+	and empty lines as a unit).
+	(split_comment): New function: iff first block in the program is a
+	function and it is predeeded by comments, take the last non-blank
+	line as function comment and any preceeding lines as program comment.)
+
+	Following token rules were changed to handle comments:
+
+	* awkgram.y (pattern, LEX_BEGIN, LEX_END, LEX_BEGINFILE, LEX_ENDFILE,
+	action, function_prologue, statements): Update to handle comments.
+				
+	Following functions were changed to handle comments:
+
+	* awkgram.y (mk_program, mk_function, allow_newline and yylex): Update
+	to handle comments. (Also fixed typo in case '\\'.)
+
+	* profile.c (print_comment): New function to format comment printing.
+	(indent, pprint, dump_prog, pp_func): Changed to handle comments and
+	the revised indentation rules.
+
 2014-09-07         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* awk.h: Move libsigsegv stuff to ...
@@ -938,6 +1659,24 @@
 
 	* debug.c (print_memory): Fix whitespace / indentation.
 
+2013-08-02         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awkgram.y (append_rule): Add attempt to insert any comment
+	before a rule. Commented out at the moment.
+
+2013-07-30         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awk.h (enum opcodeval): Add Op_comment.
+	* awkgram.y (comment): New variable to hold comment text.
+	(statement): Add saved comments to lists being built.
+	(allow_newline): Save comment text if necessary. Append if have
+	existing text.
+	(yylex): Ditto.
+	* debug.c (print_instruction): Handle Op_comment.
+	* eval.c (optypes): Add entry for Op_comment.
+	* interpret.h (r_interpret): Ditto.
+	* profile.c (pprint): For Op_comment, print the comment text.
+
 2013-07-24         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* io.c (FAKE_FD_VALUE): Move definition from here ...
@@ -948,6 +1687,45 @@
 	* io.c (get_a_record): Change `min' to `MIN' for consistency with
 	other files and general practice.
 
+2013-07-07         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* configure.ac (AC_CHECK_FUNCS): Check for sigprocmask.
+	* io.c (wait_any): If sigprocmask is available, block signals instead
+	of ignoring them temporarily.
+
+2013-07-05         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* gawkapi.h (gawk_api): Document that the api_get_file function will not
+	access the file type and length arguments if the file name is empty.
+
+2013-07-04         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* configure.ac (AC_CHECK_FUNCS): Add a check for waitpid.
+	* io.c (wait_any): Enhance comment to explain why we loop reaping all
+	exited children when the argument is zero.  When available, use waitpid
+	with WNOHANG to avoid blocking.  Remove my previous incorrect patch to
+	exit after reaping the first child.  The function is intended to
+	wait for all children, since we are not careful about reaping children
+	as soon as they die.
+
+2013-07-02         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* gawkapi.h (gawk_api): Remove unused api_lookup_file hook.
+	(lookup_file): Remove associated macro.
+	* gawkapi.c (api_lookup_file): Remove unused function.
+	(api_impl):  Remove unused api_lookup_file hook.
+
+2013-07-02         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* awkgram.y (main_beginfile): Declare new global INSTRUCTION *.
+	(parse_program): Set main_beginfile to point to the BEGINFILE
+	instruction block.
+	* gawkapi.c (api_get_file): After nextfile starts a new file,
+	we need to run the BEGINFILE actions.  We retrieve the
+	instruction pointer from main_beginfile and execute it until
+	we reach the Op_after_beginfile opcode.  We then run after_beginfile
+	manually and restore the value of currule and source.
+
 2013-07-04         Andrew J. Schorr     <aschorr@telemetry-investments.com>
 
 	* gawkapi.h (awk_element_t): Add comment indicating that the array
@@ -958,6 +1736,45 @@
 	force_string redundant, since node_to_awk_value does that internally
 	when we request a string.
 
+2013-07-02         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* eval.c (update_ERRNO_string): Set PROCINFO["errno"] to 0.
+	* io.c (inrec): Since get_a_record may now return -2, be sure
+	to throw an error in that case as well.
+	(wait_any): Fix what appears to be a bug.  The old logic repeatedly
+	called wait until it failed.  When a process has multiple children,
+	this causes it to stall until all of them have exited.  Instead,
+	we now exit the function after the first successful wait call.
+	(do_getline_redir, do_getline): Handle case where get_a_record
+	returns -2.
+	(errno_io_retry): New function to decide whether an I/O operation should
+	be retried.
+	(get_a_record): When read returns an error, call errno_io_retry to
+	decide whether the operation should be retried.  If so, return -2
+	instead of setting the IOP_AT_EOF flag.
+
+2013-07-01         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* eval.c (update_ERRNO_int, unset_ERRNO): Update PROCINFO["errno"].
+
+2013-06-30         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* awk.h (redirect_string): Declare new function that provides API access
+	to the redirection mechanism.
+	* gawkapi.h (GAWK_API_MINOR_VERSION): Bump from 0 to 1 since 2 new
+	hooks were added to the api.
+	(gawk_api_t): Add 2 new functions api_lookup_file and api_get_file.
+	(lookup_file, get_file): New macros to wrap the new API functions.
+	* gawkapi.c (curfile): Declare this extern, since it is needed
+	by lookup_file and get_flie.
+	(api_lookup_file): Find an open file using curfile or getredirect().
+	(api_get_file): Find or open a file using curfile or redirect_string().
+	(api_impl): Add api_lookup_file and api_get_file.
+	* io.c (redirect_string): Renamed from redirect and changed arguments
+	to take a string instead of a 'NODE *'.  This allows it to be called
+	through the API's new get_file hook.
+	(redirect): Now implemented by calling redirect_string backend function.
+
 2013-07-04         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* builtin.c (format_tree): Fixes for %c with multibyte characters
@@ -1465,7 +2282,7 @@
 2012-12-25         Arnold D. Robbins     <arnold@skeeve.com>
 
 	Remove sym-constant from API after discussions with John
-	Haque and Andy Schorr.
+	Haque and Andrew Schorr.
 
 	* gawkapi.h (api_sym_constant): Removed field in API struct.
 	(sym_constant): Remove macro.
diff --git a/INSTALL b/INSTALL
index 6e90e07d..20998407 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
 Inc.
 
    Copying and distribution of this file, with or without modification,
@@ -12,8 +12,8 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented
diff --git a/Makefile.am b/Makefile.am
index 52ef5a47..6c4f83c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,6 +69,7 @@ SUBDIRS = \
 	awklib \
 	po \
 	extension \
+	extras \
 	test
 
 # what to make and install
@@ -160,14 +161,14 @@ RM = rm -f
 install-exec-hook:
 	(cd $(DESTDIR)$(bindir); \
 	$(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
-	if [ ! -f awk ]; \
-	then	$(LN_S) gawk$(EXEEXT) awk; \
+	if [ ! -f awk$(EXEEXT) ]; \
+	then	$(LN_S) gawk$(EXEEXT) awk$(EXEEXT); \
 	fi; exit 0)
 
 # Undo the above when uninstalling
 uninstall-links:
 	(cd $(DESTDIR)$(bindir); \
-	if [ -f awk ] && cmp awk gawk$(EXEEXT) > /dev/null; then rm -f awk; fi ; \
+	if [ -f awk$(EXEEXT) ] && cmp awk$(EXEEXT) gawk$(EXEEXT) > /dev/null; then rm -f awk$(EXEEXT); fi ; \
 	rm -f gawk-$(VERSION)$(EXEEXT); exit 0)
 
 uninstall-recursive: uninstall-links
diff --git a/Makefile.in b/Makefile.in
index 4b5fa69f..9ddc508d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -39,7 +39,17 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -103,12 +113,6 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = gawk$(EXEEXT)
 subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
-	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/configh.in mkinstalldirs ABOUT-NLS awkgram.c \
-	command.c depcomp ylwrap $(include_HEADERS) COPYING TODO \
-	config.guess config.rpath config.sub install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
 	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -123,6 +127,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(include_HEADERS) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -257,6 +263,10 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/configh.in ABOUT-NLS \
+	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO awkgram.c \
+	command.c compile config.guess config.rpath config.sub depcomp \
+	install-sh missing mkinstalldirs ylwrap
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -364,6 +374,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POSUB = @POSUB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOCKET_LIBS = @SOCKET_LIBS@
@@ -476,6 +487,7 @@ SUBDIRS = \
 	awklib \
 	po \
 	extension \
+	extras \
 	test
 
 include_HEADERS = gawkapi.h
@@ -571,7 +583,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -592,8 +603,8 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/configh.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -695,14 +706,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .y.c:
 	$(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE)
@@ -916,10 +927,16 @@ dist-xz: distdir
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
@@ -954,16 +971,17 @@ distcheck: dist
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1153,6 +1171,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS
 	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
 	uninstall-includeHEADERS
 
+.PRECIOUS: Makefile
+
 
 # First, add a link from gawk to gawk-X.Y.Z.
 #
@@ -1162,14 +1182,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS
 install-exec-hook:
 	(cd $(DESTDIR)$(bindir); \
 	$(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
-	if [ ! -f awk ]; \
-	then	$(LN_S) gawk$(EXEEXT) awk; \
+	if [ ! -f awk$(EXEEXT) ]; \
+	then	$(LN_S) gawk$(EXEEXT) awk$(EXEEXT); \
 	fi; exit 0)
 
 # Undo the above when uninstalling
 uninstall-links:
 	(cd $(DESTDIR)$(bindir); \
-	if [ -f awk ] && cmp awk gawk$(EXEEXT) > /dev/null; then rm -f awk; fi ; \
+	if [ -f awk$(EXEEXT) ] && cmp awk$(EXEEXT) gawk$(EXEEXT) > /dev/null; then rm -f awk$(EXEEXT); fi ; \
 	rm -f gawk-$(VERSION)$(EXEEXT); exit 0)
 
 uninstall-recursive: uninstall-links
diff --git a/NEWS b/NEWS
index 58c77e7a..d3c1b055 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
-   Copyright (C) 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015,
+   Free Software Foundation, Inc.
    
    Copying and distribution of this file, with or without modification,
    are permitted in any medium without royalty provided the copyright
@@ -9,7 +10,8 @@ Changes from 4.1.x to 4.2.0
 
 1. If not in POSIX mode, changes to ENVIRON are reflected into
    gawk's environment, affecting any programs run by system()
-   or for piped redirections.
+   or for piped redirections. This can also affect built-in routines, such
+   as mktime(), which is typically influenced by the TZ environment variable.
 
 2. The series of numbers returned by rand() should now be "more
    random" than previously.  Gawk's rand() remains repeatable; you will
@@ -21,7 +23,7 @@ Changes from 4.1.x to 4.2.0
 4. The igawk script and igawk.1 man page are no longer installed by
    `make install'.  They have been obsolete since gawk 4.0.0.
 
-5. Gawk now has a `div()' function to perform integer division; this is
+5. Gawk now has a `intdiv()' function to perform integer division; this is
    primarily useful for the -M option to avoid MPFR division when all
    values involved are integers.
 
@@ -34,6 +36,21 @@ Changes from 4.1.x to 4.2.0
 
 8. MirBSD is no longer supported.
 
+9. Pretty printing now preserves comments and places them into the
+   pretty-printed file.
+
+10. `make install' now installs shell startup files
+    $sysconfdir/profile.d/gawk.{csh,sh} containing shell functions to
+    manipulate the AWKPATH and AWKLIBPATH environment variables.  On a Fedora
+    system, these files belong in /etc/profile.d, but the appropriate location
+    may be different on other platforms.
+
+11. Gawk now supports retryable I/O via PROCINFO[input-file, "RETRY"]; see
+    the manual.
+
+12. The API minor version has been increased to two; the get_file()
+    API provides access to open redirections. Also see the manual.
+
 Changes from 4.1.1 to 4.1.2
 ---------------------------
 
@@ -43,6 +60,7 @@ Changes from 4.1.1 to 4.1.2
 	- Chapter 15 on MPFR reworked.
 	- Summary sections added to all chapters.
 	- Exercises added in several chapters.
+	- Heavily proof-read and copyedited.
 
 2. The debugger's "restart" command now works again.
 
@@ -50,12 +68,38 @@ Changes from 4.1.1 to 4.1.2
 
 4. A number of bugs have been fixed in the MPFR code.
 
-5. Indirect function calls now work for both built-in and
-   extension functions.
+5. Indirect function calls now work for both built-in and extension functions.
+
+6. Built-in functions are now included in FUNCTAB.
+
+7. POSIX and historical practice require the exclusive use of the English
+   alphabet in identifiers.  In non-English locales, it was accidentally
+   possible to use "letters" beside those of the English alphabet.  This
+   has been fixed. (isalpha and isalnum are NOT our friends.)
+
+   If you feel that you must have this misfeature, use `configure --help'
+   to see what option to use when configuring gawk to reenable it.
+
+8. The "where" command has been added to the debugger as an alias
+   for "backtrace". This will make life easier for long-time GDB users.
+
+9. Gawk no longer explicitly checks the current directory after doing
+   a path search of AWKPATH.  The default value continues to have "." at
+   the front, so most people should not be affected.  If you have your own
+   AWKPATH setting, be sure to put "." in it somewhere. The documentation
+   has been updated and clarified.
+
+10. Infrastructure upgrades: Automake 1.15, Gettext 0.19.4, Libtool 2.4.6,
+    Bison 3.0.4.
+
+11. If a user-defined function has a parameter with the same name as another
+    user-defined function, it is no longer possible to call the second
+    function from inside the first.
 
-6. In non-English locales, it was accidentally possible to use "letters"
-   beside those of the English alphabet in identifiers.  This has
-   been fixed.  (isalpha and isalnum are NOT our friends.)
+12. POSIX requires that the names of function parameters not be the
+    same as any of the special built-in variables and also not conflict
+    with the names of any functions. Gawk has checked for the former
+    since 3.1.7. With --posix, it now also checks for the latter.
 
 XX. A number of bugs have been fixed. See the ChangeLog.
 
diff --git a/POSIX.STD b/POSIX.STD
index 1555d7be..a2368949 100644
--- a/POSIX.STD
+++ b/POSIX.STD
@@ -1,11 +1,11 @@
-  Copyright (C) 1992, 1995, 1998, 2001, 2006, 2007, 2010, 2011
+  Copyright (C) 1992, 1995, 1998, 2001, 2006, 2007, 2010, 2011, 2015
   Free Software Foundation, Inc.
   
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
   notice and this notice are preserved.
 --------------------------------------------------------------------------
-Thu Mar 31 22:31:57 IST 2011
+Thu Feb 12 08:51:22 IST 2015
 ============================
 This file documents several things related to the 2008 POSIX standard
 that I noted after reviewing it.
@@ -30,6 +30,19 @@ that I noted after reviewing it.
    sequence into account.  By default gawk doesn't do this. Rather, gawk
    will do this only if --posix is in effect.
 
+4. According to POSIX, the function parameters of one function may not have
+   the same name as another function, making this invalid:
+
+	function foo() { ... }
+	function bar(foo) { ...}
+
+   Or even:
+
+	function bar(foo) { ...}
+	function foo() { ... }
+
+   Gawk enforces this only with --posix.
+
 The following things aren't described by POSIX but ought to be:
 
 1. The value of $0 in an END rule
diff --git a/README b/README
index 028637ec..a7925ee5 100644
--- a/README
+++ b/README
@@ -91,9 +91,6 @@ OS/2:
 	andreas.buening@nexgo.de
 
 VMS:
-	Pat Rankin
-	r.pat.rankin@gmail.com
-
 	John Malmberg
 	wb8tyw@qsl.net
 
diff --git a/TODO b/TODO
index 66c8cc91..65aa0f15 100644
--- a/TODO
+++ b/TODO
@@ -1,13 +1,9 @@
-Sun Aug 24 20:00:53 IDT 2014
+Wed Dec 24 20:41:38 IST 2014
 ============================
 
 There were too many files tracking different thoughts and ideas for
 things to do, or consider doing.  This file merges them into one. As
-tasks are completed, they should be moved to the DONE section, below,
-or simply removed.
-
-Upon creation of a release (major or patch release), items from the
-previous release should be removed.
+tasks are completed, they should be removed.
 
 This file should exist only in the master branch or branches based off
 of it for development, but not in the stable branch. This may require some
@@ -23,9 +19,6 @@ Minor Cleanups and Code Improvements
 	order to nuke the use of libtool. [ Partially started in the
 	nolibtool branch. ]
 
-	Enhance profiling to save comments in a byte-code that does nothing
-	but that can be used when pretty printing the program.
-
 	API:
 		??? #if !defined(GAWK) && !defined(GAWK_OMIT_CONVENIENCE_MACROS)
 
@@ -43,15 +36,14 @@ Minor Cleanups and Code Improvements
 Minor New Features
 ------------------
 
+	Enable command line source text in the debugger.
+
 	Enhance extension/fork.c waitpid to allow the caller to specify
 	the options.  And add an optional array argument to wait and
 	waitpid in which to return exit status information.
 
 	Consider relaxing the strictness of --posix.
 
-	Make it possible to put print/printf + redirections into
-	an expression.
-
 	? Add an optional base to strtonum, allowing 2-36.
 
 	? Optional third argument for index indicating where to start the
@@ -68,8 +60,6 @@ Major New Features
 
 	Also needed:
 
-		Indirect calls of built-ins
-		Indirect calls of extension functions
 		Indirect through array elements, not just scalar variables
 
 	Some way to make regexp constants first class citizens:
@@ -132,8 +122,6 @@ Things To Think About That May Never Happen
 	Patch lexer for @include and @load to make quotes optional.
 	(Really needed?)
 
-	? Have strftime() pay attention to the value of ENVIRON["TZ"]
-
 	Add a lint check if the return value of a function is used but
 	the function did not supply a value.
 
@@ -146,18 +134,6 @@ Things To Think About That May Never Happen
 	E.g., a length of 0 or -1 or something.  Maybe "n"?
 
 
-DONE
-====
-
-Minor Cleanups and Code Improvements
-------------------------------------
-
-Minor New Features
-------------------
-
-Major New Features
-------------------
-
 Things That We Decided We Will Never Do
 =======================================
 
diff --git a/aclocal.m4 b/aclocal.m4
index 4099cd7e..c150e9a8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.13'
+[am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.13.4], [],
+m4_if([$1], [1.15], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.13.4])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -418,6 +417,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -493,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -526,6 +531,51 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
 ])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
@@ -534,7 +584,6 @@ dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -556,7 +605,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -567,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -577,7 +626,7 @@ if test x"${install_sh}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -598,7 +647,7 @@ AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -648,7 +697,7 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -687,7 +736,7 @@ fi
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -716,9 +765,73 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -799,7 +912,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -859,7 +972,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -887,7 +1000,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -906,7 +1019,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/array.c b/array.c
index cb2e654f..bb084223 100644
--- a/array.c
+++ b/array.c
@@ -951,14 +951,13 @@ cmp_strings(const NODE *n1, const NODE *n2)
 		const unsigned char *cp1 = (const unsigned char *) s1;
 		const unsigned char *cp2 = (const unsigned char *) s2;
 
-#if MBS_SUPPORT
 		if (gawk_mb_cur_max > 1) {
 			ret = strncasecmpmbs((const unsigned char *) cp1,
 					     (const unsigned char *) cp2, lmin);
-		} else
-#endif
-		for (ret = 0; lmin-- > 0 && ret == 0; cp1++, cp2++)
-			ret = casetable[*cp1] - casetable[*cp2];
+		} else {
+			for (ret = 0; lmin-- > 0 && ret == 0; cp1++, cp2++)
+				ret = casetable[*cp1] - casetable[*cp2];
+		}
 		if (ret != 0)
 			return ret;
 		/*
diff --git a/awk.h b/awk.h
index e1ec7b91..b1556d52 100644
--- a/awk.h
+++ b/awk.h
@@ -3,7 +3,7 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2014 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2015 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
@@ -95,13 +95,11 @@ extern int errno;
 #include "missing_d/gawkbool.h"
 #endif
 
-#include "mbsupport.h" /* defines MBS_SUPPORT */
-
-#if MBS_SUPPORT
 /* We can handle multibyte strings.  */
 #include <wchar.h>
 #include <wctype.h>
-#endif
+
+#include "mbsupport.h" /* defines stuff for DJGPP to fake MBS */
 
 #ifdef STDC_HEADERS
 #include <float.h>
@@ -379,10 +377,8 @@ typedef struct exp_node {
 			size_t slen;
 			long sref;
 			int idx;
-#if MBS_SUPPORT
 			wchar_t *wsp;
 			size_t wslen;
-#endif		
 			union {
 				AWKNUM fltnum;
 				void *pq;
@@ -518,6 +514,11 @@ typedef struct exp_node {
 #define adepth     sub.nodep.l.ll
 #define alevel     sub.nodep.x.xl
 
+/* Op_comment	*/
+#define comment_type	sub.val.idx
+#define EOL_COMMENT 1
+#define FULL_COMMENT 2
+
 /* --------------------------------lint warning types----------------------------*/
 typedef enum lintvals {
 	LINT_illegal,
@@ -648,6 +649,7 @@ typedef enum opcodeval {
 
 	Op_func,
 
+	Op_comment,		/* for pretty printing */
 	Op_exec_count,
 	Op_breakpoint,
 	Op_lint,
@@ -1165,11 +1167,7 @@ extern int exit_val;
 #define do_lint             (do_flags & (DO_LINT_INVALID|DO_LINT_ALL))
 #define do_lint_old         (do_flags & DO_LINT_OLD)
 #endif
-#if MBS_SUPPORT
 extern int gawk_mb_cur_max;
-#else
-#define gawk_mb_cur_max	(1)
-#endif
 
 #if defined (HAVE_GETGROUPS) && defined(NGROUPS_MAX) && NGROUPS_MAX > 0
 extern GETGROUPS_T *groupset;
@@ -1270,46 +1268,11 @@ DEREF(NODE *r)
 #define	cant_happen()	r_fatal("internal error line %d, file: %s", \
 				__LINE__, __FILE__)
 
-#define	emalloc(var,ty,x,str)	(void)((var=(ty)malloc((size_t)(x))) ||\
-				 (fatal(_("%s: %s: can't allocate %ld bytes of memory (%s)"),\
-					(str), #var, (long) (x), strerror(errno)),0))
-#define	erealloc(var,ty,x,str)	(void)((var = (ty)realloc((char *)var, (size_t)(x))) \
-				||\
-				 (fatal(_("%s: %s: can't allocate %ld bytes of memory (%s)"),\
-					(str), #var, (long) (x), strerror(errno)),0))
+#define	emalloc(var,ty,x,str)	(void) (var = (ty) emalloc_real((size_t)(x), str, #var, __FILE__, __LINE__))
+#define	erealloc(var,ty,x,str)	(void) (var = (ty) erealloc_real((void *) var, (size_t)(x), str, #var, __FILE__, __LINE__))
 
 #define efree(p)	free(p)
 
-static inline NODE *
-force_string(NODE *s)
-{
-	if ((s->flags & STRCUR) != 0
-		    && (s->stfmt == -1 || s->stfmt == CONVFMTidx)
-	)
-		return s;
-	return format_val(CONVFMT, CONVFMTidx, s);
-}
-
-#ifdef GAWKDEBUG
-#define unref	r_unref
-#define	force_number	str2number
-#else /* not GAWKDEBUG */
-
-static inline void
-unref(NODE *r)
-{
-	if (r != NULL && --r->valref <= 0)
-		r_unref(r);
-}
-
-static inline NODE *
-force_number(NODE *n)
-{
-	return (n->flags & NUMCUR) ? n : str2number(n);
-}
-
-#endif /* GAWKDEBUG */
-
 #define fatal		set_loc(__FILE__, __LINE__), r_fatal
 
 extern jmp_buf fatal_tag;
@@ -1383,7 +1346,6 @@ extern void shadow_funcs(void);
 extern int check_special(const char *name);
 extern SRCFILE *add_srcfile(enum srctype stype, char *src, SRCFILE *curr, bool *already_included, int *errcode);
 extern void free_srcfile(SRCFILE *thisfile);
-extern void register_deferred_variable(const char *name, NODE *(*load_func)(void));
 extern int files_are_same(char *path, SRCFILE *src);
 extern void valinfo(NODE *n, Func_print print_func, FILE *fp);
 typedef NODE *(*builtin_func_t)(int);	/* function that implements a built-in */
@@ -1392,6 +1354,7 @@ extern void install_builtins(void);
 extern bool is_alpha(int c);
 extern bool is_alnum(int c);
 extern bool is_identchar(int c);
+extern NODE *make_regnode(int type, NODE *exp);
 /* builtin.c */
 extern NODE *do_fflush(int nargs);
 extern NODE *do_index(int nargs);
@@ -1410,15 +1373,15 @@ extern NODE *do_tolower(int nargs);
 extern NODE *do_toupper(int nargs);
 extern NODE *do_match(int nargs);
 extern NODE *do_sub(int nargs, unsigned int flags);
+extern NODE *call_sub(const char *name, int nargs);
+extern NODE *call_match(int nargs);
+extern NODE *call_split_func(const char *name, int nargs);
 extern NODE *do_dcgettext(int nargs);
 extern NODE *do_dcngettext(int nargs);
 extern NODE *do_bindtextdomain(int nargs);
-extern NODE *do_div(int nargs);
-#if MBS_SUPPORT
+extern NODE *do_intdiv(int nargs);
 extern int strncasecmpmbs(const unsigned char *,
 			  const unsigned char *, size_t);
-#endif
-
 /* eval.c */
 extern void PUSH_CODE(INSTRUCTION *cp);
 extern INSTRUCTION *POP_CODE(void);
@@ -1449,7 +1412,7 @@ extern NODE **r_get_lhs(NODE *n, bool reference);
 extern STACK_ITEM *grow_stack(void);
 extern void dump_fcall_stack(FILE *fp);
 extern int register_exec_hook(Func_pre_exec preh, Func_post_exec posth);
-
+extern NODE **r_get_field(NODE *n, Func_ptr *assign, bool reference);
 /* ext.c */
 extern NODE *do_ext(int nargs);
 void load_ext(const char *lib_name);	/* temporary */
@@ -1520,7 +1483,10 @@ extern void register_output_wrapper(awk_output_wrapper_t *wrapper);
 extern void register_two_way_processor(awk_two_way_processor_t *processor);
 extern void set_FNR(void);
 extern void set_NR(void);
-extern struct redirect *redirect(NODE *redir_exp, int redirtype, int *errflg);
+extern struct redirect *redirect(NODE *redir_exp, int redirtype, int *errflg, bool failure_fatal);
+extern struct redirect *redirect_string(const char *redir_exp_str,
+		size_t redir_exp_len, bool not_string_flag, int redirtype,
+		int *errflg, int extfd, bool failure_fatal);
 extern NODE *do_close(int nargs);
 extern int flush_io(void);
 extern int close_io(bool *stdio_problem);
@@ -1532,7 +1498,8 @@ extern NODE *do_getline(int intovar, IOBUF *iop);
 extern struct redirect *getredirect(const char *str, int len);
 extern bool inrec(IOBUF *iop, int *errcode);
 extern int nextfile(IOBUF **curfile, bool skipping);
-
+extern bool is_non_fatal_std(FILE *fp);
+extern bool is_non_fatal_redirect(const char *str);
 /* main.c */
 extern int arg_assign(char *arg, bool initing);
 extern int is_std_var(const char *var);
@@ -1540,6 +1507,7 @@ extern int is_off_limits_var(const char *var);
 extern char *estrdup(const char *str, size_t len);
 extern void update_global_values();
 extern long getenv_long(const char *name);
+extern void after_beginfile(IOBUF **curfile);
 
 /* msg.c */
 extern void gawk_exit(int status);
@@ -1576,7 +1544,6 @@ extern NODE *make_str_node(const char *s, size_t len, int flags);
 extern void *more_blocks(int id);
 extern int parse_escape(const char **string_ptr);
 extern int get_numbase(const char *str, bool use_locale);
-#if MBS_SUPPORT
 extern NODE *str2wstr(NODE *n, size_t **ptr);
 extern NODE *wstr2str(NODE *n);
 #define force_wstring(n)	str2wstr(n, NULL)
@@ -1590,10 +1557,6 @@ extern wint_t btowc_cache[];
 #define btowc_cache(x) btowc_cache[(x)&0xFF]
 extern void init_btowc_cache();
 #define is_valid_character(b)	(btowc_cache[(b)&0xFF] != WEOF)
-#else
-#define free_wstr(NODE)	/* empty */
-#endif
-
 /* re.c */
 extern Regexp *make_regexp(const char *s, size_t len, bool ignorecase, bool dfa, bool canfatal);
 extern int research(Regexp *rp, char *str, int start, size_t len, int flags);
@@ -1631,6 +1594,7 @@ extern void free_context(AWK_CONTEXT *ctxt, bool keep_globals);
 extern NODE **variable_list();
 extern NODE **function_list(bool sort);
 extern void print_vars(NODE **table, Func_print print_func, FILE *fp);
+extern bool check_param_names(void);
 
 /* floatcomp.c */
 #ifdef HAVE_UINTMAX_T
@@ -1761,3 +1725,65 @@ dupnode(NODE *n)
 	return r_dupnode(n);
 }
 #endif
+
+static inline NODE *
+force_string(NODE *s)
+{
+	if ((s->flags & STRCUR) != 0
+		    && (s->stfmt == -1 || s->stfmt == CONVFMTidx)
+	)
+		return s;
+	return format_val(CONVFMT, CONVFMTidx, s);
+}
+
+#ifdef GAWKDEBUG
+#define unref	r_unref
+#define	force_number	str2number
+#else /* not GAWKDEBUG */
+
+static inline void
+unref(NODE *r)
+{
+	if (r != NULL && --r->valref <= 0)
+		r_unref(r);
+}
+
+static inline NODE *
+force_number(NODE *n)
+{
+	return (n->flags & NUMCUR) ? n : str2number(n);
+}
+
+#endif /* GAWKDEBUG */
+
+static inline void *
+emalloc_real(size_t count, const char *where, const char *var, const char *file, int line)
+{
+	void *ret;
+
+	if (count == 0)
+		fatal("%s:%d: emalloc called with zero bytes", file, line);
+
+	ret = (void *) malloc(count);
+	if (ret == NULL)
+		fatal(_("%s:%d:%s: %s: can't allocate %ld bytes of memory (%s)"),
+			file, line, where, var, (long) count, strerror(errno));
+
+	return ret;
+}
+
+static inline void *
+erealloc_real(void *ptr, size_t count, const char *where, const char *var, const char *file, int line)
+{
+	void *ret;
+
+	if (count == 0)
+		fatal("%s:%d: erealloc called with zero bytes", file, line);
+
+	ret = (void *) realloc(ptr, count);
+	if (ret == NULL)
+		fatal(_("%s:%d:%s: %s: can't reallocate %ld bytes of memory (%s)"),
+			file, line, where, var, (long) count, strerror(errno));
+
+	return ret;
+}
diff --git a/awkgram.c b/awkgram.c
index 861ab0bf..36ed2145 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.2"
+#define YYBISON_VERSION "3.0.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -97,7 +97,6 @@ static int include_source(INSTRUCTION *file);
 static int load_library(INSTRUCTION *file);
 static void next_sourcefile(void);
 static char *tokexpand(void);
-static bool is_deferred_variable(const char *name);
 
 #define instruction(t)	bcalloc(t, 1, 0)
 
@@ -113,24 +112,23 @@ static void fix_break_continue(INSTRUCTION *list, INSTRUCTION *b_target, INSTRUC
 static INSTRUCTION *mk_boolean(INSTRUCTION *left, INSTRUCTION *right, INSTRUCTION *op);
 static INSTRUCTION *mk_assignment(INSTRUCTION *lhs, INSTRUCTION *rhs, INSTRUCTION *op);
 static INSTRUCTION *mk_getline(INSTRUCTION *op, INSTRUCTION *opt_var, INSTRUCTION *redir, int redirtype);
-static NODE *make_regnode(int type, NODE *exp);
 static int count_expressions(INSTRUCTION **list, bool isarg);
 static INSTRUCTION *optimize_assignment(INSTRUCTION *exp);
 static void add_lint(INSTRUCTION *list, LINTTYPE linttype);
 
-static void process_deferred();
-
 enum defref { FUNC_DEFINE, FUNC_USE, FUNC_EXT };
 static void func_use(const char *name, enum defref how);
 static void check_funcs(void);
 
 static ssize_t read_one_line(int fd, void *buffer, size_t count);
 static int one_line_close(int fd);
+static void split_comment(void);
+static void check_comment(void);
 
+static bool at_seen = false;
 static bool want_source = false;
 static bool want_regexp = false;	/* lexical scanning kludge */
 static char *in_function;		/* parsing kludge */
-static bool symtab_used = false;	/* program used SYMTAB */
 static int rule = 0;
 
 const char *const ruletab[] = {
@@ -184,6 +182,15 @@ static INSTRUCTION *ip_atexit = NULL;
 static INSTRUCTION *ip_end;
 static INSTRUCTION *ip_endfile;
 static INSTRUCTION *ip_beginfile;
+INSTRUCTION *main_beginfile;
+
+static INSTRUCTION *comment = NULL;
+static INSTRUCTION *program_comment = NULL;
+static INSTRUCTION *function_comment = NULL;
+static INSTRUCTION *block_comment = NULL;
+
+static bool func_first = true;
+static bool first_rule = true;
 
 static inline INSTRUCTION *list_create(INSTRUCTION *x);
 static inline INSTRUCTION *list_append(INSTRUCTION *l, INSTRUCTION *x);
@@ -194,7 +201,7 @@ extern double fmod(double x, double y);
 
 #define YYSTYPE INSTRUCTION *
 
-#line 198 "awkgram.c" /* yacc.c:339  */
+#line 205 "awkgram.c" /* yacc.c:339  */
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -348,7 +355,7 @@ int yyparse (void);
 
 /* Copy the second part of user declarations.  */
 
-#line 352 "awkgram.c" /* yacc.c:358  */
+#line 359 "awkgram.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -650,25 +657,25 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   197,   197,   199,   204,   205,   211,   223,   227,   238,
-     244,   249,   257,   265,   267,   272,   280,   282,   288,   289,
-     291,   317,   328,   339,   345,   354,   364,   366,   368,   374,
-     379,   380,   384,   403,   402,   436,   438,   443,   444,   457,
-     462,   463,   467,   469,   471,   478,   568,   610,   652,   765,
-     772,   779,   789,   798,   807,   816,   827,   843,   842,   866,
-     878,   878,   976,   976,  1009,  1039,  1045,  1046,  1052,  1053,
-    1060,  1065,  1077,  1091,  1093,  1101,  1106,  1108,  1116,  1118,
-    1127,  1128,  1136,  1141,  1141,  1152,  1156,  1164,  1165,  1168,
-    1170,  1175,  1176,  1185,  1186,  1191,  1196,  1202,  1204,  1206,
-    1213,  1214,  1220,  1221,  1226,  1228,  1233,  1235,  1243,  1248,
-    1257,  1264,  1266,  1268,  1284,  1294,  1301,  1303,  1308,  1310,
-    1312,  1320,  1322,  1327,  1329,  1334,  1336,  1338,  1388,  1390,
-    1392,  1394,  1396,  1398,  1400,  1402,  1416,  1421,  1426,  1451,
-    1457,  1459,  1461,  1463,  1465,  1467,  1472,  1476,  1508,  1510,
-    1516,  1522,  1535,  1536,  1537,  1542,  1547,  1551,  1555,  1570,
-    1582,  1587,  1623,  1641,  1642,  1648,  1649,  1654,  1656,  1663,
-    1680,  1697,  1699,  1706,  1711,  1719,  1729,  1741,  1750,  1754,
-    1758,  1762,  1766,  1770,  1773,  1775,  1779,  1783,  1787
+       0,   204,   204,   206,   211,   212,   216,   228,   233,   244,
+     250,   256,   265,   273,   275,   280,   288,   290,   296,   304,
+     314,   344,   358,   372,   380,   391,   403,   405,   407,   413,
+     421,   422,   426,   461,   460,   494,   496,   501,   507,   535,
+     540,   541,   545,   547,   549,   556,   646,   688,   730,   843,
+     850,   857,   867,   876,   885,   894,   905,   921,   920,   944,
+     956,   956,  1054,  1054,  1087,  1117,  1123,  1124,  1130,  1131,
+    1138,  1143,  1155,  1169,  1171,  1179,  1184,  1186,  1194,  1196,
+    1205,  1206,  1214,  1219,  1219,  1230,  1234,  1242,  1243,  1246,
+    1248,  1253,  1254,  1263,  1264,  1269,  1274,  1280,  1282,  1284,
+    1291,  1292,  1298,  1299,  1304,  1306,  1311,  1313,  1321,  1326,
+    1335,  1342,  1344,  1346,  1362,  1372,  1379,  1381,  1386,  1388,
+    1390,  1398,  1400,  1405,  1407,  1412,  1414,  1416,  1466,  1468,
+    1470,  1472,  1474,  1476,  1478,  1480,  1494,  1499,  1504,  1529,
+    1535,  1537,  1539,  1541,  1543,  1545,  1550,  1554,  1586,  1588,
+    1594,  1600,  1613,  1614,  1615,  1620,  1625,  1629,  1633,  1648,
+    1660,  1665,  1702,  1731,  1732,  1738,  1739,  1744,  1746,  1753,
+    1770,  1787,  1789,  1796,  1801,  1809,  1819,  1831,  1840,  1844,
+    1848,  1852,  1856,  1860,  1863,  1865,  1869,  1873,  1877
 };
 #endif
 
@@ -1841,26 +1848,24 @@ yyreduce:
   switch (yyn)
     {
         case 3:
-#line 200 "awkgram.y" /* yacc.c:1646  */
+#line 207 "awkgram.y" /* yacc.c:1646  */
     {
 		rule = 0;
 		yyerrok;
 	  }
-#line 1850 "awkgram.c" /* yacc.c:1646  */
+#line 1857 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 5:
-#line 206 "awkgram.y" /* yacc.c:1646  */
+#line 213 "awkgram.y" /* yacc.c:1646  */
     {
 		next_sourcefile();
-		if (sourcefile == srcfiles)
-			process_deferred();
 	  }
-#line 1860 "awkgram.c" /* yacc.c:1646  */
+#line 1865 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 6:
-#line 212 "awkgram.y" /* yacc.c:1646  */
+#line 217 "awkgram.y" /* yacc.c:1646  */
     {
 		rule = 0;
 		/*
@@ -1869,19 +1874,20 @@ yyreduce:
 		 */
   		/* yyerrok; */
 	  }
-#line 1873 "awkgram.c" /* yacc.c:1646  */
+#line 1878 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 7:
-#line 224 "awkgram.y" /* yacc.c:1646  */
+#line 229 "awkgram.y" /* yacc.c:1646  */
     {
 		(void) append_rule((yyvsp[-1]), (yyvsp[0]));
+		first_rule = false;
 	  }
-#line 1881 "awkgram.c" /* yacc.c:1646  */
+#line 1887 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 228 "awkgram.y" /* yacc.c:1646  */
+#line 234 "awkgram.y" /* yacc.c:1646  */
     {
 		if (rule != Rule) {
 			msg(_("%s blocks must have an action part"), ruletab[rule]);
@@ -1892,39 +1898,41 @@ yyreduce:
 		} else		/* pattern rule with non-empty pattern */
 			(void) append_rule((yyvsp[-1]), NULL);
 	  }
-#line 1896 "awkgram.c" /* yacc.c:1646  */
+#line 1902 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 239 "awkgram.y" /* yacc.c:1646  */
+#line 245 "awkgram.y" /* yacc.c:1646  */
     {
 		in_function = NULL;
 		(void) mk_function((yyvsp[-1]), (yyvsp[0]));
 		yyerrok;
 	  }
-#line 1906 "awkgram.c" /* yacc.c:1646  */
+#line 1912 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 10:
-#line 245 "awkgram.y" /* yacc.c:1646  */
+#line 251 "awkgram.y" /* yacc.c:1646  */
     {
 		want_source = false;
+		at_seen = false;
 		yyerrok;
 	  }
-#line 1915 "awkgram.c" /* yacc.c:1646  */
+#line 1922 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 250 "awkgram.y" /* yacc.c:1646  */
+#line 257 "awkgram.y" /* yacc.c:1646  */
     {
 		want_source = false;
+		at_seen = false;
 		yyerrok;
 	  }
-#line 1924 "awkgram.c" /* yacc.c:1646  */
+#line 1932 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 258 "awkgram.y" /* yacc.c:1646  */
+#line 266 "awkgram.y" /* yacc.c:1646  */
     {
 		if (include_source((yyvsp[0])) < 0)
 			YYABORT;
@@ -1932,23 +1940,23 @@ yyreduce:
 		bcfree((yyvsp[0]));
 		(yyval) = NULL;
 	  }
-#line 1936 "awkgram.c" /* yacc.c:1646  */
+#line 1944 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 13:
-#line 266 "awkgram.y" /* yacc.c:1646  */
+#line 274 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = NULL; }
-#line 1942 "awkgram.c" /* yacc.c:1646  */
+#line 1950 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 14:
-#line 268 "awkgram.y" /* yacc.c:1646  */
+#line 276 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = NULL; }
-#line 1948 "awkgram.c" /* yacc.c:1646  */
+#line 1956 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 15:
-#line 273 "awkgram.y" /* yacc.c:1646  */
+#line 281 "awkgram.y" /* yacc.c:1646  */
     {
 		if (load_library((yyvsp[0])) < 0)
 			YYABORT;
@@ -1956,35 +1964,49 @@ yyreduce:
 		bcfree((yyvsp[0]));
 		(yyval) = NULL;
 	  }
-#line 1960 "awkgram.c" /* yacc.c:1646  */
+#line 1968 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 16:
-#line 281 "awkgram.y" /* yacc.c:1646  */
+#line 289 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = NULL; }
-#line 1966 "awkgram.c" /* yacc.c:1646  */
+#line 1974 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 17:
-#line 283 "awkgram.y" /* yacc.c:1646  */
+#line 291 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = NULL; }
-#line 1972 "awkgram.c" /* yacc.c:1646  */
+#line 1980 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 288 "awkgram.y" /* yacc.c:1646  */
-    {	(yyval) = NULL; rule = Rule; }
-#line 1978 "awkgram.c" /* yacc.c:1646  */
+#line 296 "awkgram.y" /* yacc.c:1646  */
+    {
+		rule = Rule;
+		if (comment != NULL) {
+			(yyval) = list_create(comment);
+			comment = NULL;
+		} else
+			(yyval) = NULL;
+	  }
+#line 1993 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 19:
-#line 290 "awkgram.y" /* yacc.c:1646  */
-    {	(yyval) = (yyvsp[0]); rule = Rule; }
-#line 1984 "awkgram.c" /* yacc.c:1646  */
+#line 305 "awkgram.y" /* yacc.c:1646  */
+    {
+		rule = Rule;
+		if (comment != NULL) {
+			(yyval) = list_prepend((yyvsp[0]), comment);
+			comment = NULL;
+		} else
+			(yyval) = (yyvsp[0]);
+	  }
+#line 2006 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 20:
-#line 292 "awkgram.y" /* yacc.c:1646  */
+#line 315 "awkgram.y" /* yacc.c:1646  */
     {
 		INSTRUCTION *tp;
 
@@ -2007,104 +2029,139 @@ yyreduce:
 			((yyvsp[-3])->nexti + 1)->condpair_left = (yyvsp[-3])->lasti;
 			((yyvsp[-3])->nexti + 1)->condpair_right = (yyvsp[0])->lasti;
 		}
-		(yyval) = list_append(list_merge((yyvsp[-3]), (yyvsp[0])), tp);
+		if (comment != NULL) {
+			(yyval) = list_append(list_merge(list_prepend((yyvsp[-3]), comment), (yyvsp[0])), tp);
+			comment = NULL;
+		} else
+			(yyval) = list_append(list_merge((yyvsp[-3]), (yyvsp[0])), tp);
 		rule = Rule;
 	  }
-#line 2014 "awkgram.c" /* yacc.c:1646  */
+#line 2040 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 21:
-#line 318 "awkgram.y" /* yacc.c:1646  */
+#line 345 "awkgram.y" /* yacc.c:1646  */
     {
 		static int begin_seen = 0;
+
+		func_first = false;
 		if (do_lint_old && ++begin_seen == 2)
 			warning_ln((yyvsp[0])->source_line,
 				_("old awk does not support multiple `BEGIN' or `END' rules"));
 
 		(yyvsp[0])->in_rule = rule = BEGIN;
 		(yyvsp[0])->source_file = source;
+		check_comment();
 		(yyval) = (yyvsp[0]);
 	  }
-#line 2029 "awkgram.c" /* yacc.c:1646  */
+#line 2058 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 22:
-#line 329 "awkgram.y" /* yacc.c:1646  */
+#line 359 "awkgram.y" /* yacc.c:1646  */
     {
 		static int end_seen = 0;
+
+		func_first = false;
 		if (do_lint_old && ++end_seen == 2)
 			warning_ln((yyvsp[0])->source_line,
 				_("old awk does not support multiple `BEGIN' or `END' rules"));
 
 		(yyvsp[0])->in_rule = rule = END;
 		(yyvsp[0])->source_file = source;
+		check_comment();
 		(yyval) = (yyvsp[0]);
 	  }
-#line 2044 "awkgram.c" /* yacc.c:1646  */
+#line 2076 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 23:
-#line 340 "awkgram.y" /* yacc.c:1646  */
+#line 373 "awkgram.y" /* yacc.c:1646  */
     {
+		func_first = false;
 		(yyvsp[0])->in_rule = rule = BEGINFILE;
 		(yyvsp[0])->source_file = source;
+		check_comment();
 		(yyval) = (yyvsp[0]);
 	  }
-#line 2054 "awkgram.c" /* yacc.c:1646  */
+#line 2088 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 24:
-#line 346 "awkgram.y" /* yacc.c:1646  */
+#line 381 "awkgram.y" /* yacc.c:1646  */
     {
+		func_first = false;
 		(yyvsp[0])->in_rule = rule = ENDFILE;
 		(yyvsp[0])->source_file = source;
+		check_comment();
 		(yyval) = (yyvsp[0]);
 	  }
-#line 2064 "awkgram.c" /* yacc.c:1646  */
+#line 2100 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 25:
-#line 355 "awkgram.y" /* yacc.c:1646  */
+#line 392 "awkgram.y" /* yacc.c:1646  */
     {
+		INSTRUCTION *ip;
 		if ((yyvsp[-3]) == NULL)
-			(yyval) = list_create(instruction(Op_no_op));
+			ip = list_create(instruction(Op_no_op));
 		else
-			(yyval) = (yyvsp[-3]);
+			ip = (yyvsp[-3]);
+		(yyval) = ip;
 	  }
-#line 2075 "awkgram.c" /* yacc.c:1646  */
+#line 2113 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 26:
-#line 365 "awkgram.y" /* yacc.c:1646  */
+#line 404 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); }
-#line 2081 "awkgram.c" /* yacc.c:1646  */
+#line 2119 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 27:
-#line 367 "awkgram.y" /* yacc.c:1646  */
+#line 406 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); }
-#line 2087 "awkgram.c" /* yacc.c:1646  */
+#line 2125 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 28:
-#line 369 "awkgram.y" /* yacc.c:1646  */
+#line 408 "awkgram.y" /* yacc.c:1646  */
     {
 		yyerror(_("`%s' is a built-in function, it cannot be redefined"),
 					tokstart);
 		YYABORT;
 	  }
-#line 2097 "awkgram.c" /* yacc.c:1646  */
+#line 2135 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 29:
-#line 375 "awkgram.y" /* yacc.c:1646  */
-    { (yyval) = (yyvsp[0]); }
-#line 2103 "awkgram.c" /* yacc.c:1646  */
+#line 414 "awkgram.y" /* yacc.c:1646  */
+    {
+		(yyval) = (yyvsp[0]);
+		at_seen = false;
+	  }
+#line 2144 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 32:
-#line 385 "awkgram.y" /* yacc.c:1646  */
+#line 427 "awkgram.y" /* yacc.c:1646  */
     {
+		/*
+		 *  treat any comments between BOF and the first function
+		 *  definition (with no intervening BEGIN etc block) as
+		 *  program comments.  Special kludge: iff there are more
+		 *  than one such comments, treat the last as a function
+		 *  comment.
+		 */
+		if (comment != NULL && func_first
+		    && strstr(comment->memory->stptr, "\n\n") != NULL)
+			split_comment();
+		/* save any other pre-function comment as function comment  */
+		if (comment != NULL) {
+			function_comment = comment;
+			comment = NULL;
+		}
+		func_first = false;
 		(yyvsp[-5])->source_file = source;
 		if (install_function((yyvsp[-4])->lextok, (yyvsp[-5]), (yyvsp[-2])) < 0)
 			YYABORT;
@@ -2114,17 +2171,17 @@ yyreduce:
 		/* $4 already free'd in install_function */
 		(yyval) = (yyvsp[-5]);
 	  }
-#line 2118 "awkgram.c" /* yacc.c:1646  */
+#line 2175 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 33:
-#line 403 "awkgram.y" /* yacc.c:1646  */
+#line 461 "awkgram.y" /* yacc.c:1646  */
     { want_regexp = true; }
-#line 2124 "awkgram.c" /* yacc.c:1646  */
+#line 2181 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 34:
-#line 405 "awkgram.y" /* yacc.c:1646  */
+#line 463 "awkgram.y" /* yacc.c:1646  */
     {
 		  NODE *n, *exp;
 		  char *re;
@@ -2153,69 +2210,89 @@ yyreduce:
 		  (yyval)->opcode = Op_match_rec;
 		  (yyval)->memory = n;
 		}
-#line 2157 "awkgram.c" /* yacc.c:1646  */
+#line 2214 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 35:
-#line 437 "awkgram.y" /* yacc.c:1646  */
+#line 495 "awkgram.y" /* yacc.c:1646  */
     { bcfree((yyvsp[0])); }
-#line 2163 "awkgram.c" /* yacc.c:1646  */
+#line 2220 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 37:
-#line 443 "awkgram.y" /* yacc.c:1646  */
-    {	(yyval) = NULL; }
-#line 2169 "awkgram.c" /* yacc.c:1646  */
+#line 501 "awkgram.y" /* yacc.c:1646  */
+    {
+		if (comment != NULL) {
+			(yyval) = list_create(comment);
+			comment = NULL;
+		} else (yyval) = NULL;
+	  }
+#line 2231 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 38:
-#line 445 "awkgram.y" /* yacc.c:1646  */
+#line 508 "awkgram.y" /* yacc.c:1646  */
     {
-		if ((yyvsp[0]) == NULL)
-			(yyval) = (yyvsp[-1]);
-		else {
+		if ((yyvsp[0]) == NULL) {
+			if (comment == NULL)
+				(yyval) = (yyvsp[-1]);
+			else {
+				(yyval) = list_append((yyvsp[-1]), comment);
+				comment = NULL;
+			}
+		} else {
 			add_lint((yyvsp[0]), LINT_no_effect);
-			if ((yyvsp[-1]) == NULL)
-				(yyval) = (yyvsp[0]);
-			else
+			if ((yyvsp[-1]) == NULL) {
+				if (comment == NULL)
+					(yyval) = (yyvsp[0]);
+				else {
+					(yyval) = list_append((yyvsp[0]), comment);
+					comment = NULL;
+				}
+			} else {
+				if (comment != NULL) {
+					list_append((yyvsp[0]), comment);
+					comment = NULL;
+				}
 				(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
+			}
 		}
-	    yyerrok;
+		yyerrok;
 	  }
-#line 2186 "awkgram.c" /* yacc.c:1646  */
+#line 2263 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 39:
-#line 458 "awkgram.y" /* yacc.c:1646  */
+#line 536 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = NULL; }
-#line 2192 "awkgram.c" /* yacc.c:1646  */
+#line 2269 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 42:
-#line 468 "awkgram.y" /* yacc.c:1646  */
+#line 546 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = NULL; }
-#line 2198 "awkgram.c" /* yacc.c:1646  */
+#line 2275 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 43:
-#line 470 "awkgram.y" /* yacc.c:1646  */
+#line 548 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[-1]); }
-#line 2204 "awkgram.c" /* yacc.c:1646  */
+#line 2281 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 44:
-#line 472 "awkgram.y" /* yacc.c:1646  */
+#line 550 "awkgram.y" /* yacc.c:1646  */
     {
 		if (do_pretty_print)
 			(yyval) = list_prepend((yyvsp[0]), instruction(Op_exec_count));
 		else
 			(yyval) = (yyvsp[0]);
  	  }
-#line 2215 "awkgram.c" /* yacc.c:1646  */
+#line 2292 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 45:
-#line 479 "awkgram.y" /* yacc.c:1646  */
+#line 557 "awkgram.y" /* yacc.c:1646  */
     {
 		INSTRUCTION *dflt, *curr = NULL, *cexp, *cstmt;
 		INSTRUCTION *ip, *nextc, *tbreak;
@@ -2236,7 +2313,7 @@ yyreduce:
 		} /*  else
 				curr = NULL; */
 
-		for(; curr != NULL; curr = nextc) {
+		for (; curr != NULL; curr = nextc) {
 			INSTRUCTION *caseexp = curr->case_exp;
 			INSTRUCTION *casestmt = curr->case_stmt;
 
@@ -2305,11 +2382,11 @@ yyreduce:
 		break_allowed--;			
 		fix_break_continue(ip, tbreak, NULL);
 	  }
-#line 2309 "awkgram.c" /* yacc.c:1646  */
+#line 2386 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 46:
-#line 569 "awkgram.y" /* yacc.c:1646  */
+#line 647 "awkgram.y" /* yacc.c:1646  */
     { 
 		/*
 		 *    -----------------
@@ -2351,11 +2428,11 @@ yyreduce:
 		continue_allowed--;
 		fix_break_continue(ip, tbreak, tcont);
 	  }
-#line 2355 "awkgram.c" /* yacc.c:1646  */
+#line 2432 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 47:
-#line 611 "awkgram.y" /* yacc.c:1646  */
+#line 689 "awkgram.y" /* yacc.c:1646  */
     {
 		/*
 		 *    -----------------
@@ -2397,11 +2474,11 @@ yyreduce:
 		} /* else
 			$1 and $4 are NULLs */
 	  }
-#line 2401 "awkgram.c" /* yacc.c:1646  */
+#line 2478 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 48:
-#line 653 "awkgram.y" /* yacc.c:1646  */
+#line 731 "awkgram.y" /* yacc.c:1646  */
     {
 		INSTRUCTION *ip;
 		char *var_name = (yyvsp[-5])->lextok;
@@ -2514,44 +2591,44 @@ regular_loop:
 		break_allowed--;
 		continue_allowed--;
 	  }
-#line 2518 "awkgram.c" /* yacc.c:1646  */
+#line 2595 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 49:
-#line 766 "awkgram.y" /* yacc.c:1646  */
+#line 844 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyval) = mk_for_loop((yyvsp[-11]), (yyvsp[-9]), (yyvsp[-6]), (yyvsp[-3]), (yyvsp[0]));
 
 		break_allowed--;
 		continue_allowed--;
 	  }
-#line 2529 "awkgram.c" /* yacc.c:1646  */
+#line 2606 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 50:
-#line 773 "awkgram.y" /* yacc.c:1646  */
+#line 851 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyval) = mk_for_loop((yyvsp[-10]), (yyvsp[-8]), (INSTRUCTION *) NULL, (yyvsp[-3]), (yyvsp[0]));
 
 		break_allowed--;
 		continue_allowed--;
 	  }
-#line 2540 "awkgram.c" /* yacc.c:1646  */
+#line 2617 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 51:
-#line 780 "awkgram.y" /* yacc.c:1646  */
+#line 858 "awkgram.y" /* yacc.c:1646  */
     {
 		if (do_pretty_print)
 			(yyval) = list_prepend((yyvsp[0]), instruction(Op_exec_count));
 		else
 			(yyval) = (yyvsp[0]);
 	  }
-#line 2551 "awkgram.c" /* yacc.c:1646  */
+#line 2628 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 52:
-#line 790 "awkgram.y" /* yacc.c:1646  */
+#line 868 "awkgram.y" /* yacc.c:1646  */
     { 
 		if (! break_allowed)
 			error_ln((yyvsp[-1])->source_line,
@@ -2560,11 +2637,11 @@ regular_loop:
 		(yyval) = list_create((yyvsp[-1]));
 
 	  }
-#line 2564 "awkgram.c" /* yacc.c:1646  */
+#line 2641 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 53:
-#line 799 "awkgram.y" /* yacc.c:1646  */
+#line 877 "awkgram.y" /* yacc.c:1646  */
     {
 		if (! continue_allowed)
 			error_ln((yyvsp[-1])->source_line,
@@ -2573,11 +2650,11 @@ regular_loop:
 		(yyval) = list_create((yyvsp[-1]));
 
 	  }
-#line 2577 "awkgram.c" /* yacc.c:1646  */
+#line 2654 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 54:
-#line 808 "awkgram.y" /* yacc.c:1646  */
+#line 886 "awkgram.y" /* yacc.c:1646  */
     {
 		/* if inside function (rule = 0), resolve context at run-time */
 		if (rule && rule != Rule)
@@ -2586,11 +2663,11 @@ regular_loop:
 		(yyvsp[-1])->target_jmp = ip_rec;
 		(yyval) = list_create((yyvsp[-1]));
 	  }
-#line 2590 "awkgram.c" /* yacc.c:1646  */
+#line 2667 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 55:
-#line 817 "awkgram.y" /* yacc.c:1646  */
+#line 895 "awkgram.y" /* yacc.c:1646  */
     {
 		/* if inside function (rule = 0), resolve context at run-time */
 		if (rule == BEGIN || rule == END || rule == ENDFILE)
@@ -2601,11 +2678,11 @@ regular_loop:
 		(yyvsp[-1])->target_endfile = ip_endfile;
 		(yyval) = list_create((yyvsp[-1]));
 	  }
-#line 2605 "awkgram.c" /* yacc.c:1646  */
+#line 2682 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 56:
-#line 828 "awkgram.y" /* yacc.c:1646  */
+#line 906 "awkgram.y" /* yacc.c:1646  */
     {
 		/* Initialize the two possible jump targets, the actual target
 		 * is resolved at run-time. 
@@ -2620,20 +2697,20 @@ regular_loop:
 		} else
 			(yyval) = list_append((yyvsp[-1]), (yyvsp[-2]));
 	  }
-#line 2624 "awkgram.c" /* yacc.c:1646  */
+#line 2701 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 57:
-#line 843 "awkgram.y" /* yacc.c:1646  */
+#line 921 "awkgram.y" /* yacc.c:1646  */
     {
 		if (! in_function)
 			yyerror(_("`return' used outside function context"));
 	  }
-#line 2633 "awkgram.c" /* yacc.c:1646  */
+#line 2710 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 58:
-#line 846 "awkgram.y" /* yacc.c:1646  */
+#line 924 "awkgram.y" /* yacc.c:1646  */
     {
 		if ((yyvsp[-1]) == NULL) {
 			(yyval) = list_create((yyvsp[-3]));
@@ -2654,17 +2731,17 @@ regular_loop:
 			(yyval) = list_append((yyvsp[-1]), (yyvsp[-3]));
 		}
 	  }
-#line 2658 "awkgram.c" /* yacc.c:1646  */
+#line 2735 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 60:
-#line 878 "awkgram.y" /* yacc.c:1646  */
+#line 956 "awkgram.y" /* yacc.c:1646  */
     { in_print = true; in_parens = 0; }
-#line 2664 "awkgram.c" /* yacc.c:1646  */
+#line 2741 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 61:
-#line 879 "awkgram.y" /* yacc.c:1646  */
+#line 957 "awkgram.y" /* yacc.c:1646  */
     {
 		/*
 		 * Optimization: plain `print' has no expression list, so $3 is null.
@@ -2761,17 +2838,17 @@ regular_print:
 			}
 		}
 	  }
-#line 2765 "awkgram.c" /* yacc.c:1646  */
+#line 2842 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 62:
-#line 976 "awkgram.y" /* yacc.c:1646  */
+#line 1054 "awkgram.y" /* yacc.c:1646  */
     { sub_counter = 0; }
-#line 2771 "awkgram.c" /* yacc.c:1646  */
+#line 2848 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 63:
-#line 977 "awkgram.y" /* yacc.c:1646  */
+#line 1055 "awkgram.y" /* yacc.c:1646  */
     {
 		char *arr = (yyvsp[-2])->lextok;
 
@@ -2804,11 +2881,11 @@ regular_print:
 			(yyval) = list_append(list_append((yyvsp[0]), (yyvsp[-2])), (yyvsp[-3]));
 		}
 	  }
-#line 2808 "awkgram.c" /* yacc.c:1646  */
+#line 2885 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 64:
-#line 1014 "awkgram.y" /* yacc.c:1646  */
+#line 1092 "awkgram.y" /* yacc.c:1646  */
     {
 		static bool warned = false;
 		char *arr = (yyvsp[-1])->lextok;
@@ -2834,52 +2911,52 @@ regular_print:
 				fatal(_("`delete' is not allowed with FUNCTAB"));
 		}
 	  }
-#line 2838 "awkgram.c" /* yacc.c:1646  */
+#line 2915 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 65:
-#line 1040 "awkgram.y" /* yacc.c:1646  */
+#line 1118 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = optimize_assignment((yyvsp[0])); }
-#line 2844 "awkgram.c" /* yacc.c:1646  */
+#line 2921 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 66:
-#line 1045 "awkgram.y" /* yacc.c:1646  */
+#line 1123 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = NULL; }
-#line 2850 "awkgram.c" /* yacc.c:1646  */
+#line 2927 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 67:
-#line 1047 "awkgram.y" /* yacc.c:1646  */
+#line 1125 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); }
-#line 2856 "awkgram.c" /* yacc.c:1646  */
+#line 2933 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 68:
-#line 1052 "awkgram.y" /* yacc.c:1646  */
+#line 1130 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = NULL; }
-#line 2862 "awkgram.c" /* yacc.c:1646  */
+#line 2939 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 69:
-#line 1054 "awkgram.y" /* yacc.c:1646  */
+#line 1132 "awkgram.y" /* yacc.c:1646  */
     {
 		if ((yyvsp[-1]) == NULL)
 			(yyval) = list_create((yyvsp[0]));
 		else
 			(yyval) = list_prepend((yyvsp[-1]), (yyvsp[0]));
 	  }
-#line 2873 "awkgram.c" /* yacc.c:1646  */
+#line 2950 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 70:
-#line 1061 "awkgram.y" /* yacc.c:1646  */
+#line 1139 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = NULL; }
-#line 2879 "awkgram.c" /* yacc.c:1646  */
+#line 2956 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 71:
-#line 1066 "awkgram.y" /* yacc.c:1646  */
+#line 1144 "awkgram.y" /* yacc.c:1646  */
     {
 		INSTRUCTION *casestmt = (yyvsp[0]);
 		if ((yyvsp[0]) == NULL)
@@ -2891,11 +2968,11 @@ regular_print:
 		bcfree((yyvsp[-2]));
 		(yyval) = (yyvsp[-4]);
 	  }
-#line 2895 "awkgram.c" /* yacc.c:1646  */
+#line 2972 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 72:
-#line 1078 "awkgram.y" /* yacc.c:1646  */
+#line 1156 "awkgram.y" /* yacc.c:1646  */
     {
 		INSTRUCTION *casestmt = (yyvsp[0]);
 		if ((yyvsp[0]) == NULL)
@@ -2906,17 +2983,17 @@ regular_print:
 		(yyvsp[-3])->case_stmt = casestmt;
 		(yyval) = (yyvsp[-3]);
 	  }
-#line 2910 "awkgram.c" /* yacc.c:1646  */
+#line 2987 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 73:
-#line 1092 "awkgram.y" /* yacc.c:1646  */
+#line 1170 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = (yyvsp[0]); }
-#line 2916 "awkgram.c" /* yacc.c:1646  */
+#line 2993 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 74:
-#line 1094 "awkgram.y" /* yacc.c:1646  */
+#line 1172 "awkgram.y" /* yacc.c:1646  */
     { 
 		NODE *n = (yyvsp[0])->memory;
 		(void) force_number(n);
@@ -2924,71 +3001,71 @@ regular_print:
 		bcfree((yyvsp[-1]));
 		(yyval) = (yyvsp[0]);
 	  }
-#line 2928 "awkgram.c" /* yacc.c:1646  */
+#line 3005 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 75:
-#line 1102 "awkgram.y" /* yacc.c:1646  */
+#line 1180 "awkgram.y" /* yacc.c:1646  */
     {
 		bcfree((yyvsp[-1]));
 		(yyval) = (yyvsp[0]);
 	  }
-#line 2937 "awkgram.c" /* yacc.c:1646  */
+#line 3014 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 76:
-#line 1107 "awkgram.y" /* yacc.c:1646  */
+#line 1185 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = (yyvsp[0]); }
-#line 2943 "awkgram.c" /* yacc.c:1646  */
+#line 3020 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 77:
-#line 1109 "awkgram.y" /* yacc.c:1646  */
+#line 1187 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyvsp[0])->opcode = Op_push_re;
 		(yyval) = (yyvsp[0]);
 	  }
-#line 2952 "awkgram.c" /* yacc.c:1646  */
+#line 3029 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 78:
-#line 1117 "awkgram.y" /* yacc.c:1646  */
+#line 1195 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); }
-#line 2958 "awkgram.c" /* yacc.c:1646  */
+#line 3035 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 79:
-#line 1119 "awkgram.y" /* yacc.c:1646  */
+#line 1197 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); }
-#line 2964 "awkgram.c" /* yacc.c:1646  */
+#line 3041 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 81:
-#line 1129 "awkgram.y" /* yacc.c:1646  */
+#line 1207 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyval) = (yyvsp[-1]);
 	  }
-#line 2972 "awkgram.c" /* yacc.c:1646  */
+#line 3049 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 82:
-#line 1136 "awkgram.y" /* yacc.c:1646  */
+#line 1214 "awkgram.y" /* yacc.c:1646  */
     {
 		in_print = false;
 		in_parens = 0;
 		(yyval) = NULL;
 	  }
-#line 2982 "awkgram.c" /* yacc.c:1646  */
+#line 3059 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 83:
-#line 1141 "awkgram.y" /* yacc.c:1646  */
+#line 1219 "awkgram.y" /* yacc.c:1646  */
     { in_print = false; in_parens = 0; }
-#line 2988 "awkgram.c" /* yacc.c:1646  */
+#line 3065 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 84:
-#line 1142 "awkgram.y" /* yacc.c:1646  */
+#line 1220 "awkgram.y" /* yacc.c:1646  */
     {
 		if ((yyvsp[-2])->redir_type == redirect_twoway
 		    	&& (yyvsp[0])->lasti->opcode == Op_K_getline_redir
@@ -2996,136 +3073,136 @@ regular_print:
 			yyerror(_("multistage two-way pipelines don't work"));
 		(yyval) = list_prepend((yyvsp[0]), (yyvsp[-2]));
 	  }
-#line 3000 "awkgram.c" /* yacc.c:1646  */
+#line 3077 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 85:
-#line 1153 "awkgram.y" /* yacc.c:1646  */
+#line 1231 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyval) = mk_condition((yyvsp[-3]), (yyvsp[-5]), (yyvsp[0]), NULL, NULL);
 	  }
-#line 3008 "awkgram.c" /* yacc.c:1646  */
+#line 3085 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 86:
-#line 1158 "awkgram.y" /* yacc.c:1646  */
+#line 1236 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyval) = mk_condition((yyvsp[-6]), (yyvsp[-8]), (yyvsp[-3]), (yyvsp[-2]), (yyvsp[0]));
 	  }
-#line 3016 "awkgram.c" /* yacc.c:1646  */
+#line 3093 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 91:
-#line 1175 "awkgram.y" /* yacc.c:1646  */
+#line 1253 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = NULL; }
-#line 3022 "awkgram.c" /* yacc.c:1646  */
+#line 3099 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 92:
-#line 1177 "awkgram.y" /* yacc.c:1646  */
+#line 1255 "awkgram.y" /* yacc.c:1646  */
     {
 		bcfree((yyvsp[-1]));
 		(yyval) = (yyvsp[0]);
 	  }
-#line 3031 "awkgram.c" /* yacc.c:1646  */
+#line 3108 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 93:
-#line 1185 "awkgram.y" /* yacc.c:1646  */
+#line 1263 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = NULL; }
-#line 3037 "awkgram.c" /* yacc.c:1646  */
+#line 3114 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 94:
-#line 1187 "awkgram.y" /* yacc.c:1646  */
-    { (yyval) = (yyvsp[0]) ; }
-#line 3043 "awkgram.c" /* yacc.c:1646  */
+#line 1265 "awkgram.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 3120 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 95:
-#line 1192 "awkgram.y" /* yacc.c:1646  */
+#line 1270 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyvsp[0])->param_count = 0;
 		(yyval) = list_create((yyvsp[0]));
 	  }
-#line 3052 "awkgram.c" /* yacc.c:1646  */
+#line 3129 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 96:
-#line 1197 "awkgram.y" /* yacc.c:1646  */
+#line 1275 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyvsp[0])->param_count =  (yyvsp[-2])->lasti->param_count + 1;
 		(yyval) = list_append((yyvsp[-2]), (yyvsp[0]));
 		yyerrok;
 	  }
-#line 3062 "awkgram.c" /* yacc.c:1646  */
+#line 3139 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 97:
-#line 1203 "awkgram.y" /* yacc.c:1646  */
+#line 1281 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = NULL; }
-#line 3068 "awkgram.c" /* yacc.c:1646  */
+#line 3145 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 98:
-#line 1205 "awkgram.y" /* yacc.c:1646  */
+#line 1283 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[-1]); }
-#line 3074 "awkgram.c" /* yacc.c:1646  */
+#line 3151 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 99:
-#line 1207 "awkgram.y" /* yacc.c:1646  */
+#line 1285 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[-2]); }
-#line 3080 "awkgram.c" /* yacc.c:1646  */
+#line 3157 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 100:
-#line 1213 "awkgram.y" /* yacc.c:1646  */
+#line 1291 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = NULL; }
-#line 3086 "awkgram.c" /* yacc.c:1646  */
+#line 3163 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 101:
-#line 1215 "awkgram.y" /* yacc.c:1646  */
+#line 1293 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); }
-#line 3092 "awkgram.c" /* yacc.c:1646  */
+#line 3169 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 102:
-#line 1220 "awkgram.y" /* yacc.c:1646  */
+#line 1298 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = NULL; }
-#line 3098 "awkgram.c" /* yacc.c:1646  */
+#line 3175 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 103:
-#line 1222 "awkgram.y" /* yacc.c:1646  */
+#line 1300 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); }
-#line 3104 "awkgram.c" /* yacc.c:1646  */
+#line 3181 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 104:
-#line 1227 "awkgram.y" /* yacc.c:1646  */
+#line 1305 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = mk_expression_list(NULL, (yyvsp[0])); }
-#line 3110 "awkgram.c" /* yacc.c:1646  */
+#line 3187 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 105:
-#line 1229 "awkgram.y" /* yacc.c:1646  */
+#line 1307 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
 		yyerrok;
 	  }
-#line 3119 "awkgram.c" /* yacc.c:1646  */
+#line 3196 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 106:
-#line 1234 "awkgram.y" /* yacc.c:1646  */
+#line 1312 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = NULL; }
-#line 3125 "awkgram.c" /* yacc.c:1646  */
+#line 3202 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 107:
-#line 1236 "awkgram.y" /* yacc.c:1646  */
+#line 1314 "awkgram.y" /* yacc.c:1646  */
     {
 		/*
 		 * Returning the expression list instead of NULL lets
@@ -3133,52 +3210,52 @@ regular_print:
 		 */
 		(yyval) = (yyvsp[-1]);
 	  }
-#line 3137 "awkgram.c" /* yacc.c:1646  */
+#line 3214 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 108:
-#line 1244 "awkgram.y" /* yacc.c:1646  */
+#line 1322 "awkgram.y" /* yacc.c:1646  */
     {
 		/* Ditto */
 		(yyval) = mk_expression_list((yyvsp[-2]), (yyvsp[0]));
 	  }
-#line 3146 "awkgram.c" /* yacc.c:1646  */
+#line 3223 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 109:
-#line 1249 "awkgram.y" /* yacc.c:1646  */
+#line 1327 "awkgram.y" /* yacc.c:1646  */
     {
 		/* Ditto */
 		(yyval) = (yyvsp[-2]);
 	  }
-#line 3155 "awkgram.c" /* yacc.c:1646  */
+#line 3232 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 110:
-#line 1258 "awkgram.y" /* yacc.c:1646  */
+#line 1336 "awkgram.y" /* yacc.c:1646  */
     {
 		if (do_lint && (yyvsp[0])->lasti->opcode == Op_match_rec)
 			lintwarn_ln((yyvsp[-1])->source_line,
 				_("regular expression on right of assignment"));
 		(yyval) = mk_assignment((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1]));
 	  }
-#line 3166 "awkgram.c" /* yacc.c:1646  */
+#line 3243 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 111:
-#line 1265 "awkgram.y" /* yacc.c:1646  */
+#line 1343 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3172 "awkgram.c" /* yacc.c:1646  */
+#line 3249 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 112:
-#line 1267 "awkgram.y" /* yacc.c:1646  */
+#line 1345 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = mk_boolean((yyvsp[-2]), (yyvsp[0]), (yyvsp[-1])); }
-#line 3178 "awkgram.c" /* yacc.c:1646  */
+#line 3255 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 113:
-#line 1269 "awkgram.y" /* yacc.c:1646  */
+#line 1347 "awkgram.y" /* yacc.c:1646  */
     {
 		if ((yyvsp[-2])->lasti->opcode == Op_match_rec)
 			warning_ln((yyvsp[-1])->source_line,
@@ -3194,11 +3271,11 @@ regular_print:
 			(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1]));
 		}
 	  }
-#line 3198 "awkgram.c" /* yacc.c:1646  */
+#line 3275 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 114:
-#line 1285 "awkgram.y" /* yacc.c:1646  */
+#line 1363 "awkgram.y" /* yacc.c:1646  */
     {
 		if (do_lint_old)
 			warning_ln((yyvsp[-1])->source_line,
@@ -3208,91 +3285,91 @@ regular_print:
 		(yyvsp[-1])->expr_count = 1;
 		(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1]));
 	  }
-#line 3212 "awkgram.c" /* yacc.c:1646  */
+#line 3289 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 115:
-#line 1295 "awkgram.y" /* yacc.c:1646  */
+#line 1373 "awkgram.y" /* yacc.c:1646  */
     {
 		if (do_lint && (yyvsp[0])->lasti->opcode == Op_match_rec)
 			lintwarn_ln((yyvsp[-1])->source_line,
 				_("regular expression on right of comparison"));
 		(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1]));
 	  }
-#line 3223 "awkgram.c" /* yacc.c:1646  */
+#line 3300 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 116:
-#line 1302 "awkgram.y" /* yacc.c:1646  */
+#line 1380 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = mk_condition((yyvsp[-4]), (yyvsp[-3]), (yyvsp[-2]), (yyvsp[-1]), (yyvsp[0])); }
-#line 3229 "awkgram.c" /* yacc.c:1646  */
+#line 3306 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 117:
-#line 1304 "awkgram.y" /* yacc.c:1646  */
+#line 1382 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); }
-#line 3235 "awkgram.c" /* yacc.c:1646  */
+#line 3312 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 118:
-#line 1309 "awkgram.y" /* yacc.c:1646  */
+#line 1387 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); }
-#line 3241 "awkgram.c" /* yacc.c:1646  */
+#line 3318 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 119:
-#line 1311 "awkgram.y" /* yacc.c:1646  */
+#line 1389 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); }
-#line 3247 "awkgram.c" /* yacc.c:1646  */
+#line 3324 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 120:
-#line 1313 "awkgram.y" /* yacc.c:1646  */
+#line 1391 "awkgram.y" /* yacc.c:1646  */
     {	
 		(yyvsp[0])->opcode = Op_assign_quotient;
 		(yyval) = (yyvsp[0]);
 	  }
-#line 3256 "awkgram.c" /* yacc.c:1646  */
+#line 3333 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 121:
-#line 1321 "awkgram.y" /* yacc.c:1646  */
+#line 1399 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); }
-#line 3262 "awkgram.c" /* yacc.c:1646  */
+#line 3339 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 122:
-#line 1323 "awkgram.y" /* yacc.c:1646  */
+#line 1401 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); }
-#line 3268 "awkgram.c" /* yacc.c:1646  */
+#line 3345 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 123:
-#line 1328 "awkgram.y" /* yacc.c:1646  */
+#line 1406 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); }
-#line 3274 "awkgram.c" /* yacc.c:1646  */
+#line 3351 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 124:
-#line 1330 "awkgram.y" /* yacc.c:1646  */
+#line 1408 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); }
-#line 3280 "awkgram.c" /* yacc.c:1646  */
+#line 3357 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 125:
-#line 1335 "awkgram.y" /* yacc.c:1646  */
+#line 1413 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); }
-#line 3286 "awkgram.c" /* yacc.c:1646  */
+#line 3363 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 126:
-#line 1337 "awkgram.y" /* yacc.c:1646  */
+#line 1415 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); }
-#line 3292 "awkgram.c" /* yacc.c:1646  */
+#line 3369 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 127:
-#line 1339 "awkgram.y" /* yacc.c:1646  */
+#line 1417 "awkgram.y" /* yacc.c:1646  */
     {
 		int count = 2;
 		bool is_simple_var = false;
@@ -3339,47 +3416,47 @@ regular_print:
 				max_args = count;
 		}
 	  }
-#line 3343 "awkgram.c" /* yacc.c:1646  */
+#line 3420 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 129:
-#line 1391 "awkgram.y" /* yacc.c:1646  */
+#line 1469 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); }
-#line 3349 "awkgram.c" /* yacc.c:1646  */
+#line 3426 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 130:
-#line 1393 "awkgram.y" /* yacc.c:1646  */
+#line 1471 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); }
-#line 3355 "awkgram.c" /* yacc.c:1646  */
+#line 3432 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 131:
-#line 1395 "awkgram.y" /* yacc.c:1646  */
+#line 1473 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); }
-#line 3361 "awkgram.c" /* yacc.c:1646  */
+#line 3438 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 132:
-#line 1397 "awkgram.y" /* yacc.c:1646  */
+#line 1475 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); }
-#line 3367 "awkgram.c" /* yacc.c:1646  */
+#line 3444 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 133:
-#line 1399 "awkgram.y" /* yacc.c:1646  */
+#line 1477 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); }
-#line 3373 "awkgram.c" /* yacc.c:1646  */
+#line 3450 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 134:
-#line 1401 "awkgram.y" /* yacc.c:1646  */
+#line 1479 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); }
-#line 3379 "awkgram.c" /* yacc.c:1646  */
+#line 3456 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 135:
-#line 1403 "awkgram.y" /* yacc.c:1646  */
+#line 1481 "awkgram.y" /* yacc.c:1646  */
     {
 		/*
 		 * In BEGINFILE/ENDFILE, allow `getline [var] < file'
@@ -3393,29 +3470,29 @@ regular_print:
 				_("non-redirected `getline' undefined inside END action"));
 		(yyval) = mk_getline((yyvsp[-2]), (yyvsp[-1]), (yyvsp[0]), redirect_input);
 	  }
-#line 3397 "awkgram.c" /* yacc.c:1646  */
+#line 3474 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 136:
-#line 1417 "awkgram.y" /* yacc.c:1646  */
+#line 1495 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyvsp[0])->opcode = Op_postincrement;
 		(yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
 	  }
-#line 3406 "awkgram.c" /* yacc.c:1646  */
+#line 3483 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 137:
-#line 1422 "awkgram.y" /* yacc.c:1646  */
+#line 1500 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyvsp[0])->opcode = Op_postdecrement;
 		(yyval) = mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
 	  }
-#line 3415 "awkgram.c" /* yacc.c:1646  */
+#line 3492 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 138:
-#line 1427 "awkgram.y" /* yacc.c:1646  */
+#line 1505 "awkgram.y" /* yacc.c:1646  */
     {
 		if (do_lint_old) {
 		    warning_ln((yyvsp[-1])->source_line,
@@ -3435,64 +3512,64 @@ regular_print:
 			(yyval) = list_append(list_merge(t, (yyvsp[0])), (yyvsp[-1]));
 		}
 	  }
-#line 3439 "awkgram.c" /* yacc.c:1646  */
+#line 3516 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 139:
-#line 1452 "awkgram.y" /* yacc.c:1646  */
+#line 1530 "awkgram.y" /* yacc.c:1646  */
     {
 		  (yyval) = mk_getline((yyvsp[-1]), (yyvsp[0]), (yyvsp[-3]), (yyvsp[-2])->redir_type);
 		  bcfree((yyvsp[-2]));
 		}
-#line 3448 "awkgram.c" /* yacc.c:1646  */
+#line 3525 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 140:
-#line 1458 "awkgram.y" /* yacc.c:1646  */
+#line 1536 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); }
-#line 3454 "awkgram.c" /* yacc.c:1646  */
+#line 3531 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 141:
-#line 1460 "awkgram.y" /* yacc.c:1646  */
+#line 1538 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); }
-#line 3460 "awkgram.c" /* yacc.c:1646  */
+#line 3537 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 142:
-#line 1462 "awkgram.y" /* yacc.c:1646  */
+#line 1540 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); }
-#line 3466 "awkgram.c" /* yacc.c:1646  */
+#line 3543 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 143:
-#line 1464 "awkgram.y" /* yacc.c:1646  */
+#line 1542 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); }
-#line 3472 "awkgram.c" /* yacc.c:1646  */
+#line 3549 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 144:
-#line 1466 "awkgram.y" /* yacc.c:1646  */
+#line 1544 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); }
-#line 3478 "awkgram.c" /* yacc.c:1646  */
+#line 3555 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 145:
-#line 1468 "awkgram.y" /* yacc.c:1646  */
+#line 1546 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = list_append(list_merge((yyvsp[-2]), (yyvsp[0])), (yyvsp[-1])); }
-#line 3484 "awkgram.c" /* yacc.c:1646  */
+#line 3561 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 146:
-#line 1473 "awkgram.y" /* yacc.c:1646  */
+#line 1551 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyval) = list_create((yyvsp[0]));
 	  }
-#line 3492 "awkgram.c" /* yacc.c:1646  */
+#line 3569 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 147:
-#line 1477 "awkgram.y" /* yacc.c:1646  */
+#line 1555 "awkgram.y" /* yacc.c:1646  */
     {
 		if ((yyvsp[0])->opcode == Op_match_rec) {
 			(yyvsp[0])->opcode = Op_nomatch;
@@ -3524,37 +3601,37 @@ regular_print:
 			}
 		}
 	   }
-#line 3528 "awkgram.c" /* yacc.c:1646  */
+#line 3605 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 148:
-#line 1509 "awkgram.y" /* yacc.c:1646  */
+#line 1587 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[-1]); }
-#line 3534 "awkgram.c" /* yacc.c:1646  */
+#line 3611 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 149:
-#line 1511 "awkgram.y" /* yacc.c:1646  */
+#line 1589 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyval) = snode((yyvsp[-1]), (yyvsp[-3]));
 		if ((yyval) == NULL)
 			YYABORT;
 	  }
-#line 3544 "awkgram.c" /* yacc.c:1646  */
+#line 3621 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 150:
-#line 1517 "awkgram.y" /* yacc.c:1646  */
+#line 1595 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyval) = snode((yyvsp[-1]), (yyvsp[-3]));
 		if ((yyval) == NULL)
 			YYABORT;
 	  }
-#line 3554 "awkgram.c" /* yacc.c:1646  */
+#line 3631 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 151:
-#line 1523 "awkgram.y" /* yacc.c:1646  */
+#line 1601 "awkgram.y" /* yacc.c:1646  */
     {
 		static bool warned = false;
 
@@ -3567,45 +3644,45 @@ regular_print:
 		if ((yyval) == NULL)
 			YYABORT;
 	  }
-#line 3571 "awkgram.c" /* yacc.c:1646  */
+#line 3648 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 154:
-#line 1538 "awkgram.y" /* yacc.c:1646  */
+#line 1616 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyvsp[-1])->opcode = Op_preincrement;
 		(yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1]));
 	  }
-#line 3580 "awkgram.c" /* yacc.c:1646  */
+#line 3657 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 155:
-#line 1543 "awkgram.y" /* yacc.c:1646  */
+#line 1621 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyvsp[-1])->opcode = Op_predecrement;
 		(yyval) = mk_assignment((yyvsp[0]), NULL, (yyvsp[-1]));
 	  }
-#line 3589 "awkgram.c" /* yacc.c:1646  */
+#line 3666 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 156:
-#line 1548 "awkgram.y" /* yacc.c:1646  */
+#line 1626 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyval) = list_create((yyvsp[0]));
 	  }
-#line 3597 "awkgram.c" /* yacc.c:1646  */
+#line 3674 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 157:
-#line 1552 "awkgram.y" /* yacc.c:1646  */
+#line 1630 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyval) = list_create((yyvsp[0]));
 	  }
-#line 3605 "awkgram.c" /* yacc.c:1646  */
+#line 3682 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 158:
-#line 1556 "awkgram.y" /* yacc.c:1646  */
+#line 1634 "awkgram.y" /* yacc.c:1646  */
     {
 		if ((yyvsp[0])->lasti->opcode == Op_push_i
 			&& ((yyvsp[0])->lasti->memory->flags & (STRCUR|STRING)) == 0
@@ -3620,11 +3697,11 @@ regular_print:
 			(yyval) = list_append((yyvsp[0]), (yyvsp[-1]));
 		}
 	  }
-#line 3624 "awkgram.c" /* yacc.c:1646  */
+#line 3701 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 159:
-#line 1571 "awkgram.y" /* yacc.c:1646  */
+#line 1649 "awkgram.y" /* yacc.c:1646  */
     {
 	    /*
 	     * was: $$ = $2
@@ -3633,20 +3710,20 @@ regular_print:
 		(yyvsp[-1])->opcode = Op_unary_plus;
 		(yyval) = list_append((yyvsp[0]), (yyvsp[-1]));
 	  }
-#line 3637 "awkgram.c" /* yacc.c:1646  */
+#line 3714 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 160:
-#line 1583 "awkgram.y" /* yacc.c:1646  */
+#line 1661 "awkgram.y" /* yacc.c:1646  */
     {
 		func_use((yyvsp[0])->lasti->func_name, FUNC_USE);
 		(yyval) = (yyvsp[0]);
 	  }
-#line 3646 "awkgram.c" /* yacc.c:1646  */
+#line 3723 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 161:
-#line 1588 "awkgram.y" /* yacc.c:1646  */
+#line 1666 "awkgram.y" /* yacc.c:1646  */
     {
 		/* indirect function call */
 		INSTRUCTION *f, *t;
@@ -3678,13 +3755,25 @@ regular_print:
 		 */
 
 		(yyval) = list_prepend((yyvsp[0]), t);
+		at_seen = false;
 	  }
-#line 3683 "awkgram.c" /* yacc.c:1646  */
+#line 3761 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 162:
-#line 1624 "awkgram.y" /* yacc.c:1646  */
+#line 1703 "awkgram.y" /* yacc.c:1646  */
     {
+		NODE *n;
+
+		if (! at_seen) {
+			n = lookup((yyvsp[-3])->func_name);
+			if (n != NULL && n->type != Node_func
+			    && n->type != Node_ext_func && n->type != Node_old_ext_func) {
+				error_ln((yyvsp[-3])->source_line,
+					_("attempt to use non-function `%s' in function call"),
+						(yyvsp[-3])->func_name);
+			}
+		}
 		param_sanity((yyvsp[-1]));
 		(yyvsp[-3])->opcode = Op_func_call;
 		(yyvsp[-3])->func_body = NULL;
@@ -3697,49 +3786,49 @@ regular_print:
 			(yyval) = list_append(t, (yyvsp[-3]));
 		}
 	  }
-#line 3701 "awkgram.c" /* yacc.c:1646  */
+#line 3790 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 163:
-#line 1641 "awkgram.y" /* yacc.c:1646  */
+#line 1731 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = NULL; }
-#line 3707 "awkgram.c" /* yacc.c:1646  */
+#line 3796 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 164:
-#line 1643 "awkgram.y" /* yacc.c:1646  */
+#line 1733 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); }
-#line 3713 "awkgram.c" /* yacc.c:1646  */
+#line 3802 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 165:
-#line 1648 "awkgram.y" /* yacc.c:1646  */
+#line 1738 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = NULL; }
-#line 3719 "awkgram.c" /* yacc.c:1646  */
+#line 3808 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 166:
-#line 1650 "awkgram.y" /* yacc.c:1646  */
+#line 1740 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[-1]); }
-#line 3725 "awkgram.c" /* yacc.c:1646  */
+#line 3814 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 167:
-#line 1655 "awkgram.y" /* yacc.c:1646  */
+#line 1745 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = (yyvsp[0]); }
-#line 3731 "awkgram.c" /* yacc.c:1646  */
+#line 3820 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 168:
-#line 1657 "awkgram.y" /* yacc.c:1646  */
+#line 1747 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
 	  }
-#line 3739 "awkgram.c" /* yacc.c:1646  */
+#line 3828 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 169:
-#line 1664 "awkgram.y" /* yacc.c:1646  */
+#line 1754 "awkgram.y" /* yacc.c:1646  */
     {
 		INSTRUCTION *ip = (yyvsp[0])->lasti; 
 		int count = ip->sub_count;	/* # of SUBSEP-seperated expressions */
@@ -3753,11 +3842,11 @@ regular_print:
 		sub_counter++;	/* count # of dimensions */
 		(yyval) = (yyvsp[0]);
 	  }
-#line 3757 "awkgram.c" /* yacc.c:1646  */
+#line 3846 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 170:
-#line 1681 "awkgram.y" /* yacc.c:1646  */
+#line 1771 "awkgram.y" /* yacc.c:1646  */
     {
 		INSTRUCTION *t = (yyvsp[-1]);
 		if ((yyvsp[-1]) == NULL) {
@@ -3771,31 +3860,31 @@ regular_print:
 			(yyvsp[0])->sub_count = count_expressions(&t, false);
 		(yyval) = list_append(t, (yyvsp[0]));
 	  }
-#line 3775 "awkgram.c" /* yacc.c:1646  */
+#line 3864 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 171:
-#line 1698 "awkgram.y" /* yacc.c:1646  */
+#line 1788 "awkgram.y" /* yacc.c:1646  */
     {	(yyval) = (yyvsp[0]); }
-#line 3781 "awkgram.c" /* yacc.c:1646  */
+#line 3870 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 172:
-#line 1700 "awkgram.y" /* yacc.c:1646  */
+#line 1790 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyval) = list_merge((yyvsp[-1]), (yyvsp[0]));
 	  }
-#line 3789 "awkgram.c" /* yacc.c:1646  */
+#line 3878 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 173:
-#line 1707 "awkgram.y" /* yacc.c:1646  */
+#line 1797 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[-1]); }
-#line 3795 "awkgram.c" /* yacc.c:1646  */
+#line 3884 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 174:
-#line 1712 "awkgram.y" /* yacc.c:1646  */
+#line 1802 "awkgram.y" /* yacc.c:1646  */
     {
 		char *var_name = (yyvsp[0])->lextok;
 
@@ -3803,22 +3892,22 @@ regular_print:
 		(yyvsp[0])->memory = variable((yyvsp[0])->source_line, var_name, Node_var_new);
 		(yyval) = list_create((yyvsp[0]));
 	  }
-#line 3807 "awkgram.c" /* yacc.c:1646  */
+#line 3896 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 175:
-#line 1720 "awkgram.y" /* yacc.c:1646  */
+#line 1810 "awkgram.y" /* yacc.c:1646  */
     {
 		char *arr = (yyvsp[-1])->lextok;
 		(yyvsp[-1])->memory = variable((yyvsp[-1])->source_line, arr, Node_var_new);
 		(yyvsp[-1])->opcode = Op_push_array;
 		(yyval) = list_prepend((yyvsp[0]), (yyvsp[-1]));
 	  }
-#line 3818 "awkgram.c" /* yacc.c:1646  */
+#line 3907 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 176:
-#line 1730 "awkgram.y" /* yacc.c:1646  */
+#line 1820 "awkgram.y" /* yacc.c:1646  */
     {
 		INSTRUCTION *ip = (yyvsp[0])->nexti;
 		if (ip->opcode == Op_push
@@ -3830,73 +3919,73 @@ regular_print:
 		} else
 			(yyval) = (yyvsp[0]);
 	  }
-#line 3834 "awkgram.c" /* yacc.c:1646  */
+#line 3923 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 177:
-#line 1742 "awkgram.y" /* yacc.c:1646  */
+#line 1832 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyval) = list_append((yyvsp[-1]), (yyvsp[-2]));
 		if ((yyvsp[0]) != NULL)
 			mk_assignment((yyvsp[-1]), NULL, (yyvsp[0]));
 	  }
-#line 3844 "awkgram.c" /* yacc.c:1646  */
+#line 3933 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 178:
-#line 1751 "awkgram.y" /* yacc.c:1646  */
+#line 1841 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyvsp[0])->opcode = Op_postincrement;
 	  }
-#line 3852 "awkgram.c" /* yacc.c:1646  */
+#line 3941 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 179:
-#line 1755 "awkgram.y" /* yacc.c:1646  */
+#line 1845 "awkgram.y" /* yacc.c:1646  */
     {
 		(yyvsp[0])->opcode = Op_postdecrement;
 	  }
-#line 3860 "awkgram.c" /* yacc.c:1646  */
+#line 3949 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 180:
-#line 1758 "awkgram.y" /* yacc.c:1646  */
+#line 1848 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = NULL; }
-#line 3866 "awkgram.c" /* yacc.c:1646  */
+#line 3955 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 182:
-#line 1766 "awkgram.y" /* yacc.c:1646  */
+#line 1856 "awkgram.y" /* yacc.c:1646  */
     { yyerrok; }
-#line 3872 "awkgram.c" /* yacc.c:1646  */
+#line 3961 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 183:
-#line 1770 "awkgram.y" /* yacc.c:1646  */
+#line 1860 "awkgram.y" /* yacc.c:1646  */
     { yyerrok; }
-#line 3878 "awkgram.c" /* yacc.c:1646  */
+#line 3967 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 186:
-#line 1779 "awkgram.y" /* yacc.c:1646  */
+#line 1869 "awkgram.y" /* yacc.c:1646  */
     { yyerrok; }
-#line 3884 "awkgram.c" /* yacc.c:1646  */
+#line 3973 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 187:
-#line 1783 "awkgram.y" /* yacc.c:1646  */
+#line 1873 "awkgram.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[0]); yyerrok; }
-#line 3890 "awkgram.c" /* yacc.c:1646  */
+#line 3979 "awkgram.c" /* yacc.c:1646  */
     break;
 
   case 188:
-#line 1787 "awkgram.y" /* yacc.c:1646  */
+#line 1877 "awkgram.y" /* yacc.c:1646  */
     { yyerrok; }
-#line 3896 "awkgram.c" /* yacc.c:1646  */
+#line 3985 "awkgram.c" /* yacc.c:1646  */
     break;
 
 
-#line 3900 "awkgram.c" /* yacc.c:1646  */
+#line 3989 "awkgram.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -4124,7 +4213,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 1789 "awkgram.y" /* yacc.c:1906  */
+#line 1879 "awkgram.y" /* yacc.c:1906  */
 
 
 struct token {
@@ -4191,7 +4280,6 @@ static struct token tokentab[] = {
 {"dcngettext",	Op_builtin,	 LEX_BUILTIN,	GAWKX|A(1)|A(2)|A(3)|A(4)|A(5),	do_dcngettext },
 {"default",	Op_K_default,	 LEX_DEFAULT,	GAWKX,		0 },
 {"delete",	Op_K_delete,	 LEX_DELETE,	NOT_OLD,	0 },
-{"div",		Op_builtin,      LEX_BUILTIN,	GAWKX|A(3)|ARG3_IS_ARR, do_div },
 {"do",		Op_K_do,	 LEX_DO,	NOT_OLD|BREAK|CONTINUE,	0 },
 {"else",	Op_K_else,	 LEX_ELSE,	0,		0 },
 {"eval",	Op_symbol,	 LEX_EVAL,	0,		0 },
@@ -4212,6 +4300,7 @@ static struct token tokentab[] = {
 {"include",  Op_symbol,	 LEX_INCLUDE,	GAWKX,	0 },
 {"index",	Op_builtin,	 LEX_BUILTIN,	A(2),	do_index },
 {"int",		Op_builtin,	 LEX_BUILTIN,	A(1),	0 },
+{"intdiv",	Op_builtin,      LEX_BUILTIN,	GAWKX|A(3)|ARG3_IS_ARR, do_intdiv },
 {"isarray",	Op_builtin,	 LEX_BUILTIN,	GAWKX|A(1),	do_isarray },
 {"length",	Op_builtin,	 LEX_LENGTH,	A(0)|A(1),	do_length },
 {"load",  	Op_symbol,	 LEX_LOAD,	GAWKX,		0 },
@@ -4249,7 +4338,6 @@ static struct token tokentab[] = {
 {"xor",		Op_builtin,    LEX_BUILTIN,	GAWKX,		0 },
 };
 
-#if MBS_SUPPORT
 /* Variable containing the current shift state.  */
 static mbstate_t cur_mbstate;
 /* Ring buffer containing current characters.  */
@@ -4261,10 +4349,6 @@ static int cur_ring_idx;
 /* This macro means that last nextc() return a singlebyte character
    or 1st byte of a multibyte character.  */
 #define nextc_is_1stbyte (cur_char_ring[cur_ring_idx] == 1)
-#else /* MBS_SUPPORT */
-/* a dummy */
-#define nextc_is_1stbyte 1
-#endif /* MBS_SUPPORT */
 
 /* getfname --- return name of a builtin function (for pretty printing) */
 
@@ -4524,6 +4608,11 @@ mk_program()
 				cp = end_block;
 			else
 				cp = list_merge(begin_block, end_block);
+			if (program_comment != NULL) {
+				(void) list_prepend(cp, program_comment);
+			}  
+			if (comment != NULL)
+				(void) list_append(cp, comment);
 			(void) list_append(cp, ip_atexit);
 			(void) list_append(cp, instruction(Op_stop));
 
@@ -4556,6 +4645,12 @@ mk_program()
 	if (begin_block != NULL)
 		cp = list_merge(begin_block, cp);
 
+	if (program_comment != NULL) {
+		(void) list_prepend(cp, program_comment);
+	}  
+	if (comment != NULL) {
+		(void) list_append(cp, comment);
+	} 
 	(void) list_append(cp, ip_atexit);
 	(void) list_append(cp, instruction(Op_stop));
 
@@ -4563,6 +4658,10 @@ out:
 	/* delete the Op_list, not needed */
 	tmp = cp->nexti;
 	bcfree(cp);
+	/* these variables are not used again but zap them anyway.  */
+	comment = NULL;
+	function_comment = NULL;
+	program_comment = NULL;
 	return tmp;
 
 #undef begin_block
@@ -4589,7 +4688,7 @@ parse_program(INSTRUCTION **pcode)
 		ip_newfile = ip_rec = ip_atexit = ip_beginfile = ip_endfile = NULL;
 	else {
 		ip_endfile = instruction(Op_no_op);
-		ip_beginfile = instruction(Op_no_op);
+		main_beginfile = ip_beginfile = instruction(Op_no_op);
 		ip_rec = instruction(Op_get_record); /* target for `next', also ip_newfile */
 		ip_newfile = bcalloc(Op_newfile, 2, 0); /* target for `nextfile' */
 		ip_newfile->target_jmp = ip_end;
@@ -4619,6 +4718,9 @@ parse_program(INSTRUCTION **pcode)
 	if (ret == 0)	/* avoid spurious warning if parser aborted with YYABORT */
 		check_funcs();
 
+	if (do_posix && ! check_param_names())
+		errcount++;
+
 	if (args_array == NULL)
 		emalloc(args_array, NODE **, (max_args + 2) * sizeof(NODE *), "parse_program");
 	else
@@ -5057,7 +5159,7 @@ get_src_buf()
 		lexend = lexptr + n;
 		if (n == 0) {
 			static bool warned = false;
-			if (do_lint && newfile && ! warned){
+			if (do_lint && newfile && ! warned) {
 				warned = true;
 				sourceline = 0;
 				lintwarn(_("source file `%s' is empty"), source);
@@ -5119,13 +5221,11 @@ check_bad_char(int c)
 	}
 
 	if (iscntrl(c) && ! isspace(c))
-		fatal(_("PEBKAC error: invalid character '\\%03o' in source code"), c);
+		fatal(_("PEBKAC error: invalid character '\\%03o' in source code"), c & 0xFF);
 }
 
 /* nextc --- get the next input character */
 
-#if MBS_SUPPORT
-
 static int
 nextc(bool check_for_bad)
 {
@@ -5150,7 +5250,7 @@ again:
 			mbstate_t tmp_state;
 			size_t mbclen;
 	
-			for (idx = 0 ; lexptr + idx < lexend ; idx++) {
+			for (idx = 0; lexptr + idx < lexend; idx++) {
 				tmp_state = cur_mbstate;
 				mbclen = mbrlen(lexptr, idx + 1, &tmp_state);
 
@@ -5196,38 +5296,116 @@ again:
 	}
 }
 
-#else /* MBS_SUPPORT */
-
-int
-nextc(bool check_for_bad)
-{
-	do {
-		if (lexeof)
-			return END_FILE;
-		if (lexptr && lexptr < lexend) {
-			if (check_for_bad)
-				check_bad_char(*lexptr);
-			return ((int) (unsigned char) *lexptr++);
-		}
-	} while (get_src_buf());
-	return END_SRC;
-}
-
-#endif /* MBS_SUPPORT */
-
 /* pushback --- push a character back on the input */
 
 static inline void
 pushback(void)
 {
-#if MBS_SUPPORT
 	if (gawk_mb_cur_max > 1)
 		cur_ring_idx = (cur_ring_idx == 0)? RING_BUFFER_SIZE - 1 :
 			cur_ring_idx - 1;
-#endif
 	(! lexeof && lexptr && lexptr > lexptr_begin ? lexptr-- : lexptr);
 }
 
+/* check_comment --- check for block comment */
+
+void
+check_comment(void)
+{
+	if (comment != NULL) {
+		if (first_rule) {
+			program_comment = comment;
+		} else 
+			block_comment = comment;
+		comment = NULL;
+	}
+	first_rule = false;
+}
+
+/*
+ * get_comment --- collect comment text.
+ * 	Flag = EOL_COMMENT for end-of-line comments.
+ * 	Flag = FULL_COMMENT for self-contained comments.
+ */
+
+int
+get_comment(int flag)
+{
+	int c;
+	int sl;
+	tok = tokstart;
+	tokadd('#');
+	sl = sourceline;
+
+	while (true) {
+		while ((c = nextc(false)) != '\n' && c != END_FILE) {
+			tokadd(c);
+		}
+		if (flag == EOL_COMMENT) {
+			/* comment at end of line.  */
+			if (c == '\n')
+				tokadd(c);
+			break;
+		}
+		if (c == '\n') {
+			tokadd(c);
+			sourceline++;
+			do {
+				c = nextc(false);
+				if (c == '\n') {
+					sourceline++;
+					tokadd(c);
+				}
+			} while (isspace(c) && c != END_FILE);
+			if (c == END_FILE)
+				break;
+			else if (c != '#') {
+				pushback();
+				sourceline--;
+				break;
+			} else
+				tokadd(c);
+		} else
+			break;
+	}
+	comment = bcalloc(Op_comment, 1, sl);
+	comment->source_file = source;
+	comment->memory = make_str_node(tokstart, tok - tokstart, 0);
+	comment->memory->comment_type = flag;
+
+	return c;
+}
+
+/* split_comment --- split initial comment text into program and function parts */
+
+static void
+split_comment(void)
+{
+	char *p;
+	int l;
+	NODE *n;
+
+	p = comment->memory->stptr;
+	l = comment->memory->stlen - 3;
+	/* have at least two comments so split at last blank line (\n\n)  */
+	while (l >= 0) {
+		if (p[l] == '\n' && p[l+1] == '\n') {
+			function_comment = comment;
+			n = function_comment->memory;
+			function_comment->memory = make_str_node(p + l + 2, n->stlen - l - 2, 0);
+			/* create program comment  */
+			program_comment = bcalloc(Op_comment, 1, sourceline);
+			program_comment->source_file = comment->source_file;
+			p[l + 2] = 0;
+			program_comment->memory = make_str_node(p, l + 2, 0);
+			comment = NULL;
+			freenode(n);
+			break;
+		}
+		else
+			l--;
+	}
+}
 
 /* allow_newline --- allow newline after &&, ||, ? and : */
 
@@ -5243,8 +5421,13 @@ allow_newline(void)
 			break;
 		}
 		if (c == '#') {
-			while ((c = nextc(false)) != '\n' && c != END_FILE)
-				continue;
+			if (do_pretty_print && ! do_profile) {
+			/* collect comment byte code iff doing pretty print but not profiling.  */
+				c = get_comment(EOL_COMMENT);
+			} else {
+				while ((c = nextc(false)) != '\n' && c != END_FILE)
+					continue;
+			}
 			if (c == END_FILE) {
 				pushback();
 				break;
@@ -5267,7 +5450,8 @@ allow_newline(void)
  * removes the warnings.
  */
 
-static int newline_eof()
+static int
+newline_eof()
 {
 	/* NB: a newline at end does not start a source line. */
 	if (lasttok != NEWLINE) {
@@ -5314,7 +5498,7 @@ yylex(void)
 	if (lasttok == LEX_EOF)		/* error earlier in current source, must give up !! */
 		return 0;
 
-	c = nextc(true);
+	c = nextc(! want_regexp);
 	if (c == END_SRC)
 		return 0;
 	if (c == END_FILE)
@@ -5356,30 +5540,31 @@ yylex(void)
 		want_regexp = false;
 		tok = tokstart;
 		for (;;) {
-			c = nextc(true);
+			c = nextc(false);
 
 			if (gawk_mb_cur_max == 1 || nextc_is_1stbyte) switch (c) {
 			case '[':
 				/* one day check for `.' and `=' too */
-				if (nextc(true) == ':' || in_brack == 0)
+				if (nextc(false) == ':' || in_brack == 0)
 					in_brack++;
 				pushback();
 				break;
 			case ']':
-				if (tokstart[0] == '['
-				    && (tok == tokstart + 1
-					|| (tok == tokstart + 2
-					    && tokstart[1] == '^')))
+				if (tok[-1] == '['
+				    || (tok[-2] == '[' && tok[-1] == '^'))
 					/* do nothing */;
 				else
 					in_brack--;
 				break;
 			case '\\':
-				if ((c = nextc(true)) == END_FILE) {
+				if ((c = nextc(false)) == END_FILE) {
 					pushback();
 					yyerror(_("unterminated regexp ends with `\\' at end of file"));
 					goto end_regexp; /* kludge */
-				} else if (c == '\n') {
+				}
+				if (c == '\r')	/* allow MS-DOS files. bleah */
+					c = nextc(true);
+				if (c == '\n') {
 					sourceline++;
 					continue;
 				} else {
@@ -5432,9 +5617,7 @@ retry:
 	thisline = NULL;
 	tok = tokstart;
 
-#if MBS_SUPPORT
 	if (gawk_mb_cur_max == 1 || nextc_is_1stbyte)
-#endif
 	switch (c) {
 	case END_SRC:
 		return 0;
@@ -5447,20 +5630,35 @@ retry:
 		return lasttok = NEWLINE;
 
 	case '#':		/* it's a comment */
-		while ((c = nextc(false)) != '\n') {
+		if (do_pretty_print && ! do_profile) {
+			/*
+			 * Collect comment byte code iff doing pretty print
+			 * but not profiling.
+			 */
+			if (lasttok == NEWLINE || lasttok == 0)
+				c = get_comment(FULL_COMMENT);
+			else
+				c = get_comment(EOL_COMMENT);
+
 			if (c == END_FILE)
 				return lasttok = NEWLINE_EOF;
+		} else {
+			while ((c = nextc(false)) != '\n') {
+				if (c == END_FILE)
+					return lasttok = NEWLINE_EOF;
+			}
 		}
 		sourceline++;
 		return lasttok = NEWLINE;
 
 	case '@':
+		at_seen = true;
 		return lasttok = '@';
 
 	case '\\':
 #ifdef RELAXED_CONTINUATION
 		/*
-		 * This code puports to allow comments and/or whitespace
+		 * This code purports to allow comments and/or whitespace
 		 * after the `\' at the end of a line used for continuation.
 		 * Use it at your own risk. We think it's a bad idea, which
 		 * is why it's not on by default.
@@ -5477,9 +5675,13 @@ retry:
 					lintwarn(
 		_("use of `\\ #...' line continuation is not portable"));
 				}
-				while ((c = nextc(false)) != '\n')
-					if (c == END_FILE)
-						break;
+				if (do_pretty_print && ! do_profile)
+					c = get_comment(EOL_COMMENT);
+				else {
+					while ((c = nextc(false)) != '\n')
+						if (c == END_FILE)
+							break;
+				}
 			}
 			pushback();
 		}
@@ -5576,7 +5778,7 @@ retry:
 		return lasttok = '*';
 
 	case '/':
-		if (nextc(true) == '=') {
+		if (nextc(false) == '=') {
 			pushback();
 			return lasttok = SLASH_BEFORE_EQUAL;
 		}
@@ -5691,14 +5893,18 @@ retry:
 				lastline = sourceline;
 			return lasttok = c;
 		}
-		did_newline++;
+		did_newline = true;
 		--lexptr;	/* pick up } next time */
 		return lasttok = NEWLINE;
 
 	case '"':
 	string:
 		esc_seen = false;
-		while ((c = nextc(true)) != '"') {
+		/*
+		 * Allow any kind of junk in quoted string,
+		 * so pass false to nextc().
+		 */
+		while ((c = nextc(false)) != '"') {
 			if (c == '\n') {
 				pushback();
 				yyerror(_("unterminated string"));
@@ -5707,6 +5913,8 @@ retry:
 			if ((gawk_mb_cur_max == 1 || nextc_is_1stbyte) &&
 			    c == '\\') {
 				c = nextc(true);
+				if (c == '\r')	/* allow MS-DOS files. bleah */
+					c = nextc(true);
 				if (c == '\n') {
 					sourceline++;
 					continue;
@@ -6491,6 +6699,14 @@ mk_function(INSTRUCTION *fi, INSTRUCTION *def)
 			(t + 1)->tail_call = true;
 	}
 
+	/* add any pre-function comment to start of action for profile.c  */
+
+	if (function_comment != NULL) {
+		function_comment->source_line = 0;
+		(void) list_prepend(def, function_comment);
+		function_comment = NULL;
+	}
+
 	/* add an implicit return at end;
 	 * also used by 'return' command in debugger
 	 */
@@ -6533,7 +6749,7 @@ install_function(char *fname, INSTRUCTION *fi, INSTRUCTION *plist)
 	int pcount = 0;
 
 	r = lookup(fname);
-	if (r != NULL || is_deferred_variable(fname)) {
+	if (r != NULL) {
 		error_ln(fi->source_line, _("function name `%s' previously defined"), fname);
 		return -1;
 	}
@@ -6726,50 +6942,6 @@ param_sanity(INSTRUCTION *arglist)
 	}
 }
 
-/* deferred variables --- those that are only defined if needed. */
-
-/*
- * Is there any reason to use a hash table for deferred variables?  At the
- * moment, there are only 1 to 3 such variables, so it may not be worth
- * the overhead.  If more modules start using this facility, it should
- * probably be converted into a hash table.
- */
-
-static struct deferred_variable {
-	NODE *(*load_func)(void);
-	struct deferred_variable *next;
-	char name[1];	/* variable-length array */
-} *deferred_variables;
-
-/* register_deferred_variable --- add a var name and loading function to the list */
-
-void
-register_deferred_variable(const char *name, NODE *(*load_func)(void))
-{
-	struct deferred_variable *dv;
-	size_t sl = strlen(name);
-
-	emalloc(dv, struct deferred_variable *, sizeof(*dv)+sl,
-		"register_deferred_variable");
-	dv->load_func = load_func;
-	dv->next = deferred_variables;
-	memcpy(dv->name, name, sl+1);
-	deferred_variables = dv;
-}
-
-/* is_deferred_variable --- check if NAME is a deferred variable */
-
-static bool
-is_deferred_variable(const char *name)
-{
-	struct deferred_variable *dv;
-	for (dv = deferred_variables; dv != NULL; dv = dv->next)
-		if (strcmp(name, dv->name) == 0)
-			return true;
-	return false;
-}
-
-
 /* variable --- make sure NAME is in the symbol table */
 
 NODE *
@@ -6781,47 +6953,17 @@ variable(int location, char *name, NODETYPE type)
 		if (r->type == Node_func || r->type == Node_ext_func )
 			error_ln(location, _("function `%s' called with space between name and `(',\nor used as a variable or an array"),
 				r->vname);
-		if (r == symbol_table)
-			symtab_used = true;
 	} else {
 		/* not found */
-		struct deferred_variable *dv;
-
-		for (dv = deferred_variables; true; dv = dv->next) {
-			if (dv == NULL) {
-				/*
-				 * This is the only case in which we may not free the string.
-				 */
-				return install_symbol(name, type);
-			}
-			if (strcmp(name, dv->name) == 0) {
-				r = (*dv->load_func)();
-				break;
-			}
-		}
+		return install_symbol(name, type);
 	}
 	efree(name);
 	return r;
 }
 
-/* process_deferred --- if the program uses SYMTAB, load deferred variables */
-
-static void
-process_deferred()
-{
-	struct deferred_variable *dv;
-
-	if (! symtab_used)
-		return;
-
-	for (dv = deferred_variables; dv != NULL; dv = dv->next) {
-		(void) dv->load_func();
-	}
-}
-
 /* make_regnode --- make a regular expression node */
 
-static NODE *
+NODE *
 make_regnode(int type, NODE *exp)
 {
 	NODE *n;
@@ -7156,7 +7298,11 @@ append_rule(INSTRUCTION *pattern, INSTRUCTION *action)
 		(rp + 1)->lasti = action->lasti;
 		(rp + 2)->first_line = pattern->source_line;
 		(rp + 2)->last_line = lastline;
-		ip = list_prepend(action, rp);
+		if (block_comment != NULL) {
+			ip = list_prepend(list_prepend(action, block_comment), rp);
+			block_comment = NULL;
+		} else
+			ip = list_prepend(action, rp);
 
 	} else {
 		rp = bcalloc(Op_rule, 3, 0);
@@ -7198,7 +7344,6 @@ append_rule(INSTRUCTION *pattern, INSTRUCTION *action)
 						action),
 					tp);
 		}
-
 	}
 
 	list_append(rule_list, rp + 1);
@@ -7862,9 +8007,21 @@ lookup_builtin(const char *name)
 {
 	int mid = check_special(name);
 
-	if (mid == -1 || tokentab[mid].class != LEX_BUILTIN)
+	if (mid == -1)
 		return NULL;
 
+	switch (tokentab[mid].class) {
+	case LEX_BUILTIN:
+	case LEX_LENGTH:
+		break;
+	default:
+		return NULL;
+	}
+
+	/* And another special case... */
+	if (tokentab[mid].value == Op_sub_builtin)
+		return (builtin_func_t) do_sub;
+
 	return tokentab[mid].ptr;
 }
 
@@ -7874,11 +8031,20 @@ void
 install_builtins(void)
 {
 	int i, j;
+	int flags_that_must_be_clear = DEBUG_USE;
+
+	if (do_traditional)
+		flags_that_must_be_clear |= GAWKX;
+
+	if (do_posix)
+		flags_that_must_be_clear |= NOT_POSIX;
+
 
 	j = sizeof(tokentab) / sizeof(tokentab[0]);
 	for (i = 0; i < j; i++) {
-		if (    tokentab[i].class == LEX_BUILTIN
-		    && (tokentab[i].flags & DEBUG_USE) == 0) {
+		if (   (tokentab[i].class == LEX_BUILTIN
+		        || tokentab[i].class == LEX_LENGTH)
+		    && (tokentab[i].flags & flags_that_must_be_clear) == 0) {
 			(void) install_symbol(tokentab[i].operator, Node_builtin_func);
 		}
 	}
@@ -7892,6 +8058,16 @@ install_builtins(void)
 
 /* is_alpha --- return true if c is an English letter */
 
+/*
+ * The scene of the murder was grisly to look upon.  When the inspector
+ * arrived, the sergeant turned to him and said, "Another programmer stabbed
+ * in the back. He never knew what happened."
+ * 
+ * The inspector replied, "Looks like the MO of isalpha, and his even meaner
+ * big brother, isalnum. The Locale brothers."  The sergeant merely
+ * shuddered in horror.
+ */
+
 bool
 is_alpha(int c)
 {
diff --git a/awkgram.y b/awkgram.y
index eaa615a2..be5c8c3c 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -3,7 +3,7 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2014 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2015 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
@@ -57,7 +57,6 @@ static int include_source(INSTRUCTION *file);
 static int load_library(INSTRUCTION *file);
 static void next_sourcefile(void);
 static char *tokexpand(void);
-static bool is_deferred_variable(const char *name);
 
 #define instruction(t)	bcalloc(t, 1, 0)
 
@@ -73,24 +72,23 @@ static void fix_break_continue(INSTRUCTION *list, INSTRUCTION *b_target, INSTRUC
 static INSTRUCTION *mk_boolean(INSTRUCTION *left, INSTRUCTION *right, INSTRUCTION *op);
 static INSTRUCTION *mk_assignment(INSTRUCTION *lhs, INSTRUCTION *rhs, INSTRUCTION *op);
 static INSTRUCTION *mk_getline(INSTRUCTION *op, INSTRUCTION *opt_var, INSTRUCTION *redir, int redirtype);
-static NODE *make_regnode(int type, NODE *exp);
 static int count_expressions(INSTRUCTION **list, bool isarg);
 static INSTRUCTION *optimize_assignment(INSTRUCTION *exp);
 static void add_lint(INSTRUCTION *list, LINTTYPE linttype);
 
-static void process_deferred();
-
 enum defref { FUNC_DEFINE, FUNC_USE, FUNC_EXT };
 static void func_use(const char *name, enum defref how);
 static void check_funcs(void);
 
 static ssize_t read_one_line(int fd, void *buffer, size_t count);
 static int one_line_close(int fd);
+static void split_comment(void);
+static void check_comment(void);
 
+static bool at_seen = false;
 static bool want_source = false;
 static bool want_regexp = false;	/* lexical scanning kludge */
 static char *in_function;		/* parsing kludge */
-static bool symtab_used = false;	/* program used SYMTAB */
 static int rule = 0;
 
 const char *const ruletab[] = {
@@ -144,6 +142,15 @@ static INSTRUCTION *ip_atexit = NULL;
 static INSTRUCTION *ip_end;
 static INSTRUCTION *ip_endfile;
 static INSTRUCTION *ip_beginfile;
+INSTRUCTION *main_beginfile;
+
+static INSTRUCTION *comment = NULL;
+static INSTRUCTION *program_comment = NULL;
+static INSTRUCTION *function_comment = NULL;
+static INSTRUCTION *block_comment = NULL;
+
+static bool func_first = true;
+static bool first_rule = true;
 
 static inline INSTRUCTION *list_create(INSTRUCTION *x);
 static inline INSTRUCTION *list_append(INSTRUCTION *l, INSTRUCTION *x);
@@ -205,8 +212,6 @@ program
 	| program LEX_EOF
 	  {
 		next_sourcefile();
-		if (sourcefile == srcfiles)
-			process_deferred();
 	  }
 	| program error
 	  {
@@ -223,6 +228,7 @@ rule
 	: pattern action
 	  {
 		(void) append_rule($1, $2);
+		first_rule = false;
 	  }
 	| pattern statement_term
 	  {
@@ -244,11 +250,13 @@ rule
 	| '@' LEX_INCLUDE source statement_term
 	  {
 		want_source = false;
+		at_seen = false;
 		yyerrok;
 	  }
 	| '@' LEX_LOAD library statement_term
 	  {
 		want_source = false;
+		at_seen = false;
 		yyerrok;
 	  }
 	;
@@ -285,9 +293,24 @@ library
 
 pattern
 	: /* empty */
-	  {	$$ = NULL; rule = Rule; }
+	  {
+		rule = Rule;
+		if (comment != NULL) {
+			$$ = list_create(comment);
+			comment = NULL;
+		} else
+			$$ = NULL;
+	  }
 	| exp
-	  {	$$ = $1; rule = Rule; }
+	  {
+		rule = Rule;
+		if (comment != NULL) {
+			$$ = list_prepend($1, comment);
+			comment = NULL;
+		} else
+			$$ = $1;
+	  }
+		
 	| exp ',' opt_nls exp
 	  {
 		INSTRUCTION *tp;
@@ -311,41 +334,55 @@ pattern
 			($1->nexti + 1)->condpair_left = $1->lasti;
 			($1->nexti + 1)->condpair_right = $4->lasti;
 		}
-		$$ = list_append(list_merge($1, $4), tp);
+		if (comment != NULL) {
+			$$ = list_append(list_merge(list_prepend($1, comment), $4), tp);
+			comment = NULL;
+		} else
+			$$ = list_append(list_merge($1, $4), tp);
 		rule = Rule;
 	  }
 	| LEX_BEGIN
 	  {
 		static int begin_seen = 0;
+
+		func_first = false;
 		if (do_lint_old && ++begin_seen == 2)
 			warning_ln($1->source_line,
 				_("old awk does not support multiple `BEGIN' or `END' rules"));
 
 		$1->in_rule = rule = BEGIN;
 		$1->source_file = source;
+		check_comment();
 		$$ = $1;
 	  }
 	| LEX_END
 	  {
 		static int end_seen = 0;
+
+		func_first = false;
 		if (do_lint_old && ++end_seen == 2)
 			warning_ln($1->source_line,
 				_("old awk does not support multiple `BEGIN' or `END' rules"));
 
 		$1->in_rule = rule = END;
 		$1->source_file = source;
+		check_comment();
 		$$ = $1;
 	  }
 	| LEX_BEGINFILE
 	  {
+		func_first = false;
 		$1->in_rule = rule = BEGINFILE;
 		$1->source_file = source;
+		check_comment();
 		$$ = $1;
 	  }
 	| LEX_ENDFILE
 	  {
+		func_first = false;
 		$1->in_rule = rule = ENDFILE;
 		$1->source_file = source;
+		check_comment();
 		$$ = $1;
 	  }
 	;
@@ -353,10 +390,12 @@ pattern
 action
 	: l_brace statements r_brace opt_semi opt_nls
 	  {
+		INSTRUCTION *ip;
 		if ($2 == NULL)
-			$$ = list_create(instruction(Op_no_op));
+			ip = list_create(instruction(Op_no_op));
 		else
-			$$ = $2;
+			ip = $2;
+		$$ = ip;
 	  }
 	;
 
@@ -372,7 +411,10 @@ func_name
 		YYABORT;
 	  }
 	| '@' LEX_EVAL
-	  { $$ = $2; }
+	  {
+		$$ = $2;
+		at_seen = false;
+	  }
 	;
 
 lex_builtin
@@ -383,6 +425,22 @@ lex_builtin
 function_prologue
 	: LEX_FUNCTION func_name '(' opt_param_list r_paren opt_nls
 	  {
+		/*
+		 *  treat any comments between BOF and the first function
+		 *  definition (with no intervening BEGIN etc block) as
+		 *  program comments.  Special kludge: iff there are more
+		 *  than one such comments, treat the last as a function
+		 *  comment.
+		 */
+		if (comment != NULL && func_first
+		    && strstr(comment->memory->stptr, "\n\n") != NULL)
+			split_comment();
+		/* save any other pre-function comment as function comment  */
+		if (comment != NULL) {
+			function_comment = comment;
+			comment = NULL;
+		}
+		func_first = false;
 		$1->source_file = source;
 		if (install_function($2->lextok, $1, $4) < 0)
 			YYABORT;
@@ -440,19 +498,39 @@ a_slash
 
 statements
 	: /* empty */
-	  {	$$ = NULL; }
+	  {
+		if (comment != NULL) {
+			$$ = list_create(comment);
+			comment = NULL;
+		} else $$ = NULL;
+	  }
 	| statements statement
 	  {
-		if ($2 == NULL)
-			$$ = $1;
-		else {
+		if ($2 == NULL) {
+			if (comment == NULL)
+				$$ = $1;
+			else {
+				$$ = list_append($1, comment);
+				comment = NULL;
+			}
+		} else {
 			add_lint($2, LINT_no_effect);
-			if ($1 == NULL)
-				$$ = $2;
-			else
+			if ($1 == NULL) {
+				if (comment == NULL)
+					$$ = $2;
+				else {
+					$$ = list_append($2, comment);
+					comment = NULL;
+				}
+			} else {
+				if (comment != NULL) {
+					list_append($2, comment);
+					comment = NULL;
+				}
 				$$ = list_merge($1, $2);
+			}
 		}
-	    yyerrok;
+		yyerrok;
 	  }
 	| statements error
 	  {	$$ = NULL; }
@@ -496,7 +574,7 @@ statement
 		} /*  else
 				curr = NULL; */
 
-		for(; curr != NULL; curr = nextc) {
+		for (; curr != NULL; curr = nextc) {
 			INSTRUCTION *caseexp = curr->case_exp;
 			INSTRUCTION *casestmt = curr->case_stmt;
 
@@ -1184,7 +1262,7 @@ opt_param_list
 	: /* empty */
 	  { $$ = NULL; }
 	| param_list
-	  { $$ = $1 ; }
+	  { $$ = $1; }
 	;
 
 param_list
@@ -1616,12 +1694,24 @@ func_call
 		 */
 
 		$$ = list_prepend($2, t);
+		at_seen = false;
 	  }
 	;
 
 direct_func_call
 	: FUNC_CALL '(' opt_expression_list r_paren
 	  {
+		NODE *n;
+
+		if (! at_seen) {
+			n = lookup($1->func_name);
+			if (n != NULL && n->type != Node_func
+			    && n->type != Node_ext_func && n->type != Node_old_ext_func) {
+				error_ln($1->source_line,
+					_("attempt to use non-function `%s' in function call"),
+						$1->func_name);
+			}
+		}
 		param_sanity($3);
 		$1->opcode = Op_func_call;
 		$1->func_body = NULL;
@@ -1852,7 +1942,6 @@ static struct token tokentab[] = {
 {"dcngettext",	Op_builtin,	 LEX_BUILTIN,	GAWKX|A(1)|A(2)|A(3)|A(4)|A(5),	do_dcngettext },
 {"default",	Op_K_default,	 LEX_DEFAULT,	GAWKX,		0 },
 {"delete",	Op_K_delete,	 LEX_DELETE,	NOT_OLD,	0 },
-{"div",		Op_builtin,      LEX_BUILTIN,	GAWKX|A(3)|ARG3_IS_ARR, do_div },
 {"do",		Op_K_do,	 LEX_DO,	NOT_OLD|BREAK|CONTINUE,	0 },
 {"else",	Op_K_else,	 LEX_ELSE,	0,		0 },
 {"eval",	Op_symbol,	 LEX_EVAL,	0,		0 },
@@ -1873,6 +1962,7 @@ static struct token tokentab[] = {
 {"include",  Op_symbol,	 LEX_INCLUDE,	GAWKX,	0 },
 {"index",	Op_builtin,	 LEX_BUILTIN,	A(2),	do_index },
 {"int",		Op_builtin,	 LEX_BUILTIN,	A(1),	0 },
+{"intdiv",	Op_builtin,      LEX_BUILTIN,	GAWKX|A(3)|ARG3_IS_ARR, do_intdiv },
 {"isarray",	Op_builtin,	 LEX_BUILTIN,	GAWKX|A(1),	do_isarray },
 {"length",	Op_builtin,	 LEX_LENGTH,	A(0)|A(1),	do_length },
 {"load",  	Op_symbol,	 LEX_LOAD,	GAWKX,		0 },
@@ -1910,7 +2000,6 @@ static struct token tokentab[] = {
 {"xor",		Op_builtin,    LEX_BUILTIN,	GAWKX,		0 },
 };
 
-#if MBS_SUPPORT
 /* Variable containing the current shift state.  */
 static mbstate_t cur_mbstate;
 /* Ring buffer containing current characters.  */
@@ -1922,10 +2011,6 @@ static int cur_ring_idx;
 /* This macro means that last nextc() return a singlebyte character
    or 1st byte of a multibyte character.  */
 #define nextc_is_1stbyte (cur_char_ring[cur_ring_idx] == 1)
-#else /* MBS_SUPPORT */
-/* a dummy */
-#define nextc_is_1stbyte 1
-#endif /* MBS_SUPPORT */
 
 /* getfname --- return name of a builtin function (for pretty printing) */
 
@@ -2185,6 +2270,11 @@ mk_program()
 				cp = end_block;
 			else
 				cp = list_merge(begin_block, end_block);
+			if (program_comment != NULL) {
+				(void) list_prepend(cp, program_comment);
+			}  
+			if (comment != NULL)
+				(void) list_append(cp, comment);
 			(void) list_append(cp, ip_atexit);
 			(void) list_append(cp, instruction(Op_stop));
 
@@ -2217,6 +2307,12 @@ mk_program()
 	if (begin_block != NULL)
 		cp = list_merge(begin_block, cp);
 
+	if (program_comment != NULL) {
+		(void) list_prepend(cp, program_comment);
+	}  
+	if (comment != NULL) {
+		(void) list_append(cp, comment);
+	} 
 	(void) list_append(cp, ip_atexit);
 	(void) list_append(cp, instruction(Op_stop));
 
@@ -2224,6 +2320,10 @@ out:
 	/* delete the Op_list, not needed */
 	tmp = cp->nexti;
 	bcfree(cp);
+	/* these variables are not used again but zap them anyway.  */
+	comment = NULL;
+	function_comment = NULL;
+	program_comment = NULL;
 	return tmp;
 
 #undef begin_block
@@ -2250,7 +2350,7 @@ parse_program(INSTRUCTION **pcode)
 		ip_newfile = ip_rec = ip_atexit = ip_beginfile = ip_endfile = NULL;
 	else {
 		ip_endfile = instruction(Op_no_op);
-		ip_beginfile = instruction(Op_no_op);
+		main_beginfile = ip_beginfile = instruction(Op_no_op);
 		ip_rec = instruction(Op_get_record); /* target for `next', also ip_newfile */
 		ip_newfile = bcalloc(Op_newfile, 2, 0); /* target for `nextfile' */
 		ip_newfile->target_jmp = ip_end;
@@ -2280,6 +2380,9 @@ parse_program(INSTRUCTION **pcode)
 	if (ret == 0)	/* avoid spurious warning if parser aborted with YYABORT */
 		check_funcs();
 
+	if (do_posix && ! check_param_names())
+		errcount++;
+
 	if (args_array == NULL)
 		emalloc(args_array, NODE **, (max_args + 2) * sizeof(NODE *), "parse_program");
 	else
@@ -2718,7 +2821,7 @@ get_src_buf()
 		lexend = lexptr + n;
 		if (n == 0) {
 			static bool warned = false;
-			if (do_lint && newfile && ! warned){
+			if (do_lint && newfile && ! warned) {
 				warned = true;
 				sourceline = 0;
 				lintwarn(_("source file `%s' is empty"), source);
@@ -2780,13 +2883,11 @@ check_bad_char(int c)
 	}
 
 	if (iscntrl(c) && ! isspace(c))
-		fatal(_("PEBKAC error: invalid character '\\%03o' in source code"), c);
+		fatal(_("PEBKAC error: invalid character '\\%03o' in source code"), c & 0xFF);
 }
 
 /* nextc --- get the next input character */
 
-#if MBS_SUPPORT
-
 static int
 nextc(bool check_for_bad)
 {
@@ -2811,7 +2912,7 @@ again:
 			mbstate_t tmp_state;
 			size_t mbclen;
 	
-			for (idx = 0 ; lexptr + idx < lexend ; idx++) {
+			for (idx = 0; lexptr + idx < lexend; idx++) {
 				tmp_state = cur_mbstate;
 				mbclen = mbrlen(lexptr, idx + 1, &tmp_state);
 
@@ -2857,38 +2958,116 @@ again:
 	}
 }
 
-#else /* MBS_SUPPORT */
-
-int
-nextc(bool check_for_bad)
-{
-	do {
-		if (lexeof)
-			return END_FILE;
-		if (lexptr && lexptr < lexend) {
-			if (check_for_bad)
-				check_bad_char(*lexptr);
-			return ((int) (unsigned char) *lexptr++);
-		}
-	} while (get_src_buf());
-	return END_SRC;
-}
-
-#endif /* MBS_SUPPORT */
-
 /* pushback --- push a character back on the input */
 
 static inline void
 pushback(void)
 {
-#if MBS_SUPPORT
 	if (gawk_mb_cur_max > 1)
 		cur_ring_idx = (cur_ring_idx == 0)? RING_BUFFER_SIZE - 1 :
 			cur_ring_idx - 1;
-#endif
 	(! lexeof && lexptr && lexptr > lexptr_begin ? lexptr-- : lexptr);
 }
 
+/* check_comment --- check for block comment */
+
+void
+check_comment(void)
+{
+	if (comment != NULL) {
+		if (first_rule) {
+			program_comment = comment;
+		} else 
+			block_comment = comment;
+		comment = NULL;
+	}
+	first_rule = false;
+}
+
+/*
+ * get_comment --- collect comment text.
+ * 	Flag = EOL_COMMENT for end-of-line comments.
+ * 	Flag = FULL_COMMENT for self-contained comments.
+ */
+
+int
+get_comment(int flag)
+{
+	int c;
+	int sl;
+	tok = tokstart;
+	tokadd('#');
+	sl = sourceline;
+
+	while (true) {
+		while ((c = nextc(false)) != '\n' && c != END_FILE) {
+			tokadd(c);
+		}
+		if (flag == EOL_COMMENT) {
+			/* comment at end of line.  */
+			if (c == '\n')
+				tokadd(c);
+			break;
+		}
+		if (c == '\n') {
+			tokadd(c);
+			sourceline++;
+			do {
+				c = nextc(false);
+				if (c == '\n') {
+					sourceline++;
+					tokadd(c);
+				}
+			} while (isspace(c) && c != END_FILE);
+			if (c == END_FILE)
+				break;
+			else if (c != '#') {
+				pushback();
+				sourceline--;
+				break;
+			} else
+				tokadd(c);
+		} else
+			break;
+	}
+	comment = bcalloc(Op_comment, 1, sl);
+	comment->source_file = source;
+	comment->memory = make_str_node(tokstart, tok - tokstart, 0);
+	comment->memory->comment_type = flag;
+
+	return c;
+}
+
+/* split_comment --- split initial comment text into program and function parts */
+
+static void
+split_comment(void)
+{
+	char *p;
+	int l;
+	NODE *n;
+
+	p = comment->memory->stptr;
+	l = comment->memory->stlen - 3;
+	/* have at least two comments so split at last blank line (\n\n)  */
+	while (l >= 0) {
+		if (p[l] == '\n' && p[l+1] == '\n') {
+			function_comment = comment;
+			n = function_comment->memory;
+			function_comment->memory = make_str_node(p + l + 2, n->stlen - l - 2, 0);
+			/* create program comment  */
+			program_comment = bcalloc(Op_comment, 1, sourceline);
+			program_comment->source_file = comment->source_file;
+			p[l + 2] = 0;
+			program_comment->memory = make_str_node(p, l + 2, 0);
+			comment = NULL;
+			freenode(n);
+			break;
+		}
+		else
+			l--;
+	}
+}
 
 /* allow_newline --- allow newline after &&, ||, ? and : */
 
@@ -2904,8 +3083,13 @@ allow_newline(void)
 			break;
 		}
 		if (c == '#') {
-			while ((c = nextc(false)) != '\n' && c != END_FILE)
-				continue;
+			if (do_pretty_print && ! do_profile) {
+			/* collect comment byte code iff doing pretty print but not profiling.  */
+				c = get_comment(EOL_COMMENT);
+			} else {
+				while ((c = nextc(false)) != '\n' && c != END_FILE)
+					continue;
+			}
 			if (c == END_FILE) {
 				pushback();
 				break;
@@ -2928,7 +3112,8 @@ allow_newline(void)
  * removes the warnings.
  */
 
-static int newline_eof()
+static int
+newline_eof()
 {
 	/* NB: a newline at end does not start a source line. */
 	if (lasttok != NEWLINE) {
@@ -2975,7 +3160,7 @@ yylex(void)
 	if (lasttok == LEX_EOF)		/* error earlier in current source, must give up !! */
 		return 0;
 
-	c = nextc(true);
+	c = nextc(! want_regexp);
 	if (c == END_SRC)
 		return 0;
 	if (c == END_FILE)
@@ -3017,30 +3202,31 @@ yylex(void)
 		want_regexp = false;
 		tok = tokstart;
 		for (;;) {
-			c = nextc(true);
+			c = nextc(false);
 
 			if (gawk_mb_cur_max == 1 || nextc_is_1stbyte) switch (c) {
 			case '[':
 				/* one day check for `.' and `=' too */
-				if (nextc(true) == ':' || in_brack == 0)
+				if (nextc(false) == ':' || in_brack == 0)
 					in_brack++;
 				pushback();
 				break;
 			case ']':
-				if (tokstart[0] == '['
-				    && (tok == tokstart + 1
-					|| (tok == tokstart + 2
-					    && tokstart[1] == '^')))
+				if (tok[-1] == '['
+				    || (tok[-2] == '[' && tok[-1] == '^'))
 					/* do nothing */;
 				else
 					in_brack--;
 				break;
 			case '\\':
-				if ((c = nextc(true)) == END_FILE) {
+				if ((c = nextc(false)) == END_FILE) {
 					pushback();
 					yyerror(_("unterminated regexp ends with `\\' at end of file"));
 					goto end_regexp; /* kludge */
-				} else if (c == '\n') {
+				}
+				if (c == '\r')	/* allow MS-DOS files. bleah */
+					c = nextc(true);
+				if (c == '\n') {
 					sourceline++;
 					continue;
 				} else {
@@ -3093,9 +3279,7 @@ retry:
 	thisline = NULL;
 	tok = tokstart;
 
-#if MBS_SUPPORT
 	if (gawk_mb_cur_max == 1 || nextc_is_1stbyte)
-#endif
 	switch (c) {
 	case END_SRC:
 		return 0;
@@ -3108,20 +3292,35 @@ retry:
 		return lasttok = NEWLINE;
 
 	case '#':		/* it's a comment */
-		while ((c = nextc(false)) != '\n') {
+		if (do_pretty_print && ! do_profile) {
+			/*
+			 * Collect comment byte code iff doing pretty print
+			 * but not profiling.
+			 */
+			if (lasttok == NEWLINE || lasttok == 0)
+				c = get_comment(FULL_COMMENT);
+			else
+				c = get_comment(EOL_COMMENT);
+
 			if (c == END_FILE)
 				return lasttok = NEWLINE_EOF;
+		} else {
+			while ((c = nextc(false)) != '\n') {
+				if (c == END_FILE)
+					return lasttok = NEWLINE_EOF;
+			}
 		}
 		sourceline++;
 		return lasttok = NEWLINE;
 
 	case '@':
+		at_seen = true;
 		return lasttok = '@';
 
 	case '\\':
 #ifdef RELAXED_CONTINUATION
 		/*
-		 * This code puports to allow comments and/or whitespace
+		 * This code purports to allow comments and/or whitespace
 		 * after the `\' at the end of a line used for continuation.
 		 * Use it at your own risk. We think it's a bad idea, which
 		 * is why it's not on by default.
@@ -3138,9 +3337,13 @@ retry:
 					lintwarn(
 		_("use of `\\ #...' line continuation is not portable"));
 				}
-				while ((c = nextc(false)) != '\n')
-					if (c == END_FILE)
-						break;
+				if (do_pretty_print && ! do_profile)
+					c = get_comment(EOL_COMMENT);
+				else {
+					while ((c = nextc(false)) != '\n')
+						if (c == END_FILE)
+							break;
+				}
 			}
 			pushback();
 		}
@@ -3237,7 +3440,7 @@ retry:
 		return lasttok = '*';
 
 	case '/':
-		if (nextc(true) == '=') {
+		if (nextc(false) == '=') {
 			pushback();
 			return lasttok = SLASH_BEFORE_EQUAL;
 		}
@@ -3352,14 +3555,18 @@ retry:
 				lastline = sourceline;
 			return lasttok = c;
 		}
-		did_newline++;
+		did_newline = true;
 		--lexptr;	/* pick up } next time */
 		return lasttok = NEWLINE;
 
 	case '"':
 	string:
 		esc_seen = false;
-		while ((c = nextc(true)) != '"') {
+		/*
+		 * Allow any kind of junk in quoted string,
+		 * so pass false to nextc().
+		 */
+		while ((c = nextc(false)) != '"') {
 			if (c == '\n') {
 				pushback();
 				yyerror(_("unterminated string"));
@@ -3368,6 +3575,8 @@ retry:
 			if ((gawk_mb_cur_max == 1 || nextc_is_1stbyte) &&
 			    c == '\\') {
 				c = nextc(true);
+				if (c == '\r')	/* allow MS-DOS files. bleah */
+					c = nextc(true);
 				if (c == '\n') {
 					sourceline++;
 					continue;
@@ -4152,6 +4361,14 @@ mk_function(INSTRUCTION *fi, INSTRUCTION *def)
 			(t + 1)->tail_call = true;
 	}
 
+	/* add any pre-function comment to start of action for profile.c  */
+
+	if (function_comment != NULL) {
+		function_comment->source_line = 0;
+		(void) list_prepend(def, function_comment);
+		function_comment = NULL;
+	}
+
 	/* add an implicit return at end;
 	 * also used by 'return' command in debugger
 	 */
@@ -4194,7 +4411,7 @@ install_function(char *fname, INSTRUCTION *fi, INSTRUCTION *plist)
 	int pcount = 0;
 
 	r = lookup(fname);
-	if (r != NULL || is_deferred_variable(fname)) {
+	if (r != NULL) {
 		error_ln(fi->source_line, _("function name `%s' previously defined"), fname);
 		return -1;
 	}
@@ -4387,50 +4604,6 @@ param_sanity(INSTRUCTION *arglist)
 	}
 }
 
-/* deferred variables --- those that are only defined if needed. */
-
-/*
- * Is there any reason to use a hash table for deferred variables?  At the
- * moment, there are only 1 to 3 such variables, so it may not be worth
- * the overhead.  If more modules start using this facility, it should
- * probably be converted into a hash table.
- */
-
-static struct deferred_variable {
-	NODE *(*load_func)(void);
-	struct deferred_variable *next;
-	char name[1];	/* variable-length array */
-} *deferred_variables;
-
-/* register_deferred_variable --- add a var name and loading function to the list */
-
-void
-register_deferred_variable(const char *name, NODE *(*load_func)(void))
-{
-	struct deferred_variable *dv;
-	size_t sl = strlen(name);
-
-	emalloc(dv, struct deferred_variable *, sizeof(*dv)+sl,
-		"register_deferred_variable");
-	dv->load_func = load_func;
-	dv->next = deferred_variables;
-	memcpy(dv->name, name, sl+1);
-	deferred_variables = dv;
-}
-
-/* is_deferred_variable --- check if NAME is a deferred variable */
-
-static bool
-is_deferred_variable(const char *name)
-{
-	struct deferred_variable *dv;
-	for (dv = deferred_variables; dv != NULL; dv = dv->next)
-		if (strcmp(name, dv->name) == 0)
-			return true;
-	return false;
-}
-
-
 /* variable --- make sure NAME is in the symbol table */
 
 NODE *
@@ -4442,47 +4615,17 @@ variable(int location, char *name, NODETYPE type)
 		if (r->type == Node_func || r->type == Node_ext_func )
 			error_ln(location, _("function `%s' called with space between name and `(',\nor used as a variable or an array"),
 				r->vname);
-		if (r == symbol_table)
-			symtab_used = true;
 	} else {
 		/* not found */
-		struct deferred_variable *dv;
-
-		for (dv = deferred_variables; true; dv = dv->next) {
-			if (dv == NULL) {
-				/*
-				 * This is the only case in which we may not free the string.
-				 */
-				return install_symbol(name, type);
-			}
-			if (strcmp(name, dv->name) == 0) {
-				r = (*dv->load_func)();
-				break;
-			}
-		}
+		return install_symbol(name, type);
 	}
 	efree(name);
 	return r;
 }
 
-/* process_deferred --- if the program uses SYMTAB, load deferred variables */
-
-static void
-process_deferred()
-{
-	struct deferred_variable *dv;
-
-	if (! symtab_used)
-		return;
-
-	for (dv = deferred_variables; dv != NULL; dv = dv->next) {
-		(void) dv->load_func();
-	}
-}
-
 /* make_regnode --- make a regular expression node */
 
-static NODE *
+NODE *
 make_regnode(int type, NODE *exp)
 {
 	NODE *n;
@@ -4817,7 +4960,11 @@ append_rule(INSTRUCTION *pattern, INSTRUCTION *action)
 		(rp + 1)->lasti = action->lasti;
 		(rp + 2)->first_line = pattern->source_line;
 		(rp + 2)->last_line = lastline;
-		ip = list_prepend(action, rp);
+		if (block_comment != NULL) {
+			ip = list_prepend(list_prepend(action, block_comment), rp);
+			block_comment = NULL;
+		} else
+			ip = list_prepend(action, rp);
 
 	} else {
 		rp = bcalloc(Op_rule, 3, 0);
@@ -4859,7 +5006,6 @@ append_rule(INSTRUCTION *pattern, INSTRUCTION *action)
 						action),
 					tp);
 		}
-
 	}
 
 	list_append(rule_list, rp + 1);
@@ -5523,8 +5669,20 @@ lookup_builtin(const char *name)
 {
 	int mid = check_special(name);
 
-	if (mid == -1 || tokentab[mid].class != LEX_BUILTIN)
+	if (mid == -1)
+		return NULL;
+
+	switch (tokentab[mid].class) {
+	case LEX_BUILTIN:
+	case LEX_LENGTH:
+		break;
+	default:
 		return NULL;
+	}
+
+	/* And another special case... */
+	if (tokentab[mid].value == Op_sub_builtin)
+		return (builtin_func_t) do_sub;
 
 	return tokentab[mid].ptr;
 }
@@ -5535,11 +5693,20 @@ void
 install_builtins(void)
 {
 	int i, j;
+	int flags_that_must_be_clear = DEBUG_USE;
+
+	if (do_traditional)
+		flags_that_must_be_clear |= GAWKX;
+
+	if (do_posix)
+		flags_that_must_be_clear |= NOT_POSIX;
+
 
 	j = sizeof(tokentab) / sizeof(tokentab[0]);
 	for (i = 0; i < j; i++) {
-		if (    tokentab[i].class == LEX_BUILTIN
-		    && (tokentab[i].flags & DEBUG_USE) == 0) {
+		if (   (tokentab[i].class == LEX_BUILTIN
+		        || tokentab[i].class == LEX_LENGTH)
+		    && (tokentab[i].flags & flags_that_must_be_clear) == 0) {
 			(void) install_symbol(tokentab[i].operator, Node_builtin_func);
 		}
 	}
@@ -5553,6 +5720,16 @@ install_builtins(void)
 
 /* is_alpha --- return true if c is an English letter */
 
+/*
+ * The scene of the murder was grisly to look upon.  When the inspector
+ * arrived, the sergeant turned to him and said, "Another programmer stabbed
+ * in the back. He never knew what happened."
+ * 
+ * The inspector replied, "Looks like the MO of isalpha, and his even meaner
+ * big brother, isalnum. The Locale brothers."  The sergeant merely
+ * shuddered in horror.
+ */
+
 bool
 is_alpha(int c)
 {
diff --git a/awklib/ChangeLog b/awklib/ChangeLog
index 4173938f..38f7259f 100644
--- a/awklib/ChangeLog
+++ b/awklib/ChangeLog
@@ -1,3 +1,13 @@
+2014-11-05         Juergen Kahrs       <juergen.kahrs@googlemail.com>
+
+	* Makefile.am (AWKPROG): Add quotes around the name in case the
+	build dir has spaces in it.
+
+2014-10-17         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* Makefile.am (stamp-eg): Use explicit ./extract.awk to avoid
+	assumptions about AWKPATH in the environment.
+
 2014-04-08         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 4.1.1: Release tar ball made.
diff --git a/awklib/Makefile.am b/awklib/Makefile.am
index 87ee96b8..27bb269f 100644
--- a/awklib/Makefile.am
+++ b/awklib/Makefile.am
@@ -30,7 +30,7 @@ EXTRA_DIST = ChangeLog ChangeLog.0 extract.awk eg $(srcdir)/stamp-eg
 if TEST_CROSS_COMPILE
 AWKPROG = LC_ALL=C LANG=C awk$(EXEEXT)
 else
-AWKPROG = LC_ALL=C LANG=C $(abs_top_builddir)/gawk$(EXEEXT)
+AWKPROG = LC_ALL=C LANG=C "$(abs_top_builddir)/gawk$(EXEEXT)"
 endif
 
 # Get config.h from the build directory and custom.h from the source directory.
@@ -66,7 +66,7 @@ $(srcdir)/stamp-eg: $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi
 	cd $(srcdir) && \
 	rm -fr eg && \
 	rm -fr stamp-eg && \
-	$(AWKPROG) -f extract.awk ../doc/gawk.texi ../doc/gawkinet.texi
+	$(AWKPROG) -f ./extract.awk ../doc/gawk.texi ../doc/gawkinet.texi
 	@echo 'some makes are stupid and will not check a directory' > $(srcdir)/stamp-eg
 	@echo 'against a file, so this file is a place holder. gack.' >> $(srcdir)/stamp-eg
 
diff --git a/awklib/Makefile.in b/awklib/Makefile.in
index 38124fad..6dc8ea81 100644
--- a/awklib/Makefile.in
+++ b/awklib/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -38,7 +38,17 @@
 #
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -101,8 +111,6 @@ build_triplet = @build@
 host_triplet = @host@
 pkglibexec_PROGRAMS = pwcat$(EXEEXT) grcat$(EXEEXT)
 subdir = awklib
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
 	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -117,6 +125,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -183,6 +192,8 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
+	$(top_srcdir)/mkinstalldirs ChangeLog
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 pkgdatadir = $(datadir)/awk
 pkglibexecdir = $(libexecdir)/awk
@@ -248,6 +259,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POSUB = @POSUB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOCKET_LIBS = @SOCKET_LIBS@
@@ -313,7 +325,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = ChangeLog ChangeLog.0 extract.awk eg $(srcdir)/stamp-eg
-@TEST_CROSS_COMPILE_FALSE@AWKPROG = LC_ALL=C LANG=C $(abs_top_builddir)/gawk$(EXEEXT)
+@TEST_CROSS_COMPILE_FALSE@AWKPROG = LC_ALL=C LANG=C "$(abs_top_builddir)/gawk$(EXEEXT)"
 # With some locales, the script extract.awk fails.
 # So we fix the locale to some sensible value.
 @TEST_CROSS_COMPILE_TRUE@AWKPROG = LC_ALL=C LANG=C awk$(EXEEXT)
@@ -339,7 +351,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu awklib/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu awklib/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -414,14 +425,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -630,6 +641,8 @@ uninstall-am: uninstall-local uninstall-pkglibexecPROGRAMS
 	tags tags-am uninstall uninstall-am uninstall-local \
 	uninstall-pkglibexecPROGRAMS
 
+.PRECIOUS: Makefile
+
 
 all: $(srcdir)/stamp-eg $(AUXPROGS) $(AUXAWK)
 
@@ -653,7 +666,7 @@ $(srcdir)/stamp-eg: $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi
 	cd $(srcdir) && \
 	rm -fr eg && \
 	rm -fr stamp-eg && \
-	$(AWKPROG) -f extract.awk ../doc/gawk.texi ../doc/gawkinet.texi
+	$(AWKPROG) -f ./extract.awk ../doc/gawk.texi ../doc/gawkinet.texi
 	@echo 'some makes are stupid and will not check a directory' > $(srcdir)/stamp-eg
 	@echo 'against a file, so this file is a place holder. gack.' >> $(srcdir)/stamp-eg
 
diff --git a/awklib/eg/lib/assert.awk b/awklib/eg/lib/assert.awk
index 75fd8853..c8e13490 100644
--- a/awklib/eg/lib/assert.awk
+++ b/awklib/eg/lib/assert.awk
@@ -1,4 +1,4 @@
-# assert --- assert that a condition is true. Otherwise exit.
+# assert --- assert that a condition is true. Otherwise, exit.
 
 #
 # Arnold Robbins, arnold@skeeve.com, Public Domain
diff --git a/awklib/eg/lib/bits2str.awk b/awklib/eg/lib/bits2str.awk
index 9725ee8f..a10ffad1 100644
--- a/awklib/eg/lib/bits2str.awk
+++ b/awklib/eg/lib/bits2str.awk
@@ -1,4 +1,4 @@
-# bits2str --- turn a byte into readable 1's and 0's
+# bits2str --- turn a byte into readable ones and zeros
 
 function bits2str(bits,        data, mask)
 {
diff --git a/awklib/eg/lib/ctime.awk b/awklib/eg/lib/ctime.awk
index ca750370..cea25b7a 100644
--- a/awklib/eg/lib/ctime.awk
+++ b/awklib/eg/lib/ctime.awk
@@ -4,7 +4,8 @@
 
 function ctime(ts,    format)
 {
-    format = PROCINFO["strftime"]
+    format = "%a %b %e %H:%M:%S %Z %Y"
+
     if (ts == 0)
         ts = systime()       # use current time as default
     return strftime(format, ts)
diff --git a/awklib/eg/lib/ftrans.awk b/awklib/eg/lib/ftrans.awk
index 1709ac82..6461efff 100644
--- a/awklib/eg/lib/ftrans.awk
+++ b/awklib/eg/lib/ftrans.awk
@@ -1,4 +1,4 @@
-# ftrans.awk --- handle data file transitions
+# ftrans.awk --- handle datafile transitions
 #
 # user supplies beginfile() and endfile() functions
 #
@@ -12,4 +12,4 @@ FNR == 1 {
     beginfile(FILENAME)
 }
 
-END  { endfile(_filename_) }
+END { endfile(_filename_) }
diff --git a/awklib/eg/lib/gettime.awk b/awklib/eg/lib/gettime.awk
index 3da9c8ab..4cb56330 100644
--- a/awklib/eg/lib/gettime.awk
+++ b/awklib/eg/lib/gettime.awk
@@ -31,7 +31,7 @@ function getlocaltime(time,    ret, now, i)
     now = systime()
 
     # return date(1)-style output
-    ret = strftime(PROCINFO["strftime"], now)
+    ret = strftime("%a %b %e %H:%M:%S %Z %Y", now)
 
     # clear out target array
     delete time
diff --git a/awklib/eg/lib/groupawk.in b/awklib/eg/lib/groupawk.in
index 9382bce8..54a27f3d 100644
--- a/awklib/eg/lib/groupawk.in
+++ b/awklib/eg/lib/groupawk.in
@@ -38,8 +38,7 @@ function _gr_init(    oldfs, oldrs, olddol0, grcat,
         n = split($4, a, "[ \t]*,[ \t]*")
         for (i = 1; i <= n; i++)
             if (a[i] in _gr_groupsbyuser)
-                _gr_groupsbyuser[a[i]] = \
-                    _gr_groupsbyuser[a[i]] " " $1
+                _gr_groupsbyuser[a[i]] = gr_groupsbyuser[a[i]] " " $1
             else
                 _gr_groupsbyuser[a[i]] = $1
 
diff --git a/awklib/eg/lib/inplace.awk b/awklib/eg/lib/inplace.awk
index 6403a228..d1574654 100644
--- a/awklib/eg/lib/inplace.awk
+++ b/awklib/eg/lib/inplace.awk
@@ -5,10 +5,15 @@
 # Please set INPLACE_SUFFIX to make a backup copy.  For example, you may
 # want to set INPLACE_SUFFIX to .bak on the command line or in a BEGIN rule.
 
+# N.B. We call inplace_end() in the BEGINFILE and END rules so that any
+# actions in an ENDFILE rule will be redirected as expected.
+
 BEGINFILE {
-    inplace_begin(FILENAME, INPLACE_SUFFIX)
+    if (_inplace_filename != "")
+        inplace_end(_inplace_filename, INPLACE_SUFFIX)
+    inplace_begin(_inplace_filename = FILENAME, INPLACE_SUFFIX)
 }
 
-ENDFILE {
+END {
     inplace_end(FILENAME, INPLACE_SUFFIX)
 }
diff --git a/awklib/eg/lib/div.awk b/awklib/eg/lib/intdiv.awk
index 9d919288..dbc553b0 100644
--- a/awklib/eg/lib/div.awk
+++ b/awklib/eg/lib/intdiv.awk
@@ -1,10 +1,13 @@
-# div --- do integer division
+# intdiv --- do integer division
 
 #
 # Arnold Robbins, arnold@skeeve.com, Public Domain
 # July, 2014
+#
+# Name changed from div() to intdiv()
+# April, 2015
 
-function div(numerator, denominator, result,    i)
+function intdiv(numerator, denominator, result)
 {
     split("", result)
 
diff --git a/awklib/eg/lib/noassign.awk b/awklib/eg/lib/noassign.awk
index 1f750edf..99227b37 100644
--- a/awklib/eg/lib/noassign.awk
+++ b/awklib/eg/lib/noassign.awk
@@ -7,7 +7,7 @@
 function disable_assigns(argc, argv,    i)
 {
     for (i = 1; i < argc; i++)
-        if (argv[i] ~ /^[[:alpha:]_][[:alnum:]_]*=.*/)
+        if (argv[i] ~ /^[a-zA-Z_][a-zA-Z0-9_]*=.*/)
             argv[i] = ("./" argv[i])
 }
 
diff --git a/awklib/eg/lib/processarray.awk b/awklib/eg/lib/processarray.awk
new file mode 100644
index 00000000..79a86d1f
--- /dev/null
+++ b/awklib/eg/lib/processarray.awk
@@ -0,0 +1,12 @@
+function process_array(arr, name, process, do_arrays,   i, new_name)
+{
+    for (i in arr) {
+        new_name = (name "[" i "]")
+        if (isarray(arr[i])) {
+            if (do_arrays)
+                @process(new_name, arr[i])
+            process_array(arr[i], new_name, process, do_arrays)
+        } else
+            @process(new_name, arr[i])
+    }
+}
diff --git a/awklib/eg/lib/quicksort.awk b/awklib/eg/lib/quicksort.awk
index 43357ac6..e0ed8bc7 100644
--- a/awklib/eg/lib/quicksort.awk
+++ b/awklib/eg/lib/quicksort.awk
@@ -4,8 +4,9 @@
 # Arnold Robbins, arnold@skeeve.com, Public Domain
 # January 2009
 
-# quicksort --- C.A.R. Hoare's quick sort algorithm. See Wikipedia
-#               or almost any algorithms or computer science text
+
+# quicksort --- C.A.R. Hoare's quicksort algorithm. See Wikipedia
+#               or almost any algorithms or computer science text.
 #
 # Adapted from K&R-II, page 110
 
@@ -26,7 +27,7 @@ function quicksort(data, left, right, less_than,    i, last)
 
 # quicksort_swap --- helper function for quicksort, should really be inline
 
-function quicksort_swap(data, i, j, temp)
+function quicksort_swap(data, i, j,      temp)
 {
     temp = data[i]
     data[i] = data[j]
diff --git a/awklib/eg/lib/readable.awk b/awklib/eg/lib/readable.awk
index 6942dcca..37970a82 100644
--- a/awklib/eg/lib/readable.awk
+++ b/awklib/eg/lib/readable.awk
@@ -6,7 +6,7 @@
 
 BEGIN {
     for (i = 1; i < ARGC; i++) {
-        if (ARGV[i] ~ /^[[:alpha:]_][[:alnum:]_]*=.*/ \
+        if (ARGV[i] ~ /^[a-zA-Z_][a-zA-Z0-9_]*=.*/ \
             || ARGV[i] == "-" || ARGV[i] == "/dev/stdin")
             continue    # assignment or standard input
         else if ((getline junk < ARGV[i]) < 0) # unreadable
diff --git a/awklib/eg/lib/shellquote.awk b/awklib/eg/lib/shellquote.awk
new file mode 100644
index 00000000..cd943dc7
--- /dev/null
+++ b/awklib/eg/lib/shellquote.awk
@@ -0,0 +1,22 @@
+# shell_quote --- quote an argument for passing to the shell
+#
+# Michael Brennan
+# brennan@madronabluff.com
+# September 2014
+
+function shell_quote(s,             # parameter
+    SINGLE, QSINGLE, i, X, n, ret)  # locals
+{
+    if (s == "")
+        return "\"\""
+
+    SINGLE = "\x27"  # single quote
+    QSINGLE = "\"\x27\""
+    n = split(s, X, SINGLE)
+
+    ret = SINGLE X[1] SINGLE
+    for (i = 2; i <= n; i++)
+        ret = ret QSINGLE SINGLE X[i] SINGLE
+
+    return ret
+}
diff --git a/awklib/eg/lib/strtonum.awk b/awklib/eg/lib/strtonum.awk
index f82c89c5..783496e4 100644
--- a/awklib/eg/lib/strtonum.awk
+++ b/awklib/eg/lib/strtonum.awk
@@ -51,8 +51,8 @@ function mystrtonum(str,        ret, n, i, k, c)
 #     a[5] = "123.45"
 #     a[6] = "1.e3"
 #     a[7] = "1.32"
-#     a[7] = "1.32E2"
-# 
+#     a[8] = "1.32E2"
+#
 #     for (i = 1; i in a; i++)
 #         print a[i], strtonum(a[i]), mystrtonum(a[i])
 # }
diff --git a/awklib/eg/misc/arraymax.awk b/awklib/eg/misc/arraymax.awk
index 20dd1768..64197f56 100644
--- a/awklib/eg/misc/arraymax.awk
+++ b/awklib/eg/misc/arraymax.awk
@@ -1,10 +1,10 @@
 {
-  if ($1 > max)
-    max = $1
-  arr[$1] = $0
+    if ($1 > max)
+        max = $1
+    arr[$1] = $0
 }
 
 END {
-  for (x = 1; x <= max; x++)
-    print arr[x]
+    for (x = 1; x <= max; x++)
+        print arr[x]
 }
diff --git a/awklib/eg/misc/findpat.awk b/awklib/eg/misc/findpat.awk
index e9bef9ea..9d799434 100644
--- a/awklib/eg/misc/findpat.awk
+++ b/awklib/eg/misc/findpat.awk
@@ -1,10 +1,9 @@
 {
-       if ($1 == "FIND")
-         regex = $2
-       else {
-         where = match($0, regex)
-         if (where != 0)
-           print "Match of", regex, "found at",
-                     where, "in", $0
+    if ($1 == "FIND")
+        regex = $2
+    else {
+        where = match($0, regex)
+        if (where != 0)
+            print "Match of", regex, "found at", where, "in", $0
        }
 }
diff --git a/awklib/eg/prog/anagram.awk b/awklib/eg/prog/anagram.awk
index 7ca14559..df2768d9 100644
--- a/awklib/eg/prog/anagram.awk
+++ b/awklib/eg/prog/anagram.awk
@@ -1,5 +1,5 @@
-# anagram.awk --- An implementation of the anagram finding algorithm
-#                 from Jon Bentley's "Programming Pearls", 2nd edition.
+# anagram.awk --- An implementation of the anagram-finding algorithm
+#                 from Jon Bentley's "Programming Pearls," 2nd edition.
 #                 Addison Wesley, 2000, ISBN 0-201-65788-0.
 #                 Column 2, Problem C, section 2.8, pp 18-20.
 #
@@ -21,7 +21,7 @@
     key = word2key($1)  # Build signature
     data[key][$1] = $1  # Store word with signature
 }
-# word2key --- split word apart into letters, sort, joining back together
+# word2key --- split word apart into letters, sort, and join back together
 
 function word2key(word,     a, i, n, result)
 {
diff --git a/awklib/eg/prog/cut.awk b/awklib/eg/prog/cut.awk
index 56e35e71..080279bc 100644
--- a/awklib/eg/prog/cut.awk
+++ b/awklib/eg/prog/cut.awk
@@ -12,12 +12,10 @@
 #
 # Requires getopt() and join() library functions
 
-function usage(    e1, e2)
+function usage()
 {
-    e1 = "usage: cut [-f list] [-d c] [-s] [files...]"
-    e2 = "usage: cut [-c list] [files...]"
-    print e1 > "/dev/stderr"
-    print e2 > "/dev/stderr"
+    print("usage: cut [-f list] [-d c] [-s] [files...]") > "/dev/stderr"
+    print("usage: cut [-c list] [files...]") > "/dev/stderr"
     exit 1
 }
 BEGIN {
diff --git a/awklib/eg/prog/egrep.awk b/awklib/eg/prog/egrep.awk
index 094bdea5..a4165a90 100644
--- a/awklib/eg/prog/egrep.awk
+++ b/awklib/eg/prog/egrep.awk
@@ -91,10 +91,9 @@ function endfile(file)
 END {
     exit (total == 0)
 }
-function usage(    e)
+function usage()
 {
-    e = "Usage: egrep [-csvil] [-e pat] [files ...]"
-    e = e "\n\tegrep [-csvil] pat [files ...]"
-    print e > "/dev/stderr"
+    print("Usage: egrep [-csvil] [-e pat] [files ...]") > "/dev/stderr"
+    print("\n\tegrep [-csvil] pat [files ...]") > "/dev/stderr"
     exit 1
 }
diff --git a/awklib/eg/prog/extract.awk b/awklib/eg/prog/extract.awk
index 12e30b54..f5dfcf40 100644
--- a/awklib/eg/prog/extract.awk
+++ b/awklib/eg/prog/extract.awk
@@ -1,5 +1,4 @@
-# extract.awk --- extract files and run programs
-#                 from texinfo files
+# extract.awk --- extract files and run programs from Texinfo files
 #
 # Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
@@ -7,8 +6,7 @@
 
 BEGIN    { IGNORECASE = 1 }
 
-/^@c(omment)?[ \t]+system/    \
-{
+/^@c(omment)?[ \t]+system/ {
     if (NF < 3) {
         e = ("extract: " FILENAME ":" FNR)
         e = (e  ": badly formed `system' line")
@@ -24,8 +22,7 @@ BEGIN    { IGNORECASE = 1 }
         print e > "/dev/stderr"
     }
 }
-/^@c(omment)?[ \t]+file/    \
-{
+/^@c(omment)?[ \t]+file/ {
     if (NF != 3) {
         e = ("extract: " FILENAME ":" FNR ": badly formed `file' line")
         print e > "/dev/stderr"
@@ -66,7 +63,7 @@ BEGIN    { IGNORECASE = 1 }
 function unexpected_eof()
 {
     printf("extract: %s:%d: unexpected EOF or error\n",
-        FILENAME, FNR) > "/dev/stderr"
+                     FILENAME, FNR) > "/dev/stderr"
     exit 1
 }
 
diff --git a/awklib/eg/prog/id.awk b/awklib/eg/prog/id.awk
index 992fa57c..b6061f9b 100644
--- a/awklib/eg/prog/id.awk
+++ b/awklib/eg/prog/id.awk
@@ -6,6 +6,7 @@
 # May 1993
 # Revised February 1996
 # Revised May 2014
+# Revised September 2014
 
 # output is:
 # uid=12(foo) euid=34(bar) gid=3(baz) \
@@ -19,26 +20,22 @@ BEGIN {
 
     printf("uid=%d", uid)
     pw = getpwuid(uid)
-    if (pw != "")
-        pr_first_field(pw)
+    pr_first_field(pw)
 
     if (euid != uid) {
         printf(" euid=%d", euid)
         pw = getpwuid(euid)
-        if (pw != "")
-            pr_first_field(pw)
+        pr_first_field(pw)
     }
 
     printf(" gid=%d", gid)
     pw = getgrgid(gid)
-    if (pw != "")
-        pr_first_field(pw)
+    pr_first_field(pw)
 
     if (egid != gid) {
         printf(" egid=%d", egid)
         pw = getgrgid(egid)
-        if (pw != "")
-            pr_first_field(pw)
+        pr_first_field(pw)
     }
 
     for (i = 1; ("group" i) in PROCINFO; i++) {
@@ -47,8 +44,7 @@ BEGIN {
         group = PROCINFO["group" i]
         printf("%d", group)
         pw = getgrgid(group)
-        if (pw != "")
-            pr_first_field(pw)
+        pr_first_field(pw)
         if (("group" (i+1)) in PROCINFO)
             printf(",")
     }
@@ -58,6 +54,8 @@ BEGIN {
 
 function pr_first_field(str,  a)
 {
-    split(str, a, ":")
-    printf("(%s)", a[1])
+    if (str != "") {
+        split(str, a, ":")
+        printf("(%s)", a[1])
+    }
 }
diff --git a/awklib/eg/prog/indirectcall.awk b/awklib/eg/prog/indirectcall.awk
index 3ecb2887..165b022a 100644
--- a/awklib/eg/prog/indirectcall.awk
+++ b/awklib/eg/prog/indirectcall.awk
@@ -27,7 +27,7 @@ function do_sort(first, last, compare,      data, i, retval)
     retval = data[1]
     for (i = 2; i in data; i++)
         retval = retval " " data[i]
-    
+
     return retval
 }
 # sort --- sort the data in ascending order and return it as a string
diff --git a/awklib/eg/prog/pi.awk b/awklib/eg/prog/pi.awk
new file mode 100644
index 00000000..e1b5bc4f
--- /dev/null
+++ b/awklib/eg/prog/pi.awk
@@ -0,0 +1,18 @@
+# pi.awk --- compute the digits of pi
+#
+# Katie Wasserman, katie@wass.net
+# August 2014
+
+BEGIN {
+    digits = 100000
+    two = 2 * 10 ^ digits
+    pi = two
+    for (m = digits * 4; m > 0; --m) {
+        d = m * 2 + 1
+        x = pi * m
+        intdiv(x, d, result)
+        pi = result["quotient"]
+        pi = pi + two
+    }
+    print pi
+}
diff --git a/awklib/eg/prog/split.awk b/awklib/eg/prog/split.awk
index bcc73ae6..b878fa50 100644
--- a/awklib/eg/prog/split.awk
+++ b/awklib/eg/prog/split.awk
@@ -22,7 +22,7 @@ BEGIN {
     }
     # test argv in case reading from stdin instead of file
     if (i in ARGV)
-        i++    # skip data file name
+        i++    # skip datafile name
     if (i in ARGV) {
         outfile = ARGV[i]
         ARGV[i] = ""
@@ -50,9 +50,8 @@ BEGIN {
     }
     print > out
 }
-function usage(   e)
+function usage()
 {
-    e = "usage: split [-num] [file] [outname]"
-    print e > "/dev/stderr"
+    print("usage: split [-num] [file] [outname]") > "/dev/stderr"
     exit 1
 }
diff --git a/awklib/eg/prog/translate.awk b/awklib/eg/prog/translate.awk
index cf7f3897..e7403717 100644
--- a/awklib/eg/prog/translate.awk
+++ b/awklib/eg/prog/translate.awk
@@ -4,7 +4,7 @@
 # August 1989
 # February 2009 - bug fix
 
-# Bugs: does not handle things like: tr A-Z a-z, it has
+# Bugs: does not handle things like tr A-Z a-z; it has
 # to be spelled out. However, if `to' is shorter than `from',
 # the last character in `to' is used for the rest of `from'.
 
diff --git a/awklib/eg/prog/uniq.awk b/awklib/eg/prog/uniq.awk
index 2a2cf63e..7dd16099 100644
--- a/awklib/eg/prog/uniq.awk
+++ b/awklib/eg/prog/uniq.awk
@@ -5,10 +5,9 @@
 # Arnold Robbins, arnold@skeeve.com, Public Domain
 # May 1993
 
-function usage(    e)
+function usage()
 {
-    e = "Usage: uniq [-udc [-n]] [+n] [ in [ out ]]"
-    print e > "/dev/stderr"
+    print("Usage: uniq [-udc [-n]] [+n] [ in [ out ]]") > "/dev/stderr"
     exit 1
 }
 
diff --git a/builtin.c b/builtin.c
index 4b3670a1..a3fb7a5a 100644
--- a/builtin.c
+++ b/builtin.c
@@ -3,7 +3,7 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2014 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2015 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
@@ -111,10 +111,14 @@ wrerror:
 	if (fp == stdout && errno == EPIPE)
 		gawk_exit(EXIT_FATAL);
 
+
 	/* otherwise die verbosely */
-	fatal(_("%s to \"%s\" failed (%s)"), from,
-		rp ? rp->value : _("standard output"),
-		errno ? strerror(errno) : _("reason unknown"));
+	if ((rp != NULL) ? is_non_fatal_redirect(rp->value) : is_non_fatal_std(fp))
+		update_ERRNO_int(errno);
+	else
+		fatal(_("%s to \"%s\" failed (%s)"), from,
+			rp ? rp->value : _("standard output"),
+			errno ? strerror(errno) : _("reason unknown"));
 }
 
 
@@ -210,7 +214,6 @@ do_fflush(int nargs)
 	return make_number((AWKNUM) status);
 }
 
-#if MBS_SUPPORT
 /* strncasecmpmbs --- like strncasecmp (multibyte string version)  */
 
 int
@@ -290,14 +293,6 @@ index_multibyte_buffer(char* src, char* dest, int len)
 		dest[idx] = mbclen;
     }
 }
-#else
-/* a dummy function */
-static void
-index_multibyte_buffer(char* src ATTRIBUTE_UNUSED, char* dest ATTRIBUTE_UNUSED, int len ATTRIBUTE_UNUSED)
-{
-	cant_happen();
-}
-#endif
 
 /* do_index --- find index of a string */
 
@@ -308,7 +303,6 @@ do_index(int nargs)
 	const char *p1, *p2;
 	size_t l1, l2;
 	long ret;
-#if MBS_SUPPORT
 	bool do_single_byte = false;
 	mbstate_t mbs1, mbs2;
 
@@ -316,7 +310,6 @@ do_index(int nargs)
 		memset(& mbs1, 0, sizeof(mbstate_t));
 		memset(& mbs2, 0, sizeof(mbstate_t));
 	}
-#endif
 
 	POP_TWO_SCALARS(s1, s2);
 
@@ -346,7 +339,6 @@ do_index(int nargs)
 		goto out;
 	}
 
-#if MBS_SUPPORT
 	if (gawk_mb_cur_max > 1) {
 		s1 = force_wstring(s1);
 		s2 = force_wstring(s2);
@@ -357,14 +349,12 @@ do_index(int nargs)
 		do_single_byte = ((s1->wstlen == 0 && s1->stlen > 0) 
 					|| (s2->wstlen == 0 && s2->stlen > 0));
 	}
-#endif
 
 	/* IGNORECASE will already be false if posix */
 	if (IGNORECASE) {
 		while (l1 > 0) {
 			if (l2 > l1)
 				break;
-#if MBS_SUPPORT
 			if (! do_single_byte && gawk_mb_cur_max > 1) {
 				const wchar_t *pos;
 
@@ -375,21 +365,18 @@ do_index(int nargs)
 					ret = pos - s1->wstptr + 1;	/* 1-based */
 				goto out;
 			} else {
-#endif
-			/*
-			 * Could use tolower(*p1) == tolower(*p2) here.
-			 * See discussion in eval.c as to why not.
-			 */
-			if (casetable[(unsigned char)*p1] == casetable[(unsigned char)*p2]
-			    && (l2 == 1 || strncasecmp(p1, p2, l2) == 0)) {
-				ret = 1 + s1->stlen - l1;
-				break;
-			}
-			l1--;
-			p1++;
-#if MBS_SUPPORT
+				/*
+				 * Could use tolower(*p1) == tolower(*p2) here.
+				 * See discussion in eval.c as to why not.
+				 */
+				if (casetable[(unsigned char)*p1] == casetable[(unsigned char)*p2]
+				    && (l2 == 1 || strncasecmp(p1, p2, l2) == 0)) {
+					ret = 1 + s1->stlen - l1;
+					break;
+				}
+				l1--;
+				p1++;
 			}
-#endif
 		}
 	} else {
 		while (l1 > 0) {
@@ -400,7 +387,6 @@ do_index(int nargs)
 				ret = 1 + s1->stlen - l1;
 				break;
 			}
-#if MBS_SUPPORT
 			if (! do_single_byte && gawk_mb_cur_max > 1) {
 				const wchar_t *pos;
 
@@ -414,10 +400,6 @@ do_index(int nargs)
 				l1--;
 				p1++;
 			}
-#else
-			l1--;
-			p1++;
-#endif
 		}
 	}
 out:
@@ -466,6 +448,9 @@ do_length(int nargs)
 		 * Support for deferred loading of array elements requires that
 		 * we use the array length interface even though it isn't 
 		 * necessary for the built-in array types.
+		 *
+		 * 1/2015: The deferred arrays are gone, but this is probably
+		 * still a good idea.
 		 */
 
 		size = assoc_length(tmp);
@@ -478,7 +463,6 @@ do_length(int nargs)
 		lintwarn(_("length: received non-string argument"));
 	tmp = force_string(tmp);
 
-#if MBS_SUPPORT
 	if (gawk_mb_cur_max > 1) {
 		tmp = force_wstring(tmp);
 		len = tmp->wstlen;
@@ -489,7 +473,6 @@ do_length(int nargs)
 		 if (len == 0 && tmp->stlen > 0)
 			 len = tmp->stlen;
 	} else
-#endif
 		len = tmp->stlen;
 
 	DEREF(tmp);
@@ -546,7 +529,7 @@ do_printf(int nargs, int redirtype)
 	FILE *fp = NULL;
 	NODE *tmp;
 	struct redirect *rp = NULL;
-	int errflg;	/* not used, sigh */
+	int errflg = 0;
 	NODE *redir_exp = NULL;
 
 	if (nargs == 0) {
@@ -557,7 +540,7 @@ do_printf(int nargs, int redirtype)
 				redir_exp = TOP();
 				if (redir_exp->type != Node_val)
 					fatal(_("attempt to use array `%s' in a scalar context"), array_vname(redir_exp));
-				rp = redirect(redir_exp, redirtype, & errflg);
+				rp = redirect(redir_exp, redirtype, & errflg, true);
 				DEREF(redir_exp);
 				decr_sp();
 			}
@@ -570,9 +553,13 @@ do_printf(int nargs, int redirtype)
 		redir_exp = PEEK(nargs);
 		if (redir_exp->type != Node_val)
 			fatal(_("attempt to use array `%s' in a scalar context"), array_vname(redir_exp));
-		rp = redirect(redir_exp, redirtype, & errflg);
+		rp = redirect(redir_exp, redirtype, & errflg, true);
 		if (rp != NULL)
 			fp = rp->output.fp;
+		else if (errflg) {
+			update_ERRNO_int(errflg);
+			return;
+		}
 	} else if (do_debug)	/* only the debugger can change the default output */
 		fp = output_fp;
 	else
@@ -671,13 +658,11 @@ do_substr(int nargs)
 	if (nargs == 2) {	/* third arg. missing */
 		/* use remainder of string */
 		length = t1->stlen - indx;	/* default to bytes */
-#if MBS_SUPPORT
 		if (gawk_mb_cur_max > 1) {
 			t1 = force_wstring(t1);
 			if (t1->wstlen > 0)	/* use length of wide char string if we have one */
 				length = t1->wstlen - indx;
 		}
-#endif
 		d_length = length;	/* set here in case used in diagnostics, below */
 	}
 
@@ -690,12 +675,10 @@ do_substr(int nargs)
 	}
 
 	/* get total len of input string, for following checks */
-#if MBS_SUPPORT
 	if (gawk_mb_cur_max > 1) {
 		t1 = force_wstring(t1);
 		src_len = t1->wstlen;
 	} else
-#endif
 		src_len = t1->stlen;
 
 	if (indx >= src_len) {
@@ -713,7 +696,6 @@ do_substr(int nargs)
 		length = src_len - indx;
 	}
 
-#if MBS_SUPPORT
 	/* force_wstring() already called */
 	if (gawk_mb_cur_max == 1 || t1->wstlen == t1->stlen)
 		/* single byte case */
@@ -743,9 +725,6 @@ do_substr(int nargs)
 		*cp = '\0';
 		r = make_str_node(substr, cp - substr, ALREADY_MALLOCED);
 	}
-#else
-	r = make_string(t1->stptr + indx, length);
-#endif
 
 finish:
 	if (t3 != NULL)
@@ -977,7 +956,7 @@ void
 do_print(int nargs, int redirtype)
 {
 	struct redirect *rp = NULL;
-	int errflg;	/* not used, sigh */
+	int errflg = 0;
 	FILE *fp = NULL;
 	int i;
 	NODE *redir_exp = NULL;
@@ -989,9 +968,13 @@ do_print(int nargs, int redirtype)
 		redir_exp = PEEK(nargs);
 		if (redir_exp->type != Node_val)
 			fatal(_("attempt to use array `%s' in a scalar context"), array_vname(redir_exp));
-		rp = redirect(redir_exp, redirtype, & errflg);
+		rp = redirect(redir_exp, redirtype, & errflg, true);
 		if (rp != NULL)
 			fp = rp->output.fp;
+		else if (errflg) {
+			update_ERRNO_int(errflg);
+			return;
+		}
 	} else if (do_debug)	/* only the debugger can change the default output */
 		fp = output_fp;
 	else
@@ -1047,13 +1030,13 @@ do_print_rec(int nargs, int redirtype)
 	FILE *fp = NULL;
 	NODE *f0;
 	struct redirect *rp = NULL;
-	int errflg;	/* not used, sigh */
+	int errflg = 0;
 	NODE *redir_exp = NULL;
 
 	assert(nargs == 0);
 	if (redirtype != 0) {
 		redir_exp = TOP();
-		rp = redirect(redir_exp, redirtype, & errflg);
+		rp = redirect(redir_exp, redirtype, & errflg, true);
 		if (rp != NULL)
 			fp = rp->output.fp;
 		DEREF(redir_exp);
@@ -1061,6 +1044,11 @@ do_print_rec(int nargs, int redirtype)
 	} else
 		fp = output_fp;
 
+	if (errflg) {
+		update_ERRNO_int(errflg);
+		return;
+	}
+
 	if (fp == NULL)
 		return;
 
@@ -1081,7 +1069,6 @@ do_print_rec(int nargs, int redirtype)
 		rp->output.gawk_fflush(rp->output.fp, rp->output.opaque);
 }
 
-#if MBS_SUPPORT
 
 /* is_wupper --- function version of iswupper for passing function pointers */
 
@@ -1146,7 +1133,6 @@ wide_tolower(wchar_t *wstr, size_t wlen)
 {
 	wide_change_case(wstr, wlen, is_wupper, to_wlower);
 }
-#endif
 
 /* do_tolower --- lower case a string */
 
@@ -1169,14 +1155,11 @@ do_tolower(int nargs)
 			cp < cp2; cp++)
 			if (isupper(*cp))
 				*cp = tolower(*cp);
-	}
-#if MBS_SUPPORT
-	else {
+	} else {
 		force_wstring(t2);
 		wide_tolower(t2->wstptr, t2->wstlen);
 		wstr2str(t2);
 	}
-#endif
 
 	DEREF(t1);
 	return t2;
@@ -1203,14 +1186,11 @@ do_toupper(int nargs)
 			cp < cp2; cp++)
 			if (islower(*cp))
 				*cp = toupper(*cp);
-	}
-#if MBS_SUPPORT
-	else {
+	} else {
 		force_wstring(t2);
 		wide_toupper(t2->wstptr, t2->wstlen);
 		wstr2str(t2);
 	}
-#endif
 
 	DEREF(t1);
 	return t2;
@@ -1252,13 +1232,12 @@ do_match(int nargs)
 		size_t *wc_indices = NULL;
 
 		rlength = REEND(rp, t1->stptr) - RESTART(rp, t1->stptr);	/* byte length */
-#if MBS_SUPPORT
 		if (rlength > 0 && gawk_mb_cur_max > 1) {
 			t1 = str2wstr(t1, & wc_indices);
 			rlength = wc_indices[rstart + rlength - 1] - wc_indices[rstart] + 1;
 			rstart = wc_indices[rstart];
 		}
-#endif
+
 		rstart++;	/* now it's 1-based indexing */
 	
 		/* Build the array only if the caller wants the optional subpatterns */
@@ -1280,12 +1259,10 @@ do_match(int nargs)
 					start = t1->stptr + s;
 					subpat_start = s;
 					subpat_len = len = SUBPATEND(rp, t1->stptr, ii) - s;
-#if MBS_SUPPORT
 					if (len > 0 && gawk_mb_cur_max > 1) {
 						subpat_start = wc_indices[s];
 						subpat_len = wc_indices[s + len - 1] - subpat_start + 1;
 					}
-#endif
 	
 					it = make_string(start, len);
 					it->flags |= MAYBE_NUM;	/* user input */
@@ -1504,6 +1481,8 @@ do_sub(int nargs, unsigned int flags)
 				if ((t1->flags & NUMCUR) != 0)
 					goto set_how_many;
 
+				warning(_("gensub: third argument `%.*s' treated as 1"),
+						(int) t1->stlen, t1->stptr);
 				how_many = 1;
 			}
 		} else {
@@ -1516,8 +1495,8 @@ set_how_many:
 				how_many = d;
 			else
 				how_many = LONG_MAX;
-			if (d == 0)
-				warning(_("gensub: third argument of 0 treated as 1"));
+			if (d <= 0)
+				warning(_("gensub: third argument %g treated as 1"), d);
 		}
 		DEREF(t1);
 
@@ -1794,6 +1773,146 @@ done:
 	return make_number((AWKNUM) matches);
 }
 
+/* call_sub --- call do_sub indirectly */
+
+NODE *
+call_sub(const char *name, int nargs)
+{
+	unsigned int flags = 0;
+	NODE *regex, *replace, *glob_flag;
+	NODE **lhs, *rhs;
+	NODE *zero = make_number(0.0);
+	NODE *result;
+
+	if (name[0] == 'g') {
+		if (name[1] == 'e')
+			flags = GENSUB;
+		else
+			flags = GSUB;
+	}
+
+	if (flags == 0 || flags == GSUB) {
+		/* sub or gsub */
+		if (nargs != 2)
+			fatal(_("%s: can be called indirectly only with two arguments"), name);
+
+		replace = POP_STRING();
+		regex = POP();	/* the regex */
+		/*
+		 * push regex
+		 * push replace
+		 * push $0
+		 */
+		regex = make_regnode(Node_regex, regex);
+		PUSH(regex);
+		PUSH(replace);
+		lhs = r_get_field(zero, (Func_ptr *) 0, true);
+		nargs++;
+		PUSH_ADDRESS(lhs);
+	} else {
+		/* gensub */
+		if (nargs == 4)
+			rhs = POP();
+		else
+			rhs = NULL;
+		glob_flag = POP_STRING();
+		replace = POP_STRING();
+		regex = POP();	/* the regex */
+		/*
+		 * push regex
+		 * push replace
+		 * push glob_flag
+		 * if (nargs = 3) {
+		 *	 push $0
+		 *	 nargs++
+		 * }
+		 */
+		regex = make_regnode(Node_regex, regex);
+		PUSH(regex);
+		PUSH(replace);
+		PUSH(glob_flag);
+		if (rhs == NULL) {
+			lhs = r_get_field(zero, (Func_ptr *) 0, true);
+			rhs = *lhs;
+			UPREF(rhs);
+			PUSH(rhs);
+			nargs++;
+		}
+		PUSH(rhs);
+	}
+
+
+	unref(zero);
+	result = do_sub(nargs, flags);
+	if (flags != GENSUB)
+		reset_record();
+	return result;
+}
+
+/* call_match --- call do_match indirectly */
+
+NODE *
+call_match(int nargs)
+{
+	NODE *regex, *text, *array;
+	NODE *result;
+
+	regex = text = array = NULL;
+	if (nargs == 3)
+		array = POP();
+	regex = POP();
+
+	/* Don't need to pop the string just to push it back ... */
+
+	regex = make_regnode(Node_regex, regex);
+	PUSH(regex);
+
+	if (array)
+		PUSH(array);
+
+	result = do_match(nargs);
+	return result;
+}
+
+/* call_split_func --- call do_split or do_pat_split indirectly */
+
+NODE *
+call_split_func(const char *name, int nargs)
+{
+	NODE *regex, *seps;
+	NODE *result;
+
+	regex = seps = NULL;
+	if (nargs < 2)
+		fatal(_("indirect call to %s requires at least two arguments"),
+				name);
+
+	if (nargs == 4)
+		seps = POP();
+
+	if (nargs >= 3) {
+		regex = POP_STRING();
+		regex = make_regnode(Node_regex, regex);
+	} else {
+		if (name[0] == 's') {
+			regex = make_regnode(Node_regex, FS_node->var_value);
+			regex->re_flags |= FS_DFLT;
+		} else
+			regex = make_regnode(Node_regex, FPAT_node->var_value);
+		nargs++;
+	}
+
+	/* Don't need to pop the string or the data array */
+
+	PUSH(regex);
+
+	if (seps)
+		PUSH(seps);
+
+	result = (name[0] == 's') ? do_split(nargs) : do_patsplit(nargs);
+
+	return result;
+}
 
 /* do_dcgettext, do_dcngettext --- handle i18n translations */
 
diff --git a/command.c b/command.c
index a5ed47bf..4588377c 100644
--- a/command.c
+++ b/command.c
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.2"
+#define YYBISON_VERSION "3.0.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -2648,6 +2648,8 @@ struct cmdtoken cmdtab[] = {
 	gettext_noop("up [N] - move N frames up the stack.") },
 { "watch", "w", D_watch, D_WATCH, do_watch,
 	gettext_noop("watch var - set a watchpoint for a variable.") },
+{ "where", "", D_backtrace, D_BACKTRACE, do_backtrace,
+	gettext_noop("where [N] - (same as backtrace) print trace of all or N innermost (outermost if N < 0) frames.") },
 { NULL, NULL, D_illegal, 0, (Func_cmd) 0,
 	 NULL },
 };
diff --git a/command.y b/command.y
index a8942513..ade2cab7 100644
--- a/command.y
+++ b/command.y
@@ -897,6 +897,8 @@ struct cmdtoken cmdtab[] = {
 	gettext_noop("up [N] - move N frames up the stack.") },
 { "watch", "w", D_watch, D_WATCH, do_watch,
 	gettext_noop("watch var - set a watchpoint for a variable.") },
+{ "where", "", D_backtrace, D_BACKTRACE, do_backtrace,
+	gettext_noop("where [N] - (same as backtrace) print trace of all or N innermost (outermost if N < 0) frames.") },
 { NULL, NULL, D_illegal, 0, (Func_cmd) 0,
 	 NULL },
 };
diff --git a/compile b/compile
new file mode 100755
index 00000000..a85b723c
--- /dev/null
+++ b/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/config.guess b/config.guess
index 4438cd70..dbfb9786 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2014-01-01'
+timestamp='2015-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@ timestamp='2014-01-01'
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 #
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 
 
 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +149,7 @@ Linux|GNU|GNU/*)
 	LIBC=gnu
 	#endif
 	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
 	;;
 esac
 
@@ -579,8 +579,9 @@ EOF
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@@ -826,7 +827,7 @@ EOF
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
@@ -969,10 +970,10 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    or1k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
 	exit ;;
-    or32:Linux:*:*)
+    or32:Linux:*:* | or1k*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
@@ -1371,154 +1372,6 @@ EOF
 	exit ;;
 esac
 
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
 cat >&2 <<EOF
 $0: unable to guess system type
 
diff --git a/config.rpath b/config.rpath
index ab6fd995..b625621f 100755
--- a/config.rpath
+++ b/config.rpath
@@ -367,11 +367,7 @@ else
     dgux*)
       hardcode_libdir_flag_spec='-L$libdir'
       ;;
-    freebsd2.2*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      ;;
-    freebsd2*)
+    freebsd2.[01]*)
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
@@ -548,13 +544,11 @@ case "$host_os" in
   dgux*)
     library_names_spec='$libname$shrext'
     ;;
+  freebsd[23].*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
   freebsd* | dragonfly*)
-    case "$host_os" in
-      freebsd[123]*)
-        library_names_spec='$libname$shrext$versuffix' ;;
-      *)
-        library_names_spec='$libname$shrext' ;;
-    esac
+    library_names_spec='$libname$shrext'
     ;;
   gnu*)
     library_names_spec='$libname$shrext'
diff --git a/config.sub b/config.sub
index 092cff00..6d2e94c8 100755
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2014-01-01'
+timestamp='2015-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ timestamp='2014-01-01'
 # of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -260,7 +260,7 @@ case $basic_machine in
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
-	| fido | fr30 | frv \
+	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
@@ -283,8 +283,10 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipsr5900 | mipsr5900el \
@@ -296,11 +298,11 @@ case $basic_machine in
 	| nds32 | nds32le | nds32be \
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
-	| or1k | or32 \
+	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
+	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -311,6 +313,7 @@ case $basic_machine in
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -325,6 +328,9 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -402,8 +408,10 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipsr5900-* | mipsr5900el-* \
@@ -415,6 +423,7 @@ case $basic_machine in
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -432,6 +441,7 @@ case $basic_machine in
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
+	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -769,6 +779,9 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@@ -824,6 +837,10 @@ case $basic_machine in
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -1369,14 +1386,14 @@ case $os in
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1594,9 +1611,6 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
-	or1k-*)
-		os=-elf
-		;;
 	or32-*)
 		os=-coff
 		;;
diff --git a/configh.in b/configh.in
index 1ca2946a..f4309812 100644
--- a/configh.in
+++ b/configh.in
@@ -96,9 +96,6 @@
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
 
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
 /* Define to 1 if you have a fully functional readline library. */
 #undef HAVE_LIBREADLINE
 
@@ -171,6 +168,9 @@
 /* Define to 1 if you have the `setsid' function. */
 #undef HAVE_SETSID
 
+/* Define to 1 if you have the `sigprocmask' function. */
+#undef HAVE_SIGPROCMASK
+
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
 
@@ -296,6 +296,9 @@
 /* Define to 1 if you have the `usleep' function. */
 #undef HAVE_USLEEP
 
+/* Define to 1 if you have the `waitpid' function. */
+#undef HAVE_WAITPID
+
 /* Define to 1 if you have the <wchar.h> header file. */
 #undef HAVE_WCHAR_H
 
@@ -320,6 +323,9 @@
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL
 
+/* enable severe portability problems */
+#undef I_DONT_KNOW_WHAT_IM_DOING
+
 /* disable lint checks */
 #undef NO_LINT
 
diff --git a/configure b/configure
index 038e2081..def8a041 100755
--- a/configure
+++ b/configure
@@ -657,6 +657,7 @@ GMSGFMT
 MSGFMT
 GETTEXT_MACRO_VERSION
 USE_NLS
+SED
 pkgextensiondir
 acl_shlibext
 LN_S
@@ -761,6 +762,7 @@ enable_option_checking
 enable_silent_rules
 with_whiny_user_strftime
 enable_lint
+enable_severe_portability_problems
 enable_dependency_tracking
 enable_largefile
 enable_nls
@@ -1405,6 +1407,7 @@ Optional Features:
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
   --disable-lint	Disable gawk lint checking
+  --enable-severe-portability-problems	Enable really nasty portability problems
   --enable-dependency-tracking
                           do not reject slow dependency extractors
   --disable-dependency-tracking
@@ -1418,7 +1421,7 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-whiny-user-strftime	Force use of included version of strftime for deficient systems
-  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
@@ -2589,7 +2592,7 @@ then
 fi
 
 
-am__api_version='1.13'
+am__api_version='1.15'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2790,8 +2793,8 @@ test "$program_suffix" != NONE &&
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
@@ -2810,7 +2813,7 @@ else
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3138,8 +3141,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
@@ -3155,6 +3158,48 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
 
 
 
@@ -3181,6 +3226,17 @@ $as_echo "#define NO_LINT 1" >>confdefs.h
 
 fi
 
+# Check whether --enable-severe-portability-problems was given.
+if test "${enable_severe_portability_problems+set}" = set; then :
+  enableval=$enable_severe_portability_problems; if test "$enableval" = yes
+	then
+
+$as_echo "#define I_DONT_KNOW_WHAT_IM_DOING 1" >>confdefs.h
+
+	fi
+
+fi
+
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -4105,6 +4161,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -5353,6 +5468,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -5662,17 +5836,13 @@ $as_echo_n "checking for special development options... " >&6; }
 if test -f $srcdir/.developing
 then
 	# add other debug flags as appropriate, save GAWKDEBUG for emergencies
-	CFLAGS="$CFLAGS -DARRAYDEBUG -DYYDEBUG"
-	if grep dbug $srcdir/.developing
-	then
-		CFLAGS="$CFLAGS -DDBUG"
-		LIBS="$LIBS dbug/libdbug.a"
-	fi
+	CFLAGS="$CFLAGS -DARRAYDEBUG -DYYDEBUG -DLOCALEDEBUG"
+
 	# turn on compiler warnings if we're doing development
 	# enable debugging using macros also
 	if test "$GCC" = yes
 	then
-		CFLAGS="$CFLAGS -Wall -fno-builtin -g3 -gdwarf-2"
+		CFLAGS="$CFLAGS -Wall -fno-builtin -g3"
 	fi
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -6006,6 +6176,75 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
@@ -6022,7 +6261,7 @@ $as_echo "$USE_NLS" >&6; }
 
 
 
-      GETTEXT_MACRO_VERSION=0.18
+      GETTEXT_MACRO_VERSION=0.19
 
 
 
@@ -6030,15 +6269,14 @@ $as_echo "$USE_NLS" >&6; }
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -6153,15 +6391,14 @@ fi
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -6231,15 +6468,14 @@ fi
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -6323,6 +6559,7 @@ fi
   prefix="$acl_save_prefix"
 
 
+
 # Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
@@ -6333,21 +6570,21 @@ fi
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
-$as_echo_n "checking for ld used by GCC... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -6357,11 +6594,11 @@ $as_echo_n "checking for ld used by GCC... " >&6; }
   esac
   case $ac_prog in
     # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
+    [\\/]* | ?:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+      # Canonicalize the pathname of ld
+      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
         ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
@@ -6386,23 +6623,26 @@ if ${acl_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
+    IFS="$acl_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       acl_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break ;;
+        test "$with_gnu_ld" != no && break
+        ;;
       *)
-        test "$with_gnu_ld" != yes && break ;;
+        test "$with_gnu_ld" != yes && break
+        ;;
       esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$acl_save_ifs"
 else
   acl_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
@@ -6422,12 +6662,14 @@ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if ${acl_cv_prog_gnu_ld+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
+  acl_cv_prog_gnu_ld=yes
+  ;;
 *)
-  acl_cv_prog_gnu_ld=no ;;
+  acl_cv_prog_gnu_ld=no
+  ;;
 esac
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
@@ -6610,7 +6852,7 @@ fi
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -7139,15 +7381,19 @@ if eval \${$gt_func_gnugettext_libc+:} false; then :
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+
   ;
   return 0;
 }
@@ -7205,14 +7451,16 @@ else
     am_cv_lib_iconv=no
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);
   ;
   return 0;
 }
@@ -7227,14 +7475,16 @@ rm -f core conftest.err conftest.$ac_objext \
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);
   ;
   return 0;
 }
@@ -7258,40 +7508,50 @@ if ${am_cv_func_iconv_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-            am_save_LIBS="$LIBS"
+                  am_save_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
-      if test "$cross_compiling" = yes; then :
+      am_cv_func_iconv_works=no
+      for ac_iconv_const in '' 'const'; do
+        if test "$cross_compiling" = yes; then :
   case "$host_os" in
-           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-           *)            am_cv_func_iconv_works="guessing yes" ;;
-         esac
+             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+             *)            am_cv_func_iconv_works="guessing yes" ;;
+           esac
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <iconv.h>
 #include <string.h>
-int main ()
+
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+
+int
+main ()
 {
+int result = 0;
   /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
      returns.  */
   {
     iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
     if (cd_utf8_to_88591 != (iconv_t)(-1))
       {
-        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
         char buf[10];
-        const char *inptr = input;
+        ICONV_CONST char *inptr = input;
         size_t inbytesleft = strlen (input);
         char *outptr = buf;
         size_t outbytesleft = sizeof (buf);
         size_t res = iconv (cd_utf8_to_88591,
-                            (char **) &inptr, &inbytesleft,
+                            &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
       }
   }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
@@ -7300,17 +7560,37 @@ int main ()
     iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
     if (cd_ascii_to_88591 != (iconv_t)(-1))
       {
-        static const char input[] = "\263";
+        static ICONV_CONST char input[] = "\263";
         char buf[10];
-        const char *inptr = input;
+        ICONV_CONST char *inptr = input;
         size_t inbytesleft = strlen (input);
         char *outptr = buf;
         size_t outbytesleft = sizeof (buf);
         size_t res = iconv (cd_ascii_to_88591,
-                            (char **) &inptr, &inbytesleft,
+                            &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\304";
+        static char buf[2] = { (char)0xDE, (char)0xAD };
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
       }
   }
 #if 0 /* This bug could be worked around by the caller.  */
@@ -7319,17 +7599,18 @@ int main ()
     iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
     if (cd_88591_to_utf8 != (iconv_t)(-1))
       {
-        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
         char buf[50];
-        const char *inptr = input;
+        ICONV_CONST char *inptr = input;
         size_t inbytesleft = strlen (input);
         char *outptr = buf;
         size_t outbytesleft = sizeof (buf);
         size_t res = iconv (cd_88591_to_utf8,
-                            (char **) &inptr, &inbytesleft,
+                            &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          return 1;
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
       }
   }
 #endif
@@ -7343,19 +7624,22 @@ int main ()
       && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
       /* Try HP-UX names.  */
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    return 1;
+    result |= 16;
+  return result;
+
+  ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   am_cv_func_iconv_works=yes
-else
-  am_cv_func_iconv_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+        test "$am_cv_func_iconv_works" = no || break
+      done
       LIBS="$am_save_LIBS"
 
 fi
@@ -7461,7 +7745,7 @@ fi
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -7859,6 +8143,7 @@ else
             LIBS="$LIBS $LIBINTL"
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -7867,11 +8152,14 @@ extern
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
   ;
   return 0;
 }
@@ -7887,6 +8175,7 @@ rm -f core conftest.err conftest.$ac_objext \
               LIBS="$LIBS $LIBICONV"
               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -7895,19 +8184,22 @@ extern
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                eval "$gt_func_gnugettext_libintl=yes"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                 eval "$gt_func_gnugettext_libintl=yes"
 
 fi
 rm -f core conftest.err conftest.$ac_objext \
@@ -9300,13 +9592,12 @@ fi
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fmod in -lm" >&5
-$as_echo_n "checking for fmod in -lm... " >&6; }
-if ${ac_cv_lib_m_fmod+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fmod" >&5
+$as_echo_n "checking for library containing fmod... " >&6; }
+if ${ac_cv_search_fmod+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -9325,33 +9616,44 @@ return fmod ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_fmod=yes
-else
-  ac_cv_lib_m_fmod=no
+for ac_lib in '' m; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_fmod=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+    conftest$ac_exeext
+  if ${ac_cv_search_fmod+:} false; then :
+  break
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_fmod" >&5
-$as_echo "$ac_cv_lib_m_fmod" >&6; }
-if test "x$ac_cv_lib_m_fmod" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
+done
+if ${ac_cv_search_fmod+:} false; then :
 
-  LIBS="-lm $LIBS"
+else
+  ac_cv_search_fmod=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fmod" >&5
+$as_echo "$ac_cv_search_fmod" >&6; }
+ac_res=$ac_cv_search_fmod
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isinf in -lm" >&5
-$as_echo_n "checking for isinf in -lm... " >&6; }
-if ${ac_cv_lib_m_isinf+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing isinf" >&5
+$as_echo_n "checking for library containing isinf... " >&6; }
+if ${ac_cv_search_isinf+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -9370,33 +9672,44 @@ return isinf ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_isinf=yes
-else
-  ac_cv_lib_m_isinf=no
+for ac_lib in '' m; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_isinf=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+    conftest$ac_exeext
+  if ${ac_cv_search_isinf+:} false; then :
+  break
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_isinf" >&5
-$as_echo "$ac_cv_lib_m_isinf" >&6; }
-if test "x$ac_cv_lib_m_isinf" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
+done
+if ${ac_cv_search_isinf+:} false; then :
 
-  LIBS="-lm $LIBS"
+else
+  ac_cv_search_isinf=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_isinf" >&5
+$as_echo "$ac_cv_search_isinf" >&6; }
+ac_res=$ac_cv_search_isinf
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ismod in -lm" >&5
-$as_echo_n "checking for ismod in -lm... " >&6; }
-if ${ac_cv_lib_m_ismod+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ismod" >&5
+$as_echo_n "checking for library containing ismod... " >&6; }
+if ${ac_cv_search_ismod+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -9415,23 +9728,35 @@ return ismod ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_ismod=yes
-else
-  ac_cv_lib_m_ismod=no
+for ac_lib in '' m; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_ismod=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+    conftest$ac_exeext
+  if ${ac_cv_search_ismod+:} false; then :
+  break
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_ismod" >&5
-$as_echo "$ac_cv_lib_m_ismod" >&6; }
-if test "x$ac_cv_lib_m_ismod" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
+done
+if ${ac_cv_search_ismod+:} false; then :
 
-  LIBS="-lm $LIBS"
+else
+  ac_cv_search_ismod=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ismod" >&5
+$as_echo "$ac_cv_search_ismod" >&6; }
+ac_res=$ac_cv_search_ismod
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
@@ -9519,7 +9844,7 @@ fi
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -9998,9 +10323,10 @@ esac
 for ac_func in atexit btowc fmod getgrent getgroups grantpt \
 	isascii iswctype iswlower iswupper mbrlen \
 	memcmp memcpy memcpy_ulong memmove memset \
-	memset_ulong mkstemp posix_openpt setenv setlocale setsid snprintf strchr \
+	memset_ulong mkstemp posix_openpt setenv setlocale setsid sigprocmask \
+	snprintf strchr \
 	strerror strftime strcasecmp strncasecmp strcoll strtod strtoul \
-	system tmpfile towlower towupper tzset usleep wcrtomb \
+	system tmpfile towlower towupper tzset usleep waitpid wcrtomb \
 	wcscoll wctype
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -10418,7 +10744,39 @@ fi
 $as_echo_n "checking whether readline via \"$_combo\" is present and sane... " >&6; }
 
 	if test "$cross_compiling" = yes; then :
-              _found_readline=no
+  		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+#include <readline/readline.h>
+#include <readline/history.h>
+int
+main ()
+{
+
+	int fd;
+	char *line;
+
+	close(0);
+	close(1);
+	fd = open("/dev/null", 2);	/* should get fd 0 */
+	dup(fd);
+	line = readline("giveittome> ");
+
+	/* some printfs don't handle NULL for %s */
+	printf("got <%s>\n", line ? line : "(NULL)");
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  			_found_readline=yes
+else
+  			_found_readline=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10952,7 +11310,7 @@ dylib)	GAWKLIBEXT=so ;;	# MacOS uses .dylib for shared libraries, but libtool us
 esac
 
 
-ac_config_files="$ac_config_files Makefile awklib/Makefile doc/Makefile po/Makefile.in test/Makefile"
+ac_config_files="$ac_config_files Makefile awklib/Makefile doc/Makefile extras/Makefile po/Makefile.in test/Makefile"
 
 if test "x$enable_extensions" = "xyes"; then
 
@@ -11708,6 +12066,7 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "awklib/Makefile") CONFIG_FILES="$CONFIG_FILES awklib/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "extras/Makefile") CONFIG_FILES="$CONFIG_FILES extras/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
 
@@ -12408,7 +12767,7 @@ $as_echo X"$file" |
       case "$ac_file" in */Makefile.in)
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.
@@ -12424,7 +12783,8 @@ $as_echo X"$file" |
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
           # on $ac_dir but don't depend on user-specified configuration
@@ -12435,12 +12795,12 @@ $as_echo X"$file" |
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
diff --git a/configure.ac b/configure.ac
index 8b4f188e..a6972ab2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl
 dnl configure.ac --- autoconf input file for gawk
 dnl
-dnl Copyright (C) 1995-2014 the Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2015 the Free Software Foundation, Inc.
 dnl
 dnl This file is part of GAWK, the GNU implementation of the
 dnl AWK Programming Language.
@@ -40,7 +40,7 @@ then
 fi
 
 AC_PREREQ(2.69)
-AM_INIT_AUTOMAKE([1.13 dist-xz dist-lzip])
+AM_INIT_AUTOMAKE([1.15 dist-xz dist-lzip])
 
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -58,6 +58,12 @@ AC_ARG_ENABLE([lint], [  --disable-lint	Disable gawk lint checking],
 		AC_DEFINE(NO_LINT, 1, [disable lint checks])
 	fi
 )
+AC_ARG_ENABLE([severe-portability-problems], [  --enable-severe-portability-problems	Enable really nasty portability problems],
+	if test "$enableval" = yes
+	then
+		AC_DEFINE(I_DONT_KNOW_WHAT_IM_DOING, 1, [enable severe portability problems])
+	fi
+)
 
 AC_CANONICAL_HOST
 AC_USE_SYSTEM_EXTENSIONS
@@ -81,17 +87,13 @@ AC_MSG_CHECKING([for special development options])
 if test -f $srcdir/.developing
 then
 	# add other debug flags as appropriate, save GAWKDEBUG for emergencies
-	CFLAGS="$CFLAGS -DARRAYDEBUG -DYYDEBUG"
-	if grep dbug $srcdir/.developing
-	then
-		CFLAGS="$CFLAGS -DDBUG"
-		LIBS="$LIBS dbug/libdbug.a"
-	fi
+	CFLAGS="$CFLAGS -DARRAYDEBUG -DYYDEBUG -DLOCALEDEBUG"
+
 	# turn on compiler warnings if we're doing development
 	# enable debugging using macros also
 	if test "$GCC" = yes
 	then
-		CFLAGS="$CFLAGS -Wall -fno-builtin -g3 -gdwarf-2"
+		CFLAGS="$CFLAGS -Wall -fno-builtin -g3"
 	fi
 	AC_MSG_RESULT([yes])
 else
@@ -125,7 +127,7 @@ AC_LANG([C])
 
 dnl initialize GNU gettext
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.18.1])
+AM_GNU_GETTEXT_VERSION([0.19.4])
 AM_LANGINFO_CODESET
 gt_LC_MESSAGES
 
@@ -252,9 +254,9 @@ AC_CHECK_FUNC(getaddrinfo, [AC_DEFINE(HAVE_GETADDRINFO, 1, [have getaddrinfo])],
 			    [AC_DEFINE(HAVE_GETADDRINFO, 1,
 				       [have getaddrinfo])])])
 
-AC_CHECK_LIB(m, fmod)
-AC_CHECK_LIB(m, isinf)
-AC_CHECK_LIB(m, ismod)
+AC_SEARCH_LIBS(fmod, m)
+AC_SEARCH_LIBS(isinf, m)
+AC_SEARCH_LIBS(ismod, m)
 dnl Don't look for libsigsegv on OSF/1, gives us severe headaches
 case $host_os in
 osf1)	: ;;
@@ -267,9 +269,10 @@ esac
 AC_CHECK_FUNCS(atexit btowc fmod getgrent getgroups grantpt \
 	isascii iswctype iswlower iswupper mbrlen \
 	memcmp memcpy memcpy_ulong memmove memset \
-	memset_ulong mkstemp posix_openpt setenv setlocale setsid snprintf strchr \
+	memset_ulong mkstemp posix_openpt setenv setlocale setsid sigprocmask \
+	snprintf strchr \
 	strerror strftime strcasecmp strncasecmp strcoll strtod strtoul \
-	system tmpfile towlower towupper tzset usleep wcrtomb \
+	system tmpfile towlower towupper tzset usleep waitpid wcrtomb \
 	wcscoll wctype)
 dnl this check is for both mbrtowc and the mbstate_t type, which is good
 AC_FUNC_MBRTOWC
@@ -396,6 +399,7 @@ AC_SUBST(GAWKLIBEXT)
 AC_CONFIG_FILES(Makefile
 	awklib/Makefile
 	doc/Makefile
+	extras/Makefile
 	po/Makefile.in
 	test/Makefile)
 if test "x$enable_extensions" = "xyes"; then
diff --git a/debug.c b/debug.c
index d129c4e3..40ac5553 100644
--- a/debug.c
+++ b/debug.c
@@ -3976,6 +3976,7 @@ print_instruction(INSTRUCTION *pc, Func_print print_func, FILE *fp, int in_dump)
 	case Op_match:
 	case Op_nomatch:
 	case Op_assign_concat:
+	case Op_comment:
 		print_memory(pc->memory, func, print_func, fp);
 		/* fall through */
 	default:
diff --git a/depcomp b/depcomp
index 31788017..fc98710e 100755
--- a/depcomp
+++ b/depcomp
@@ -3,7 +3,7 @@
 
 scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -251,6 +251,41 @@ hp)
   exit 1
   ;;
 
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
 xlc)
   # This case exists only to let depend.m4 do its work.  It works by
   # looking at the text of this script.  This case will never be run,
diff --git a/dfa.c b/dfa.c
index 2d0e7f20..2cfd30b6 100644
--- a/dfa.c
+++ b/dfa.c
@@ -1,5 +1,5 @@
 /* dfa.c - deterministic extended regexp routines for GNU
-   Copyright (C) 1988, 1998, 2000, 2002, 2004-2005, 2007-2014 Free Software
+   Copyright (C) 1988, 1998, 2000, 2002, 2004-2005, 2007-2015 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -58,15 +58,15 @@
 #include "gettext.h"
 #define _(str) gettext (str)
 
-#include "mbsupport.h" /* Define MBS_SUPPORT to 1 or 0, as appropriate.  */
-#if MBS_SUPPORT
-/* We can handle multibyte strings.  */
-# include <wchar.h>
-# include <wctype.h>
-#endif
+#include <wchar.h>
+#include <wctype.h>
 
 #include "xalloc.h"
 
+#if defined(__DJGPP__)
+#include "mbsupport.h"
+#endif
+
 #include "dfa.h"
 
 #ifdef GAWK
@@ -367,6 +367,9 @@ struct dfa
   token utf8_anychar_classes[5]; /* To lower ANYCHAR in UTF-8 locales.  */
   mbstate_t mbs;		/* Multibyte conversion state.  */
 
+  /* dfaexec implementation.  */
+  char *(*dfaexec) (struct dfa *, char const *, char *, int, size_t *, int *);
+
   /* The following are valid only if MB_CUR_MAX > 1.  */
 
   /* The value of multibyte_prop[i] is defined by following rule.
@@ -388,12 +391,10 @@ struct dfa
    */
   int *multibyte_prop;
 
-#if MBS_SUPPORT
   /* A table indexed by byte values that contains the corresponding wide
      character (if any) for that byte.  WEOF means the byte is not a
      valid single-byte character.  */
   wint_t mbrtowc_cache[NOTCHAR];
-#endif
 
   /* Array of the bracket expression in the DFA.  */
   struct mb_char_classes *mbcsets;
@@ -429,6 +430,10 @@ struct dfa
                                    slots so far, not counting trans[-1].  */
   int trcount;                  /* Number of transition tables that have
                                    actually been built.  */
+  int min_trcount;              /* Minimum of number of transition tables.
+                                   Always keep the number, even after freeing
+                                   the transition tables.  It is also the
+                                   number of initial states.  */
   state_num **trans;            /* Transition tables for states that can
                                    never accept.  If the transitions for a
                                    state have not yet been computed, or the
@@ -447,6 +452,8 @@ struct dfa
                                    newline is stored separately and handled
                                    as a special case.  Newline is also used
                                    as a sentinel at the end of the buffer.  */
+  state_num initstate_letter;   /* Initial state for letter context.  */
+  state_num initstate_others;   /* Initial state for other contexts.  */
   struct dfamust *musts;        /* List of strings, at least one of which
                                    is known to appear in any r.e. matching
                                    the dfa.  */
@@ -472,7 +479,6 @@ static void regexp (void);
 static void
 dfambcache (struct dfa *d)
 {
-#if MBS_SUPPORT
   int i;
   for (i = CHAR_MIN; i <= CHAR_MAX; ++i)
     {
@@ -482,10 +488,8 @@ dfambcache (struct dfa *d)
       wchar_t wc;
       d->mbrtowc_cache[uc] = mbrtowc (&wc, &c, 1, &s) <= 1 ? wc : WEOF;
     }
-#endif
 }
 
-#if MBS_SUPPORT
 /* Store into *PWC the result of converting the leading bytes of the
    multibyte buffer S of length N bytes, using the mbrtowc_cache in *D
    and updating the conversion state in *D.  On conversion error,
@@ -524,9 +528,6 @@ mbs_to_wchar (wint_t *pwc, char const *s, size_t n, struct dfa *d)
   *pwc = wc;
   return 1;
 }
-#else
-#define mbs_to_wchar(pwc, s, n, d) (WEOF)
-#endif
 
 #ifdef DEBUG
 
@@ -721,7 +722,7 @@ static charclass newline;
 #ifdef __GLIBC__
 # define is_valid_unibyte_character(c) 1
 #else
-# define is_valid_unibyte_character(c) (! (MBS_SUPPORT && btowc (c) == WEOF))
+# define is_valid_unibyte_character(c) (btowc (c) != WEOF)
 #endif
 
 /* C is a "word-constituent" byte.  */
@@ -782,17 +783,12 @@ dfasyntax (reg_syntax_t bits, int fold, unsigned char eol)
 static bool
 setbit_wc (wint_t wc, charclass c)
 {
-#if MBS_SUPPORT
   int b = wctob (wc);
   if (b == EOF)
     return false;
 
   setbit (b, c);
   return true;
-#else
-  abort ();
-   /*NOTREACHED*/ return false;
-#endif
 }
 
 /* Set a bit for B and its case variants in the charclass C.
@@ -886,7 +882,6 @@ static wint_t wctok;		/* Wide character representation of the current
                                    MB_CUR_MAX > 1.  */
 
 
-#if MBS_SUPPORT
 /* Fetch the next lexical input character.  Set C (of type int) to the
    next input byte, except set C to EOF if the input is a multibyte
    character of length greater than 1.  Set WC (of type wint_t) to the
@@ -915,23 +910,6 @@ static wint_t wctok;		/* Wide character representation of the current
       }						\
   } while (0)
 
-#else
-/* Note that characters become unsigned here.  */
-# define FETCH_WC(c, unused, eoferr)  \
-  do {				      \
-    if (! lexleft)		      \
-      {				      \
-        if ((eoferr) != 0)	      \
-          dfaerror (eoferr);	      \
-        else			      \
-          return lasttok = END;	      \
-      }				      \
-    (c) = to_uchar (*lexptr++);       \
-    --lexleft;			      \
-  } while (0)
-
-#endif /* MBS_SUPPORT */
-
 #ifndef MIN
 # define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
@@ -1296,6 +1274,20 @@ parse_bracket_exp (void)
   return CSET + charclass_index (ccl);
 }
 
+#define PUSH_LEX_STATE(s)			\
+  do						\
+    {						\
+      char const *lexptr_saved = lexptr;	\
+      size_t lexleft_saved = lexleft;		\
+      lexptr = (s);				\
+      lexleft = strlen (lexptr)
+
+#define POP_LEX_STATE()				\
+      lexptr = lexptr_saved;			\
+      lexleft = lexleft_saved;			\
+    }						\
+  while (0)
+
 static token
 lex (void)
 {
@@ -1543,20 +1535,6 @@ lex (void)
               return lasttok = CSET + charclass_index (ccl);
             }
 
-#define PUSH_LEX_STATE(s)			\
-  do						\
-    {						\
-      char const *lexptr_saved = lexptr;	\
-      size_t lexleft_saved = lexleft;		\
-      lexptr = (s);				\
-      lexleft = strlen (lexptr)
-
-#define POP_LEX_STATE()				\
-      lexptr = lexptr_saved;			\
-      lexleft = lexleft_saved;			\
-    }						\
-  while (0)
-
           /* FIXME: see if optimizing this, as is done with ANYCHAR and
              add_utf8_anychar, makes sense.  */
 
@@ -1576,14 +1554,33 @@ lex (void)
         case 'W':
           if (!backslash || (syntax_bits & RE_NO_GNU_OPS))
             goto normal_char;
-          zeroset (ccl);
-          for (c2 = 0; c2 < NOTCHAR; ++c2)
-            if (IS_WORD_CONSTITUENT (c2))
-              setbit (c2, ccl);
-          if (c == 'W')
-            notset (ccl);
+
+          if (!dfa->multibyte)
+            {
+              zeroset (ccl);
+              for (c2 = 0; c2 < NOTCHAR; ++c2)
+                if (IS_WORD_CONSTITUENT (c2))
+                  setbit (c2, ccl);
+              if (c == 'W')
+                notset (ccl);
+              laststart = false;
+              return lasttok = CSET + charclass_index (ccl);
+            }
+
+          /* FIXME: see if optimizing this, as is done with ANYCHAR and
+             add_utf8_anychar, makes sense.  */
+
+          /* \w and \W are documented to be equivalent to [_[:alnum:]] and
+             [^_[:alnum:]] respectively, so tell the lexer to process those
+             strings, each minus its "already processed" '['.  */
+          PUSH_LEX_STATE (c == 'w' ? "_[:alnum:]]" : "^_[:alnum:]]");
+
+          lasttok = parse_bracket_exp ();
+
+          POP_LEX_STATE ();
+
           laststart = false;
-          return lasttok = CSET + charclass_index (ccl);
+          return lasttok;
 
         case '[':
           if (backslash)
@@ -1724,7 +1721,6 @@ addtok (token t)
     }
 }
 
-#if MBS_SUPPORT
 /* We treat a multibyte character as a single atom, so that DFA
    can treat a multibyte character as a single expression.
 
@@ -1756,17 +1752,10 @@ addtok_wc (wint_t wc)
       addtok (CAT);
     }
 }
-#else
-static void
-addtok_wc (wint_t wc)
-{
-}
-#endif
 
 static void
 add_utf8_anychar (void)
 {
-#if MBS_SUPPORT
   static const charclass utf8_classes[5] = {
     /* 80-bf: non-leading bytes.  */
     {0, 0, 0, 0, CHARCLASS_WORD_MASK, CHARCLASS_WORD_MASK, 0, 0},
@@ -1821,7 +1810,6 @@ add_utf8_anychar (void)
       addtok (CAT);
       addtok (OR);
     }
-#endif
 }
 
 /* The grammar understood by the parser is as follows.
@@ -1862,7 +1850,7 @@ add_utf8_anychar (void)
 static void
 atom (void)
 {
-  if (MBS_SUPPORT && tok == WCHAR)
+  if (tok == WCHAR)
     {
       if (wctok == WEOF)
         addtok (BACKREF);
@@ -1884,7 +1872,7 @@ atom (void)
 
       tok = lex ();
     }
-  else if (MBS_SUPPORT && tok == ANYCHAR && using_utf8 ())
+  else if (tok == ANYCHAR && using_utf8 ())
     {
       /* For UTF-8 expand the period to a series of CSETs that define a valid
          UTF-8 character.  This avoids using the slow multibyte path.  I'm
@@ -1898,9 +1886,7 @@ atom (void)
     }
   else if ((tok >= 0 && tok < NOTCHAR) || tok >= CSET || tok == BACKREF
            || tok == BEGLINE || tok == ENDLINE || tok == BEGWORD
-#if MBS_SUPPORT
            || tok == ANYCHAR || tok == MBCSET
-#endif /* MBS_SUPPORT */
            || tok == ENDWORD || tok == LIMWORD || tok == NOTLIMWORD)
     {
       addtok (tok);
@@ -2233,10 +2219,8 @@ epsclosure (position_set *s, struct dfa const *d, char *visited)
   for (i = 0; i < s->nelem; ++i)
     if (d->tokens[s->elems[i].index] >= NOTCHAR
         && d->tokens[s->elems[i].index] != BACKREF
-#if MBS_SUPPORT
         && d->tokens[s->elems[i].index] != ANYCHAR
         && d->tokens[s->elems[i].index] != MBCSET
-#endif
         && d->tokens[s->elems[i].index] < CSET)
       {
         if (!initialized)
@@ -2555,9 +2539,7 @@ dfaanalyze (struct dfa *d, int searchflag)
      it with its epsilon closure.  */
   for (i = 0; i < d->tindex; ++i)
     if (d->tokens[i] < NOTCHAR || d->tokens[i] == BACKREF
-#if MBS_SUPPORT
         || d->tokens[i] == ANYCHAR || d->tokens[i] == MBCSET
-#endif
         || d->tokens[i] >= CSET)
       {
 #ifdef DEBUG
@@ -2585,9 +2567,16 @@ dfaanalyze (struct dfa *d, int searchflag)
 
   /* Build the initial state.  */
   separate_contexts = state_separate_contexts (&merged);
-  state_index (d, &merged,
-               (separate_contexts & CTX_NEWLINE
-                ? CTX_NEWLINE : separate_contexts ^ CTX_ANY));
+  if (separate_contexts & CTX_NEWLINE)
+    state_index (d, &merged, CTX_NEWLINE);
+  d->initstate_others = d->min_trcount
+    = state_index (d, &merged, separate_contexts ^ CTX_ANY);
+  if (separate_contexts & CTX_LETTER)
+    d->initstate_letter = d->min_trcount
+      = state_index (d, &merged, CTX_LETTER);
+  else
+    d->initstate_letter = d->initstate_others;
+  d->min_trcount++;
 
   free (posalloc);
   free (stkalloc);
@@ -2660,9 +2649,8 @@ dfastate (state_num s, struct dfa *d, state_num trans[])
         copyset (d->charclasses[d->tokens[pos.index] - CSET], matches);
       else
         {
-          if (MBS_SUPPORT
-               && (d->tokens[pos.index] == MBCSET
-              || d->tokens[pos.index] == ANYCHAR))
+          if (d->tokens[pos.index] == MBCSET
+              || d->tokens[pos.index] == ANYCHAR)
             {
               /* MB_CUR_MAX > 1 */
               if (d->tokens[pos.index] == MBCSET)
@@ -2924,17 +2912,17 @@ build_state (state_num s, struct dfa *d)
   /* Set an upper limit on the number of transition tables that will ever
      exist at once.  1024 is arbitrary.  The idea is that the frequently
      used transition tables will be quickly rebuilt, whereas the ones that
-     were only needed once or twice will be cleared away.  However, do
-     not clear the initial state, as it's always used.  */
+     were only needed once or twice will be cleared away.  However, do not
+     clear the initial D->min_trcount states, since they are always used.  */
   if (d->trcount >= 1024)
     {
-      for (i = 1; i < d->tralloc; ++i)
+      for (i = d->min_trcount; i < d->tralloc; ++i)
         {
           free (d->trans[i]);
           free (d->fails[i]);
           d->trans[i] = d->fails[i] = NULL;
         }
-      d->trcount = 1;
+      d->trcount = d->min_trcount;
     }
 
   ++d->trcount;
@@ -3067,17 +3055,7 @@ match_mb_charset (struct dfa *d, state_num s, position pos,
   int context;
 
   /* Check syntax bits.  */
-  if (wc == (wchar_t) eolbyte)
-    {
-      if (!(syntax_bits & RE_DOT_NEWLINE))
-        return 0;
-    }
-  else if (wc == (wchar_t) '\0')
-    {
-      if (syntax_bits & RE_DOT_NOT_NULL)
-        return 0;
-    }
-  else if (wc == WEOF)
+  if (wc == WEOF)
     return 0;
 
   context = wchar_context (wc);
@@ -3309,6 +3287,31 @@ transit_state (struct dfa *d, state_num s, unsigned char const **pp,
   return s1;
 }
 
+/* The initial state may encounter a byte which is not a single byte character
+   nor the first byte of a multibyte character.  But it is incorrect for the
+   initial state to accept such a byte.  For example, in Shift JIS the regular
+   expression "\\" accepts the codepoint 0x5c, but should not accept the second
+   byte of the codepoint 0x815c.  Then the initial state must skip the bytes
+   that are not a single byte character nor the first byte of a multibyte
+   character.
+
+   Given DFA state d, use mbs_to_wchar to advance MBP until it reaches or
+   exceeds P.  If WCP is non-NULL, set *WCP to the final wide character
+   processed, or if no wide character is processed, set it to WEOF.
+   Both P and MBP must be no larger than END.  */
+static unsigned char const *
+skip_remains_mb (struct dfa *d, unsigned char const *p,
+                 unsigned char const *mbp, char const *end, wint_t *wcp)
+{
+  wint_t wc = WEOF;
+  while (mbp < p)
+    mbp += mbs_to_wchar (&wc, (char const *) mbp,
+                         end - (char const *) mbp, d);
+  if (wcp != NULL)
+    *wcp = wc;
+  return mbp;
+}
+
 /* Search through a buffer looking for a match to the given struct dfa.
    Find the first occurrence of a string matching the regexp in the
    buffer, and the shortest possible version thereof.  Return a pointer to
@@ -3320,10 +3323,14 @@ transit_state (struct dfa *d, state_num s, unsigned char const **pp,
    If COUNT is non-NULL, increment *COUNT once for each newline processed.
    Finally, if BACKREF is non-NULL set *BACKREF to indicate whether we
    encountered a back-reference (1) or not (0).  The caller may use this
-   to decide whether to fall back on a backtracking matcher.  */
-char *
-dfaexec (struct dfa *d, char const *begin, char *end,
-         int allow_nl, size_t *count, int *backref)
+   to decide whether to fall back on a backtracking matcher.
+
+   If MULTIBYTE, the input consists of multibyte characters and/or
+   encoding-error bytes.  Otherwise, the input consists of single-byte
+   characters.  */
+static inline char *
+dfaexec_main (struct dfa *d, char const *begin, char *end,
+             int allow_nl, size_t *count, int *backref, bool multibyte)
 {
   state_num s, s1;              /* Current state.  */
   unsigned char const *p, *mbp; /* Current input character.  */
@@ -3345,7 +3352,7 @@ dfaexec (struct dfa *d, char const *begin, char *end,
   saved_end = *(unsigned char *) end;
   *end = eol;
 
-  if (d->multibyte)
+  if (multibyte)
     {
       memset (&d->mbs, 0, sizeof d->mbs);
       if (! d->mb_match_lens)
@@ -3357,34 +3364,49 @@ dfaexec (struct dfa *d, char const *begin, char *end,
 
   for (;;)
     {
-      if (d->multibyte)
+      if (multibyte)
         {
           while ((t = trans[s]) != NULL)
             {
               s1 = s;
 
-              if (s == 0)
+              if (s < d->min_trcount)
                 {
-                  /* The initial state may encounter a byte which is not
-                     a single byte character nor the first byte of a
-                     multibyte character.  But it is incorrect for the
-                     initial state to accept such a byte.  For example,
-                     in Shift JIS the regular expression "\\" accepts
-                     the codepoint 0x5c, but should not accept the second
-                     byte of the codepoint 0x815c.  Then the initial
-                     state must skip the bytes that are not a single
-                     byte character nor the first byte of a multibyte
-                     character.  */
-                  wint_t wc;
-                  while (mbp < p)
-                    mbp += mbs_to_wchar (&wc, (char const *) mbp,
-                                         end - (char const *) mbp, d);
-                  p = mbp;
-
-                  if ((char *) p > end)
+                  if (d->min_trcount == 1)
                     {
-                      p = NULL;
-                      goto done;
+                      if (d->states[s].mbps.nelem == 0)
+                        {
+                          do
+                            {
+                              while (t[*p] == 0)
+                                p++;
+                              p = mbp = skip_remains_mb (d, p, mbp, end, NULL);
+                            }
+                          while (t[*p] == 0);
+                        }
+                      else
+                        p = mbp = skip_remains_mb (d, p, mbp, end, NULL);
+                    }
+                  else
+                    {
+                      wint_t wc;
+                      mbp = skip_remains_mb (d, p, mbp, end, &wc);
+
+                      /* If d->min_trcount is greater than 1, maybe
+                         transit to another initial state after skip.  */
+                      if (p < mbp)
+                        {
+                          int context = wchar_context (wc);
+                          if (context == CTX_LETTER)
+                            s = d->initstate_letter;
+                          else
+                            /* It's CTX_NONE.  CTX_NEWLINE cannot happen,
+                               as we assume that a newline is always a
+                               single byte character.  */
+                            s = d->initstate_others;
+                          p = mbp;
+                          s1 = s;
+                        }
                     }
                 }
 
@@ -3394,25 +3416,60 @@ dfaexec (struct dfa *d, char const *begin, char *end,
                   continue;
                 }
 
-              /* Falling back to the glibc matcher in this case gives
-                 better performance (up to 25% better on [a-z], for
-                 example) and enables support for collating symbols and
-                 equivalence classes.  */
-              if (d->states[s].has_mbcset && backref)
-                {
-                  *backref = 1;
-                  goto done;
-                }
+              /* The following code is used twice.
+                 Use a macro to avoid the risk that they diverge.  */
+#define State_transition()                                              \
+  do {                                                                  \
+              /* Falling back to the glibc matcher in this case gives   \
+                 better performance (up to 25% better on [a-z], for     \
+                 example) and enables support for collating symbols and \
+                 equivalence classes.  */                               \
+              if (d->states[s].has_mbcset && backref)                   \
+                {                                                       \
+                  *backref = 1;                                         \
+                  goto done;                                            \
+                }                                                       \
+                                                                        \
+              /* Can match with a multibyte character (and multi-character \
+                 collating element).  Transition table might be updated.  */ \
+              s = transit_state (d, s, &p, (unsigned char *) end);      \
+                                                                        \
+              /* If previous character is newline after a transition    \
+                 for ANYCHAR or MBCSET in non-UTF8 multibyte locales,   \
+                 check whether current position is beyond the end of    \
+                 the input buffer.  Also, transit to initial state if   \
+                 !ALLOW_NL, even if RE_DOT_NEWLINE is set. */           \
+              if (p[-1] == eol)                                         \
+                {                                                       \
+                  if ((char *) p > end)                                 \
+                    {                                                   \
+                      p = NULL;                                         \
+                      goto done;                                        \
+                    }                                                   \
+                                                                        \
+                  nlcount++;                                            \
+                                                                        \
+                  if (!allow_nl)                                        \
+                    s = 0;                                              \
+                }                                                       \
+                                                                        \
+              mbp = p;                                                  \
+              trans = d->trans;                                         \
+  } while (0)
 
-              /* Can match with a multibyte character (and multi character
-                 collating element).  Transition table might be updated.  */
-              s = transit_state (d, s, &p, (unsigned char *) end);
-              mbp = p;
-              trans = d->trans;
+              State_transition();
             }
         }
       else
         {
+          if (s == 0 && (t = trans[s]) != NULL)
+            {
+              while (t[*p] == 0)
+                p++;
+              s1 = 0;
+              s = t[*p++];
+            }
+
           while ((t = trans[s]) != NULL)
             {
               s1 = t[*p++];
@@ -3427,13 +3484,23 @@ dfaexec (struct dfa *d, char const *begin, char *end,
             }
         }
 
-      if ((char *) p > end)
+      if (s < 0)
         {
-          p = NULL;
-          goto done;
+          if ((char *) p > end || p[-1] != eol || d->newlines[s1] < 0)
+            {
+              p = NULL;
+              goto done;
+            }
+
+          /* The previous character was a newline, count it, and skip
+             checking of multibyte character boundary until here.  */
+          nlcount++;
+          mbp = p;
+
+          s = allow_nl ? d->newlines[s1] : 0;
         }
 
-      if (s >= 0 && d->fails[s])
+      if (d->fails[s])
         {
           if (d->success[s] & sbit[*p])
             {
@@ -3443,42 +3510,17 @@ dfaexec (struct dfa *d, char const *begin, char *end,
             }
 
           s1 = s;
-          if (d->multibyte)
-            {
-              /* Can match with a multibyte character (and multicharacter
-                 collating element).  Transition table might be updated.  */
-              s = transit_state (d, s, &p, (unsigned char *) end);
-              mbp = p;
-              trans = d->trans;
-            }
+          if (multibyte)
+            State_transition();
           else
             s = d->fails[s][*p++];
-          continue;
         }
-
-      /* If the previous character was a newline, count it, and skip
-         checking of multibyte character boundary until here.  */
-      if (p[-1] == eol)
-        {
-          nlcount++;
-          mbp = p;
-        }
-
-      if (s >= 0)
+      else
         {
           if (!d->trans[s])
             build_state (s, d);
           trans = d->trans;
-          continue;
-        }
-
-      if (p[-1] == eol && allow_nl)
-        {
-          s = d->newlines[s1];
-          continue;
         }
-
-      s = 0;
     }
 
  done:
@@ -3488,6 +3530,33 @@ dfaexec (struct dfa *d, char const *begin, char *end,
   return (char *) p;
 }
 
+/* Specialized versions of dfaexec_main for multibyte and single-byte
+   cases.  This is for performance.  */
+
+static char *
+dfaexec_mb (struct dfa *d, char const *begin, char *end,
+            int allow_nl, size_t *count, int *backref)
+{
+  return dfaexec_main (d, begin, end, allow_nl, count, backref, true);
+}
+
+static char *
+dfaexec_sb (struct dfa *d, char const *begin, char *end,
+            int allow_nl, size_t *count, int *backref)
+{
+  return dfaexec_main (d, begin, end, allow_nl, count, backref, false);
+}
+
+/* Like dfaexec_main (D, BEGIN, END, ALLOW_NL, COUNT, BACKREF, D->multibyte),
+   but faster.  */
+
+char *
+dfaexec (struct dfa *d, char const *begin, char *end,
+         int allow_nl, size_t *count, int *backref)
+{
+  return d->dfaexec (d, begin, end, allow_nl, count, backref);
+}
+
 struct dfa *
 dfasuperset (struct dfa const *d)
 {
@@ -3537,6 +3606,7 @@ dfainit (struct dfa *d)
 {
   memset (d, 0, sizeof *d);
   d->multibyte = MB_CUR_MAX > 1;
+  d->dfaexec = d->multibyte ? dfaexec_mb : dfaexec_sb;
   d->fast = !d->multibyte;
 }
 
@@ -3546,7 +3616,7 @@ dfaoptimize (struct dfa *d)
   size_t i;
   bool have_backref = false;
 
-  if (!MBS_SUPPORT || !using_utf8 ())
+  if (!using_utf8 ())
     return;
 
   for (i = 0; i < d->tindex; ++i)
@@ -3577,6 +3647,7 @@ dfaoptimize (struct dfa *d)
 
   free_mbdata (d);
   d->multibyte = false;
+  d->dfaexec = dfaexec_sb;
 }
 
 static void
@@ -3590,6 +3661,7 @@ dfassbuild (struct dfa *d)
 
   *sup = *d;
   sup->multibyte = false;
+  sup->dfaexec = dfaexec_sb;
   sup->multibyte_prop = NULL;
   sup->mbcsets = NULL;
   sup->superset = NULL;
@@ -3604,8 +3676,11 @@ dfassbuild (struct dfa *d)
   sup->musts = NULL;
 
   sup->charclasses = xnmalloc (sup->calloc, sizeof *sup->charclasses);
-  memcpy (sup->charclasses, d->charclasses,
-          d->cindex * sizeof *sup->charclasses);
+  if (d->cindex)
+    {
+      memcpy (sup->charclasses, d->charclasses,
+              d->cindex * sizeof *sup->charclasses);
+    }
 
   sup->tokens = xnmalloc (d->tindex, 2 * sizeof *sup->tokens);
   sup->talloc = d->tindex * 2;
diff --git a/dfa.h b/dfa.h
index 4eb42968..79027810 100644
--- a/dfa.h
+++ b/dfa.h
@@ -1,5 +1,5 @@
 /* dfa.h - declarations for GNU deterministic regexp compiler
-   Copyright (C) 1988, 1998, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1998, 2007, 2009-2015 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/doc/ChangeLog b/doc/ChangeLog
index b917e642..0e88c869 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,353 @@
+2015-04-02         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in, gawk.1, awkcard.in: Name change: div() --> intdiv().
+
+2015-03-31         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Update discussion of calling built-in functions
+	indirectly. Small additional fix relating to rand(). Thanks
+	to Antonio Colombo.
+
+2015-03-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Minor edits.
+
+2015-03-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Minor fixes from Antonio Colombo and new exercise
+	in chapter 16.
+	* gawk.1: Minor edits.
+	* gawktexi.in: Edits in material on errno and retryable and get_file
+	API.
+
+2015-03-17         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* gawktexi.in: Modify inplace.awk to call inplace_end in BEGINFILE
+	and END instead of in ENDFILE. This way, actions in ENDFILE rules
+	will be redirected as expected.
+
+2015-03-17         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Turn "positive" into non-negative as appropriate.
+	Thanks to Nicholas Mills <nlmills@clemson.edu> for pointing out
+	the issue.
+
+2015-03-08         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Briefly describe that nonfatal I/O overrides
+	GAWK_SOCK_RETRIES, in the env var part and in the nonfatal I/O
+	part.
+
+2015-03-01         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Change quotes to @dfn for pseudorandom.
+	A last-minute O'Reilly fix.
+
+2015-02-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Update UPDATE-MONTH and copyright year.
+	Note that "the guide is definitive" quote is really
+	from "The Restaurant at the End of the Universe". Thanks
+	to Antonio Colombo for pointing this out.
+
+2015-02-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* texinfo.tex: Update to most current version.
+	* gawktexi.in: Minor edit to match an O'Reilly fix.
+	Add some FIXMEs to one day use @sup.
+
+2015-02-22         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Change 'div' to 'divisor' in some examples.
+	This future-proofs against a new function in master.
+	Thanks to Antonio Giovanni Colombo for the report.
+
+2015-02-20         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: More O'Reilly fixes. I think it's done!
+
+2015-02-19         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: More O'Reilly fixes.
+
+2015-02-17         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: A few minor formatting fixes to sync with O'Reilly
+	version.
+
+2015-02-13         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: O'Reilly fixes. Through QC1 review.
+
+2015-02-11         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: O'Reilly fixes.
+
+2015-02-10         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Minor fixes, O'Reilly fixes.
+
+2015-02-09         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Restore a lost sentence. O'Reilly fixes.
+
+2015-02-08         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: O'Reilly fixes.
+	Make non-fatal i/o use "NONFATAL".
+
+2015-02-06         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: O'Reilly fixes.
+
+2015-02-04         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: O'Reilly fixes.
+	* gawktexi.in: Update various version-related bits of info.
+
+2015-02-02         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: O'Reilly fixes.
+
+2015-02-01         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: POSIX requirement that function parameters cannot
+	have the same name as a function is now --posix.
+	Restore indirectcall example.
+
+	More O'Reilly fixes.
+
+2015-01-30         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Document POSIX requirement that function parameters
+	cannot have the same name as a function. Fix indirectcall example.
+
+2015-01-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: O'Reilly fixes.
+	And still more. Also, fix @code --> @command in a number of places.
+
+2015-01-26         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: O'Reilly fixes.
+
+2015-01-25         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Fix a bad URL. And another one.
+	More O'Reilly fixes.
+
+2015-01-23         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: O'Reilly fixes.
+	(Glossary): Many new entries from Antonio Giovanni Colombo.
+
+2015-01-21         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: O'Reilly fixes.
+	Remove obsolete start/end of range indexing comments.
+
+2015-01-20         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: O'Reilly fixes.
+
+2015-01-19         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawkinet.texi: Fix capitalization in document title.
+	* gawktexi.in: Here we go again: Starting on more O'Reilly fixes.
+
+2014-12-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Add info that nonfatal I/O works with stdout and
+	stderr.  Revise version info and what was added when.
+
+2015-01-05         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* gawktexi.in: Improve get_file documentation.
+
+2015-01-05         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* gawktexi.in: Replace "Retrying I/O" with "Retrying Input", since this
+	feature pertains to input, not output.
+
+2015-01-04         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* gawktexi.in: Document the get_file API function.
+
+2015-01-04         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* gawk.1: Document new features PROCINFO["errno"] and
+	PROCINFO["input", "RETRY"], and new getline return value of -2.
+	* gawktexi.in: Ditto.
+
+2014-12-26         Antonio Giovanni Colombo   <azc100@gmail.com>
+
+	* gawktexi.in (Glossary): Really sort the items.
+
+2014-12-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Start documenting nonfatal output.
+
+2014-12-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Add one more paragraph to new foreword.
+	* gawktexi.in: Fix exponentiation in TeX mode. Thanks to
+	Marco Curreli by way of Antonio Giovanni Colombo.
+
+	* texinfo.tex: Updated.
+
+2014-12-12         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Minor fix.
+	Thanks to Teri Price <tjp212@lehigh.edu>.
+
+2014-12-10         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: More minor fixes.
+
+2014-12-09         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: More minor fixes.
+
+2014-12-07         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Minor fixes.
+
+2014-12-06         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: A minor fix.
+
+2014-12-05         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Various minor fixes and updates.
+
+2014-11-23         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Update that TZ env. var can influnce mktime
+	in running program.  Thanks to Hermann Peifer.
+
+2014-11-19         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Update that RFC 4180 documents CSV data.
+
+2014-11-17         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Copyedits applied.
+
+2014-11-02         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Comment out that I need an owner for awk.info.
+	I may have found one or two people.
+
+2014-10-29         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* gawktexi.in: Document new extras directory containing shell startup
+	files to manipulate AWKPATH and AWKLIBPATH environment variables.
+
+2014-10-28         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawk.1: Clarification that debugger reads stdin.
+	* gawktexi.in: Ditto, and correctly place the "Braces" entry in
+	the Glossary. Thanks to Antonio Colombo for that.
+
+	Unrelated:
+
+	* gawktexi.in: Restore use of @sc. Karl fixed makeinfo. :-)
+
+2014-10-25         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Minor typo fixes.
+	Fix discussion of \x, per note from Antonio Colombo.
+
+2014-10-17         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Fix date in docbook attribution for new Foreword;
+	thanks to Antonio Colombo for the catch.  Update latest version
+	of gettext.
+
+2014-10-15         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawk.1: Fix default value for AWKLIBPATH.
+	* gawktexi.in: Revised text for AWKPATH and AWKLIBPATH.
+
+2014-10-14         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Add new Foreword from Mike Brennan.
+
+2014-10-13         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Fix example outputs in chapter 2.
+	Improve description of SYMTAB.
+
+2014-10-12         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Revise doc for {INT,STR}_CHAIN_MAX. Remove Pat
+	Rankin from VMS duties (per his request). Add a small TeX fix
+	for the table in ch 16 for requesting values.
+
+2014-10-05         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Finished changes!
+
+2014-10-03         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in (EMRED): Renamed from EMISTERED to match original.
+	Thanks to Warren Toomey at TUHS for access to archives recording
+	the text.
+
+2014-10-02         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Pretty much done!
+
+	Unrelated:
+
+	* gawktexi.in: Fix braino in awk version of div function.
+	Thanks to Katie Wasserman for the catch.
+
+2014-10-01         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: More fixes after reading through the MS.
+
+	Unrelated:
+
+	* gawktexi.in: Add Katie Wasserman's program to compute
+	the digits of PI.
+
+	Unrelated:
+
+	* gawktexi.in: Document the differences between profiling
+	and pretty printing.
+
+2014-09-30         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: More fixes after reading through the MS.
+
+2014-09-29         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: More fixes after reading through the MS.
+	And still more fixes.
+
+2014-09-28         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: More fixes after reading through the MS.
+	Document the debugger's "where" command.
+
+2014-09-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Lots more fixes after reading through the MS.
+
+2014-09-23         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Rework the documentation of special files in
+	Chapter 5; some reordering as well as rewriting.
+
+2014-09-22         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktex.in: Continue fixes after reading through the MS.
+
+2014-09-21         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktex.in: Start on fixes after reading through the MS.
+
 2014-09-18         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawktexi.in: Fix italics in quotations.  Some docbook special
diff --git a/doc/Makefile.in b/doc/Makefile.in
index d89beffd..68aacf48 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -38,7 +38,17 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -102,8 +112,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/mkinstalldirs texinfo.tex ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
 	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -118,6 +126,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -213,6 +222,8 @@ man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs \
+	ChangeLog texinfo.tex
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -276,6 +287,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POSUB = @POSUB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOCKET_LIBS = @SOCKET_LIBS@
@@ -393,7 +405,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -451,13 +462,9 @@ $(am__aclocal_m4_deps):
 	$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
 	 -o $(@:.html=.htp) $<; \
 	then \
-	  rm -rf $@; \
-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-	    mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
+	  rm -rf $@ && mv $(@:.html=.htp) $@; \
 	else \
-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
-	  exit 1; \
+	  rm -rf $(@:.html=.htp); exit 1; \
 	fi
 $(srcdir)/gawk.info: gawk.texi 
 gawk.dvi: gawk.texi 
@@ -859,6 +866,8 @@ uninstall-man: uninstall-man1
 	uninstall-info-am uninstall-man uninstall-man1 \
 	uninstall-pdf-am uninstall-ps-am
 
+.PRECIOUS: Makefile
+
 
 # Uncomment the following definition of AWKCARD if your troff can produce
 # Postscript but still has troubles with macros from 'colors'.  As this
diff --git a/doc/awkcard.in b/doc/awkcard.in
index 556bdc1e..2e455b2d 100644
--- a/doc/awkcard.in
+++ b/doc/awkcard.in
@@ -1609,11 +1609,11 @@ expand;
 l lw(2i).
 \*(CD\*(FCatan2(\*(FIy\*(FC, \*(FIx\*(FC)\*(FR	The arctangent of \*(FIy/x\fP in radians.
 \*(FCcos(\*(FIexpr\*(FC)\*(FR	The cosine of \*(FIexpr\fP, which is in radians.
-\*(CB\*(FCdiv(\*(FIn\*(FR\*(FC,\*(FI d\*(FR\*(FC,\*(FI res\*(FR\*(FC)\*(FR	T{
-Return the result of integer division in \*(FIres\*(FR.\*(CD
-T}
 \*(FCexp(\*(FIexpr\*(FC)\*(FR	The exponential function (\*(FIe \*(FC^ \*(FIx\*(FR).
 \*(FCint(\*(FIexpr\*(FC)\*(FR	Truncate to integer.
+\*(CB\*(FCintdiv(\*(FIn\*(FR\*(FC,\*(FI d\*(FR\*(FC,\*(FI res\*(FR\*(FC)\*(FR	T{
+Return the result of integer division in \*(FIres\*(FR.\*(CD
+T}
 \*(FClog(\*(FIexpr\*(FC)\*(FR	The natural logarithm function (base \*(FIe\^\*(FR).
 \*(FCrand()\fP	A random number \*(FIN\fP such that 0 \(<= \*(FIN\fP < 1.
 \*(FCsin(\*(FIexpr\*(FC)\*(FR	The sine of \*(FIexpr\fP, which is in radians.
diff --git a/doc/gawk.1 b/doc/gawk.1
index a4d66720..cbc15d15 100644
--- a/doc/gawk.1
+++ b/doc/gawk.1
@@ -13,7 +13,7 @@
 .		if \w'\(rq' .ds rq "\(rq
 .	\}
 .\}
-.TH GAWK 1 "Aug 03 2014" "Free Software Foundation" "Utility Commands"
+.TH GAWK 1 "Apr 02 2015" "Free Software Foundation" "Utility Commands"
 .SH NAME
 gawk \- pattern scanning and processing language
 .SH SYNOPSIS
@@ -231,7 +231,8 @@ and so on.)
 .PD
 \fB\-\^\-debug\fR[\fB=\fIfile\fR]
 Enable debugging of \*(AK programs.
-By default, the debugger reads commands interactively from the terminal.
+By default, the debugger reads commands interactively from the keyboard
+(standard input).
 The optional
 .IR file
 argument specifies a file with a list
@@ -626,7 +627,7 @@ specifies a search path to use when finding source files named with
 the
 .B \-l
 option.  If this variable does not exist, the default path is
-\fB".:/usr/local/lib/gawk"\fR.
+\fB"/usr/local/lib/gawk"\fR.
 (The actual directory may vary, depending upon how
 .I gawk
 was built and installed.)
@@ -941,6 +942,15 @@ then
 will contain
 a string describing the error.
 The value is subject to translation in non-English locales.
+If the string in
+.B ERRNO
+corresponds to a system error in the
+.IR errno (3)
+variable, then the numeric value can be found in
+.B PROCINFO["errno"].
+For non-system errors,
+.B PROCINFO["errno"]
+will be zero.
 .TP
 .B FIELDWIDTHS
 A whitespace separated list of field widths.  When set,
@@ -1102,6 +1112,13 @@ system call.
 The default time format string for
 .BR strftime() .
 .TP
+\fBPROCINFO["errno"]\fP
+The value of
+.IR errno (3)
+when
+.BR ERRNO
+is set to the associated error message.
+.TP
 \fBPROCINFO["euid"]\fP
 The value of the
 .IR geteuid (2)
@@ -1220,6 +1237,28 @@ where
 is a redirection string or a filename. A value of zero or
 less than zero means no timeout.
 .TP
+\fBPROCINFO["input", "RETRY"]\fP
+If an I/O error that may be retried occurs when reading data from
+.IR input ,
+and this array entry exists, then
+.B getline
+will return \-2 instead of following the default behavior of returning \-1
+and configuring
+.IR input
+to return no further data.
+An I/O error that may be retried is one where
+.IR errno (3)
+has the value
+.IR EAGAIN ,
+.IR EWOULDBLOCK ,
+.IR EINTR ,
+or
+.IR ETIMEDOUT .
+This may be useful in conjunction with
+\fBPROCINFO["input", "READ_TIMEOUT"]\fP
+or situations where a file descriptor has been configured to behave in a
+non-blocking fashion.
+.TP
 \fBPROCINFO["mpfr_version"]\fP
 The version of the GNU MPFR library used for arbitrary precision
 number support in
@@ -2288,6 +2327,13 @@ below.)
 The
 .B getline
 command returns 1 on success, 0 on end of file, and \-1 on an error.
+If the
+.IR errno (3)
+value indicates that the I/O operation may be retried,
+and \fBPROCINFO["input", "RETRY"]\fP
+is set, then \-2 will be returned instead of \-1, and further calls to
+.B getline
+may be attempted.
 Upon an error,
 .B ERRNO
 is set to a string describing the problem.
@@ -2634,7 +2680,13 @@ Return the cosine of
 .IR expr ,
 which is in radians.
 .TP
-.BI div( num ", " denom ", " result )
+.BI exp( expr )
+The exponential function.
+.TP
+.BI int( expr )
+Truncate to integer.
+.TP
+.BI intdiv( num ", " denom ", " result )
 Truncate
 .I num
 and
@@ -2651,12 +2703,6 @@ This is a
 extension, primarily of value when working with
 arbitrarily large integers.
 .TP
-.BI exp( expr )
-The exponential function.
-.TP
-.BI int( expr )
-Truncate to integer.
-.TP
 .BI log( expr )
 The natural logarithm function.
 .TP
diff --git a/doc/gawk.info b/doc/gawk.info
index f1aa1f4a..685df45b 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -9,12 +9,12 @@ START-INFO-DIR-ENTRY
 * awk: (gawk)Invoking gawk.                     Text scanning and processing.
 END-INFO-DIR-ENTRY
 
-   Copyright (C) 1989, 1991, 1992, 1993, 1996-2005, 2007, 2009-2014
+   Copyright (C) 1989, 1991, 1992, 1993, 1996-2005, 2007, 2009-2015
 Free Software Foundation, Inc.
 
 
    This is Edition 4.1 of `GAWK: Effective AWK Programming: A User's
-Guide for GNU Awk', for the 4.1.1 (or later) version of the GNU
+Guide for GNU Awk', for the 4.1.2 (or later) version of the GNU
 implementation of AWK.
 
    Permission is granted to copy, distribute and/or modify this document
@@ -29,7 +29,7 @@ entitled "GNU Free Documentation License".
      modify this GNU manual."
 
 
-File: gawk.info,  Node: Top,  Next: Foreword,  Up: (dir)
+File: gawk.info,  Node: Top,  Next: Foreword3,  Up: (dir)
 
 General Introduction
 ********************
@@ -37,12 +37,12 @@ General Introduction
 This file documents `awk', a program that you can use to select
 particular records in a file and perform operations upon them.
 
-   Copyright (C) 1989, 1991, 1992, 1993, 1996-2005, 2007, 2009-2014
+   Copyright (C) 1989, 1991, 1992, 1993, 1996-2005, 2007, 2009-2015
 Free Software Foundation, Inc.
 
 
    This is Edition 4.1 of `GAWK: Effective AWK Programming: A User's
-Guide for GNU Awk', for the 4.1.1 (or later) version of the GNU
+Guide for GNU Awk', for the 4.1.2 (or later) version of the GNU
 implementation of AWK.
 
    Permission is granted to copy, distribute and/or modify this document
@@ -58,8 +58,9 @@ entitled "GNU Free Documentation License".
 
 * Menu:
 
-* Foreword::                       Some nice words about this
+* Foreword3::                      Some nice words about this
                                    Info file.
+* Foreword4::                      More nice words.
 * Preface::                        What this Info file is about; brief
                                    history and acknowledgments.
 * Getting Started::                A basic introduction to using
@@ -189,8 +190,8 @@ entitled "GNU Free Documentation License".
 * Regexp Field Splitting::              Using regexps as the field separator.
 * Single Character Fields::             Making each character a separate
                                         field.
-* Command Line Field Separator::        Setting `FS' from the
-                                        command line.
+* Command Line Field Separator::        Setting `FS' from the command
+                                        line.
 * Full Line Fields::                    Making the full line be a single
                                         field.
 * Field Splitting Summary::             Some final points and a summary table.
@@ -216,6 +217,7 @@ entitled "GNU Free Documentation License".
                                         `getline'.
 * Getline Summary::                     Summary of `getline' Variants.
 * Read Timeout::                        Reading input with a timeout.
+* Retrying Input::                      Retrying input after certain errors.
 * Command-line directories::            What happens if you put a directory on
                                         the command line.
 * Input Summary::                       Input summary.
@@ -234,15 +236,18 @@ entitled "GNU Free Documentation License".
 * Printf Examples::                     Several examples.
 * Redirection::                         How to redirect output to multiple
                                         files and pipes.
+* Special FD::                          Special files for I/O.
 * Special Files::                       File name interpretation in
                                         `gawk'. `gawk' allows
                                         access to inherited file descriptors.
-* Special FD::                          Special files for I/O.
+* Other Inherited Files::               Accessing other open files with
+                                        `gawk'.
 * Special Network::                     Special files for network
                                         communications.
 * Special Caveats::                     Things to watch out for.
 * Close Files And Pipes::               Closing Input and Output Files and
                                         Pipes.
+* Nonfatal::                            Enabling Nonfatal Output.
 * Output Summary::                      Output summary.
 * Output Exercises::                    Exercises.
 * Values::                              Constants, Variables, and Regular
@@ -330,7 +335,7 @@ entitled "GNU Free Documentation License".
                                         record.
 * Nextfile Statement::                  Stop processing the current file.
 * Exit Statement::                      Stop execution of `awk'.
-* Built-in Variables::                  Summarizes the built-in variables.
+* Built-in Variables::                  Summarizes the predefined variables.
 * User-modified::                       Built-in variables that you change to
                                         control `awk'.
 * Auto-set::                            Built-in variables where `awk'
@@ -350,12 +355,12 @@ entitled "GNU Free Documentation License".
                                         elements.
 * Controlling Scanning::                Controlling the order in which arrays
                                         are scanned.
-* Delete::                              The `delete' statement removes an
-                                        element from an array.
 * Numeric Array Subscripts::            How to use numbers as subscripts in
                                         `awk'.
 * Uninitialized Subscripts::            Using Uninitialized variables as
                                         subscripts.
+* Delete::                              The `delete' statement removes an
+                                        element from an array.
 * Multidimensional::                    Emulating multidimensional arrays in
                                         `awk'.
 * Multiscanning::                       Scanning multidimensional arrays.
@@ -414,6 +419,8 @@ entitled "GNU Free Documentation License".
 * Getlocaltime Function::               A function to get formatted times.
 * Readfile Function::                   A function to read an entire file at
                                         once.
+* Shell Quoting::                       A function to quote strings for the
+                                        shell.
 * Data File Management::                Functions for managing command-line
                                         data files.
 * Filetrans Function::                  A function for handling data file
@@ -528,7 +535,6 @@ entitled "GNU Free Documentation License".
 * Extension API Description::           A full description of the API.
 * Extension API Functions Introduction:: Introduction to the API functions.
 * General Data Types::                  The data types.
-* Requesting Values::                   How to get a value.
 * Memory Allocation Functions::         Functions for allocating memory.
 * Constructor Functions::               Functions for creating values.
 * Registration Functions::              Functions to register things with
@@ -541,6 +547,7 @@ entitled "GNU Free Documentation License".
 * Two-way processors::                  Registering a two-way processor.
 * Printing Messages::                   Functions for printing messages.
 * Updating `ERRNO'::               Functions for updating `ERRNO'.
+* Requesting Values::                   How to get a value.
 * Accessing Parameters::                Functions for accessing parameters.
 * Symbol Table Access::                 Functions for accessing global
                                         variables.
@@ -552,6 +559,7 @@ entitled "GNU Free Documentation License".
 * Array Functions::                     Functions for working with arrays.
 * Flattening Arrays::                   How to flatten arrays.
 * Creating Arrays::                     How to create and populate arrays.
+* Redirection API::                     How to access and manipulate redirections.
 * Extension API Variables::             Variables provided by the API.
 * Extension Versioning::                API Version information.
 * Extension API Informational Variables:: Variables providing information about
@@ -579,9 +587,9 @@ entitled "GNU Free Documentation License".
                                         processor.
 * Extension Sample Read write array::   Serializing an array to a file.
 * Extension Sample Readfile::           Reading an entire file into a string.
-* Extension Sample API Tests::          Tests for the API.
 * Extension Sample Time::               An interface to `gettimeofday()'
                                         and `sleep()'.
+* Extension Sample API Tests::          Tests for the API.
 * gawkextlib::                          The `gawkextlib' project.
 * Extension summary::                   Extension summary.
 * Extension Exercises::                 Exercises.
@@ -610,6 +618,7 @@ entitled "GNU Free Documentation License".
 * Unix Installation::                   Installing `gawk' under
                                         various versions of Unix.
 * Quick Installation::                  Compiling `gawk' under Unix.
+* Shell Startup Files::                 Shell convenience functions.
 * Additional Configuration Options::    Other compile-time options.
 * Configuration Philosophy::            How it's all supposed to work.
 * Non-Unix Installation::               Installation on Other Operating
@@ -675,34 +684,34 @@ your life together with me.
 lives in innumerable ways.
 
 
-File: gawk.info,  Node: Foreword,  Next: Preface,  Prev: Top,  Up: Top
+File: gawk.info,  Node: Foreword3,  Next: Foreword4,  Prev: Top,  Up: Top
 
-Foreword
-********
+Foreword to the Third Edition
+*****************************
 
 Arnold Robbins and I are good friends. We were introduced in 1990 by
 circumstances--and our favorite programming language, AWK.  The
 circumstances started a couple of years earlier. I was working at a new
 job and noticed an unplugged Unix computer sitting in the corner.  No
 one knew how to use it, and neither did I.  However, a couple of days
-later it was running, and I was `root' and the one-and-only user.  That
-day, I began the transition from statistician to Unix programmer.
+later, it was running, and I was `root' and the one-and-only user.
+That day, I began the transition from statistician to Unix programmer.
 
    On one of many trips to the library or bookstore in search of books
-on Unix, I found the gray AWK book, a.k.a. Aho, Kernighan and
-Weinberger, `The AWK Programming Language', Addison-Wesley, 1988.
-AWK's simple programming paradigm--find a pattern in the input and then
-perform an action--often reduced complex or tedious data manipulations
-to few lines of code.  I was excited to try my hand at programming in
-AWK.
+on Unix, I found the gray AWK book, a.k.a.  Alfred V. Aho, Brian W.
+Kernighan, and Peter J. Weinberger's `The AWK Programming Language'
+(Addison-Wesley, 1988).  `awk''s simple programming paradigm--find a
+pattern in the input and then perform an action--often reduced complex
+or tedious data manipulations to a few lines of code.  I was excited to
+try my hand at programming in AWK.
 
    Alas,  the `awk' on my computer was a limited version of the
-language described in the AWK book.  I discovered that my computer had
-"old `awk'" and the AWK book described "new `awk'."  I learned that
-this was typical; the old version refused to step aside or relinquish
-its name.  If a system had a new `awk', it was invariably called
-`nawk', and few systems had it.  The best way to get a new `awk' was to
-`ftp' the source code for `gawk' from `prep.ai.mit.edu'.  `gawk' was a
+language described in the gray book.  I discovered that my computer had
+"old `awk'" and the book described "new `awk'."  I learned that this
+was typical; the old version refused to step aside or relinquish its
+name.  If a system had a new `awk', it was invariably called `nawk',
+and few systems had it.  The best way to get a new `awk' was to `ftp'
+the source code for `gawk' from `prep.ai.mit.edu'.  `gawk' was a
 version of new `awk' written by David Trueman and Arnold, and available
 under the GNU General Public License.
 
@@ -713,14 +722,15 @@ almost any system; my wife uses `gawk' on her VMS box.)
    My Unix system started out unplugged from the wall; it certainly was
 not plugged into a network.  So, oblivious to the existence of `gawk'
 and the Unix community in general, and desiring a new `awk', I wrote my
-own, called `mawk'.  Before I was finished I knew about `gawk', but it
+own, called `mawk'.  Before I was finished, I knew about `gawk', but it
 was too late to stop, so I eventually posted to a `comp.sources'
 newsgroup.
 
    A few days after my posting, I got a friendly email from Arnold
 introducing himself.   He suggested we share design and algorithms and
 attached a draft of the POSIX standard so that I could update `mawk' to
-support language extensions added after publication of the AWK book.
+support language extensions added after publication of `The AWK
+Programming Language'.
 
    Frankly, if our roles had been reversed, I would not have been so
 open and we probably would have never met.  I'm glad we did meet.  He
@@ -734,17 +744,17 @@ a definitive reference to the AWK language as defined by the 1987 Bell
 Laboratories release and codified in the 1992 POSIX Utilities standard.
 
    On the other hand, the novice AWK programmer can study a wealth of
-practical programs that emphasize the power of AWK's basic idioms: data
-driven control-flow, pattern matching with regular expressions, and
-associative arrays.  Those looking for something new can try out
+practical programs that emphasize the power of AWK's basic idioms:
+data-driven control flow, pattern matching with regular expressions,
+and associative arrays.  Those looking for something new can try out
 `gawk''s interface to network protocols via special `/inet' files.
 
    The programs in this book make clear that an AWK program is
 typically much smaller and faster to develop than a counterpart written
-in C.  Consequently, there is often a payoff to prototype an algorithm
-or design in AWK to get it running quickly and expose problems early.
-Often, the interpreted performance is adequate and the AWK prototype
-becomes the product.
+in C.  Consequently, there is often a payoff to prototyping an
+algorithm or design in AWK to get it running quickly and expose
+problems early. Often, the interpreted performance is adequate and the
+AWK prototype becomes the product.
 
    The new `pgawk' (profiling `gawk'), produces program execution
 counts.  I recently experimented with an algorithm that for n lines of
@@ -759,10 +769,47 @@ want to learn how, then read this book.
 
      Michael Brennan
      Author of `mawk'
-     March, 2001
+     March 2001
 
 
-File: gawk.info,  Node: Preface,  Next: Getting Started,  Prev: Foreword,  Up: Top
+File: gawk.info,  Node: Foreword4,  Next: Preface,  Prev: Foreword3,  Up: Top
+
+Foreword to the Fourth Edition
+******************************
+
+Some things don't change.  Thirteen years ago I wrote: "If you use AWK
+or want to learn how, then read this book."  True then, and still true
+today.
+
+   Learning to use a programming language is about more than mastering
+the syntax.  One needs to acquire an understanding of how to use the
+features of the language to solve practical programming problems.  A
+focus of this book is many examples that show how to use AWK.
+
+   Some things do change. Our computers are much faster and have more
+memory.  Consequently, speed and storage inefficiencies of a high-level
+language matter less.  Prototyping in AWK and then rewriting in C for
+performance reasons happens less, because more often the prototype is
+fast enough.
+
+   Of course, there are computing operations that are best done in C or
+C++.  With `gawk' 4.1 and later, you do not have to choose between
+writing your program in AWK or in C/C++.  You can write most of your
+program in AWK and the aspects that require C/C++ capabilities can be
+written in C/C++, and then the pieces glued together when the `gawk'
+module loads the C/C++ module as a dynamic plug-in.  *note Dynamic
+Extensions::, has all the details, and, as expected, many examples to
+help you learn the ins and outs.
+
+   I enjoy programming in AWK and had fun (re)reading this book.  I
+think you will too.
+
+     Michael Brennan
+     Author of `mawk'
+     October 2014
+
+
+File: gawk.info,  Node: Preface,  Next: Getting Started,  Prev: Foreword4,  Up: Top
 
 Preface
 *******
@@ -775,14 +822,14 @@ rest of the file alone.  Such jobs are often easy with `awk'.  The
 makes it easy to handle simple data-reformatting jobs.
 
    The GNU implementation of `awk' is called `gawk'; if you invoke it
-with the proper options or environment variables (*note Options::), it
-is fully compatible with the POSIX(1) specification of the `awk'
-language and with the Unix version of `awk' maintained by Brian
-Kernighan.  This means that all properly written `awk' programs should
-work with `gawk'.  Thus, we usually don't distinguish between `gawk'
-and other `awk' implementations.
+with the proper options or environment variables, it is fully
+compatible with the POSIX(1) specification of the `awk' language and
+with the Unix version of `awk' maintained by Brian Kernighan.  This
+means that all properly written `awk' programs should work with `gawk'.
+So most of the time, we don't distinguish between `gawk' and other
+`awk' implementations.
 
-   Using `awk' allows you to:
+   Using `awk' you can:
 
    * Manage small, personal databases
 
@@ -790,7 +837,7 @@ and other `awk' implementations.
 
    * Validate data
 
-   * Produce indexes and perform other document preparation tasks
+   * Produce indexes and perform other document-preparation tasks
 
    * Experiment with algorithms that you can adapt later to other
      computer languages
@@ -803,9 +850,9 @@ and other `awk' implementations.
 
    * Perform simple network communications
 
-   * Profile and debug `awk' programs.
+   * Profile and debug `awk' programs
 
-   * Extend the language with functions written in C or C++.
+   * Extend the language with functions written in C or C++
 
    This Info file teaches you about the `awk' language and how you can
 use it effectively.  You should already be familiar with basic system
@@ -818,9 +865,8 @@ different computing environments.  This Info file, while describing the
 of `awk' called `gawk' (which stands for "GNU `awk'").  `gawk' runs on
 a broad range of Unix systems, ranging from Intel-architecture PC-based
 computers up through large-scale systems.  `gawk' has also been ported
-to Mac OS X, Microsoft Windows (all versions) and OS/2 PCs, and OpenVMS.
-(Some other, obsolete systems to which `gawk' was once ported are no
-longer supported and the code for those systems has been removed.)
+to Mac OS X, Microsoft Windows (all versions) and OS/2 PCs, and
+OpenVMS.(3)
 
 * Menu:
 
@@ -840,18 +886,21 @@ longer supported and the code for those systems has been removed.)
    (1) The 2008 POSIX standard is accessible online at
 `http://www.opengroup.org/onlinepubs/9699919799/'.
 
-   (2) These commands are available on POSIX-compliant systems, as well
-as on traditional Unix-based systems. If you are using some other
+   (2) These utilities are available on POSIX-compliant systems, as
+well as on traditional Unix-based systems. If you are using some other
 operating system, you still need to be familiar with the ideas of I/O
 redirection and pipes.
 
+   (3) Some other, obsolete systems to which `gawk' was once ported are
+no longer supported and the code for those systems has been removed.
+
 
 File: gawk.info,  Node: History,  Next: Names,  Up: Preface
 
 History of `awk' and `gawk'
 ===========================
 
-                   Recipe For A Programming Language
+                   Recipe for a Programming Language
 
           1 part  `egrep'   1 part  `snobol'
           2 parts `ed'      3 parts C
@@ -863,7 +912,7 @@ release.
 Document very well and release.
 
 The name `awk' comes from the initials of its designers: Alfred V.
-Aho, Peter J. Weinberger and Brian W. Kernighan.  The original version
+Aho, Peter J. Weinberger, and Brian W. Kernighan.  The original version
 of `awk' was written in 1977 at AT&T Bell Laboratories.  In 1985, a new
 version made the programming language more powerful, introducing
 user-defined functions, multiple input streams, and computed regular
@@ -872,18 +921,18 @@ V Release 3.1 (1987).  The version in System V Release 4 (1989) added
 some new features and cleaned up the behavior in some of the "dark
 corners" of the language.  The specification for `awk' in the POSIX
 Command Language and Utilities standard further clarified the language.
-Both the `gawk' designers and the original Bell Laboratories `awk'
-designers provided feedback for the POSIX specification.
-
-   Paul Rubin wrote the GNU implementation, `gawk', in 1986.  Jay
-Fenlason completed it, with advice from Richard Stallman.  John Woods
-contributed parts of the code as well.  In 1988 and 1989, David
-Trueman, with help from me, thoroughly reworked `gawk' for compatibility
-with the newer `awk'.  Circa 1994, I became the primary maintainer.
-Current development focuses on bug fixes, performance improvements,
-standards compliance and, occasionally, new features.
-
-   In May of 1997, Ju"rgen Kahrs felt the need for network access from
+Both the `gawk' designers and the original `awk' designers at Bell
+Laboratories provided feedback for the POSIX specification.
+
+   Paul Rubin wrote `gawk' in 1986.  Jay Fenlason completed it, with
+advice from Richard Stallman.  John Woods contributed parts of the code
+as well.  In 1988 and 1989, David Trueman, with help from me,
+thoroughly reworked `gawk' for compatibility with the newer `awk'.
+Circa 1994, I became the primary maintainer.  Current development
+focuses on bug fixes, performance improvements, standards compliance,
+and, occasionally, new features.
+
+   In May 1997, Ju"rgen Kahrs felt the need for network access from
 `awk', and with a little help from me, set about adding features to do
 this for `gawk'.  At that time, he also wrote the bulk of `TCP/IP
 Internetworking with `gawk'' (a separate document, available as part of
@@ -892,9 +941,9 @@ the `gawk' distribution).  His code finally became part of the main
 
    John Haque rewrote the `gawk' internals, in the process providing an
 `awk'-level debugger. This version became available as `gawk' version
-4.0, in 2011.
+4.0 in 2011.
 
-   *Note Contributors::, for a complete list of those who made
+   *Note Contributors::, for a full list of those who have made
 important contributions to `gawk'.
 
 
@@ -905,10 +954,10 @@ A Rose by Any Other Name
 
 The `awk' language has evolved over the years. Full details are
 provided in *note Language History::.  The language described in this
-Info file is often referred to as "new `awk'".  By analogy, the
+Info file is often referred to as "new `awk'."  By analogy, the
 original version of `awk' is referred to as "old `awk'."
 
-   Today, on most systems, when you run the `awk' utility, you get some
+   On most current systems, when you run the `awk' utility you get some
 version of new `awk'.(1) If your system's standard `awk' is the old
 one, you will see something like this if you try the test program:
 
@@ -948,8 +997,8 @@ programming language.
 in the POSIX standard.  It does so in the context of the `gawk'
 implementation.  While doing so, it also attempts to describe important
 differences between `gawk' and other `awk' implementations.(1) Finally,
-any `gawk' features that are not in the POSIX standard for `awk' are
-noted.
+it notes any `gawk' features that are not in the POSIX standard for
+`awk'.
 
    There are sidebars scattered throughout the Info file.  They add a
 more complete explanation of points that are relevant, but not likely
@@ -958,111 +1007,122 @@ heading "sidebar."
 
    Most of the time, the examples use complete `awk' programs.  Some of
 the more advanced sections show only the part of the `awk' program that
-illustrates the concept currently being described.
+illustrates the concept being described.
 
-   While this Info file is aimed principally at people who have not been
-exposed to `awk', there is a lot of information here that even the `awk'
-expert should find useful.  In particular, the description of POSIX
-`awk' and the example programs in *note Library Functions::, and in
-*note Sample Programs::, should be of interest.
+   Although this Info file is aimed principally at people who have not
+been exposed to `awk', there is a lot of information here that even the
+`awk' expert should find useful.  In particular, the description of
+POSIX `awk' and the example programs in *note Library Functions::, and
+in *note Sample Programs::, should be of interest.
 
    This Info file is split into several parts, as follows:
 
-   Part I describes the `awk' language and `gawk' program in detail.
-It starts with the basics, and continues through all of the features of
-`awk'.  It contains the following chapters:
+   * Part I describes the `awk' language and the `gawk' program in
+     detail.  It starts with the basics, and continues through all of
+     the features of `awk'.  It contains the following chapters:
 
-   *note Getting Started::, provides the essentials you need to know to
-begin using `awk'.
+        - *note Getting Started::, provides the essentials you need to
+          know to begin using `awk'.
 
-   *note Invoking Gawk::, describes how to run `gawk', the meaning of
-its command-line options, and how it finds `awk' program source files.
+        - *note Invoking Gawk::, describes how to run `gawk', the
+          meaning of its command-line options, and how it finds `awk'
+          program source files.
 
-   *note Regexp::, introduces regular expressions in general, and in
-particular the flavors supported by POSIX `awk' and `gawk'.
+        - *note Regexp::, introduces regular expressions in general,
+          and in particular the flavors supported by POSIX `awk' and
+          `gawk'.
 
-   *note Reading Files::, describes how `awk' reads your data.  It
-introduces the concepts of records and fields, as well as the `getline'
-command.  I/O redirection is first described here.  Network I/O is also
-briefly introduced here.
+        - *note Reading Files::, describes how `awk' reads your data.
+          It introduces the concepts of records and fields, as well as
+          the `getline' command.  I/O redirection is first described
+          here.  Network I/O is also briefly introduced here.
 
-   *note Printing::, describes how `awk' programs can produce output
-with `print' and `printf'.
+        - *note Printing::, describes how `awk' programs can produce
+          output with `print' and `printf'.
 
-   *note Expressions::, describes expressions, which are the basic
-building blocks for getting most things done in a program.
+        - *note Expressions::, describes expressions, which are the
+          basic building blocks for getting most things done in a
+          program.
 
-   *note Patterns and Actions::, describes how to write patterns for
-matching records, actions for doing something when a record is matched,
-and the built-in variables `awk' and `gawk' use.
+        - *note Patterns and Actions::, describes how to write patterns
+          for matching records, actions for doing something when a
+          record is matched, and the predefined variables `awk' and
+          `gawk' use.
 
-   *note Arrays::, covers `awk''s one-and-only data structure:
-associative arrays.  Deleting array elements and whole arrays is also
-described, as well as sorting arrays in `gawk'.  It also describes how
-`gawk' provides arrays of arrays.
+        - *note Arrays::, covers `awk''s one-and-only data structure:
+          the associative array.  Deleting array elements and whole
+          arrays is described, as well as sorting arrays in `gawk'.
+          The major node also describes how `gawk' provides arrays of
+          arrays.
 
-   *note Functions::, describes the built-in functions `awk' and `gawk'
-provide, as well as how to define your own functions.
+        - *note Functions::, describes the built-in functions `awk' and
+          `gawk' provide, as well as how to define your own functions.
+          It also discusses how `gawk' lets you call functions
+          indirectly.
 
-   Part II shows how to use `awk' and `gawk' for problem solving.
-There is lots of code here for you to read and learn from.  It contains
-the following chapters:
+   * Part II shows how to use `awk' and `gawk' for problem solving.
+     There is lots of code here for you to read and learn from.  This
+     part contains the following chapters:
 
-   *note Library Functions::, which provides a number of functions
-meant to be used from main `awk' programs.
+        - *note Library Functions::, provides a number of functions
+          meant to be used from main `awk' programs.
 
-   *note Sample Programs::, which provides many sample `awk' programs.
+        - *note Sample Programs::, provides many sample `awk' programs.
 
-   Reading these two chapters allows you to see `awk' solving real
-problems.
+     Reading these two chapters allows you to see `awk' solving real
+     problems.
 
-   Part III focuses on features specific to `gawk'.  It contains the
-following chapters:
+   * Part III focuses on features specific to `gawk'.  It contains the
+     following chapters:
 
-   *note Advanced Features::, describes a number of `gawk'-specific
-advanced features.  Of particular note are the abilities to have
-two-way communications with another process, perform TCP/IP networking,
-and profile your `awk' programs.
+        - *note Advanced Features::, describes a number of advanced
+          features.  Of particular note are the abilities to control
+          the order of array traversal, have two-way communications
+          with another process, perform TCP/IP networking, and profile
+          your `awk' programs.
 
-   *note Internationalization::, describes special features in `gawk'
-for translating program messages into different languages at runtime.
+        - *note Internationalization::, describes special features for
+          translating program messages into different languages at
+          runtime.
 
-   *note Debugger::, describes the `awk' debugger.
+        - *note Debugger::, describes the `gawk' debugger.
 
-   *note Arbitrary Precision Arithmetic::, describes advanced
-arithmetic facilities provided by `gawk'.
+        - *note Arbitrary Precision Arithmetic::, describes advanced
+          arithmetic facilities.
 
-   *note Dynamic Extensions::, describes how to add new variables and
-functions to `gawk' by writing extensions in C or C++.
+        - *note Dynamic Extensions::, describes how to add new
+          variables and functions to `gawk' by writing extensions in C
+          or C++.
 
-   Part IV provides the appendices, the Glossary, and two licenses that
-cover the `gawk' source code and this Info file, respectively.  It
-contains the following appendices:
+   * Part IV provides the appendices, the Glossary, and two licenses
+     that cover the `gawk' source code and this Info file, respectively.
+     It contains the following appendices:
 
-   *note Language History::, describes how the `awk' language has
-evolved since its first release to present.  It also describes how
-`gawk' has acquired features over time.
+        - *note Language History::, describes how the `awk' language
+          has evolved since its first release to the present.  It also
+          describes how `gawk' has acquired features over time.
 
-   *note Installation::, describes how to get `gawk', how to compile it
-on POSIX-compatible systems, and how to compile and use it on different
-non-POSIX systems.  It also describes how to report bugs in `gawk' and
-where to get other freely available `awk' implementations.
+        - *note Installation::, describes how to get `gawk', how to
+          compile it on POSIX-compatible systems, and how to compile
+          and use it on different non-POSIX systems.  It also describes
+          how to report bugs in `gawk' and where to get other freely
+          available `awk' implementations.
 
-   *note Notes::, describes how to disable `gawk''s extensions, as well
-as how to contribute new code to `gawk', and some possible future
-directions for `gawk' development.
+        - *note Notes::, describes how to disable `gawk''s extensions,
+          as well as how to contribute new code to `gawk', and some
+          possible future directions for `gawk' development.
 
-   *note Basic Concepts::, provides some very cursory background
-material for those who are completely unfamiliar with computer
-programming.
+        - *note Basic Concepts::, provides some very cursory background
+          material for those who are completely unfamiliar with
+          computer programming.
 
-   The *note Glossary::, defines most, if not all, the significant
-terms used throughout the Info file.  If you find terms that you aren't
-familiar with, try looking them up here.
+          The *note Glossary::, defines most, if not all, of the
+          significant terms used throughout the Info file.  If you find
+          terms that you aren't familiar with, try looking them up here.
 
-   *note Copying::, and *note GNU Free Documentation License::, present
-the licenses that cover the `gawk' source code and this Info file,
-respectively.
+        - *note Copying::, and *note GNU Free Documentation License::,
+          present the licenses that cover the `gawk' source code and
+          this Info file, respectively.
 
    ---------- Footnotes ----------
 
@@ -1085,8 +1145,8 @@ node briefly documents the typographical conventions used in Texinfo.
 common shell primary and secondary prompts, `$' and `>'.  Input that
 you type is shown `like this'.  Output from the command is preceded by
 the glyph "-|".  This typically represents the command's standard
-output.  Error messages, and other output on the command's standard
-error, are preceded by the glyph "error-->".  For example:
+output.  Error messages and other output on the command's standard
+error are preceded by the glyph "error-->".  For example:
 
      $ echo hi on stdout
      -| hi on stdout
@@ -1098,7 +1158,7 @@ particular, there are special characters called "control characters."
 These are characters that you type by holding down both the `CONTROL'
 key and another key, at the same time.  For example, a `Ctrl-d' is typed
 by first pressing and holding the `CONTROL' key, next pressing the `d'
-key and finally releasing both keys.
+key, and finally releasing both keys.
 
    For the sake of brevity, throughout this Info file, we refer to
 Brian Kernighan's version of `awk' as "BWK `awk'."  (*Note Other
@@ -1107,18 +1167,18 @@ Versions::, for information on his and other versions.)
 Dark Corners
 ------------
 
-     Dark corners are basically fractal -- no matter how much you
+     Dark corners are basically fractal--no matter how much you
      illuminate, there's always a smaller but darker one.  -- Brian
      Kernighan
 
    Until the POSIX standard (and `GAWK: Effective AWK Programming'),
 many features of `awk' were either poorly documented or not documented
 at all.  Descriptions of such features (often called "dark corners")
-are noted in this Info file with "(d.c.)".  They also appear in the
+are noted in this Info file with "(d.c.)."  They also appear in the
 index under the heading "dark corner."
 
-   As noted by the opening quote, though, any coverage of dark corners
-is, by definition, incomplete.
+   But, as noted by the opening quote, any coverage of dark corners is
+by definition incomplete.
 
    Extensions to the standard `awk' language that are supported by more
 than one `awk' implementation are marked "(c.e.)," and listed in the
@@ -1137,13 +1197,13 @@ editor.  GNU Emacs is the most widely used version of Emacs today.
 
    The GNU(1) Project is an ongoing effort on the part of the Free
 Software Foundation to create a complete, freely distributable,
-POSIX-compliant computing environment.  The FSF uses the "GNU General
-Public License" (GPL) to ensure that their software's source code is
+POSIX-compliant computing environment.  The FSF uses the GNU General
+Public License (GPL) to ensure that its software's source code is
 always available to the end user.  A copy of the GPL is included for
 your reference (*note Copying::).  The GPL applies to the C language
 source code for `gawk'.  To find out more about the FSF and the GNU
 Project online, see the GNU Project's home page (http://www.gnu.org).
-This Info file may also be read from their web site
+This Info file may also be read from GNU's website
 (http://www.gnu.org/software/gawk/manual/).
 
    A shell, an editor (Emacs), highly portable optimizing C, C++, and
@@ -1158,35 +1218,34 @@ system for Intel, Power Architecture, Sun SPARC, IBM S/390, and other
 systems.(2) Many GNU/Linux distributions are available for download
 from the Internet.
 
-   The Info file itself has gone through a number of previous editions.
+   The Info file itself has gone through multiple previous editions.
 Paul Rubin wrote the very first draft of `The GAWK Manual'; it was
-around 40 pages in size.  Diane Close and Richard Stallman improved it,
-yielding a version that was around 90 pages long and barely described
-the original, "old" version of `awk'.
+around 40 pages long.  Diane Close and Richard Stallman improved it,
+yielding a version that was around 90 pages and barely described the
+original, "old" version of `awk'.
 
    I started working with that version in the fall of 1988.  As work on
 it progressed, the FSF published several preliminary versions (numbered
-0.X).  In 1996, Edition 1.0 was released with `gawk' 3.0.0.  The FSF
+0.X).  In 1996, edition 1.0 was released with `gawk' 3.0.0.  The FSF
 published the first two editions under the title `The GNU Awk User's
 Guide'.
 
    This edition maintains the basic structure of the previous editions.
-For FSF edition 4.0, the content has been thoroughly reviewed and
-updated. All references to `gawk' versions prior to 4.0 have been
-removed.  Of significant note for this edition was *note Debugger::.
+For FSF edition 4.0, the content was thoroughly reviewed and updated.
+All references to `gawk' versions prior to 4.0 were removed.  Of
+significant note for that edition was the addition of *note Debugger::.
 
    For FSF edition 4.1, the content has been reorganized into parts,
 and the major new additions are *note Arbitrary Precision Arithmetic::,
 and *note Dynamic Extensions::.
 
-   This Info file will undoubtedly continue to evolve.  An electronic
-version comes with the `gawk' distribution from the FSF.  If you find
-an error in this Info file, please report it!  *Note Bugs::, for
+   This Info file will undoubtedly continue to evolve.  If you find an
+error in the Info file, please report it!  *Note Bugs::, for
 information on submitting problem reports electronically.
 
    ---------- Footnotes ----------
 
-   (1) GNU stands for "GNU's not Unix."
+   (1) GNU stands for "GNU's Not Unix."
 
    (2) The terminology "GNU/Linux" is explained in the *note Glossary::.
 
@@ -1210,15 +1269,12 @@ contributed code: the archive did not grow and the domain went unused
 for several years.
 
    Late in 2008, a volunteer took on the task of setting up an
-`awk'-related web site--`http://awk.info'--and did a very nice job.
+`awk'-related website--`http://awk.info'--and did a very nice job.
 
    If you have written an interesting `awk' program, or have written a
 `gawk' extension that you would like to share with the rest of the
 world, please see `http://awk.info/?contribute' for how to contribute
-it to the web site.
-
-   As of this writing, this website is in search of a maintainer; please
-contact me if you are interested.
+it to the website.
 
 
 File: gawk.info,  Node: Acknowledgments,  Prev: How To Contribute,  Up: Preface
@@ -1233,7 +1289,7 @@ acknowledgments:
      this manual.  Jay Fenlason contributed many ideas and sample
      programs.  Richard Mlynarik and Robert Chassell gave helpful
      comments on drafts of this manual.  The paper `A Supplemental
-     Document for `awk'' by John W.  Pierce of the Chemistry Department
+     Document for AWK' by John W.  Pierce of the Chemistry Department
      at UC San Diego, pinpointed several issues relevant both to `awk'
      implementation and to this manual, that would otherwise have
      escaped us.
@@ -1246,7 +1302,7 @@ GNU Project.
 acknowledgements:
 
      The following people (in alphabetical order) provided helpful
-     comments on various versions of this book, Rick Adams, Dr. Nelson
+     comments on various versions of this book: Rick Adams, Dr. Nelson
      H.F. Beebe, Karl Berry, Dr. Michael Brennan, Rich Burridge, Claire
      Cloutier, Diane Close, Scott Deifik, Christopher ("Topher") Eliot,
      Jeffrey Friedl, Dr. Darrel Hankerson, Michal Jaegermann, Dr.
@@ -1255,7 +1311,7 @@ acknowledgements:
 
      Robert J. Chassell provided much valuable advice on the use of
      Texinfo.  He also deserves special thanks for convincing me _not_
-     to title this Info file `How To Gawk Politely'.  Karl Berry helped
+     to title this Info file `How to Gawk Politely'.  Karl Berry helped
      significantly with the TeX part of Texinfo.
 
      I would like to thank Marshall and Elaine Hartholz of Seattle and
@@ -1286,29 +1342,31 @@ Michal Jaegermann, Ju"rgen Kahrs, Stepan Kasal, John Malmberg, Dave
 Pitts, Chet Ramey, Pat Rankin, Andrew Schorr, Corinna Vinschen, and Eli
 Zaretskii (in alphabetical order) make up the current `gawk' "crack
 portability team."  Without their hard work and help, `gawk' would not
-be nearly the fine program it is today.  It has been and continues to
-be a pleasure working with this team of fine people.
+be nearly the robust, portable program it is today.  It has been and
+continues to be a pleasure working with this team of fine people.
 
    Notable code and documentation contributions were made by a number
 of people. *Note Contributors::, for the full list.
 
+   Thanks to Michael Brennan for the Forewords.
+
    Thanks to Patrice Dumas for the new `makeinfo' program.  Thanks to
-Karl Berry who continues to work to keep the Texinfo markup language
+Karl Berry, who continues to work to keep the Texinfo markup language
 sane.
 
-   Robert P.J. Day, Michael Brennan and Brian Kernighan kindly acted as
+   Robert P.J. Day, Michael Brennan, and Brian Kernighan kindly acted as
 reviewers for the 2015 edition of this Info file. Their feedback helped
 improve the final work.
 
-   I would like to thank Brian Kernighan for invaluable assistance
-during the testing and debugging of `gawk', and for ongoing help and
-advice in clarifying numerous points about the language.  We could not
-have done nearly as good a job on either `gawk' or its documentation
-without his help.
+   I would also like to thank Brian Kernighan for his invaluable
+assistance during the testing and debugging of `gawk', and for his
+ongoing help and advice in clarifying numerous points about the
+language.  We could not have done nearly as good a job on either `gawk'
+or its documentation without his help.
 
    Brian is in a class by himself as a programmer and technical author.
-I have to thank him (yet again) for his ongoing friendship and the role
-model he has been for me for close to 30 years!  Having him as a
+I have to thank him (yet again) for his ongoing friendship and for
+being a role model to me for close to 30 years!  Having him as a
 reviewer is an exciting privilege. It has also been extremely
 humbling...
 
@@ -1320,6 +1378,12 @@ also must acknowledge my gratitude to G-d, for the many opportunities
 He has sent my way, as well as for the gifts He has given me with which
 to take advantage of those opportunities.
 
+
+Arnold Robbins
+Nof Ayalon
+Israel
+February 2015
+
 
 File: gawk.info,  Node: Getting Started,  Next: Invoking Gawk,  Prev: Preface,  Up: Top
 
@@ -1329,28 +1393,28 @@ File: gawk.info,  Node: Getting Started,  Next: Invoking Gawk,  Prev: Preface,
 The basic function of `awk' is to search files for lines (or other
 units of text) that contain certain patterns.  When a line matches one
 of the patterns, `awk' performs specified actions on that line.  `awk'
-keeps processing input lines in this way until it reaches the end of
-the input files.
+continues to process input lines in this way until it reaches the end
+of the input files.
 
    Programs in `awk' are different from programs in most other
-languages, because `awk' programs are "data-driven"; that is, you
-describe the data you want to work with and then what to do when you
-find it.  Most other languages are "procedural"; you have to describe,
-in great detail, every step the program is to take.  When working with
+languages, because `awk' programs are "data driven" (i.e., you describe
+the data you want to work with and then what to do when you find it).
+Most other languages are "procedural"; you have to describe, in great
+detail, every step the program should take.  When working with
 procedural languages, it is usually much harder to clearly describe the
 data your program will process.  For this reason, `awk' programs are
 often refreshingly easy to read and write.
 
    When you run `awk', you specify an `awk' "program" that tells `awk'
-what to do.  The program consists of a series of "rules".  (It may also
+what to do.  The program consists of a series of "rules" (it may also
 contain "function definitions", an advanced feature that we will ignore
-for now.  *Note User-defined::.)  Each rule specifies one pattern to
+for now; *note User-defined::).  Each rule specifies one pattern to
 search for and one action to perform upon finding the pattern.
 
-   Syntactically, a rule consists of a pattern followed by an action.
-The action is enclosed in braces to separate it from the pattern.
-Newlines usually separate rules.  Therefore, an `awk' program looks
-like this:
+   Syntactically, a rule consists of a "pattern" followed by an
+"action".  The action is enclosed in braces to separate it from the
+pattern.  Newlines usually separate rules.  Therefore, an `awk' program
+looks like this:
 
      PATTERN { ACTION }
      PATTERN { ACTION }
@@ -1418,7 +1482,7 @@ program as the first argument of the `awk' command, like this:
 
      awk 'PROGRAM' INPUT-FILE1 INPUT-FILE2 ...
 
-where PROGRAM consists of a series of PATTERNS and ACTIONS, as
+where PROGRAM consists of a series of patterns and actions, as
 described earlier.
 
    This command format instructs the "shell", or command interpreter,
@@ -1433,7 +1497,8 @@ programs from shell scripts, because it avoids the need for a separate
 file for the `awk' program.  A self-contained shell script is more
 reliable because there are no other files to misplace.
 
-   *note Very Simple::, presents several short, self-contained programs.
+   Later in this chapter, in *note Very Simple::, we'll see examples of
+several short, self-contained programs.
 
 
 File: gawk.info,  Node: Read Terminal,  Next: Long,  Prev: One-shot,  Up: Running gawk
@@ -1448,7 +1513,7 @@ following command line:
 
 `awk' applies the PROGRAM to the "standard input", which usually means
 whatever you type on the keyboard.  This continues until you indicate
-end-of-file by typing `Ctrl-d'.  (On other operating systems, the
+end-of-file by typing `Ctrl-d'.  (On non-POSIX operating systems, the
 end-of-file character may be different.  For example, on OS/2, it is
 `Ctrl-z'.)
 
@@ -1457,25 +1522,25 @@ advice (from Douglas Adams's `The Hitchhiker's Guide to the Galaxy'),
 to keep you from worrying about the complexities of computer
 programming:
 
-     $ awk "BEGIN { print "Don\47t Panic!" }"
+     $ awk 'BEGIN { print "Don\47t Panic!" }'
      -| Don't Panic!
 
    `awk' executes statements associated with `BEGIN' before reading any
 input.  If there are no other statements in your program, as is the
 case here, `awk' just stops, instead of trying to read input it doesn't
-know how to process.  The `\47' is a magic way of getting a single
-quote into the program, without having to engage in ugly shell quoting
-tricks.
+know how to process.  The `\47' is a magic way (explained later) of
+getting a single quote into the program, without having to engage in
+ugly shell quoting tricks.
 
-     NOTE: As a side note, if you use Bash as your shell, you should
-     execute the command `set +H' before running this program
-     interactively, to disable the C shell-style command history, which
-     treats `!' as a special character. We recommend putting this
-     command into your personal startup file.
+     NOTE: If you use Bash as your shell, you should execute the
+     command `set +H' before running this program interactively, to
+     disable the C shell-style command history, which treats `!' as a
+     special character. We recommend putting this command into your
+     personal startup file.
 
    This next simple `awk' program emulates the `cat' utility; it copies
 whatever you type on the keyboard to its standard output (why this
-works is explained shortly).
+works is explained shortly):
 
      $ awk '{ print }'
      Now is the time for all good men
@@ -1494,9 +1559,9 @@ File: gawk.info,  Node: Long,  Next: Executable Scripts,  Prev: Read Terminal,
 1.1.3 Running Long Programs
 ---------------------------
 
-Sometimes your `awk' programs can be very long.  In this case, it is
-more convenient to put the program into a separate file.  In order to
-tell `awk' to use that file for its program, you type:
+Sometimes `awk' programs are very long.  In these cases, it is more
+convenient to put the program into a separate file.  In order to tell
+`awk' to use that file for its program, you type:
 
      awk -f SOURCE-FILE INPUT-FILE1 INPUT-FILE2 ...
 
@@ -1512,19 +1577,20 @@ into the file `advice'.  Then this command:
 
 does the same thing as this one:
 
-     awk "BEGIN { print \"Don't Panic!\" }"
+     awk 'BEGIN { print "Don\47t Panic!" }'
 
 This was explained earlier (*note Read Terminal::).  Note that you
 don't usually need single quotes around the file name that you specify
 with `-f', because most file names don't contain any of the shell's
 special characters.  Notice that in `advice', the `awk' program did not
 have single quotes around it.  The quotes are only needed for programs
-that are provided on the `awk' command line.
+that are provided on the `awk' command line.  (Also, placing the
+program in a file allows us to use a literal single quote in the program
+text, instead of the magic `\47'.)
 
-   If you want to clearly identify your `awk' program files as such,
-you can add the extension `.awk' to the file name.  This doesn't affect
-the execution of the `awk' program but it does make "housekeeping"
-easier.
+   If you want to clearly identify an `awk' program file as such, you
+can add the extension `.awk' to the file name.  This doesn't affect the
+execution of the `awk' program but it does make "housekeeping" easier.
 
 
 File: gawk.info,  Node: Executable Scripts,  Next: Comments,  Prev: Long,  Up: Running gawk
@@ -1563,9 +1629,9 @@ program is written in `awk'.
 utility reads your program and then processes your data according to
 the instructions in your program. (This is different from a "compiled"
 language such as C, where your program is first compiled into machine
-code that is executed directly by your system's hardware.)  The `awk'
+code that is executed directly by your system's processor.)  The `awk'
 utility is thus termed an "interpreter".  Many modern languages are
-interperted.
+interpreted.
 
    The line beginning with `#!' lists the full file name of an
 interpreter to run and a single optional initial command-line argument
@@ -1573,8 +1639,8 @@ to pass to that interpreter.  The operating system then runs the
 interpreter with the given argument and the full argument list of the
 executed program.  The first argument in the list is the full file name
 of the `awk' program.  The rest of the argument list contains either
-options to `awk', or data files, or both. Note that on many systems
-`awk' may be found in `/usr/bin' instead of in `/bin'. Caveat Emptor.
+options to `awk', or data files, or both. (Note that on many systems
+`awk' may be found in `/usr/bin' instead of in `/bin'.)
 
    Some systems limit the length of the interpreter name to 32
 characters.  Often, this can be dealt with by using a symbolic link.
@@ -1593,8 +1659,8 @@ the name of your script (`advice').  (d.c.)  Don't rely on the value of
 
    ---------- Footnotes ----------
 
-   (1) The `#!' mechanism works on GNU/Linux systems, BSD-based systems
-and commercial Unix systems.
+   (1) The `#!' mechanism works on GNU/Linux systems, BSD-based
+systems, and commercial Unix systems.
 
 
 File: gawk.info,  Node: Comments,  Next: Quoting,  Prev: Executable Scripts,  Up: Running gawk
@@ -1608,13 +1674,13 @@ Comments can explain what the program does and how it works.  Nearly all
 programming languages have provisions for comments, as programs are
 typically hard to understand without them.
 
-   In the `awk' language, a comment starts with the sharp sign
+   In the `awk' language, a comment starts with the number sign
 character (`#') and continues to the end of the line.  The `#' does not
 have to be the first character on the line. The `awk' language ignores
-the rest of a line following a sharp sign.  For example, we could have
+the rest of a line following a number sign.  For example, we could have
 put the following into `advice':
 
-     # This program prints a nice friendly message.  It helps
+     # This program prints a nice, friendly message.  It helps
      # keep novice users from being afraid of the computer.
      BEGIN    { print "Don't Panic!" }
 
@@ -1623,15 +1689,15 @@ programs, but this usually isn't very useful; the purpose of a comment
 is to help you or another person understand the program when reading it
 at a later time.
 
-     CAUTION: As mentioned in *note One-shot::, you can enclose small
-     to medium programs in single quotes, in order to keep your shell
-     scripts self-contained.  When doing so, _don't_ put an apostrophe
-     (i.e., a single quote) into a comment (or anywhere else in your
-     program). The shell interprets the quote as the closing quote for
-     the entire program. As a result, usually the shell prints a
-     message about mismatched quotes, and if `awk' actually runs, it
-     will probably print strange messages about syntax errors.  For
-     example, look at the following:
+     CAUTION: As mentioned in *note One-shot::, you can enclose short
+     to medium-sized programs in single quotes, in order to keep your
+     shell scripts self-contained.  When doing so, _don't_ put an
+     apostrophe (i.e., a single quote) into a comment (or anywhere else
+     in your program). The shell interprets the quote as the closing
+     quote for the entire program. As a result, usually the shell
+     prints a message about mismatched quotes, and if `awk' actually
+     runs, it will probably print strange messages about syntax errors.
+     For example, look at the following:
 
           $ awk 'BEGIN { print "hello" } # let's be cute'
           >
@@ -1647,20 +1713,20 @@ at a later time.
           error-->  source line number 1
 
      Putting a backslash before the single quote in `let's' wouldn't
-     help, since backslashes are not special inside single quotes.  The
-     next node describes the shell's quoting rules.
+     help, because backslashes are not special inside single quotes.
+     The next node describes the shell's quoting rules.
 
 
 File: gawk.info,  Node: Quoting,  Prev: Comments,  Up: Running gawk
 
-1.1.6 Shell-Quoting Issues
+1.1.6 Shell Quoting Issues
 --------------------------
 
 * Menu:
 
 * DOS Quoting::                 Quoting in Windows Batch Files.
 
-   For short to medium length `awk' programs, it is most convenient to
+   For short to medium-length `awk' programs, it is most convenient to
 enter the program on the `awk' command line.  This is best done by
 enclosing the entire program in single quotes.  This is true whether
 you are entering the program interactively at the shell prompt, or
@@ -1680,15 +1746,15 @@ string.
    The null string is character data that has no value.  In other
 words, it is empty.  It is written in `awk' programs like this: `""'.
 In the shell, it can be written using single or double quotes: `""' or
-`'''. While the null string has no characters in it, it does exist.
-Consider this command:
+`'''. Although the null string has no characters in it, it does exist.
+For example, consider this command:
 
      $ echo ""
 
 Here, the `echo' utility receives a single argument, even though that
 argument has no characters in it. In the rest of this Info file, we use
 the terms "null string" and "empty string" interchangeably.  Now, on to
-the quoting rules.
+the quoting rules:
 
    * Quoted items can be concatenated with nonquoted items as well as
      with other quoted items.  The shell turns everything into one
@@ -1709,13 +1775,16 @@ the quoting rules.
      on the quoted text.  Different shells may do additional kinds of
      processing on double-quoted text.
 
-     Since certain characters within double-quoted text are processed
+     Because certain characters within double-quoted text are processed
      by the shell, they must be "escaped" within the text.  Of note are
      the characters `$', ``', `\', and `"', all of which must be
      preceded by a backslash within double-quoted text if they are to
      be passed on literally to the program.  (The leading backslash is
-     stripped first.)  Thus, the example seen in *note Read Terminal::,
-     is applicable:
+     stripped first.)  Thus, the example seen in *note Read Terminal:::
+
+          awk 'BEGIN { print "Don\47t Panic!" }'
+
+     could instead be written this way:
 
           $ awk "BEGIN { print \"Don't Panic!\" }"
           -| Don't Panic!
@@ -1733,10 +1802,10 @@ the quoting rules.
 
           awk -F"" 'PROGRAM' FILES  # wrong!
 
-     In the second case, `awk' will attempt to use the text of the
-     program as the value of `FS', and the first file name as the text
-     of the program!  This results in syntax errors at best, and
-     confusing behavior at worst.
+     In the second case, `awk' attempts to use the text of the program
+     as the value of `FS', and the first file name as the text of the
+     program!  This results in syntax errors at best, and confusing
+     behavior at worst.
 
    Mixing single and double quotes is difficult.  You have to resort to
 shell quoting tricks, like this:
@@ -1745,7 +1814,7 @@ shell quoting tricks, like this:
      -| Here is a single quote <'>
 
 This program consists of three concatenated quoted strings.  The first
-and the third are single-quoted, the second is double-quoted.
+and the third are single-quoted, and the second is double-quoted.
 
    This can be "simplified" to:
 
@@ -1772,8 +1841,7 @@ like so:
      $ awk 'BEGIN { print "Here is a double quote <\42>" }'
      -| Here is a double quote <">
 
-This works nicely, except that you should comment clearly what the
-escapes mean.
+This works nicely, but you should comment clearly what the escapes mean.
 
    A fourth option is to use command-line variable assignment, like
 this:
@@ -1781,9 +1849,12 @@ this:
      $ awk -v sq="'" 'BEGIN { print "Here is a single quote <" sq ">" }'
      -| Here is a single quote <'>
 
+   (Here, the two string constants and the value of `sq' are
+concatenated into a single string that is printed by `print'.)
+
    If you really need both single and double quotes in your `awk'
 program, it is probably best to move it into a separate file, where the
-shell won't be part of the picture, and you can say what you mean.
+shell won't be part of the picture and you can say what you mean.
 
 
 File: gawk.info,  Node: DOS Quoting,  Up: Quoting
@@ -1806,7 +1877,7 @@ file surrounded by double quotes:
 
 File: gawk.info,  Node: Sample Data Files,  Next: Very Simple,  Prev: Running gawk,  Up: Getting Started
 
-1.2 Data Files for the Examples
+1.2 Data files for the Examples
 ===============================
 
 Many of the examples in this Info file take their input from two sample
@@ -1816,12 +1887,12 @@ The second data file, called `inventory-shipped', contains information
 about monthly shipments.  In both files, each line is considered to be
 one "record".
 
-   In the data file `mail-list', each record contains the name of a
-person, his/her phone number, his/her email-address, and a code for
-their relationship with the author of the list.  The columns are
-aligned using spaces.  An `A' in the last column means that the person
-is an acquaintance.  An `F' in the last column means that the person is
-a friend.  An `R' means that the person is a relative:
+   In `mail-list', each record contains the name of a person, his/her
+phone number, his/her email address, and a code for his/her relationship
+with the author of the list.  The columns are aligned using spaces.  An
+`A' in the last column means that the person is an acquaintance.  An
+`F' in the last column means that the person is a friend.  An `R' means
+that the person is a relative:
 
      Amelia       555-5553     amelia.zodiacusque@gmail.com    F
      Anthony      555-3412     anthony.asserturo@hotmail.com   A
@@ -1841,7 +1912,7 @@ of green crates shipped, the number of red boxes shipped, the number of
 orange bags shipped, and the number of blue packages shipped,
 respectively.  There are 16 entries, covering the 12 months of last year
 and the first four months of the current year.  An empty line separates
-the data for the two years.
+the data for the two years:
 
      Jan  13  25  15 115
      Feb  15  32  24 226
@@ -1873,7 +1944,7 @@ File: gawk.info,  Node: Very Simple,  Next: Two Rules,  Prev: Sample Data Files,
 The following command runs a simple `awk' program that searches the
 input file `mail-list' for the character string `li' (a grouping of
 characters is usually called a "string"; the term "string" is based on
-similar usage in English, such as "a string of pearls," or "a string of
+similar usage in English, such as "a string of pearls" or "a string of
 cars in a train"):
 
      awk '/li/ { print $0 }' mail-list
@@ -1909,24 +1980,25 @@ prints all lines matching the pattern `li'.  By comparison, omitting
 the `print' statement but retaining the braces makes an empty action
 that does nothing (i.e., no lines are printed).
 
-   Many practical `awk' programs are just a line or two.  Following is a
-collection of useful, short programs to get you started.  Some of these
-programs contain constructs that haven't been covered yet. (The
-description of the program will give you a good idea of what is going
-on, but please read the rest of the Info file to become an `awk'
-expert!)  Most of the examples use a data file named `data'.  This is
-just a placeholder; if you use these programs yourself, substitute your
-own file names for `data'.  For future reference, note that there is
-often more than one way to do things in `awk'.  At some point, you may
-want to look back at these examples and see if you can come up with
-different ways to do the same things shown here:
+   Many practical `awk' programs are just a line or two long.
+Following is a collection of useful, short programs to get you started.
+Some of these programs contain constructs that haven't been covered
+yet. (The description of the program will give you a good idea of what
+is going on, but you'll need to read the rest of the Info file to
+become an `awk' expert!)  Most of the examples use a data file named
+`data'.  This is just a placeholder; if you use these programs
+yourself, substitute your own file names for `data'.  For future
+reference, note that there is often more than one way to do things in
+`awk'.  At some point, you may want to look back at these examples and
+see if you can come up with different ways to do the same things shown
+here:
 
    * Print every line that is longer than 80 characters:
 
           awk 'length($0) > 80' data
 
-     The sole rule has a relational expression as its pattern and it
-     has no action--so it uses the default action, printing the record.
+     The sole rule has a relational expression as its pattern and has no
+     action--so it uses the default action, printing the record.
 
    * Print the length of the longest input line:
 
@@ -1939,9 +2011,9 @@ different ways to do the same things shown here:
    * Print the length of the longest line in `data':
 
           expand data | awk '{ if (x < length($0)) x = length($0) }
-                        END { print "maximum line length is " x }'
+                             END { print "maximum line length is " x }'
 
-     This example differs slightly from the previous one: The input is
+     This example differs slightly from the previous one: the input is
      processed by the `expand' utility to change TABs into spaces, so
      the widths compared are actually the right-margin columns, as
      opposed to the number of input characters on each line.
@@ -1962,7 +2034,7 @@ different ways to do the same things shown here:
    * Print the total number of bytes used by FILES:
 
           ls -l FILES | awk '{ x += $5 }
-                            END { print "total bytes: " x }'
+                             END { print "total bytes: " x }'
 
    * Print the total number of kilobytes used by FILES:
 
@@ -1981,8 +2053,8 @@ different ways to do the same things shown here:
 
           awk 'NR % 2 == 0' data
 
-     If you use the expression `NR % 2 == 1' instead, the program would
-     print the odd-numbered lines.
+     If you used the expression `NR % 2 == 1' instead, the program
+     would print the odd-numbered lines.
 
 
 File: gawk.info,  Node: Two Rules,  Next: More Complex,  Prev: Very Simple,  Up: Getting Started
@@ -1991,13 +2063,13 @@ File: gawk.info,  Node: Two Rules,  Next: More Complex,  Prev: Very Simple,  Up:
 =============================
 
 The `awk' utility reads the input files one line at a time.  For each
-line, `awk' tries the patterns of each of the rules.  If several
-patterns match, then several actions execute in the order in which they
-appear in the `awk' program.  If no patterns match, then no actions run.
+line, `awk' tries the patterns of each rule.  If several patterns
+match, then several actions execute in the order in which they appear
+in the `awk' program.  If no patterns match, then no actions run.
 
    After processing all the rules that match the line (and perhaps
 there are none), `awk' reads the next line.  (However, *note Next
-Statement::, and also *note Nextfile Statement::).  This continues
+Statement::, and also *note Nextfile Statement::.)  This continues
 until the program reaches the end of the file.  For example, the
 following `awk' program contains two rules:
 
@@ -2061,11 +2133,11 @@ date the file was last modified. Its output looks like this:
 
 The first field contains read-write permissions, the second field
 contains the number of links to the file, and the third field
-identifies the owner of the file. The fourth field identifies the group
-of the file.  The fifth field contains the size of the file in bytes.
-The sixth, seventh, and eighth fields contain the month, day, and time,
+identifies the file's owner.  The fourth field identifies the file's
+group.  The fifth field contains the file's size in bytes.  The sixth,
+seventh, and eighth fields contain the month, day, and time,
 respectively, that the file was last modified.  Finally, the ninth field
-contains the file name.(1)
+contains the file name.
 
    The `$6 == "Nov"' in our `awk' program is an expression that tests
 whether the sixth field of the output from `ls -l' matches the string
@@ -2087,11 +2159,6 @@ displays your output.  By manipulating fields and using `print'
 statements, you can produce some very useful and impressive-looking
 reports.
 
-   ---------- Footnotes ----------
-
-   (1) The `LC_ALL=C' is needed to produce this traditional-style
-output from `ls'.
-
 
 File: gawk.info,  Node: Statements/Lines,  Next: Other Features,  Prev: More Complex,  Up: Getting Started
 
@@ -2140,10 +2207,10 @@ or a string.
      the C shell._  It works for `awk' programs in files and for
      one-shot programs, _provided_ you are using a POSIX-compliant
      shell, such as the Unix Bourne shell or Bash.  But the C shell
-     behaves differently!  There, you must use two backslashes in a
-     row, followed by a newline.  Note also that when using the C
-     shell, _every_ newline in your `awk' program must be escaped with
-     a backslash. To illustrate:
+     behaves differently!  There you must use two backslashes in a row,
+     followed by a newline.  Note also that when using the C shell,
+     _every_ newline in your `awk' program must be escaped with a
+     backslash. To illustrate:
 
           % awk 'BEGIN { \
           ?   print \\
@@ -2220,9 +2287,10 @@ built-in functions for working with timestamps, performing bit
 manipulation, for runtime string translation (internationalization),
 determining the type of a variable, and array sorting.
 
-   As we develop our presentation of the `awk' language, we introduce
-most of the variables and many of the functions. They are described
-systematically in *note Built-in Variables::, and in *note Built-in::.
+   As we develop our presentation of the `awk' language, we will
+introduce most of the variables and many of the functions. They are
+described systematically in *note Built-in Variables::, and in *note
+Built-in::.
 
 
 File: gawk.info,  Node: When,  Next: Intro Summary,  Prev: Other Features,  Up: Getting Started
@@ -2248,8 +2316,8 @@ edit-compile-test-debug cycle of software development.
    Complex programs have been written in `awk', including a complete
 retargetable assembler for eight-bit microprocessors (*note Glossary::,
 for more information), and a microcode assembler for a special-purpose
-Prolog computer.  While the original `awk''s capabilities were strained
-by tasks of such complexity, modern versions are more capable.
+Prolog computer.  The original `awk''s capabilities were strained by
+tasks of such complexity, but modern versions are more capable.
 
    If you find yourself writing `awk' scripts of more than, say, a few
 hundred lines, you might consider using a different programming
@@ -2287,7 +2355,7 @@ File: gawk.info,  Node: Intro Summary,  Prev: When,  Up: Getting Started
 
    * You may use backslash continuation to continue a source line.
      Lines are automatically continued after a comma, open brace,
-     question mark, colon, `||', `&&', `do' and `else'.
+     question mark, colon, `||', `&&', `do', and `else'.
 
 
 File: gawk.info,  Node: Invoking Gawk,  Next: Regexp,  Prev: Getting Started,  Up: Top
@@ -2297,10 +2365,10 @@ File: gawk.info,  Node: Invoking Gawk,  Next: Regexp,  Prev: Getting Started,  U
 
 This major node covers how to run `awk', both POSIX-standard and
 `gawk'-specific command-line options, and what `awk' and `gawk' do with
-non-option arguments.  It then proceeds to cover how `gawk' searches
-for source files, reading standard input along with other files,
-`gawk''s environment variables, `gawk''s exit status, using include
-files, and obsolete and undocumented options and/or features.
+nonoption arguments.  It then proceeds to cover how `gawk' searches for
+source files, reading standard input along with other files, `gawk''s
+environment variables, `gawk''s exit status, using include files, and
+obsolete and undocumented options and/or features.
 
    Many of the options and features described here are discussed in
 more detail later in the Info file; feel free to skip over things in
@@ -2334,8 +2402,8 @@ enclosed in [...] in these templates are optional:
      `awk' [OPTIONS] `-f' PROGFILE [`--'] FILE ...
      `awk' [OPTIONS] [`--'] `'PROGRAM'' FILE ...
 
-   Besides traditional one-letter POSIX-style options, `gawk' also
-supports GNU long options.
+   In addition to traditional one-letter POSIX-style options, `gawk'
+also supports GNU long options.
 
    It is possible to invoke `awk' with an empty program:
 
@@ -2354,8 +2422,8 @@ File: gawk.info,  Node: Options,  Next: Other Arguments,  Prev: Command Line,  U
 Options begin with a dash and consist of a single character.  GNU-style
 long options consist of two dashes and a keyword.  The keyword can be
 abbreviated, as long as the abbreviation allows the option to be
-uniquely identified.  If the option takes an argument, then the keyword
-is either immediately followed by an equals sign (`=') and the
+uniquely identified.  If the option takes an argument, either the
+keyword is immediately followed by an equals sign (`=') and the
 argument's value, or the keyword and the argument's value are separated
 by whitespace.  If a particular option with a value is given more than
 once, it is the last value that counts.
@@ -2370,10 +2438,10 @@ The following list describes options mandated by the POSIX standard:
 
 `-f SOURCE-FILE'
 `--file SOURCE-FILE'
-     Read `awk' program source from SOURCE-FILE instead of in the first
-     non-option argument.  This option may be given multiple times; the
-     `awk' program consists of the concatenation of the contents of
-     each specified SOURCE-FILE.
+     Read the `awk' program source from SOURCE-FILE instead of in the
+     first nonoption argument.  This option may be given multiple
+     times; the `awk' program consists of the concatenation of the
+     contents of each specified SOURCE-FILE.
 
 `-v VAR=VAL'
 `--assign VAR=VAL'
@@ -2388,7 +2456,7 @@ The following list describes options mandated by the POSIX standard:
           CAUTION: Using `-v' to set the values of the built-in
           variables may lead to surprising results.  `awk' will reset
           the values of those variables as it needs to, possibly
-          ignoring any predefined value you may have given.
+          ignoring any initial value you may have given.
 
 `-W GAWK-OPT'
      Provide an implementation-specific option.  This is the POSIX
@@ -2414,7 +2482,7 @@ The following list describes options mandated by the POSIX standard:
 `-b'
 `--characters-as-bytes'
      Cause `gawk' to treat all input data as single-byte characters.
-     In addition, all output written with `print' or `printf' are
+     In addition, all output written with `print' or `printf' is
      treated as single-byte characters.
 
      Normally, `gawk' follows the POSIX standard and attempts to process
@@ -2422,7 +2490,7 @@ The following list describes options mandated by the POSIX standard:
      This can often involve converting multibyte characters into wide
      characters (internally), and can lead to problems or confusion if
      the input data does not contain valid multibyte characters. This
-     option is an easy way to tell `gawk': "hands off my data!".
+     option is an easy way to tell `gawk', "Hands off my data!"
 
 `-c'
 `--traditional'
@@ -2439,9 +2507,9 @@ The following list describes options mandated by the POSIX standard:
 `-d'[FILE]
 `--dump-variables'[`='FILE]
      Print a sorted list of global variables, their types, and final
-     values to FILE.  If no FILE is provided, print this list to the
-     file named `awkvars.out' in the current directory.  No space is
-     allowed between the `-d' and FILE, if FILE is supplied.
+     values to FILE.  If no FILE is provided, print this list to a file
+     named `awkvars.out' in the current directory.  No space is allowed
+     between the `-d' and FILE, if FILE is supplied.
 
      Having a list of all global variables is a good way to look for
      typographical errors in your programs.  You would also use this
@@ -2455,10 +2523,10 @@ The following list describes options mandated by the POSIX standard:
 `--debug'[`='FILE]
      Enable debugging of `awk' programs (*note Debugging::).  By
      default, the debugger reads commands interactively from the
-     keyboard.  The optional FILE argument allows you to specify a file
-     with a list of commands for the debugger to execute
-     non-interactively.  No space is allowed between the `-D' and FILE,
-     if FILE is supplied.
+     keyboard (standard input).  The optional FILE argument allows you
+     to specify a file with a list of commands for the debugger to
+     execute noninteractively.  No space is allowed between the `-D'
+     and FILE, if FILE is supplied.
 
 `-e' PROGRAM-TEXT
 `--source' PROGRAM-TEXT
@@ -2483,8 +2551,8 @@ The following list describes options mandated by the POSIX standard:
      applications that pass arguments through the URL; using this
      option prevents a malicious (or other) user from passing in
      options, assignments, or `awk' source code (via `-e') to the CGI
-     application.  This option should be used with `#!' scripts (*note
-     Executable Scripts::), like so:
+     application.(1) This option should be used with `#!' scripts
+     (*note Executable Scripts::), like so:
 
           #! /usr/local/bin/gawk -E
 
@@ -2492,23 +2560,23 @@ The following list describes options mandated by the POSIX standard:
 
 `-g'
 `--gen-pot'
-     Analyze the source program and generate a GNU `gettext' Portable
-     Object Template file on standard output for all string constants
+     Analyze the source program and generate a GNU `gettext' portable
+     object template file on standard output for all string constants
      that have been marked for translation.  *Note
      Internationalization::, for information about this option.
 
 `-h'
 `--help'
-     Print a "usage" message summarizing the short and long style
+     Print a "usage" message summarizing the short- and long-style
      options that `gawk' accepts and then exit.
 
 `-i' SOURCE-FILE
 `--include' SOURCE-FILE
-     Read `awk' source library from SOURCE-FILE.  This option is
+     Read an `awk' source library from SOURCE-FILE.  This option is
      completely equivalent to using the `@include' directive inside
-     your program.  This option is very similar to the `-f' option, but
-     there are two important differences.  First, when `-i' is used,
-     the program source is not loaded if it has been previously loaded,
+     your program.  It is very similar to the `-f' option, but there
+     are two important differences.  First, when `-i' is used, the
+     program source is not loaded if it has been previously loaded,
      whereas with `-f', `gawk' always loads the file.  Second, because
      this option is intended to be used with code libraries, `gawk'
      does not recognize such files as constituting main program input.
@@ -2525,8 +2593,8 @@ The following list describes options mandated by the POSIX standard:
      not be specified in the extension name.  The extension
      initialization routine should be named `dl_load()'.  An
      alternative is to use the `@load' keyword inside the program to
-     load a shared library.  This feature is described in detail in
-     *note Dynamic Extensions::.
+     load a shared library.  This advanced feature is described in
+     detail in *note Dynamic Extensions::.
 
 `-L'[VALUE]
 `--lint'[`='VALUE]
@@ -2550,7 +2618,7 @@ The following list describes options mandated by the POSIX standard:
 
 `-M'
 `--bignum'
-     Force arbitrary precision arithmetic on numbers. This option has
+     Force arbitrary-precision arithmetic on numbers. This option has
      no effect if `gawk' is not compiled to use the GNU MPFR and MP
      libraries (*note Arbitrary Precision Arithmetic::).
 
@@ -2560,7 +2628,8 @@ The following list describes options mandated by the POSIX standard:
      input data (*note Nondecimal Data::).
 
           CAUTION: This option can severely break old programs.  Use
-          with care.
+          with care.  Also note that this option may disappear in a
+          future version of `gawk'.
 
 `-N'
 `--use-lc-numeric'
@@ -2569,7 +2638,7 @@ The following list describes options mandated by the POSIX standard:
 
 `-o'[FILE]
 `--pretty-print'[`='FILE]
-     Enable pretty-printing of `awk' programs.  By default, output
+     Enable pretty-printing of `awk' programs.  By default, the output
      program is created in a file named `awkprof.out' (*note
      Profiling::).  The optional FILE argument allows you to specify a
      different file name for the output.  No space is allowed between
@@ -2581,7 +2650,8 @@ The following list describes options mandated by the POSIX standard:
 `-O'
 `--optimize'
      Enable some optimizations on the internal representation of the
-     program.  At the moment this includes just simple constant folding.
+     program.  At the moment, this includes just simple constant
+     folding.
 
 `-p'[FILE]
 `--profile'[`='FILE]
@@ -2624,8 +2694,8 @@ The following list describes options mandated by the POSIX standard:
 `--re-interval'
      Allow interval expressions (*note Regexp Operators::) in regexps.
      This is now `gawk''s default behavior.  Nevertheless, this option
-     remains both for backward compatibility, and for use in
-     combination with `--traditional'.
+     remains (both for backward compatibility and for use in
+     combination with `--traditional').
 
 `-S'
 `--sandbox'
@@ -2661,25 +2731,26 @@ it is, `awk' reads its program source from all of the named files, as
 if they had been concatenated together into one big file.  This is
 useful for creating libraries of `awk' functions.  These functions can
 be written once and then retrieved from a standard place, instead of
-having to be included into each individual program.  (As mentioned in
-*note Definition Syntax::, function names must be unique.)
+having to be included in each individual program.  The `-i' option is
+similar in this regard.  (As mentioned in *note Definition Syntax::,
+function names must be unique.)
 
    With standard `awk', library functions can still be used, even if
 the program is entered at the keyboard, by specifying `-f /dev/tty'.
 After typing your program, type `Ctrl-d' (the end-of-file character) to
 terminate it.  (You may also use `-f -' to read program source from the
-standard input but then you will not be able to also use the standard
+standard input, but then you will not be able to also use the standard
 input as a source of data.)
 
    Because it is clumsy using the standard `awk' mechanisms to mix
 source file and command-line `awk' programs, `gawk' provides the `-e'
-option.  This does not require you to pre-empt the standard input for
+option.  This does not require you to preempt the standard input for
 your source code; it allows you to easily mix command-line and library
 source code (*note AWKPATH Variable::).  As with `-f', the `-e' and `-i'
 options may also be used multiple times on the command line.
 
    If no `-f' or `-e' option is specified, then `gawk' uses the first
-non-option command-line argument as the text of the program source code.
+nonoption command-line argument as the text of the program source code.
 
    If the environment variable `POSIXLY_CORRECT' exists, then `gawk'
 behaves in strict POSIX mode, exactly as if you had supplied `--posix'.
@@ -2696,7 +2767,7 @@ you would add these lines to the `.profile' file in your home directory:
      POSIXLY_CORRECT=true
      export POSIXLY_CORRECT
 
-   For a C shell-compatible shell,(1) you would add this line to the
+   For a C shell-compatible shell,(2) you would add this line to the
 `.login' file in your home directory:
 
      setenv POSIXLY_CORRECT true
@@ -2707,7 +2778,12 @@ environments.
 
    ---------- Footnotes ----------
 
-   (1) Not recommended.
+   (1) For more detail, please see Section 4.4 of RFC 3875
+(http://www.ietf.org/rfc/rfc3875). Also see the explanatory note sent
+to the `gawk' bug mailing list
+(http://lists.gnu.org/archive/html/bug-gawk/2014-11/msg00022.html).
+
+   (2) Not recommended.
 
 
 File: gawk.info,  Node: Other Arguments,  Next: Naming Standard Input,  Prev: Options,  Up: Invoking Gawk
@@ -2719,14 +2795,17 @@ Any additional arguments on the command line are normally treated as
 input files to be processed in the order specified.   However, an
 argument that has the form `VAR=VALUE', assigns the value VALUE to the
 variable VAR--it does not specify a file at all.  (See *note Assignment
-Options::.)
+Options::.) In the following example, COUNT=1 is a variable assignment,
+not a file name:
+
+     awk -f program.awk file1 count=1 file2
 
-   All these arguments are made available to your `awk' program in the
-`ARGV' array (*note Built-in Variables::).  Command-line options and
-the program text (if present) are omitted from `ARGV'.  All other
-arguments, including variable assignments, are included.   As each
-element of `ARGV' is processed, `gawk' sets the variable `ARGIND' to
-the index in `ARGV' of the current element.
+   All the command-line arguments are made available to your `awk'
+program in the `ARGV' array (*note Built-in Variables::).  Command-line
+options and the program text (if present) are omitted from `ARGV'.  All
+other arguments, including variable assignments, are included.   As
+each element of `ARGV' is processed, `gawk' sets `ARGIND' to the index
+in `ARGV' of the current element.
 
    Changing `ARGC' and `ARGV' in your `awk' program lets you control
 how `awk' processes the input files; this is described in more detail
@@ -2820,56 +2899,64 @@ File: gawk.info,  Node: AWKPATH Variable,  Next: AWKLIBPATH Variable,  Up: Envir
 
 The previous minor node described how `awk' program files can be named
 on the command line with the `-f' option.  In most `awk'
-implementations, you must supply a precise path name for each program
-file, unless the file is in the current directory.  But in `gawk', if
+implementations, you must supply a precise pathname for each program
+file, unless the file is in the current directory.  But with `gawk', if
 the file name supplied to the `-f' or `-i' options does not contain a
 directory separator `/', then `gawk' searches a list of directories
-(called the "search path"), one by one, looking for a file with the
+(called the "search path") one by one, looking for a file with the
 specified name.
 
 The search path is a string consisting of directory names separated by
-colons(1).  `gawk' gets its search path from the `AWKPATH' environment
-variable.  If that variable does not exist, `gawk' uses a default path,
-`.:/usr/local/share/awk'.(2)
+colons.(1) `gawk' gets its search path from the `AWKPATH' environment
+variable.  If that variable does not exist, or if it has an empty value,
+`gawk' uses a default path (described shortly).
 
    The search path feature is particularly helpful for building
 libraries of useful `awk' functions.  The library files can be placed
 in a standard directory in the default path and then specified on the
-command line with a short file name.  Otherwise, the full file name
-would have to be typed for each file.
+command line with a short file name.  Otherwise, you would have to type
+the full file name for each file.
 
-   By using the `-i' option, or the `-e' and `-f' options, your
-command-line `awk' programs can use facilities in `awk' library files
-(*note Library Functions::).  Path searching is not done if `gawk' is
-in compatibility mode.  This is true for both `--traditional' and
-`--posix'.  *Note Options::.
+   By using the `-i' or `-f' options, your command-line `awk' programs
+can use facilities in `awk' library files (*note Library Functions::).
+Path searching is not done if `gawk' is in compatibility mode.  This is
+true for both `--traditional' and `--posix'.  *Note Options::.
 
-   If the source code is not found after the initial search, the path
-is searched again after adding the default `.awk' suffix to the file
-name.
+   If the source code file is not found after the initial search, the
+path is searched again after adding the suffix `.awk' to the file name.
+
+   `gawk''s path search mechanism is similar to the shell's.  (See `The
+Bourne-Again SHell manual' (http://www.gnu.org/software/bash/manual/).)
+It treats a null entry in the path as indicating the current directory.
+(A null entry is indicated by starting or ending the path with a colon
+or by placing two colons next to each other [`::'].)
 
      NOTE: To include the current directory in the path, either place
-     `.' explicitly in the path or write a null entry in the path.  (A
-     null entry is indicated by starting or ending the path with a
-     colon or by placing two colons next to each other [`::'].)  This
-     path search mechanism is similar to the shell's.  (See `The
-     Bourne-Again SHell manual'.
-     (http://www.gnu.org/software/bash/manual/))
-
-     However, `gawk' always looks in the current directory _before_
-     searching `AWKPATH', so there is no real reason to include the
-     current directory in the search path.
-
-   If `AWKPATH' is not defined in the environment, `gawk' places its
-default search path into `ENVIRON["AWKPATH"]'. This makes it easy to
-determine the actual search path that `gawk' used from within an `awk'
-program.
+     `.'  as an entry in the path or write a null entry in the path.
+
+     Different past versions of `gawk' would also look explicitly in
+     the current directory, either before or after the path search.  As
+     of version 4.1.2, this no longer happens; if you wish to look in
+     the current directory, you must include `.' either as a separate
+     entry or as a null entry in the search path.
+
+   The default value for `AWKPATH' is `.:/usr/local/share/awk'.(2)
+Since `.' is included at the beginning, `gawk' searches first in the
+current directory and then in `/usr/local/share/awk'.  In practice,
+this means that you will rarely need to change the value of `AWKPATH'.
 
-   While you can change `ENVIRON["AWKPATH"]' within your `awk' program,
-this has no effect on the running program's behavior.  This makes
-sense: the `AWKPATH' environment variable is used to find the program
-source files.  Once your program is running, all the files have been
-found, and `gawk' no longer needs to use `AWKPATH'.
+   *Note Shell Startup Files::, for information on functions that help
+to manipulate the `AWKPATH' variable.
+
+   `gawk' places the value of the search path that it used into
+`ENVIRON["AWKPATH"]'. This provides access to the actual search path
+value from within an `awk' program.
+
+   Although you can change `ENVIRON["AWKPATH"]' within your `awk'
+program, this has no effect on the running program's behavior.  This
+makes sense: the `AWKPATH' environment variable is used to find the
+program source files.  Once your program is running, all the files have
+been found, and `gawk' no longer needs to use `AWKPATH'.
 
    ---------- Footnotes ----------
 
@@ -2895,6 +2982,18 @@ platform.  For example, on GNU/Linux systems, the suffix `.so' is used.
 The search path specified is also used for extensions loaded via the
 `@load' keyword (*note Loading Shared Libraries::).
 
+   If `AWKLIBPATH' does not exist in the environment, or if it has an
+empty value, `gawk' uses a default path; this is typically
+`/usr/local/lib/gawk', although it can vary depending upon how `gawk'
+was built.
+
+   *Note Shell Startup Files::, for information on functions that help
+to manipulate the `AWKLIBPATH' variable.
+
+   `gawk' places the value of the search path that it used into
+`ENVIRON["AWKLIBPATH"]'. This provides access to the actual search path
+value from within an `awk' program.
+
 
 File: gawk.info,  Node: Other Environment Variables,  Prev: AWKLIBPATH Variable,  Up: Environment Variables
 
@@ -2903,16 +3002,7 @@ File: gawk.info,  Node: Other Environment Variables,  Prev: AWKLIBPATH Variable,
 
 A number of other environment variables affect `gawk''s behavior, but
 they are more specialized. Those in the following list are meant to be
-used by regular users.
-
-`POSIXLY_CORRECT'
-     Causes `gawk' to switch to POSIX compatibility mode, disabling all
-     traditional and GNU extensions.  *Note Options::.
-
-`GAWK_SOCK_RETRIES'
-     Controls the number of times `gawk' attempts to retry a two-way
-     TCP/IP (socket) connection before giving up.  *Note TCP/IP
-     Networking::.
+used by regular users:
 
 `GAWK_MSEC_SLEEP'
      Specifies the interval between connection retries, in
@@ -2923,6 +3013,16 @@ used by regular users.
      Specifies the time, in milliseconds, for `gawk' to wait for input
      before returning with an error.  *Note Read Timeout::.
 
+`GAWK_SOCK_RETRIES'
+     Controls the number of times `gawk' attempts to retry a two-way
+     TCP/IP (socket) connection before giving up.  *Note TCP/IP
+     Networking::.  Note that when nonfatal I/O is enabled (*note
+     Nonfatal::), `gawk' only tries to open a TCP/IP socket once.
+
+`POSIXLY_CORRECT'
+     Causes `gawk' to switch to POSIX-compatibility mode, disabling all
+     traditional and GNU extensions.  *Note Options::.
+
    The environment variables in the following list are meant for use by
 the `gawk' developers for testing and tuning.  They are subject to
 change. The variables are:
@@ -2934,7 +3034,7 @@ change. The variables are:
      the value should be a number, and `gawk' uses that number as the
      size of the buffer to allocate.  (When this variable is not set,
      `gawk' uses the smaller of the file's size and the "default"
-     blocksize, which is usually the filesystems I/O blocksize.)
+     blocksize, which is usually the filesystem's I/O blocksize.)
 
 `AWK_HASH'
      If this variable exists with a value of `gst', `gawk' switches to
@@ -2948,11 +3048,11 @@ change. The variables are:
      where I/O is performed in records, not in blocks.
 
 `GAWK_MSG_SRC'
-     If this variable exists, `gawk' includes the source file name and
-     line number from which warning and/or fatal messages are
-     generated.  Its purpose is to help isolate the source of a
-     message, since there can be multiple places which produce the same
-     warning or error message.
+     If this variable exists, `gawk' includes the file name and line
+     number within the `gawk' source code from which warning and/or
+     fatal messages are generated.  Its purpose is to help isolate the
+     source of a message, as there are multiple places that produce the
+     same warning or error message.
 
 `GAWK_NO_DFA'
      If this variable exists, `gawk' does not use the DFA regexp matcher
@@ -2967,16 +3067,16 @@ change. The variables are:
      evaluation stack, when needed.
 
 `INT_CHAIN_MAX'
-     The average number of items `gawk' will maintain on a hash chain
-     for managing arrays indexed by integers.
+     This specifies intended maximum number of items `gawk' will
+     maintain on a hash chain for managing arrays indexed by integers.
 
 `STR_CHAIN_MAX'
-     The average number of items `gawk' will maintain on a hash chain
-     for managing arrays indexed by strings.
+     This specifies intended maximum number of items `gawk' will
+     maintain on a hash chain for managing arrays indexed by strings.
 
 `TIDYMEM'
      If this variable exists, `gawk' uses the `mtrace()' library calls
-     from GNU LIBC to help track down possible memory leaks.
+     from the GNU C library to help track down possible memory leaks.
 
 
 File: gawk.info,  Node: Exit Status,  Next: Include Files,  Prev: Environment Variables,  Up: Invoking Gawk
@@ -2993,13 +3093,13 @@ with the value of the C constant `EXIT_SUCCESS'.  This is usually zero.
    If an error occurs, `gawk' exits with the value of the C constant
 `EXIT_FAILURE'.  This is usually one.
 
-   If `gawk' exits because of a fatal error, the exit status is 2.  On
-non-POSIX systems, this value may be mapped to `EXIT_FAILURE'.
+   If `gawk' exits because of a fatal error, the exit status is two.
+On non-POSIX systems, this value may be mapped to `EXIT_FAILURE'.
 
 
 File: gawk.info,  Node: Include Files,  Next: Loading Shared Libraries,  Prev: Exit Status,  Up: Invoking Gawk
 
-2.7 Including Other Files Into Your Program
+2.7 Including Other Files into Your Program
 ===========================================
 
 This minor node describes a feature that is specific to `gawk'.
@@ -3008,11 +3108,11 @@ This minor node describes a feature that is specific to `gawk'.
 files.  This gives you the ability to split large `awk' source files
 into smaller, more manageable pieces, and also lets you reuse common
 `awk' code from various `awk' scripts.  In other words, you can group
-together `awk' functions, used to carry out specific tasks, into
-external files. These files can be used just like function libraries,
-using the `@include' keyword in conjunction with the `AWKPATH'
-environment variable.  Note that source files may also be included
-using the `-i' option.
+together `awk' functions used to carry out specific tasks into external
+files. These files can be used just like function libraries, using the
+`@include' keyword in conjunction with the `AWKPATH' environment
+variable.  Note that source files may also be included using the `-i'
+option.
 
    Let's see an example.  We'll start with two (trivial) `awk' scripts,
 namely `test1' and `test2'. Here is the `test1' script:
@@ -3031,12 +3131,12 @@ and here is `test2':
    Running `gawk' with `test2' produces the following result:
 
      $ gawk -f test2
-     -| This is file test1.
-     -| This is file test2.
+     -| This is script test1.
+     -| This is script test2.
 
-   `gawk' runs the `test2' script which includes `test1' using the
-`@include' keyword.  So, to include external `awk' source files you just
-use `@include' followed by the name of the file to be included,
+   `gawk' runs the `test2' script, which includes `test1' using the
+`@include' keyword.  So, to include external `awk' source files, you
+just use `@include' followed by the name of the file to be included,
 enclosed in double quotes.
 
      NOTE: Keep in mind that this is a language construct and the file
@@ -3054,31 +3154,31 @@ namely `test3':
 Running `gawk' with the `test3' script produces the following results:
 
      $ gawk -f test3
-     -| This is file test1.
-     -| This is file test2.
-     -| This is file test3.
+     -| This is script test1.
+     -| This is script test2.
+     -| This is script test3.
 
    The file name can, of course, be a pathname. For example:
 
      @include "../io_funcs"
 
-or:
+and:
 
      @include "/usr/awklib/network"
 
-are valid. The `AWKPATH' environment variable can be of great value
-when using `@include'. The same rules for the use of the `AWKPATH'
-variable in command-line file searches (*note AWKPATH Variable::) apply
-to `@include' also.
+are both valid. The `AWKPATH' environment variable can be of great
+value when using `@include'. The same rules for the use of the
+`AWKPATH' variable in command-line file searches (*note AWKPATH
+Variable::) apply to `@include' also.
 
    This is very helpful in constructing `gawk' function libraries.  If
-you have a large script with useful, general purpose `awk' functions,
+you have a large script with useful, general-purpose `awk' functions,
 you can break it down into library files and put those files in a
-special directory.  You can then include those "libraries," using
-either the full pathnames of the files, or by setting the `AWKPATH'
+special directory.  You can then include those "libraries," either by
+using the full pathnames of the files, or by setting the `AWKPATH'
 environment variable accordingly and then using `@include' with just
-the file part of the full pathname. Of course you can have more than
-one directory to keep library files; the more complex the working
+the file part of the full pathname. Of course, you can keep library
+files in more than one directory; the more complex the working
 environment is, the more directories you may need to organize the files
 to be included.
 
@@ -3090,13 +3190,13 @@ particular, `@include' is very useful for writing CGI scripts to be run
 from web pages.
 
    As mentioned in *note AWKPATH Variable::, the current directory is
-always searched first for source files, before searching in `AWKPATH',
-and this also applies to files named with `@include'.
+always searched first for source files, before searching in `AWKPATH';
+this also applies to files named with `@include'.
 
 
 File: gawk.info,  Node: Loading Shared Libraries,  Next: Obsolete,  Prev: Include Files,  Up: Invoking Gawk
 
-2.8 Loading Dynamic Extensions Into Your Program
+2.8 Loading Dynamic Extensions into Your Program
 ================================================
 
 This minor node describes a feature that is specific to `gawk'.
@@ -3111,7 +3211,7 @@ The `AWKLIBPATH' variable is used to search for the extension.  Using
    If the extension is not initially found in `AWKLIBPATH', another
 search is conducted after appending the platform's default shared
 library suffix to the file name.  For example, on GNU/Linux systems,
-the suffix `.so' is used.
+the suffix `.so' is used:
 
      $ gawk '@load "ordchr"; BEGIN {print chr(65)}'
      -| A
@@ -3126,7 +3226,8 @@ is useful for embedding inside an `awk' source file that requires
 access to an extension.
 
    *note Dynamic Extensions::, describes how to write extensions (in C
-or C++) that can be loaded with either `@load' or the `-l' option.
+or C++) that can be loaded with either `@load' or the `-l' option.  It
+also describes the `ordchr' extension.
 
 
 File: gawk.info,  Node: Obsolete,  Next: Undocumented,  Prev: Loading Shared Libraries,  Up: Invoking Gawk
@@ -3135,8 +3236,8 @@ File: gawk.info,  Node: Obsolete,  Next: Undocumented,  Prev: Loading Shared Lib
 ====================================
 
 This minor node describes features and/or command-line options from
-previous releases of `gawk' that are either not available in the
-current version or that are still supported but deprecated (meaning that
+previous releases of `gawk' that either are not available in the
+current version or are still supported but deprecated (meaning that
 they will _not_ be in the next release).
 
    The process-related special files `/dev/pid', `/dev/ppid',
@@ -3164,20 +3265,21 @@ File: gawk.info,  Node: Invoking Summary,  Prev: Undocumented,  Up: Invoking Gaw
      run `awk'.
 
    * The three standard options for all versions of `awk' are `-f',
-     `-F' and `-v'.  `gawk' supplies these and many others, as well as
+     `-F', and `-v'.  `gawk' supplies these and many others, as well as
      corresponding GNU-style long options.
 
-   * Non-option command-line arguments are usually treated as file
-     names, unless they have the form `VAR=VALUE', in which case they
-     are taken as variable assignments to be performed at that point in
+   * Nonoption command-line arguments are usually treated as file names,
+     unless they have the form `VAR=VALUE', in which case they are
+     taken as variable assignments to be performed at that point in
      processing the input.
 
-   * All non-option command-line arguments, excluding the program text,
+   * All nonoption command-line arguments, excluding the program text,
      are placed in the `ARGV' array.  Adjusting `ARGC' and `ARGV'
      affects how `awk' processes input.
 
    * You can use a single minus sign (`-') to refer to standard input
-     on the command line.
+     on the command line. `gawk' also lets you use the special file
+     name `/dev/stdin'.
 
    * `gawk' pays attention to a number of environment variables.
      `AWKPATH', `AWKLIBPATH', and `POSIXLY_CORRECT' are the most
@@ -3193,7 +3295,7 @@ File: gawk.info,  Node: Invoking Summary,  Prev: Undocumented,  Up: Invoking Gaw
 
    * `gawk' allows you to load additional functions written in C or C++
      using the `@load' statement and/or the `-l' option.  (This
-     advanced feature is described later on in *note Dynamic
+     advanced feature is described later, in *note Dynamic
      Extensions::.)
 
 
@@ -3210,7 +3312,7 @@ strings.  Because regular expressions are such a fundamental part of
 that matches every input record whose text belongs to that set.  The
 simplest regular expression is a sequence of letters, numbers, or both.
 Such a regexp matches any string that contains that sequence.  Thus,
-the regexp `foo' matches any string containing `foo'.  Therefore, the
+the regexp `foo' matches any string containing `foo'.  Thus, the
 pattern `/foo/' matches any input record containing the three adjacent
 characters `foo' _anywhere_ in the record.  Other kinds of regexps let
 you specify more complicated classes of strings.
@@ -3251,13 +3353,13 @@ expressions allow you to specify the string to match against; it need
 not be the entire current input record.  The two operators `~' and `!~'
 perform regular expression comparisons.  Expressions using these
 operators can be used as patterns, or in `if', `while', `for', and `do'
-statements.  (*Note Statements::.)  For example:
+statements.  (*Note Statements::.)  For example, the following is true
+if the expression EXP (taken as a string) matches REGEXP:
 
      EXP ~ /REGEXP/
 
-is true if the expression EXP (taken as a string) matches REGEXP.  The
-following example matches, or selects, all input records with the
-uppercase letter `J' somewhere in the first field:
+This example matches, or selects, all input records with the uppercase
+letter `J' somewhere in the first field:
 
      $ awk '$1 ~ /J/' inventory-shipped
      -| Jan  13  25  15 115
@@ -3311,13 +3413,13 @@ string or regexp.  Thus, the string whose contents are the two
 characters `"' and `\' must be written `"\"\\"'.
 
    Other escape sequences represent unprintable characters such as TAB
-or newline.  While there is nothing to stop you from entering most
+or newline.  There is nothing to stop you from entering most
 unprintable characters directly in a string constant or regexp constant,
-they may look ugly.
+but they may look ugly.
 
-   The following table lists all the escape sequences used in `awk' and
-what they represent. Unless noted otherwise, all these escape sequences
-apply to both string constants and regexp constants:
+   The following list presents all the escape sequences used in `awk'
+and what they represent. Unless noted otherwise, all these escape
+sequences apply to both string constants and regexp constants:
 
 `\\'
      A literal backslash, `\'.
@@ -3342,7 +3444,7 @@ apply to both string constants and regexp constants:
      Horizontal TAB, `Ctrl-i', ASCII code 9 (HT).
 
 `\v'
-     Vertical tab, `Ctrl-k', ASCII code 11 (VT).
+     Vertical TAB, `Ctrl-k', ASCII code 11 (VT).
 
 `\NNN'
      The octal value NNN, where NNN stands for 1 to 3 digits between
@@ -3354,20 +3456,21 @@ apply to both string constants and regexp constants:
      hexadecimal digits (`0'-`9', and either `A'-`F' or `a'-`f').  A
      maximum of two digts are allowed after the `\x'. Any further
      hexadecimal digits are treated as simple letters or numbers.
-     (c.e.)
+     (c.e.)  (The `\x' escape sequence is not allowed in POSIX awk.)
 
           CAUTION: In ISO C, the escape sequence continues until the
           first nonhexadecimal digit is seen.  For many years, `gawk'
           would continue incorporating hexadecimal digits into the
           value until a non-hexadecimal digit or the end of the string
           was encountered.  However, using more than two hexadecimal
-          digits produces
+          digits produced undefined results.  As of version 4.2, only
+          two digits are processed.
 
 `\/'
      A literal slash (necessary for regexp constants only).  This
      sequence is used when you want to write a regexp constant that
      contains a slash (such as `/.*:\/home\/[[:alnum:]]+:.*/'; the
-     `[[:alnum:]]' notation is discussed shortly, in *note Bracket
+     `[[:alnum:]]' notation is discussed in *note Bracket
      Expressions::).  Because the regexp is delimited by slashes, you
      need to escape any slash that is part of the pattern, in order to
      tell `awk' to keep processing the rest of the regexp.
@@ -3391,20 +3494,7 @@ normally be a regexp operator.  For example, `/a\+b/' matches the three
 characters `a+b'.
 
    For complete portability, do not use a backslash before any
-character not shown in the previous list.
-
-   To summarize:
-
-   * The escape sequences in the table above are always processed first,
-     for both string constants and regexp constants. This happens very
-     early, as soon as `awk' reads your program.
-
-   * `gawk' processes both regexp constants and dynamic regexps (*note
-     Computed Regexps::), for the special operators listed in *note GNU
-     Regexp Operators::.
-
-   * A backslash before any other character means to treat that
-     character literally.
+character not shown in the previous list or that is not an operator.
 
                   Backslash Before Regular Characters
 
@@ -3424,6 +3514,19 @@ Leave the backslash alone
      Some other `awk' implementations do this.  In such
      implementations, typing `"a\qc"' is the same as typing `"a\\qc"'.
 
+   To summarize:
+
+   * The escape sequences in the preceding list are always processed
+     first, for both string constants and regexp constants. This
+     happens very early, as soon as `awk' reads your program.
+
+   * `gawk' processes both regexp constants and dynamic regexps (*note
+     Computed Regexps::), for the special operators listed in *note GNU
+     Regexp Operators::.
+
+   * A backslash before any other character means to treat that
+     character literally.
+
                   Escape Sequences for Metacharacters
 
    Suppose you use an octal or hexadecimal escape to represent a regexp
@@ -3453,18 +3556,18 @@ and converted into corresponding real characters as the very first step
 in processing regexps.
 
    Here is a list of metacharacters.  All characters that are not escape
-sequences and that are not listed in the table stand for themselves:
+sequences and that are not listed here stand for themselves:
 
 `\'
-     This is used to suppress the special meaning of a character when
-     matching.  For example, `\$' matches the character `$'.
+     This suppresses the special meaning of a character when matching.
+     For example, `\$' matches the character `$'.
 
 `^'
-     This matches the beginning of a string.  For example, `^@chapter'
-     matches `@chapter' at the beginning of a string and can be used to
-     identify chapter beginnings in Texinfo source files.  The `^' is
-     known as an "anchor", because it anchors the pattern to match only
-     at the beginning of the string.
+     This matches the beginning of a string.  `^@chapter' matches
+     `@chapter' at the beginning of a string, for example, and can be
+     used to identify chapter beginnings in Texinfo source files.  The
+     `^' is known as an "anchor", because it anchors the pattern to
+     match only at the beginning of the string.
 
      It is important to realize that `^' does not match the beginning of
      a line (the point right after a `\n' newline character) embedded
@@ -3536,10 +3639,10 @@ sequences and that are not listed in the table stand for themselves:
      There are two subtle points to understand about how `*' works.
      First, the `*' applies only to the single preceding regular
      expression component (e.g., in `ph*', it applies just to the `h').
-     To cause `*' to apply to a larger sub-expression, use parentheses:
-     `(ph)*' matches `ph', `phph', `phphph' and so on.
+     To cause `*' to apply to a larger subexpression, use parentheses:
+     `(ph)*' matches `ph', `phph', `phphph', and so on.
 
-     Second, `*' finds as many repetititons as possible. If the text to
+     Second, `*' finds as many repetitions as possible. If the text to
      be matched is `phhhhhhhhhhhhhhooey', `ph*' matches all of the `h's.
 
 `+'
@@ -3567,10 +3670,10 @@ sequences and that are not listed in the table stand for themselves:
           Matches `whhhy', but not `why' or `whhhhy'.
 
     `wh{3,5}y'
-          Matches `whhhy', `whhhhy', or `whhhhhy', only.
+          Matches `whhhy', `whhhhy', or `whhhhhy' only.
 
     `wh{2,}y'
-          Matches `whhy' or `whhhy', and so on.
+          Matches `whhy', `whhhy', and so on.
 
      Interval expressions were not traditionally available in `awk'.
      They were added as part of the POSIX standard to make `awk' and
@@ -3621,7 +3724,7 @@ File: gawk.info,  Node: Bracket Expressions,  Next: Leftmost Longest,  Prev: Reg
 3.4 Using Bracket Expressions
 =============================
 
-As mentioned earlier, a bracket expression matches any character amongst
+As mentioned earlier, a bracket expression matches any character among
 those listed between the opening and closing square brackets.
 
    Within a bracket expression, a "range expression" consists of two
@@ -3641,8 +3744,8 @@ matches either `d' or `]'.  Additionally, if you place `]' right after
 the opening `[', the closing bracket is treated as one of the
 characters to be matched.
 
-   This treatment of `\' in bracket expressions is compatible with
-other `awk' implementations and is also mandated by POSIX.  The regular
+   The treatment of `\' in bracket expressions is compatible with other
+`awk' implementations and is also mandated by POSIX.  The regular
 expressions in `awk' are a superset of the POSIX specification for
 Extended Regular Expressions (EREs).  POSIX EREs are based on the
 regular expressions accepted by the traditional `egrep' utility.
@@ -3661,24 +3764,24 @@ character classes defined by the POSIX standard.
 
 Class       Meaning
 -------------------------------------------------------------------------- 
-`[:alnum:]' Alphanumeric characters.
-`[:alpha:]' Alphabetic characters.
-`[:blank:]' Space and TAB characters.
-`[:cntrl:]' Control characters.
-`[:digit:]' Numeric characters.
-`[:graph:]' Characters that are both printable and visible.  (A space is
-            printable but not visible, whereas an `a' is both.)
-`[:lower:]' Lowercase alphabetic characters.
+`[:alnum:]' Alphanumeric characters
+`[:alpha:]' Alphabetic characters
+`[:blank:]' Space and TAB characters
+`[:cntrl:]' Control characters
+`[:digit:]' Numeric characters
+`[:graph:]' Characters that are both printable and visible (a space is
+            printable but not visible, whereas an `a' is both)
+`[:lower:]' Lowercase alphabetic characters
 `[:print:]' Printable characters (characters that are not control
-            characters).
+            characters)
 `[:punct:]' Punctuation characters (characters that are not letters,
-            digits, control characters, or space characters).
+            digits, control characters, or space characters)
 `[:space:]' Space characters (such as space, TAB, and formfeed, to name
-            a few).
-`[:upper:]' Uppercase alphabetic characters.
-`[:xdigit:]'Characters that are hexadecimal digits.
+            a few)
+`[:upper:]' Uppercase alphabetic characters
+`[:xdigit:]'Characters that are hexadecimal digits
 
-Table 3.1: POSIX Character Classes
+Table 3.1: POSIX character classes
 
    For example, before the POSIX standard, you had to write
 `/[A-Za-z0-9]/' to match alphanumeric characters.  If your character
@@ -3686,7 +3789,7 @@ set had other alphabetic characters in it, this would not match them.
 With the POSIX character classes, you can write `/[[:alnum:]]/' to
 match the alphabetic and numeric characters in your character set.
 
-   Some utilities that match regular expressions provide a non-standard
+   Some utilities that match regular expressions provide a nonstandard
 `[:ascii:]' character class; `awk' does not. However, you can simulate
 such a construct using `[\x00-\x7F]'.  This matches all values
 numerically between zero and 127, which is the defined range of the
@@ -3710,8 +3813,9 @@ Collating symbols
 Equivalence classes
      Locale-specific names for a list of characters that are equal. The
      name is enclosed between `[=' and `=]'.  For example, the name `e'
-     might be used to represent all of "e," "e`," and "e'." In this
-     case, `[[=e=]]' is a regexp that matches any of `e', `e'', or `e`'.
+     might be used to represent all of "e," "e^," "e`," and "e'." In
+     this case, `[[=e=]]' is a regexp that matches any of `e', `e^',
+     `e'', or `e`'.
 
    These features are very valuable in non-English-speaking locales.
 
@@ -3730,10 +3834,11 @@ Consider the following:
 
      echo aaaabcd | awk '{ sub(/a+/, "<A>"); print }'
 
-   This example uses the `sub()' function (which we haven't discussed
-yet; *note String Functions::) to make a change to the input record.
-Here, the regexp `/a+/' indicates "one or more `a' characters," and the
-replacement text is `<A>'.
+   This example uses the `sub()' function to make a change to the input
+record.  (`sub()' replaces the first instance of any text matched by
+the first argument with the string provided as the second argument;
+*note String Functions::.)  Here, the regexp `/a+/' indicates "one or
+more `a' characters," and the replacement text is `<A>'.
 
    The input contains four `a' characters.  `awk' (and POSIX) regular
 expressions always match the leftmost, _longest_ sequence of input
@@ -3769,15 +3874,16 @@ regexp":
 This sets `digits_regexp' to a regexp that describes one or more digits,
 and tests whether the input record matches this regexp.
 
-     NOTE: When using the `~' and `!~' operators, there is a difference
-     between a regexp constant enclosed in slashes and a string
-     constant enclosed in double quotes.  If you are going to use a
-     string constant, you have to understand that the string is, in
-     essence, scanned _twice_: the first time when `awk' reads your
+     NOTE: When using the `~' and `!~' operators, be aware that there
+     is a difference between a regexp constant enclosed in slashes and
+     a string constant enclosed in double quotes.  If you are going to
+     use a string constant, you have to understand that the string is,
+     in essence, scanned _twice_: the first time when `awk' reads your
      program, and the second time when it goes to match the string on
      the lefthand side of the operator with the pattern on the right.
      This is true of any string-valued expression (such as
-     `digits_regexp', shown previously), not just string constants.
+     `digits_regexp', shown in the previous example), not just string
+     constants.
 
    What difference does it make if the string is scanned twice? The
 answer has to do with escape sequences, and particularly with
@@ -3809,15 +3915,15 @@ constants," for several reasons:
 
          Using `\n' in Bracket Expressions of Dynamic Regexps
 
-   Some versions of `awk' do not allow the newline character to be used
-inside a bracket expression for a dynamic regexp:
+   Some older versions of `awk' do not allow the newline character to
+be used inside a bracket expression for a dynamic regexp:
 
      $ awk '$0 ~ "[ \t\n]"'
      error--> awk: newline in character class [
      error--> ]...
      error-->  source line number 1
      error-->  context is
-     error-->          >>>  <<<
+     error-->        $0 ~ "[ >>>  \t\n]" <<<
 
    But a newline in a regexp constant works with no problem:
 
@@ -3874,19 +3980,19 @@ letters, digits, or underscores (`_'):
 
 `\B'
      Matches the empty string that occurs between two word-constituent
-     characters. For example, `/\Brat\B/' matches `crate' but it does
+     characters. For example, `/\Brat\B/' matches `crate', but it does
      not match `dirty rat'.  `\B' is essentially the opposite of `\y'.
 
    There are two other operators that work on buffers.  In Emacs, a
-"buffer" is, naturally, an Emacs buffer.  For other programs, `gawk''s
-regexp library routines consider the entire string to match as the
-buffer.  The operators are:
+"buffer" is, naturally, an Emacs buffer.  Other GNU programs, including
+`gawk', consider the entire string to match as the buffer.  The
+operators are:
 
 `\`'
-     Matches the empty string at the beginning of a buffer (string).
+     Matches the empty string at the beginning of a buffer (string)
 
 `\''
-     Matches the empty string at the end of a buffer (string).
+     Matches the empty string at the end of a buffer (string)
 
    Because `^' and `$' always work in terms of the beginning and end of
 strings, these operators don't add any new capabilities for `awk'.
@@ -3908,15 +4014,14 @@ No options
      Operators::.
 
 `--posix'
-     Only POSIX regexps are supported; the GNU operators are not special
-     (e.g., `\w' matches a literal `w').  Interval expressions are
-     allowed.
+     Match only POSIX regexps; the GNU operators are not special (e.g.,
+     `\w' matches a literal `w').  Interval expressions are allowed.
 
 `--traditional'
-     Traditional Unix `awk' regexps are matched. The GNU operators are
-     not special, and interval expressions are not available.  The
-     POSIX character classes (`[[:alnum:]]', etc.) are supported, as
-     BWK `awk' does support them.  Characters described by octal and
+     Match traditional Unix `awk' regexps. The GNU operators are not
+     special, and interval expressions are not available.  Because BWK
+     `awk' supports them, the POSIX character classes (`[[:alnum:]]',
+     etc.) are available.  Characters described by octal and
      hexadecimal escape sequences are treated literally, even if they
      represent regexp metacharacters.
 
@@ -3956,10 +4061,9 @@ works in any POSIX-compliant `awk'.
 `IGNORECASE' is not zero, _all_ regexp and string operations ignore
 case.
 
-   Changing the value of `IGNORECASE' dynamically controls the
-case-sensitivity of the program as it runs.  Case is significant by
-default because `IGNORECASE' (like most variables) is initialized to
-zero:
+   Changing the value of `IGNORECASE' dynamically controls the case
+sensitivity of the program as it runs.  Case is significant by default
+because `IGNORECASE' (like most variables) is initialized to zero:
 
      x = "aB"
      if (x ~ /ab/) ...   # this test will fail
@@ -3967,17 +4071,17 @@ zero:
      IGNORECASE = 1
      if (x ~ /ab/) ...   # now it will succeed
 
-   In general, you cannot use `IGNORECASE' to make certain rules
-case-insensitive and other rules case-sensitive, because there is no
+   In general, you cannot use `IGNORECASE' to make certain rules case
+insensitive and other rules case sensitive, as there is no
 straightforward way to set `IGNORECASE' just for the pattern of a
 particular rule.(1) To do this, use either bracket expressions or
 `tolower()'.  However, one thing you can do with `IGNORECASE' only is
-dynamically turn case-sensitivity on or off for all the rules at once.
+dynamically turn case sensitivity on or off for all the rules at once.
 
    `IGNORECASE' can be set on the command line or in a `BEGIN' rule
 (*note Other Arguments::; also *note Using BEGIN/END::).  Setting
-`IGNORECASE' from the command line is a way to make a program
-case-insensitive without having to edit it.
+`IGNORECASE' from the command line is a way to make a program case
+insensitive without having to edit it.
 
    In multibyte locales, the equivalences between upper- and lowercase
 characters are tested based on the wide-character values of the
@@ -4014,28 +4118,28 @@ File: gawk.info,  Node: Regexp Summary,  Prev: Case-sensitivity,  Up: Regexp
      conditional expressions, or as part of matching expressions using
      the `~' and `!~' operators.
 
-   * Escape sequences let you represent non-printable characters and
+   * Escape sequences let you represent nonprintable characters and
      also let you represent regexp metacharacters as literal characters
      to be matched.
 
-   * Regexp operators provide grouping, alternation and repetition.
+   * Regexp operators provide grouping, alternation, and repetition.
 
    * Bracket expressions give you a shorthand for specifying sets of
      characters that can match at a particular point in a regexp.
      Within bracket expressions, POSIX character classes let you specify
      certain groups of characters in a locale-independent fashion.
 
-   * `gawk''s `IGNORECASE' variable lets you control the case
-     sensitivity of regexp matching.  In other `awk' versions, use
-     `tolower()' or `toupper()'.
-
    * Regular expressions match the leftmost longest text in the string
      being matched.  This matters for cases where you need to know the
      extent of the match, such as for text substitution and when the
      record separator is a regexp.
 
-   * Matching expressions may use dynamic regexps, that is, string
-     values treated as regular expressions.
+   * Matching expressions may use dynamic regexps (i.e., string values
+     treated as regular expressions).
+
+   * `gawk''s `IGNORECASE' variable lets you control the case
+     sensitivity of regexp matching.  In other `awk' versions, use
+     `tolower()' or `toupper()'.
 
 
 
@@ -4049,8 +4153,8 @@ standard input (by default, this is the keyboard, but often it is a
 pipe from another command) or from files whose names you specify on the
 `awk' command line.  If you specify input files, `awk' reads them in
 order, processing all the data from one before going on to the next.
-The name of the current input file can be found in the built-in variable
-`FILENAME' (*note Built-in Variables::).
+The name of the current input file can be found in the predefined
+variable `FILENAME' (*note Built-in Variables::).
 
    The input is read in units called "records", and is processed by the
 rules of your program one record at a time.  By default, each record is
@@ -4059,7 +4163,7 @@ one line.  Each record is automatically split into chunks called
 parts of a record.
 
    On rare occasions, you may need to use the `getline' command.  The
-`getline' command is valuable, both because it can do explicit input
+`getline' command is valuable both because it can do explicit input
 from any number of files, and because the files used with it do not
 have to be named on the `awk' command line (*note Getline::).
 
@@ -4076,6 +4180,7 @@ have to be named on the `awk' command line (*note Getline::).
 * Getline::                     Reading files under explicit program control
                                 using the `getline' function.
 * Read Timeout::                Reading input with a timeout.
+* Retrying Input::              Retrying input after certain errors.
 * Command-line directories::    What happens if you put a directory on the
                                 command line.
 * Input Summary::               Input summary.
@@ -4089,9 +4194,9 @@ File: gawk.info,  Node: Records,  Next: Fields,  Up: Reading Files
 
 `awk' divides the input for your program into records and fields.  It
 keeps track of the number of records that have been read so far from
-the current input file.  This value is stored in a built-in variable
-called `FNR' which is reset to zero when a new file is started.
-Another built-in variable, `NR', records the total number of input
+the current input file.  This value is stored in a predefined variable
+called `FNR', which is reset to zero every time a new file is started.
+Another predefined variable, `NR', records the total number of input
 records read so far from all data files.  It starts at zero, but is
 never automatically reset to zero.
 
@@ -4103,19 +4208,19 @@ never automatically reset to zero.
 
 File: gawk.info,  Node: awk split records,  Next: gawk split records,  Up: Records
 
-4.1.1 Record Splitting With Standard `awk'
+4.1.1 Record Splitting with Standard `awk'
 ------------------------------------------
 
 Records are separated by a character called the "record separator".  By
 default, the record separator is the newline character.  This is why
-records are, by default, single lines.  A different character can be
-used for the record separator by assigning the character to the
-built-in variable `RS'.
+records are, by default, single lines.  To use a different character
+for the record separator, simply assign that character to the
+predefined variable `RS'.
 
    Like any other variable, the value of `RS' can be changed in the
 `awk' program with the assignment operator, `=' (*note Assignment
 Ops::).  The new record-separator character should be enclosed in
-quotation marks, which indicate a string constant.  Often the right
+quotation marks, which indicate a string constant.  Often, the right
 time to do this is at the beginning of execution, before any input is
 processed, so that the very first record is read with the proper
 separator.  To do this, use the special `BEGIN' pattern (*note
@@ -4124,14 +4229,14 @@ BEGIN/END::).  For example:
      awk 'BEGIN { RS = "u" }
           { print $0 }' mail-list
 
-changes the value of `RS' to `u', before reading any input.  This is a
-string whose first character is the letter "u;" as a result, records
-are separated by the letter "u."  Then the input file is read, and the
-second rule in the `awk' program (the action with no pattern) prints
-each record.  Because each `print' statement adds a newline at the end
-of its output, this `awk' program copies the input with each `u'
-changed to a newline.  Here are the results of running the program on
-`mail-list':
+changes the value of `RS' to `u', before reading any input.  The new
+value is a string whose first character is the letter "u"; as a result,
+records are separated by the letter "u".  Then the input file is read,
+and the second rule in the `awk' program (the action with no pattern)
+prints each record.  Because each `print' statement adds a newline at
+the end of its output, this `awk' program copies the input with each
+`u' changed to a newline.  Here are the results of running the program
+on `mail-list':
 
      $ awk 'BEGIN { RS = "u" }
      >      { print $0 }' mail-list
@@ -4179,11 +4284,11 @@ data file (*note Sample Data Files::), the line looks like this:
 
      Bill         555-1675     bill.drowning@hotmail.com       A
 
-It contains no `u' so there is no reason to split the record, unlike
-the others which have one or more occurrences of the `u'.  In fact,
-this record is treated as part of the previous record; the newline
-separating them in the output is the original newline in the data file,
-not the one added by `awk' when it printed the record!
+It contains no `u', so there is no reason to split the record, unlike
+the others, which each have one or more occurrences of the `u'.  In
+fact, this record is treated as part of the previous record; the
+newline separating them in the output is the original newline in the
+data file, not the one added by `awk' when it printed the record!
 
    Another way to change the record separator is on the command line,
 using the variable-assignment feature (*note Other Arguments::):
@@ -4198,9 +4303,10 @@ character such as `/' is more likely to produce correct behavior in the
 majority of cases, but there are no guarantees. The moral is: Know Your
 Data.
 
-   There is one unusual case, that occurs when `gawk' is being fully
-POSIX-compliant (*note Options::).  Then, the following (extreme)
-pipeline prints a surprising `1':
+   When using regular characters as the record separator, there is one
+unusual case that occurs when `gawk' is being fully POSIX-compliant
+(*note Options::).  Then, the following (extreme) pipeline prints a
+surprising `1':
 
      $ echo | gawk --posix 'BEGIN { RS = "a" } ; { print NF }'
      -| 1
@@ -4230,7 +4336,7 @@ variable `RT' to the text in the input that matched `RS'.
 
 File: gawk.info,  Node: gawk split records,  Prev: awk split records,  Up: Records
 
-4.1.2 Record Splitting With `gawk'
+4.1.2 Record Splitting with `gawk'
 ----------------------------------
 
 When using `gawk', the value of `RS' is not limited to a one-character
@@ -4248,8 +4354,8 @@ part of either record.
 character. However, when `RS' is a regular expression, `RT' contains
 the actual input text that matched the regular expression.
 
-   If the input file ended without any text that matches `RS', `gawk'
-sets `RT' to the null string.
+   If the input file ends without any text matching `RS', `gawk' sets
+`RT' to the null string.
 
    The following example illustrates both of these features.  It sets
 `RS' equal to a regular expression that matches either a newline or a
@@ -4265,12 +4371,12 @@ trailing whitespace:
      -| ]
 
 The square brackets delineate the contents of `RT', letting you see the
-leading and trailing whitespace. The final value of `RT' `RT' is a
-newline.  *Note Simple Sed::, for a more useful example of `RS' as a
-regexp and `RT'.
+leading and trailing whitespace. The final value of `RT' is a newline.
+*Note Simple Sed::, for a more useful example of `RS' as a regexp and
+`RT'.
 
    If you set `RS' to a regular expression that allows optional
-trailing text, such as `RS = "abc(XYZ)?"' it is possible, due to
+trailing text, such as `RS = "abc(XYZ)?"', it is possible, due to
 implementation constraints, that `gawk' may match the leading part of
 the regular expression, but not the trailing part, particularly if the
 input text that could match the trailing part is fairly long.  `gawk'
@@ -4282,13 +4388,13 @@ that this will never happen.
      the beginning and end of a _line_.  As a result, something like
      `RS = "^[[:upper:]]"' can only match at the beginning of a file.
      This is because `gawk' views the input file as one long string
-     that happens to contain newline characters in it.  It is thus best
-     to avoid anchor characters in the value of `RS'.
+     that happens to contain newline characters.  It is thus best to
+     avoid anchor metacharacters in the value of `RS'.
 
    The use of `RS' as a regular expression and the `RT' variable are
 `gawk' extensions; they are not available in compatibility mode (*note
 Options::).  In compatibility mode, only the first character of the
-value of `RS' is used to determine the end of the record.
+value of `RS' determines the end of the record.
 
                       `RS = "\0"' Is Not Portable
 
@@ -4317,11 +4423,12 @@ terminator.  In effect, this means that `RS = "\0"' is the same as `RS
 
    It happens that recent versions of `mawk' can use the NUL character
 as a record separator. However, this is a special case: `mawk' does not
-allow embedded NUL characters in strings.
+allow embedded NUL characters in strings.  (This may change in a future
+version of `mawk'.)
 
-   *Note Readfile Function::, for an interesting, portable way to read
-whole files.  If you are using `gawk', see *note Extension Sample
-Readfile::, for another option.
+   *Note Readfile Function::, for an interesting way to read whole
+files.  If you are using `gawk', see *note Extension Sample Readfile::,
+for another option.
 
    ---------- Footnotes ----------
 
@@ -4337,8 +4444,8 @@ When `awk' reads an input record, the record is automatically "parsed"
 or separated by the `awk' utility into chunks called "fields".  By
 default, fields are separated by "whitespace", like words in a line.
 Whitespace in `awk' means any string of one or more spaces, TABs, or
-newlines;(1) other characters, such as formfeed, vertical tab, etc.,
-that are considered whitespace by other languages, are _not_ considered
+newlines;(1) other characters that are considered whitespace by other
+languages (such as formfeed, vertical tab, etc.) are _not_ considered
 whitespace by `awk'.
 
    The purpose of fields is to make it more convenient for you to refer
@@ -4346,12 +4453,12 @@ to these pieces of the record.  You don't have to use them--you can
 operate on the whole record if you want--but fields are what make
 simple `awk' programs so powerful.
 
-   You use a dollar-sign (`$') to refer to a field in an `awk' program,
+   You use a dollar sign (`$') to refer to a field in an `awk' program,
 followed by the number of the field you want.  Thus, `$1' refers to the
-first field, `$2' to the second, and so on.  (Unlike the Unix shells,
-the field numbers are not limited to single digits.  `$127' is the one
-hundred twenty-seventh field in the record.)  For example, suppose the
-following is a line of input:
+first field, `$2' to the second, and so on.  (Unlike in the Unix
+shells, the field numbers are not limited to single digits.  `$127' is
+the 127th field in the record.)  For example, suppose the following is
+a line of input:
 
      This seems like a pretty nice example.
 
@@ -4360,7 +4467,7 @@ Here the first field, or `$1', is `This', the second field, or `$2', is
 Because there is no space between the `e' and the `.', the period is
 considered part of the seventh field.
 
-   `NF' is a built-in variable whose value is the number of fields in
+   `NF' is a predefined variable whose value is the number of fields in
 the current record.  `awk' automatically updates the value of `NF' each
 time it reads a record.  No matter how many fields there are, the last
 field in a record can be represented by `$NF'.  So, `$NF' is the same
@@ -4368,23 +4475,20 @@ as `$7', which is `example.'.  If you try to reference a field beyond
 the last one (such as `$8' when the record has only seven fields), you
 get the empty string.  (If used in a numeric operation, you get zero.)
 
-   The use of `$0', which looks like a reference to the "zero-th"
-field, is a special case: it represents the whole input record. Use it
-when you are not interested in specific fields.  Here are some more
-examples:
+   The use of `$0', which looks like a reference to the "zeroth" field,
+is a special case: it represents the whole input record. Use it when
+you are not interested in specific fields.  Here are some more examples:
 
      $ awk '$1 ~ /li/ { print $0 }' mail-list
      -| Amelia       555-5553     amelia.zodiacusque@gmail.com    F
      -| Julie        555-6699     julie.perscrutabor@skeeve.com   F
 
 This example prints each record in the file `mail-list' whose first
-field contains the string `li'.  The operator `~' is called a "matching
-operator" (*note Regexp Usage::); it tests whether a string (here, the
-field `$1') matches a given regular expression.
+field contains the string `li'.
 
    By contrast, the following example looks for `li' in _the entire
-record_ and prints the first field and the last field for each matching
-input record:
+record_ and prints the first and last fields for each matching input
+record:
 
      $ awk '/li/ { print $1, $NF }' mail-list
      -| Amelia F
@@ -4412,17 +4516,17 @@ example:
      awk '{ print $NR }'
 
 Recall that `NR' is the number of records read so far: one in the first
-record, two in the second, etc.  So this example prints the first field
-of the first record, the second field of the second record, and so on.
-For the twentieth record, field number 20 is printed; most likely, the
-record has fewer than 20 fields, so this prints a blank line.  Here is
-another example of using expressions as field numbers:
+record, two in the second, and so on.  So this example prints the first
+field of the first record, the second field of the second record, and so
+on.  For the twentieth record, field number 20 is printed; most likely,
+the record has fewer than 20 fields, so this prints a blank line.  Here
+is another example of using expressions as field numbers:
 
      awk '{ print $(2*2) }' mail-list
 
    `awk' evaluates the expression `(2*2)' and uses its value as the
-number of the field to print.  The `*' sign represents multiplication,
-so the expression `2*2' evaluates to four.  The parentheses are used so
+number of the field to print.  The `*' represents multiplication, so
+the expression `2*2' evaluates to four.  The parentheses are used so
 that the multiplication is done before the `$' operation; they are
 necessary whenever there is a binary operator(1) in the field-number
 expression.  This example, then, prints the type of relationship (the
@@ -4439,14 +4543,14 @@ program.  Other `awk' implementations may behave differently.)
 
    As mentioned in *note Fields::, `awk' stores the current record's
 number of fields in the built-in variable `NF' (also *note Built-in
-Variables::).  The expression `$NF' is not a special feature--it is the
-direct consequence of evaluating `NF' and using its value as a field
-number.
+Variables::).  Thus, the expression `$NF' is not a special feature--it
+is the direct consequence of evaluating `NF' and using its value as a
+field number.
 
    ---------- Footnotes ----------
 
    (1) A "binary operator", such as `*' for multiplication, is one that
-takes two operands. The distinction is required, since `awk' also has
+takes two operands. The distinction is required because `awk' also has
 unary (one-operand) and ternary (three-operand) operators.
 
 
@@ -4492,8 +4596,8 @@ subtracted from the second field of each line:
      -| Mar 5 24 34 228
      ...
 
-   It is also possible to also assign contents to fields that are out
-of range.  For example:
+   It is also possible to assign contents to fields that are out of
+range.  For example:
 
      $ awk '{ $6 = ($5 + $4 + $3 + $2)
      >        print $6 }' inventory-shipped
@@ -4560,15 +4664,15 @@ value six.
 value of `NF' and recomputes `$0'.  (d.c.)  Here is an example:
 
      $ echo a b c d e f | awk '{ print "NF =", NF;
-     >                            NF = 3; print $0 }'
+     >                           NF = 3; print $0 }'
      -| NF = 6
      -| a b c
 
      CAUTION: Some versions of `awk' don't rebuild `$0' when `NF' is
-     decremented. Caveat emptor.
+     decremented.
 
    Finally, there are times when it is convenient to force `awk' to
-rebuild the entire record, using the current value of the fields and
+rebuild the entire record, using the current values of the fields and
 `OFS'.  To do this, use the seemingly innocuous assignment:
 
      $1 = $1   # force record to be reconstituted
@@ -4588,13 +4692,13 @@ built-in function that updates `$0', such as `sub()' and `gsub()'
    It is important to remember that `$0' is the _full_ record, exactly
 as it was read from the input.  This includes any leading or trailing
 whitespace, and the exact whitespace (or other characters) that
-separate the fields.
+separates the fields.
 
-   It is a not-uncommon error to try to change the field separators in
-a record simply by setting `FS' and `OFS', and then expecting a plain
+   It is a common error to try to change the field separators in a
+record simply by setting `FS' and `OFS', and then expecting a plain
 `print' or `print $0' to print the modified record.
 
-   But this does not work, since nothing was done to change the record
+   But this does not work, because nothing was done to change the record
 itself.  Instead, you must force the record to be rebuilt, typically
 with a statement such as `$1 = $1', as described earlier.
 
@@ -4628,13 +4732,13 @@ the following line:
 is split into three fields: `m', `*g', and `*gai*pan'.  Note the
 leading spaces in the values of the second and third fields.
 
-   The field separator is represented by the built-in variable `FS'.
+   The field separator is represented by the predefined variable `FS'.
 Shell programmers take note:  `awk' does _not_ use the name `IFS' that
 is used by the POSIX-compliant shells (such as the Unix Bourne shell,
 `sh', or Bash).
 
    The value of `FS' can be changed in the `awk' program with the
-assignment operator, `=' (*note Assignment Ops::).  Often the right
+assignment operator, `=' (*note Assignment Ops::).  Often, the right
 time to do this is at the beginning of execution before any input has
 been processed, so that the very first record is read with the proper
 separator.  To do this, use the special `BEGIN' pattern (*note
@@ -4656,7 +4760,7 @@ attached, such as:
 
      John Q. Smith, LXIX, 29 Oak St., Walamazoo, MI 42139
 
-The same program would extract `*LXIX', instead of `*29*Oak*St.'.  If
+The same program would extract `*LXIX' instead of `*29*Oak*St.'.  If
 you were expecting the program to print the address, you would be
 surprised.  The moral is to choose your data layout and separator
 characters carefully to prevent such problems.  (If the data is not in
@@ -4741,12 +4845,12 @@ play whenever `$0' is recomputed.  For instance, study this pipeline:
 The first `print' statement prints the record as it was read, with
 leading whitespace intact.  The assignment to `$2' rebuilds `$0' by
 concatenating `$1' through `$NF' together, separated by the value of
-`OFS'.  Because the leading whitespace was ignored when finding `$1',
-it is not part of the new `$0'.  Finally, the last `print' statement
-prints the new `$0'.
+`OFS' (which is a space by default).  Because the leading whitespace
+was ignored when finding `$1', it is not part of the new `$0'.
+Finally, the last `print' statement prints the new `$0'.
 
    There is an additional subtlety to be aware of when using regular
-expressions for field splitting.  It is not well-specified in the POSIX
+expressions for field splitting.  It is not well specified in the POSIX
 standard, or anywhere else, what `^' means when splitting fields.  Does
 the `^'  match only at the beginning of the entire record? Or is each
 field separator a new string?  It turns out that different `awk'
@@ -4758,7 +4862,7 @@ beginning of the record. `gawk' also works this way. For example:
 
      $ echo 'xxAA  xxBxx  C' |
      > gawk -F '(^x+)|( +)' '{ for (i = 1; i <= NF; i++)
-     >                                   printf "-->%s<--\n", $i }'
+     >                             printf "-->%s<--\n", $i }'
      -| --><--
      -| -->AA<--
      -| -->xxBxx<--
@@ -4803,13 +4907,10 @@ For example:
 
 sets `FS' to the `,' character.  Notice that the option uses an
 uppercase `F' instead of a lowercase `f'. The latter option (`-f')
-specifies a file containing an `awk' program.  Case is significant in
-command-line options: the `-F' and `-f' options have nothing to do with
-each other.  You can use both options at the same time to set the `FS'
-variable _and_ get an `awk' program from a file.
+specifies a file containing an `awk' program.
 
    The value used for the argument to `-F' is processed in exactly the
-same way as assignments to the built-in variable `FS'.  Any special
+same way as assignments to the predefined variable `FS'.  Any special
 characters in the field separator must be escaped appropriately.  For
 example, to use a `\' as the field separator on the command line, you
 would have to type:
@@ -4858,11 +4959,11 @@ your field and record separators.
    Perhaps the most common use of a single character as the field
 separator occurs when processing the Unix system password file.  On
 many Unix systems, each user has a separate entry in the system
-password file, one line per user.  The information in these lines is
-separated by colons.  The first field is the user's login name and the
-second is the user's encrypted or shadow password.  (A shadow password
-is indicated by the presence of a single `x' in the second field.)  A
-password file entry might look like this:
+password file, with one line per user.  The information in these lines
+is separated by colons.  The first field is the user's login name and
+the second is the user's encrypted or shadow password.  (A shadow
+password is indicated by the presence of a single `x' in the second
+field.)  A password file entry might look like this:
 
      arnold:x:2076:10:Arnold Robbins:/home/arnold:/bin/bash
 
@@ -4874,21 +4975,51 @@ the entries for users whose full name is not indicated:
 
 File: gawk.info,  Node: Full Line Fields,  Next: Field Splitting Summary,  Prev: Command Line Field Separator,  Up: Field Separators
 
-4.5.5 Making The Full Line Be A Single Field
+4.5.5 Making the Full Line Be a Single Field
 --------------------------------------------
 
 Occasionally, it's useful to treat the whole input line as a single
 field.  This can be done easily and portably simply by setting `FS' to
-`"\n"' (a newline).(1)
+`"\n"' (a newline):(1)
 
      awk -F'\n' 'PROGRAM' FILES ...
 
 When you do this, `$1' is the same as `$0'.
 
+               Changing `FS' Does Not Affect the Fields
+
+   According to the POSIX standard, `awk' is supposed to behave as if
+each record is split into fields at the time it is read.  In
+particular, this means that if you change the value of `FS' after a
+record is read, the values of the fields (i.e., how they were split)
+should reflect the old value of `FS', not the new one.
+
+   However, many older implementations of `awk' do not work this way.
+Instead, they defer splitting the fields until a field is actually
+referenced.  The fields are split using the _current_ value of `FS'!
+(d.c.)  This behavior can be difficult to diagnose. The following
+example illustrates the difference between the two methods:
+
+     sed 1q /etc/passwd | awk '{ FS = ":" ; print $1 }'
+
+which usually prints:
+
+     root
+
+on an incorrect implementation of `awk', while `gawk' prints the full
+first line of the file, something like:
+
+     root:x:0:0:Root:/:
+
+   (The `sed'(2) command prints just the first line of `/etc/passwd'.)
+
    ---------- Footnotes ----------
 
    (1) Thanks to Andrew Schorr for this tip.
 
+   (2) The `sed' utility is a "stream editor."  Its behavior is also
+defined by the POSIX standard.
+
 
 File: gawk.info,  Node: Field Splitting Summary,  Prev: Full Line Fields,  Up: Field Separators
 
@@ -4904,7 +5035,7 @@ occurrences of any two characters."  If instead you want fields to be
 separated by a literal period followed by any single character, use `FS
 = "\\.."'.
 
-   The following table summarizes how fields are split, based on the
+   The following list summarizes how fields are split, based on the
 value of `FS' (`==' means "is equal to"):
 
 `FS == " "'
@@ -4924,35 +5055,9 @@ value of `FS' (`==' means "is equal to"):
 
 `FS == ""'
      Each individual character in the record becomes a separate field.
-     (This is a `gawk' extension; it is not specified by the POSIX
+     (This is a common extension; it is not specified by the POSIX
      standard.)
 
-               Changing `FS' Does Not Affect the Fields
-
-   According to the POSIX standard, `awk' is supposed to behave as if
-each record is split into fields at the time it is read.  In
-particular, this means that if you change the value of `FS' after a
-record is read, the value of the fields (i.e., how they were split)
-should reflect the old value of `FS', not the new one.
-
-   However, many older implementations of `awk' do not work this way.
-Instead, they defer splitting the fields until a field is actually
-referenced.  The fields are split using the _current_ value of `FS'!
-(d.c.)  This behavior can be difficult to diagnose. The following
-example illustrates the difference between the two methods.  (The
-`sed'(1) command prints just the first line of `/etc/passwd'.)
-
-     sed 1q /etc/passwd | awk '{ FS = ":" ; print $1 }'
-
-which usually prints:
-
-     root
-
-on an incorrect implementation of `awk', while `gawk' prints the full
-first line of the file, something like:
-
-     root:nSijPlPhZZwgE:0:0:Root:/:
-
                          `FS' and `IGNORECASE'
 
    The `IGNORECASE' variable (*note User-modified::) affects field
@@ -4967,23 +5072,17 @@ Thus, in the following code:
 
 The output is `aCa'.  If you really want to split fields on an
 alphabetic character while ignoring case, use a regexp that will do it
-for you.  E.g., `FS = "[c]"'.  In this case, `IGNORECASE' will take
+for you (e.g., `FS = "[c]"').  In this case, `IGNORECASE' will take
 effect.
 
-   ---------- Footnotes ----------
-
-   (1) The `sed' utility is a "stream editor."  Its behavior is also
-defined by the POSIX standard.
-
 
 File: gawk.info,  Node: Constant Size,  Next: Splitting By Content,  Prev: Field Separators,  Up: Reading Files
 
 4.6 Reading Fixed-Width Data
 ============================
 
-     NOTE: This minor node discusses an advanced feature of `gawk'.  If
-     you are a novice `awk' user, you might want to skip it on the
-     first reading.
+This minor node discusses an advanced feature of `gawk'.  If you are a
+novice `awk' user, you might want to skip it on the first reading.
 
    `gawk' provides a facility for dealing with fixed-width fields with
 no distinctive field separator.  For example, data of this nature
@@ -5004,9 +5103,9 @@ the built-in variable `FIELDWIDTHS'.  Each number specifies the width
 of the field, _including_ columns between fields.  If you want to
 ignore the columns between fields, you can specify the width as a
 separate field that is subsequently ignored.  It is a fatal error to
-supply a field width that is not a positive number.  The following data
-is the output of the Unix `w' utility.  It is useful to illustrate the
-use of `FIELDWIDTHS':
+supply a field width that has a negative value.  The following data is
+the output of the Unix `w' utility.  It is useful to illustrate the use
+of `FIELDWIDTHS':
 
       10:06pm  up 21 days, 14:04,  23 users
      User     tty       login  idle   JCPU   PCPU  what
@@ -5019,13 +5118,10 @@ use of `FIELDWIDTHS':
      brent    ttyp0    26Jun91  4:46  26:46   4:41  bash
      dave     ttyq4    26Jun9115days     46     46  wnewmail
 
-   The following program takes the above input, converts the idle time
-to number of seconds, and prints out the first two fields and the
+   The following program takes this input, converts the idle time to
+number of seconds, and prints out the first two fields and the
 calculated idle time:
 
-     NOTE: This program uses a number of `awk' features that haven't
-     been introduced yet.
-
      BEGIN  { FIELDWIDTHS = "9 6 10 6 7 7 35" }
      NR > 2 {
          idle = $4
@@ -5042,6 +5138,9 @@ calculated idle time:
          print $1, $2, idle
      }
 
+     NOTE: The preceding program uses a number of `awk' features that
+     haven't been introduced yet.
+
    Running the program on the data produces the following results:
 
      hzuo      ttyV0  0
@@ -5067,7 +5166,7 @@ run on a system with card readers is another story!)
 splitting again.  Use `FS = FS' to make this happen, without having to
 know the current value of `FS'.  In order to tell which kind of field
 splitting is in effect, use `PROCINFO["FS"]' (*note Auto-set::).  The
-value is `"FS"' if regular field splitting is being used, or it is
+value is `"FS"' if regular field splitting is being used, or
 `"FIELDWIDTHS"' if fixed-width field splitting is being used:
 
      if (PROCINFO["FS"] == "FS")
@@ -5085,12 +5184,11 @@ of such a function).
 
 File: gawk.info,  Node: Splitting By Content,  Next: Multiple Line,  Prev: Constant Size,  Up: Reading Files
 
-4.7 Defining Fields By Content
+4.7 Defining Fields by Content
 ==============================
 
-     NOTE: This minor node discusses an advanced feature of `gawk'.  If
-     you are a novice `awk' user, you might want to skip it on the
-     first reading.
+This minor node discusses an advanced feature of `gawk'.  If you are a
+novice `awk' user, you might want to skip it on the first reading.
 
    Normally, when using `FS', `gawk' defines the fields as the parts of
 the record that occur in between each field separator. In other words,
@@ -5098,14 +5196,13 @@ the record that occur in between each field separator. In other words,
 However, there are times when you really want to define the fields by
 what they are, and not by what they are not.
 
-   The most notorious such case is so-called "comma separated value"
+   The most notorious such case is so-called "comma-separated values"
 (CSV) data. Many spreadsheet programs, for example, can export their
 data into text files, where each record is terminated with a newline,
-and fields are separated by commas. If only commas separated the data,
+and fields are separated by commas. If commas only separated the data,
 there wouldn't be an issue. The problem comes when one of the fields
-contains an _embedded_ comma. While there is no formal standard
-specification for CSV data(1), in such cases, most programs embed the
-field in double quotes. So we might have data like this:
+contains an _embedded_ comma.  In such cases, most programs embed the
+field in double quotes.(1) So, we might have data like this:
 
      Robbins,Arnold,"1234 A Pretty Street, NE",MyTown,MyState,12345-6789,USA
 
@@ -5113,7 +5210,7 @@ field in double quotes. So we might have data like this:
 value of `FPAT' should be a string that provides a regular expression.
 This regular expression describes the contents of each field.
 
-   In the case of CSV data as presented above, each field is either
+   In the case of CSV data as presented here, each field is either
 "anything that is not a comma," or "a double quote, anything that is
 not a double quote, and a closing double quote."  If written as a
 regular expression constant (*note Regexp::), we would have
@@ -5167,14 +5264,14 @@ being used.
 
      NOTE: Some programs export CSV data that contains embedded
      newlines between the double quotes.  `gawk' provides no way to
-     deal with this.  Since there is no formal specification for CSV
-     data, there isn't much more to be done; the `FPAT' mechanism
+     deal with this.  Even though a formal specification for CSV data
+     exists, there isn't much more to be done; the `FPAT' mechanism
      provides an elegant solution for the majority of cases, and the
      `gawk' developers are satisfied with that.
 
-   As written, the regexp used for `FPAT' requires that each field have
-a least one character.  A straightforward modification (changing
-changed the first `+' to `*') allows fields to be empty:
+   As written, the regexp used for `FPAT' requires that each field
+contain at least one character.  A straightforward modification
+(changing the first `+' to `*') allows fields to be empty:
 
      FPAT = "([^,]*)|(\"[^\"]+\")"
 
@@ -5182,13 +5279,14 @@ changed the first `+' to `*') allows fields to be empty:
 available for splitting regular strings (*note String Functions::).
 
    To recap, `gawk' provides three independent methods to split input
-records into fields. `gawk' uses whichever mechanism was last chosen
-based on which of the three variables--`FS', `FIELDWIDTHS', and
-`FPAT'--was last assigned to.
+records into fields.  The mechanism used is based on which of the three
+variables--`FS', `FIELDWIDTHS', or `FPAT'--was last assigned to.
 
    ---------- Footnotes ----------
 
-   (1) At least, we don't know of one.
+   (1) The CSV format lacked a formal standard definition for many
+years.  RFC 4180 (http://www.ietf.org/rfc/rfc4180.txt) standardizes the
+most common practices.
 
 
 File: gawk.info,  Node: Multiple Line,  Next: Getline,  Prev: Splitting By Content,  Up: Reading Files
@@ -5220,7 +5318,7 @@ empty; lines that contain only whitespace do not count.)
 `"\n\n+"' to `RS'. This regexp matches the newline at the end of the
 record and one or more blank lines after the record.  In addition, a
 regular expression always matches the longest possible sequence when
-there is a choice (*note Leftmost Longest::).  So the next record
+there is a choice (*note Leftmost Longest::).  So, the next record
 doesn't start until the first nonblank line that follows--no matter how
 many blank lines appear in a row, they are considered one record
 separator.
@@ -5232,12 +5330,12 @@ last record, the final newline is removed from the record.  In the
 second case, this special processing is not done.  (d.c.)
 
    Now that the input is separated into records, the second step is to
-separate the fields in the record.  One way to do this is to divide each
-of the lines into fields in the normal manner.  This happens by default
-as the result of a special feature.  When `RS' is set to the empty
-string, _and_ `FS' is set to a single character, the newline character
-_always_ acts as a field separator.  This is in addition to whatever
-field separations result from `FS'.(1)
+separate the fields in the records.  One way to do this is to divide
+each of the lines into fields in the normal manner.  This happens by
+default as the result of a special feature.  When `RS' is set to the
+empty string _and_ `FS' is set to a single character, the newline
+character _always_ acts as a field separator.  This is in addition to
+whatever field separations result from `FS'.(1)
 
    The original motivation for this special exception was probably to
 provide useful behavior in the default case (i.e., `FS' is equal to
@@ -5245,17 +5343,17 @@ provide useful behavior in the default case (i.e., `FS' is equal to
 newline character to separate fields, because there is no way to
 prevent it.  However, you can work around this by using the `split()'
 function to break up the record manually (*note String Functions::).
-If you have a single character field separator, you can work around the
+If you have a single-character field separator, you can work around the
 special feature in a different way, by making `FS' into a regexp for
 that single character.  For example, if the field separator is a
 percent character, instead of `FS = "%"', use `FS = "[%]"'.
 
    Another way to separate fields is to put each field on a separate
 line: to do this, just set the variable `FS' to the string `"\n"'.
-(This single character separator matches a single newline.)  A
+(This single-character separator matches a single newline.)  A
 practical example of a data file organized this way might be a mailing
-list, where each entry is separated by blank lines.  Consider a mailing
-list in a file named `addresses', which looks like this:
+list, where blank lines separate the entries.  Consider a mailing list
+in a file named `addresses', which looks like this:
 
      Jane Doe
      123 Main Street
@@ -5294,8 +5392,8 @@ A simple program to process this file is as follows:
      -|
      ...
 
-   *Note Labels Program::, for a more realistic program that deals with
-address lists.  The following table summarizes how records are split,
+   *Note Labels Program::, for a more realistic program dealing with
+address lists.  The following list summarizes how records are split,
 based on the value of `RS'.  (`==' means "is equal to.")
 
 `RS == "\n"'
@@ -5319,9 +5417,10 @@ based on the value of `RS'.  (`==' means "is equal to.")
      records.  (This is a `gawk' extension; it is not specified by the
      POSIX standard.)
 
-   In all cases, `gawk' sets `RT' to the input text that matched the
-value specified by `RS'.  But if the input file ended without any text
-that matches `RS', then `gawk' sets `RT' to the null string.
+   If not in compatibility mode (*note Options::), `gawk' sets `RT' to
+the input text that matched the value specified by `RS'.  But if the
+input file ended without any text that matches `RS', then `gawk' sets
+`RT' to the null string.
 
    ---------- Footnotes ----------
 
@@ -5337,7 +5436,7 @@ File: gawk.info,  Node: Getline,  Next: Read Timeout,  Prev: Multiple Line,  Up:
 
 So far we have been getting our input data from `awk''s main input
 stream--either the standard input (usually your keyboard, sometimes the
-output from another program) or from the files specified on the command
+output from another program) or the files specified on the command
 line.  The `awk' language has a special built-in command called
 `getline' that can be used to read input under your explicit control.
 
@@ -5354,11 +5453,16 @@ record, such as a file that cannot be opened, then `getline' returns
 -1.  In this case, `gawk' sets the variable `ERRNO' to a string
 describing the error that occurred.
 
+   If `ERRNO' indicates that the I/O operation may be retried, and
+`PROCINFO["INPUT", "RETRY"]' is set, then `getline' returns -2 instead
+of -1, and further calls to `getline' may be attemped.  *Note Retrying
+Input::, for further information about this feature.
+
    In the following examples, COMMAND stands for a string value that
 represents a shell command.
 
      NOTE: When `--sandbox' is specified (*note Options::), reading
-     lines from files, pipes and coprocesses is disabled.
+     lines from files, pipes, and coprocesses is disabled.
 
 * Menu:
 
@@ -5400,9 +5504,7 @@ processing on the next record _right now_.  For example:
                  while (j == 0) {
                      # get more text
                      if (getline <= 0) {
-                         m = "unexpected EOF or error"
-                         m = (m ": " ERRNO)
-                         print m > "/dev/stderr"
+                         print("unexpected EOF or error:", ERRNO) > "/dev/stderr"
                          exit
                      }
                      # build up the line using string concatenation
@@ -5477,7 +5579,7 @@ and produces these results:
      free
 
    The `getline' command used in this way sets only the variables `NR',
-`FNR' and `RT' (and of course, VAR).  The record is not split into
+`FNR', and `RT' (and, of course, VAR).  The record is not split into
 fields, so the values of the fields (including `$0') and the value of
 `NF' do not change.
 
@@ -5487,8 +5589,8 @@ File: gawk.info,  Node: Getline/File,  Next: Getline/Variable/File,  Prev: Getli
 4.9.3 Using `getline' from a File
 ---------------------------------
 
-Use `getline < FILE' to read the next record from FILE.  Here FILE is a
-string-valued expression that specifies the file name.  `< FILE' is
+Use `getline < FILE' to read the next record from FILE.  Here, FILE is
+a string-valued expression that specifies the file name.  `< FILE' is
 called a "redirection" because it directs input to come from a
 different place.  For example, the following program reads its input
 record from the file `secondary.input' when it encounters a first field
@@ -5521,10 +5623,10 @@ File: gawk.info,  Node: Getline/Variable/File,  Next: Getline/Pipe,  Prev: Getli
 -------------------------------------------------
 
 Use `getline VAR < FILE' to read input from the file FILE, and put it
-in the variable VAR.  As above, FILE is a string-valued expression that
-specifies the file from which to read.
+in the variable VAR.  As earlier, FILE is a string-valued expression
+that specifies the file from which to read.
 
-   In this version of `getline', none of the built-in variables are
+   In this version of `getline', none of the predefined variables are
 changed and the record is not split into fields.  The only variable
 changed is VAR.(1) For example, the following program copies all the
 input files to the output, except for records that say
@@ -5605,9 +5707,9 @@ the program might produce:
      bill       ttyp1   Jul 13 14:23     (murphy:0)
      bletch
 
-Notice that this program ran the command `who' and printed the previous
-result.  (If you try this program yourself, you will of course get
-different results, depending upon who is logged in on your system.)
+Notice that this program ran the command `who' and printed the result.
+(If you try this program yourself, you will of course get different
+results, depending upon who is logged in on your system.)
 
    This variation of `getline' splits the record into fields, sets the
 value of `NF', and recomputes the value of `$0'.  The values of `NR'
@@ -5623,10 +5725,10 @@ all `awk' implementations.
      NOTE: Unfortunately, `gawk' has not been consistent in its
      treatment of a construct like `"echo " "date" | getline'.  Most
      versions, including the current version, treat it at as `("echo "
-     "date") | getline'.  (This how BWK `awk' behaves.)  Some versions
-     changed and treated it as `"echo " ("date" | getline)'.  (This is
-     how `mawk' behaves.)  In short, _always_ use explicit parentheses,
-     and then you won't have to worry.
+     "date") | getline'.  (This is also how BWK `awk' behaves.)  Some
+     versions instead treat it as `"echo " ("date" | getline)'.  (This
+     is how `mawk' behaves.)  In short, _always_ use explicit
+     parentheses, and then you won't have to worry.
 
 
 File: gawk.info,  Node: Getline/Variable/Pipe,  Next: Getline/Coprocess,  Prev: Getline/Pipe,  Up: Getline
@@ -5645,8 +5747,8 @@ following program reads the current date and time into the variable
           print "Report printed on " current_time
      }
 
-   In this version of `getline', none of the built-in variables are
-changed and the record is not split into fields.
+   In this version of `getline', none of the predefined variables are
+changed and the record is not split into fields. However, `RT' is set.
 
    According to POSIX, `EXPRESSION | getline VAR' is ambiguous if
 EXPRESSION contains unparenthesized operators other than `$'; for
@@ -5661,15 +5763,16 @@ File: gawk.info,  Node: Getline/Coprocess,  Next: Getline/Variable/Coprocess,  P
 4.9.7 Using `getline' from a Coprocess
 --------------------------------------
 
-Input into `getline' from a pipe is a one-way operation.  The command
-that is started with `COMMAND | getline' only sends data _to_ your
-`awk' program.
+Reading input into `getline' from a pipe is a one-way operation.  The
+command that is started with `COMMAND | getline' only sends data _to_
+your `awk' program.
 
    On occasion, you might want to send data to another program for
 processing and then read the results back.  `gawk' allows you to start
 a "coprocess", with which two-way communications are possible.  This is
 done with the `|&' operator.  Typically, you write data to the
-coprocess first and then read results back, as shown in the following:
+coprocess first and then read the results back, as shown in the
+following:
 
      print "SOME QUERY" |& "db_server"
      "db_server" |& getline
@@ -5695,7 +5798,7 @@ When you use `COMMAND |& getline VAR', the output from the coprocess
 COMMAND is sent through a two-way pipe to `getline' and into the
 variable VAR.
 
-   In this version of `getline', none of the built-in variables are
+   In this version of `getline', none of the predefined variables are
 changed and the record is not split into fields.  The only variable
 changed is VAR.  However, `RT' is set.
 
@@ -5728,26 +5831,26 @@ in mind:
      `getline' command causes `awk' to set the value of `FILENAME'.
      Normally, `FILENAME' does not have a value inside `BEGIN' rules,
      because you have not yet started to process the command-line data
-     files.  (d.c.)  (*Note BEGIN/END::, also *note Auto-set::.)
+     files.  (d.c.)  (See *note BEGIN/END::; also *note Auto-set::.)
 
    * Using `FILENAME' with `getline' (`getline < FILENAME') is likely
-     to be a source for confusion.  `awk' opens a separate input stream
+     to be a source of confusion.  `awk' opens a separate input stream
      from the current input file.  However, by not using a variable,
-     `$0' and `NR' are still updated.  If you're doing this, it's
+     `$0' and `NF' are still updated.  If you're doing this, it's
      probably by accident, and you should reconsider what it is you're
      trying to accomplish.
 
    * *note Getline Summary::, presents a table summarizing the
      `getline' variants and which variables they can affect.  It is
-     worth noting that those variants which do not use redirection can
+     worth noting that those variants that do not use redirection can
      cause `FILENAME' to be updated if they cause `awk' to start
      reading a new input file.
 
    * If the variable being assigned is an expression with side effects,
      different versions of `awk' behave differently upon encountering
      end-of-file.  Some versions don't evaluate the expression; many
-     versions (including `gawk') do.  Here is an example, due to Duncan
-     Moore:
+     versions (including `gawk') do.  Here is an example, courtesy of
+     Duncan Moore:
 
           BEGIN {
               system("echo 1 > f")
@@ -5755,13 +5858,13 @@ in mind:
               print c
           }
 
-     Here, the side effect is the `++c'.  Is `c' incremented if end of
-     file is encountered, before the element in `a' is assigned?
+     Here, the side effect is the `++c'.  Is `c' incremented if
+     end-of-file is encountered before the element in `a' is assigned?
 
      `gawk' treats `getline' like a function call, and evaluates the
      expression `a[++c]' before attempting to read from `f'.  However,
      some versions of `awk' only evaluate the expression once they know
-     that there is a string value to be assigned.  Caveat Emptor.
+     that there is a string value to be assigned.
 
 
 File: gawk.info,  Node: Getline Summary,  Prev: Getline Notes,  Up: Getline
@@ -5770,39 +5873,38 @@ File: gawk.info,  Node: Getline Summary,  Prev: Getline Notes,  Up: Getline
 ------------------------------------
 
 *note table-getline-variants:: summarizes the eight variants of
-`getline', listing which built-in variables are set by each one, and
+`getline', listing which predefined variables are set by each one, and
 whether the variant is standard or a `gawk' extension.  Note: for each
-variant, `gawk' sets the `RT' built-in variable.
+variant, `gawk' sets the `RT' predefined variable.
 
-Variant                  Effect                      Standard /
-                                                     Extension
+Variant                  Effect                      `awk' / `gawk'
 ------------------------------------------------------------------------- 
-`getline'                Sets `$0', `NF', `FNR',     Standard
+`getline'                Sets `$0', `NF', `FNR',     `awk'
                          `NR', and `RT'              
-`getline' VAR            Sets VAR, `FNR', `NR', and  Standard
+`getline' VAR            Sets VAR, `FNR', `NR', and  `awk'
                          `RT'                        
-`getline <' FILE         Sets `$0', `NF', and `RT'   Standard
-`getline VAR < FILE'     Sets VAR and `RT'           Standard
-COMMAND `| getline'      Sets `$0', `NF', and `RT'   Standard
-COMMAND `| getline' VAR  Sets VAR and `RT'           Standard
-COMMAND `|& getline'     Sets `$0', `NF', and `RT'   Extension
-COMMAND `|& getline'     Sets VAR and `RT'           Extension
+`getline <' FILE         Sets `$0', `NF', and `RT'   `awk'
+`getline VAR < FILE'     Sets VAR and `RT'           `awk'
+COMMAND `| getline'      Sets `$0', `NF', and `RT'   `awk'
+COMMAND `| getline' VAR  Sets VAR and `RT'           `awk'
+COMMAND `|& getline'     Sets `$0', `NF', and `RT'   `gawk'
+COMMAND `|& getline'     Sets VAR and `RT'           `gawk'
 VAR                                                  
 
-Table 4.1: `getline' Variants and What They Set
+Table 4.1: `getline' variants and what they set
 
 
-File: gawk.info,  Node: Read Timeout,  Next: Command-line directories,  Prev: Getline,  Up: Reading Files
+File: gawk.info,  Node: Read Timeout,  Next: Retrying Input,  Prev: Getline,  Up: Reading Files
 
-4.10 Reading Input With A Timeout
+4.10 Reading Input with a Timeout
 =================================
 
 This minor node describes a feature that is specific to `gawk'.
 
    You may specify a timeout in milliseconds for reading input from the
 keyboard, a pipe, or two-way communication, including TCP/IP sockets.
-This can be done on a per input, command or connection basis, by
-setting a special element in the `PROCINFO' (*note Auto-set::) array:
+This can be done on a per-input, per-command, or per-connection basis,
+by setting a special element in the `PROCINFO' array (*note Auto-set::):
 
      PROCINFO["input_name", "READ_TIMEOUT"] = TIMEOUT IN MILLISECONDS
 
@@ -5826,15 +5928,15 @@ for more than five seconds:
          print $0
 
    `gawk' terminates the read operation if input does not arrive after
-waiting for the timeout period, returns failure and sets the `ERRNO'
-variable to an appropriate string value.  A negative or zero value for
-the timeout is the same as specifying no timeout at all.
+waiting for the timeout period, returns failure, and sets `ERRNO' to an
+appropriate string value.  A negative or zero value for the timeout is
+the same as specifying no timeout at all.
 
    A timeout can also be set for reading from the keyboard in the
 implicit loop that reads input records and matches them against
 patterns, like so:
 
-     $  gawk 'BEGIN { PROCINFO["-", "READ_TIMEOUT"] = 5000 }
+     $ gawk 'BEGIN { PROCINFO["-", "READ_TIMEOUT"] = 5000 }
      > { print "You entered: " $0 }'
      gawk
      -| You entered: gawk
@@ -5853,25 +5955,26 @@ input to arrive:
      PROCINFO[Service, "READ_TIMEOUT"] = 1000
      while ((Service |& getline) > 0) {
          print $0
-         PROCINFO[S, "READ_TIMEOUT"] -= 100
+         PROCINFO[Service, "READ_TIMEOUT"] -= 100
      }
 
      NOTE: You should not assume that the read operation will block
      exactly after the tenth record has been printed. It is possible
      that `gawk' will read and buffer more than one record's worth of
      data the first time. Because of this, changing the value of
-     timeout like in the above example is not very useful.
+     timeout like in the preceding example is not very useful.
 
-   If the `PROCINFO' element is not present and the environment
-variable `GAWK_READ_TIMEOUT' exists, `gawk' uses its value to
-initialize the timeout value.  The exclusive use of the environment
-variable to specify timeout has the disadvantage of not being able to
-control it on a per command or connection basis.
+   If the `PROCINFO' element is not present and the `GAWK_READ_TIMEOUT'
+environment variable exists, `gawk' uses its value to initialize the
+timeout value.  The exclusive use of the environment variable to
+specify timeout has the disadvantage of not being able to control it on
+a per-command or per-connection basis.
 
    `gawk' considers a timeout event to be an error even though the
 attempt to read from the underlying device may succeed in a later
 attempt. This is a limitation, and it also means that you cannot use
-this to multiplex input from two or more sources.
+this to multiplex input from two or more sources.  *Note Retrying
+Input::, for a way to enable later I/O attempts to succeed.
 
    Assigning a timeout value prevents read operations from blocking
 indefinitely. But bear in mind that there are other ways `gawk' can
@@ -5886,9 +5989,36 @@ writing.
    (1) This assumes that standard input is the keyboard.
 
 
-File: gawk.info,  Node: Command-line directories,  Next: Input Summary,  Prev: Read Timeout,  Up: Reading Files
+File: gawk.info,  Node: Retrying Input,  Next: Command-line directories,  Prev: Read Timeout,  Up: Reading Files
+
+4.11 Retrying Reads After Certain Input Errors
+==============================================
+
+This minor node describes a feature that is specific to `gawk'.
+
+   When `gawk' encounters an error while reading input, by default
+`getline' returns -1, and subsequent attempts to read from that file
+result in an end-of-file indication.  However, you may optionally
+instruct `gawk' to allow I/O to be retried when certain errors are
+encountered by setting a special element in the `PROCINFO' array (*note
+Auto-set::):
+
+     PROCINFO["INPUT_NAME", "RETRY"] = 1
+
+   When this element exists, `gawk' checks the value of the system (C
+language) `errno' variable when an I/O error occurs.  If `errno'
+indicates a subsequent I/O attempt may succeed, `getline' instead
+returns -2 and further calls to `getline' may succeed.  This applies to
+the `errno' values `EAGAIN', `EWOULDBLOCK', `EINTR', or `ETIMEDOUT'.
+
+   This feature is useful in conjunction with `PROCINFO["INPUT_NAME",
+"READ_TIMEOUT"]' or situations where a file descriptor has been
+configured to behave in a non-blocking fashion.
+
+
+File: gawk.info,  Node: Command-line directories,  Next: Input Summary,  Prev: Retrying Input,  Up: Reading Files
 
-4.11 Directories On The Command Line
+4.12 Directories on the Command Line
 ====================================
 
 According to the POSIX standard, files named on the `awk' command line
@@ -5899,7 +6029,7 @@ of `awk' treat a directory on the command line as a fatal error.
 line, but otherwise ignores it.  This makes it easier to use shell
 wildcards with your `awk' program:
 
-     $ gawk -f whizprog.awk *        Directories could kill this progam
+     $ gawk -f whizprog.awk *        Directories could kill this program
 
    If either of the `--posix' or `--traditional' options is given, then
 `gawk' reverts to treating a directory on the command line as a fatal
@@ -5911,13 +6041,14 @@ usable data from an `awk' program.
 
 File: gawk.info,  Node: Input Summary,  Next: Input Exercises,  Prev: Command-line directories,  Up: Reading Files
 
-4.12 Summary
+4.13 Summary
 ============
 
    * Input is split into records based on the value of `RS'.  The
      possibilities are as follows:
 
      Value of `RS'     Records are split on    `awk' / `gawk'
+                       ...                     
      ---------------------------------------------------------------------- 
      Any single        That character          `awk'
      character                                 
@@ -5926,11 +6057,15 @@ File: gawk.info,  Node: Input Summary,  Next: Input Exercises,  Prev: Command-li
      A regexp          Text that matches the   `gawk'
                        regexp                  
 
+   * `FNR' indicates how many records have been read from the current
+     input file; `NR' indicates how many records have been read in
+     total.
+
    * `gawk' sets `RT' to the text matched by `RS'.
 
    * After splitting the input into records, `awk' further splits the
-     record into individual fields, named `$1', `$2' and so on. `$0' is
-     the whole record, and `NF' indicates how many fields there are.
+     records into individual fields, named `$1', `$2', and so on. `$0'
+     is the whole record, and `NF' indicates how many fields there are.
      The default way to split fields is between whitespace characters.
 
    * Fields may be referenced using a variable, as in `$NF'.  Fields
@@ -5941,7 +6076,7 @@ File: gawk.info,  Node: Input Summary,  Next: Input Exercises,  Prev: Command-li
      does the same thing. Decrementing `NF' throws away fields and
      rebuilds the record.
 
-   * Field splitting is more complicated than record splitting.
+   * Field splitting is more complicated than record splitting:
 
      Field separator value       Fields are split ...        `awk' /
                                                              `gawk'
@@ -5951,27 +6086,27 @@ File: gawk.info,  Node: Input Summary,  Next: Input Exercises,  Prev: Command-li
      CHARACTER'                                              
      `FS == REGEXP'              On text matching the        `awk'
                                  regexp                      
-     `FS == ""'                  Each individual character   `gawk'
-                                 is a separate field         
+     `FS == ""'                  Such that each individual   `gawk'
+                                 character is a separate     
+                                 field                       
      `FIELDWIDTHS == LIST OF     Based on character          `gawk'
      COLUMNS'                    position                    
-     `FPAT == REGEXP'            On text around text         `gawk'
-                                 matching the regexp         
+     `FPAT == REGEXP'            On the text surrounding     `gawk'
+                                 text matching the regexp    
 
-     Using `FS = "\n"' causes the entire record to be a single field
+   * Using `FS = "\n"' causes the entire record to be a single field
      (assuming that newlines separate records).
 
    * `FS' may be set from the command line using the `-F' option.  This
      can also be done using command-line variable assignment.
 
-   * `PROCINFO["FS"]' can be used to see how fields are being split.
+   * Use `PROCINFO["FS"]' to see how fields are being split.
 
-   * Use `getline' in its various forms to read additional records,
-     from the default input stream, from a file, or from a pipe or
-     co-process.
+   * Use `getline' in its various forms to read additional records from
+     the default input stream, from a file, or from a pipe or coprocess.
 
-   * Use `PROCINFO[FILE, "READ_TIMEOUT"]' to cause reads to timeout for
-     FILE.
+   * Use `PROCINFO[FILE, "READ_TIMEOUT"]' to cause reads to time out
+     for FILE.
 
    * Directories on the command line are fatal for standard `awk';
      `gawk' ignores them if not in POSIX mode.
@@ -5980,7 +6115,7 @@ File: gawk.info,  Node: Input Summary,  Next: Input Exercises,  Prev: Command-li
 
 File: gawk.info,  Node: Input Exercises,  Prev: Input Summary,  Up: Reading Files
 
-4.13 Exercises
+4.14 Exercises
 ==============
 
   1. Using the `FIELDWIDTHS' variable (*note Constant Size::), write a
@@ -6026,10 +6161,12 @@ function.
 * Printf::                      The `printf' statement.
 * Redirection::                 How to redirect output to multiple files and
                                 pipes.
+* Special FD::                  Special files for I/O.
 * Special Files::               File name interpretation in `gawk'.
                                 `gawk' allows access to inherited file
                                 descriptors.
 * Close Files And Pipes::       Closing Input and Output Files and Pipes.
+* Nonfatal::                    Enabling Nonfatal Output.
 * Output Summary::              Output summary.
 * Output Exercises::            Exercises.
 
@@ -6039,10 +6176,10 @@ File: gawk.info,  Node: Print,  Next: Print Examples,  Up: Printing
 5.1 The `print' Statement
 =========================
 
-The `print' statement is used for producing output with simple,
-standardized formatting.  You specify only the strings or numbers to
-print, in a list separated by commas.  They are output, separated by
-single spaces, followed by a newline.  The statement looks like this:
+Use the `print' statement to produce output with simple, standardized
+formatting.  You specify only the strings or numbers to print, in a
+list separated by commas.  They are output, separated by single spaces,
+followed by a newline.  The statement looks like this:
 
      print ITEM1, ITEM2, ...
 
@@ -6057,14 +6194,14 @@ Numeric values are converted to strings and then printed.
 
    The simple statement `print' with no items is equivalent to `print
 $0': it prints the entire current record.  To print a blank line, use
-`print ""', where `""' is the empty string.  To print a fixed piece of
-text, use a string constant, such as `"Don't Panic"', as one item.  If
-you forget to use the double-quote characters, your text is taken as an
-`awk' expression, and you will probably get an error.  Keep in mind
-that a space is printed between any two items.
+`print ""'.  To print a fixed piece of text, use a string constant,
+such as `"Don't Panic"', as one item.  If you forget to use the
+double-quote characters, your text is taken as an `awk' expression, and
+you will probably get an error.  Keep in mind that a space is printed
+between any two items.
 
    Note that the `print' statement is a statement and not an
-expression--you can't use it the pattern part of a pattern-action
+expression--you can't use it in the pattern part of a pattern-action
 statement, for example.
 
 
@@ -6157,15 +6294,16 @@ As mentioned previously, a `print' statement contains a list of items
 separated by commas.  In the output, the items are normally separated
 by single spaces.  However, this doesn't need to be the case; a single
 space is simply the default.  Any string of characters may be used as
-the "output field separator" by setting the built-in variable `OFS'.
-The initial value of this variable is the string `" "'--that is, a
-single space.
+the "output field separator" by setting the predefined variable `OFS'.
+The initial value of this variable is the string `" "' (i.e., a single
+space).
 
    The output from an entire `print' statement is called an "output
 record".  Each `print' statement outputs one output record, and then
 outputs a string called the "output record separator" (or `ORS').  The
-initial value of `ORS' is the string `"\n"'; i.e., a newline character.
-Thus, each `print' statement normally makes a separate line.
+initial value of `ORS' is the string `"\n"' (i.e., a newline
+character).  Thus, each `print' statement normally makes a separate
+line.
 
    In order to change how output fields and records are separated,
 assign new values to the variables `OFS' and `ORS'.  The usual place to
@@ -6211,7 +6349,7 @@ File: gawk.info,  Node: OFMT,  Next: Printf,  Prev: Output Separators,  Up: Prin
 ===========================================
 
 When printing numeric values with the `print' statement, `awk'
-internally converts the number to a string of characters and prints
+internally converts each number to a string of characters and prints
 that string.  `awk' uses the `sprintf()' function to do this conversion
 (*note String Functions::).  For now, it suffices to say that the
 `sprintf()' function accepts a "format specification" that tells it how
@@ -6219,12 +6357,12 @@ to format numbers (or strings), and that there are a number of
 different ways in which numbers can be formatted.  The different format
 specifications are discussed more fully in *note Control Letters::.
 
-   The built-in variable `OFMT' contains the default format
-specification that `print' uses with `sprintf()' when it wants to
-convert a number to a string for printing.  The default value of `OFMT'
-is `"%.6g"'.  The way `print' prints numbers can be changed by
-supplying different format specifications as the value of `OFMT', as
-shown in the following example:
+   The predefined variable `OFMT' contains the format specification
+that `print' uses with `sprintf()' when it wants to convert a number to
+a string for printing.  The default value of `OFMT' is `"%.6g"'.  The
+way `print' prints numbers can be changed by supplying a different
+format specification for the value of `OFMT', as shown in the following
+example:
 
      $ awk 'BEGIN {
      >   OFMT = "%.0f"  # print numbers as integers (rounds)
@@ -6246,8 +6384,6 @@ by `print', use `printf'.  With `printf' you can specify the width to
 use for each item, as well as various formatting choices for numbers
 (such as what output base to use, whether to print an exponent, whether
 to print a sign, and how many digits to print after the decimal point).
-You do this by supplying a string, called the "format string", that
-controls how and where to print the other arguments.
 
 * Menu:
 
@@ -6266,10 +6402,10 @@ A simple `printf' statement looks like this:
 
      printf FORMAT, ITEM1, ITEM2, ...
 
-The entire list of arguments may optionally be enclosed in parentheses.
-The parentheses are necessary if any of the item expressions use the `>'
-relational operator; otherwise, it can be confused with an output
-redirection (*note Redirection::).
+As for `print', the entire list of arguments may optionally be enclosed
+in parentheses. Here too, the parentheses are necessary if any of the
+item expressions uses the `>' relational operator; otherwise, it can be
+confused with an output redirection (*note Redirection::).
 
    The difference between `printf' and `print' is the FORMAT argument.
 This is an expression whose value is taken as a string; it specifies
@@ -6290,12 +6426,12 @@ statements. For example:
 
      $ awk 'BEGIN {
      >    ORS = "\nOUCH!\n"; OFS = "+"
-     >    msg = "Dont Panic!"
+     >    msg = "Don\47t Panic!"
      >    printf "%s\n", msg
      > }'
-     -| Dont Panic!
+     -| Don't Panic!
 
-Here, neither the `+' nor the `OUCH' appear in the output message.
+Here, neither the `+' nor the `OUCH!' appears in the output message.
 
 
 File: gawk.info,  Node: Control Letters,  Next: Format Modifiers,  Prev: Basic Printf,  Up: Printf
@@ -6311,9 +6447,9 @@ print.  The rest of the format specifier is made up of optional
 width.  Here is a list of the format-control letters:
 
 `%c'
-     Print a number as an ASCII character; thus, `printf "%c", 65'
-     outputs the letter `A'. The output for a string value is the first
-     character of the string.
+     Print a number as a character; thus, `printf "%c", 65' outputs the
+     letter `A'. The output for a string value is the first character
+     of the string.
 
           NOTE: The POSIX standard says the first character of a string
           is printed.  In locales with multibyte characters, `gawk'
@@ -6334,7 +6470,7 @@ width.  Here is a list of the format-control letters:
      (The `%i' specification is for compatibility with ISO C.)
 
 `%e', `%E'
-     Print a number in scientific (exponential) notation; for example:
+     Print a number in scientific (exponential) notation.  For example:
 
           printf "%4.3e\n", 1950
 
@@ -6352,14 +6488,14 @@ width.  Here is a list of the format-control letters:
      of which follow the decimal point.  (The `4.3' represents two
      modifiers, discussed in the next node.)
 
-     On systems supporting IEEE 754 floating point format, values
+     On systems supporting IEEE 754 floating-point format, values
      representing negative infinity are formatted as `-inf' or
-     `-infinity', and positive infinity as `inf' and `infinity'.  The
+     `-infinity', and positive infinity as `inf' or `infinity'.  The
      special "not a number" value formats as `-nan' or `nan' (*note
      Math Definitions::).
 
 `%F'
-     Like `%f' but the infinity and "not a number" values are spelled
+     Like `%f', but the infinity and "not a number" values are spelled
      using uppercase letters.
 
      The `%F' format is a POSIX extension to ISO C; not all systems
@@ -6378,7 +6514,7 @@ width.  Here is a list of the format-control letters:
 
 `%u'
      Print an unsigned decimal integer.  (This format is of marginal
-     use, because all numbers in `awk' are floating-point; it is
+     use, because all numbers in `awk' are floating point; it is
      provided primarily for compatibility with C.)
 
 `%x', `%X'
@@ -6406,7 +6542,7 @@ File: gawk.info,  Node: Format Modifiers,  Next: Printf Examples,  Prev: Control
 A format specification can also include "modifiers" that can control
 how much of the item's value is printed, as well as how much space it
 gets.  The modifiers come between the `%' and the format-control letter.
-We will use the bullet symbol "*" in the following examples to represent
+We use the bullet symbol "*" in the following examples to represent
 spaces in the output. Here are the possible modifiers, in the order in
 which they may appear:
 
@@ -6426,10 +6562,9 @@ which they may appear:
      At first glance, this feature doesn't seem to be of much use.  It
      is in fact a `gawk' extension, intended for use in translating
      messages at runtime.  *Note Printf Ordering::, which describes how
-     and why to use positional specifiers.  For now, we will not use
-     them.
+     and why to use positional specifiers.  For now, we ignore them.
 
-`-'
+`-' (Minus)
      The minus sign, used before the width modifier (see later on in
      this list), says to left-justify the argument within its specified
      width.  Normally, the argument is printed right-justified in the
@@ -6439,7 +6574,7 @@ which they may appear:
 
      prints `foo*'.
 
-`SPACE'
+SPACE
      For numeric conversions, prefix positive values with a space and
      negative values with a minus sign.
 
@@ -6450,21 +6585,21 @@ which they may appear:
      space modifier.
 
 `#'
-     Use an "alternate form" for certain control letters.  For `%o',
+     Use an "alternative form" for certain control letters.  For `%o',
      supply a leading zero.  For `%x' and `%X', supply a leading `0x'
      or `0X' for a nonzero result.  For `%e', `%E', `%f', and `%F', the
      result always contains a decimal point.  For `%g' and `%G',
      trailing zeros are not removed from the result.
 
 `0'
-     A leading `0' (zero) acts as a flag that indicates that output
-     should be padded with zeros instead of spaces.  This applies only
-     to the numeric output formats.  This flag only has an effect when
-     the field width is wider than the value to print.
+     A leading `0' (zero) acts as a flag indicating that output should
+     be padded with zeros instead of spaces.  This applies only to the
+     numeric output formats.  This flag only has an effect when the
+     field width is wider than the value to print.
 
 `''
      A single quote or apostrophe character is a POSIX extension to ISO
-     C.  It indicates that the integer part of a floating point value,
+     C.  It indicates that the integer part of a floating-point value,
      or the entire part of an integer decimal value, should have a
      thousands-separator character in it.  This only works in locales
      that support such characters.  For example:
@@ -6484,7 +6619,7 @@ which they may appear:
           programs.  For information on appropriate quoting tricks, see
           *note Quoting::.
 
-`WIDTH'
+WIDTH
      This is a number specifying the desired minimum width of a field.
      Inserting any number between the `%' sign and the format-control
      character forces the field to expand to this width.  The default
@@ -6529,10 +6664,10 @@ which they may appear:
 
      prints `foob'.
 
-   The C library `printf''s dynamic WIDTH and PREC capability (for
-example, `"%*.*s"') is supported.  Instead of supplying explicit WIDTH
-and/or PREC values in the format string, they are passed in the
-argument list.  For example:
+   The C library `printf''s dynamic WIDTH and PREC capability (e.g.,
+`"%*.*s"') is supported.  Instead of supplying explicit WIDTH and/or
+PREC values in the format string, they are passed in the argument list.
+For example:
 
      w = 5
      p = 3
@@ -6554,7 +6689,7 @@ string, like so:
      s = "abcdefg"
      printf "%" w "." p "s\n", s
 
-This is not particularly easy to read but it does work.
+This is not particularly easy to read, but it does work.
 
    C programmers may be used to supplying additional modifiers (`h',
 `j', `l', `L', `t', and `z') in `printf' format strings. These are not
@@ -6593,7 +6728,7 @@ an aligned two-column table of names and phone numbers, as shown here:
      -| Jean-Paul  555-2127
 
    In this case, the phone numbers had to be printed as strings because
-the numbers are separated by a dash.  Printing the phone numbers as
+the numbers are separated by dashes.  Printing the phone numbers as
 numbers would have produced just the first three digits: `555'.  This
 would have been pretty confusing.
 
@@ -6608,14 +6743,15 @@ beginning of the `awk' program:
 
      awk 'BEGIN { print "Name      Number"
                   print "----      ------" }
-          { printf "%-10s %s\n", $1, $2 }' mail-list
+                { printf "%-10s %s\n", $1, $2 }' mail-list
 
-   The above example mixes `print' and `printf' statements in the same
-program.  Using just `printf' statements can produce the same results:
+   The preceding example mixes `print' and `printf' statements in the
+same program.  Using just `printf' statements can produce the same
+results:
 
      awk 'BEGIN { printf "%-10s %s\n", "Name", "Number"
                   printf "%-10s %s\n", "----", "------" }
-          { printf "%-10s %s\n", $1, $2 }' mail-list
+                { printf "%-10s %s\n", $1, $2 }' mail-list
 
 Printing each column heading with the same format specification used
 for the column elements ensures that the headings are aligned just like
@@ -6627,10 +6763,10 @@ be emphasized by storing it in a variable, like this:
      awk 'BEGIN { format = "%-10s %s\n"
                   printf format, "Name", "Number"
                   printf format, "----", "------" }
-          { printf format, $1, $2 }' mail-list
+                { printf format, $1, $2 }' mail-list
 
 
-File: gawk.info,  Node: Redirection,  Next: Special Files,  Prev: Printf,  Up: Printing
+File: gawk.info,  Node: Redirection,  Next: Special FD,  Prev: Printf,  Up: Printing
 
 5.6 Redirecting Output of `print' and `printf'
 ==============================================
@@ -6640,7 +6776,7 @@ output, usually the screen.  Both `print' and `printf' can also send
 their output to other places.  This is called "redirection".
 
      NOTE: When `--sandbox' is specified (*note Options::), redirecting
-     output to files and pipes is disabled.
+     output to files, pipes, and coprocesses is disabled.
 
    A redirection appears after the `print' or `printf' statement.
 Redirections in `awk' are written just like redirections in shell
@@ -6680,7 +6816,7 @@ work identically for `printf':
      Each output file contains one name or number per line.
 
 `print ITEMS >> OUTPUT-FILE'
-     This redirection prints the items into the pre-existing output file
+     This redirection prints the items into the preexisting output file
      named OUTPUT-FILE.  The difference between this and the single-`>'
      redirection is that the old contents (if any) of OUTPUT-FILE are
      not erased.  Instead, the `awk' output is appended to the file.
@@ -6711,16 +6847,10 @@ work identically for `printf':
      maintenance:
 
           report = "mail bug-system"
-          print "Awk script failed:", $0 | report
-          m = ("at record number " FNR " of " FILENAME)
-          print m | report
+          print("Awk script failed:", $0) | report
+          print("at record number", FNR, "of", FILENAME) | report
           close(report)
 
-     The message is built using string concatenation and saved in the
-     variable `m'.  It's then sent down the pipeline to the `mail'
-     program.  (The parentheses group the items to concatenate--see
-     *note Concatenation::.)
-
      The `close()' function is called here because it's a good idea to
      close the pipe as soon as all the intended output has been sent to
      it.  *Note Close Files And Pipes::, for more information.
@@ -6734,8 +6864,8 @@ work identically for `printf':
 `print ITEMS |& COMMAND'
      This redirection prints the items to the input of COMMAND.  The
      difference between this and the single-`|' redirection is that the
-     output from COMMAND can be read with `getline'.  Thus COMMAND is a
-     "coprocess", which works together with, but subsidiary to, the
+     output from COMMAND can be read with `getline'.  Thus, COMMAND is
+     a "coprocess", which works together with but is subsidiary to the
      `awk' program.
 
      This feature is a `gawk' extension, and is not available in POSIX
@@ -6758,8 +6888,8 @@ a file, and then to use `>>' for subsequent output:
 
 This is indeed how redirections must be used from the shell.  But in
 `awk', it isn't necessary.  In this kind of case, a program should use
-`>' for all the `print' statements, since the output file is only
-opened once. (It happens that if you mix `>' and `>>' that output is
+`>' for all the `print' statements, because the output file is only
+opened once. (It happens that if you mix `>' and `>>' output is
 produced in the expected order. However, mixing the operators for the
 same file is definitely poor style, and is confusing to readers of your
 program.)
@@ -6786,40 +6916,30 @@ uppercase characters converted to lowercase (*note String Functions::).
 The program builds up a list of command lines, using the `mv' utility
 to rename the files.  It then sends the list to the shell for execution.
 
-
-File: gawk.info,  Node: Special Files,  Next: Close Files And Pipes,  Prev: Redirection,  Up: Printing
-
-5.7 Special File Names in `gawk'
-================================
-
-`gawk' provides a number of special file names that it interprets
-internally.  These file names provide access to standard file
-descriptors and TCP/IP networking.
-
-* Menu:
-
-* Special FD::                  Special files for I/O.
-* Special Network::             Special files for network communications.
-* Special Caveats::             Things to watch out for.
+   *Note Shell Quoting::, for a function that can help in generating
+command lines to be fed to the shell.
 
 
-File: gawk.info,  Node: Special FD,  Next: Special Network,  Up: Special Files
+File: gawk.info,  Node: Special FD,  Next: Special Files,  Prev: Redirection,  Up: Printing
 
-5.7.1 Special Files for Standard Descriptors
---------------------------------------------
+5.7 Special Files for Standard Preopened Data Streams
+=====================================================
 
 Running programs conventionally have three input and output streams
 already available to them for reading and writing.  These are known as
 the "standard input", "standard output", and "standard error output".
-These streams are, by default, connected to your keyboard and screen,
-but they are often redirected with the shell, via the `<', `<<', `>',
-`>>', `>&', and `|' operators.  Standard error is typically used for
-writing error messages; the reason there are two separate streams,
+These open streams (and any other open files or pipes) are often
+referred to by the technical term "file descriptors".
+
+   These streams are, by default, connected to your keyboard and
+screen, but they are often redirected with the shell, via the `<', `<<',
+`>', `>>', `>&', and `|' operators.  Standard error is typically used
+for writing error messages; the reason there are two separate streams,
 standard output and standard error, is so that they can be redirected
 separately.
 
-   In other implementations of `awk', the only way to write an error
-message to standard error in an `awk' program is as follows:
+   In traditional implementations of `awk', the only way to write an
+error message to standard error in an `awk' program is as follows:
 
      print "Serious error detected!" | "cat 1>&2"
 
@@ -6834,19 +6954,18 @@ error messages to the screen, like this:
 (`/dev/tty' is a special file supplied by the operating system that is
 connected to your keyboard and screen. It represents the "terminal,"(1)
 which on modern systems is a keyboard and screen, not a serial console.)
-This usually has the same effect but not always: although the standard
-error stream is usually the screen, it can be redirected; when that
-happens, writing to the screen is not correct.  In fact, if `awk' is
-run from a background job, it may not have a terminal at all.  Then
+This generally has the same effect, but not always: although the
+standard error stream is usually the screen, it can be redirected; when
+that happens, writing to the screen is not correct.  In fact, if `awk'
+is run from a background job, it may not have a terminal at all.  Then
 opening `/dev/tty' fails.
 
-   `gawk' provides special file names for accessing the three standard
-streams. (c.e.) It also provides syntax for accessing any other
-inherited open files.  If the file name matches one of these special
-names when `gawk' redirects input or output, then it directly uses the
-stream that the file name stands for.  These special file names work
-for all operating systems that `gawk' has been ported to, not just
-those that are POSIX-compliant:
+   `gawk', BWK `awk', and `mawk' provide special file names for
+accessing the three standard streams.  If the file name matches one of
+these special names when `gawk' (or one of the others) redirects input
+or output, then it directly uses the descriptor that the file name
+stands for.  These special file names work for all operating systems
+that `gawk' has been ported to, not just those that are POSIX-compliant:
 
 `/dev/stdin'
      The standard input (file descriptor 0).
@@ -6857,38 +6976,69 @@ those that are POSIX-compliant:
 `/dev/stderr'
      The standard error output (file descriptor 2).
 
-`/dev/fd/N'
-     The file associated with file descriptor N.  Such a file must be
-     opened by the program initiating the `awk' execution (typically
-     the shell).  Unless special pains are taken in the shell from which
-     `gawk' is invoked, only descriptors 0, 1, and 2 are available.
-
-   The file names `/dev/stdin', `/dev/stdout', and `/dev/stderr' are
-aliases for `/dev/fd/0', `/dev/fd/1', and `/dev/fd/2', respectively.
-However, they are more self-explanatory.  The proper way to write an
-error message in a `gawk' program is to use `/dev/stderr', like this:
+   With these facilities, the proper way to write an error message then
+becomes:
 
      print "Serious error detected!" > "/dev/stderr"
 
-   Note the use of quotes around the file name.  Like any other
+   Note the use of quotes around the file name.  Like with any other
 redirection, the value must be a string.  It is a common error to omit
 the quotes, which leads to confusing results.
 
-   Finally, using the `close()' function on a file name of the form
-`"/dev/fd/N"', for file descriptor numbers above two, does actually
-close the given file descriptor.
-
-   The `/dev/stdin', `/dev/stdout', and `/dev/stderr' special files are
-also recognized internally by several other versions of `awk'.
+   `gawk' does not treat these file names as special when in
+POSIX-compatibility mode. However, because BWK `awk' supports them,
+`gawk' does support them even when invoked with the `--traditional'
+option (*note Options::).
 
    ---------- Footnotes ----------
 
    (1) The "tty" in `/dev/tty' stands for "Teletype," a serial terminal.
 
 
-File: gawk.info,  Node: Special Network,  Next: Special Caveats,  Prev: Special FD,  Up: Special Files
+File: gawk.info,  Node: Special Files,  Next: Close Files And Pipes,  Prev: Special FD,  Up: Printing
+
+5.8 Special File names in `gawk'
+================================
+
+Besides access to standard input, standard output, and standard error,
+`gawk' provides access to any open file descriptor.  Additionally,
+there are special file names reserved for TCP/IP networking.
+
+* Menu:
+
+* Other Inherited Files::       Accessing other open files with
+                                `gawk'.
+* Special Network::             Special files for network communications.
+* Special Caveats::             Things to watch out for.
+
+
+File: gawk.info,  Node: Other Inherited Files,  Next: Special Network,  Up: Special Files
+
+5.8.1 Accessing Other Open Files with `gawk'
+--------------------------------------------
+
+Besides the `/dev/stdin', `/dev/stdout', and `/dev/stderr' special file
+names mentioned earlier, `gawk' provides syntax for accessing any other
+inherited open file:
 
-5.7.2 Special Files for Network Communications
+`/dev/fd/N'
+     The file associated with file descriptor N.  Such a file must be
+     opened by the program initiating the `awk' execution (typically
+     the shell).  Unless special pains are taken in the shell from which
+     `gawk' is invoked, only descriptors 0, 1, and 2 are available.
+
+   The file names `/dev/stdin', `/dev/stdout', and `/dev/stderr' are
+essentially aliases for `/dev/fd/0', `/dev/fd/1', and `/dev/fd/2',
+respectively. However, those names are more self-explanatory.
+
+   Note that using `close()' on a file name of the form `"/dev/fd/N"',
+for file descriptor numbers above two, does actually close the given
+file descriptor.
+
+
+File: gawk.info,  Node: Special Network,  Next: Special Caveats,  Prev: Other Inherited Files,  Up: Special Files
+
+5.8.2 Special Files for Network Communications
 ----------------------------------------------
 
 `gawk' programs can open a two-way TCP/IP connection, acting as either
@@ -6897,7 +7047,7 @@ form:
 
      `/NET-TYPE/PROTOCOL/LOCAL-PORT/REMOTE-HOST/REMOTE-PORT'
 
-   The NET-TYPE is one of `inet', `inet4' or `inet6'.  The PROTOCOL is
+   The NET-TYPE is one of `inet', `inet4', or `inet6'.  The PROTOCOL is
 one of `tcp' or `udp', and the other fields represent the other
 essential pieces of information for making a networking connection.
 These file names are used with the `|&' operator for communicating with
@@ -6908,27 +7058,31 @@ mentioned here only for completeness.  Full discussion is delayed until
 
 File: gawk.info,  Node: Special Caveats,  Prev: Special Network,  Up: Special Files
 
-5.7.3 Special File Name Caveats
+5.8.3 Special File name Caveats
 -------------------------------
 
-Here is a list of things to bear in mind when using the special file
-names that `gawk' provides:
+Here are some things to bear in mind when using the special file names
+that `gawk' provides:
 
-   * Recognition of these special file names is disabled if `gawk' is in
-     compatibility mode (*note Options::).
+   * Recognition of the file names for the three standard preopened
+     files is disabled only in POSIX mode.
+
+   * Recognition of the other special file names is disabled if `gawk'
+     is in compatibility mode (either `--traditional' or `--posix';
+     *note Options::).
 
    * `gawk' _always_ interprets these special file names.  For example,
      using `/dev/fd/4' for output actually writes on file descriptor 4,
-     and not on a new file descriptor that is `dup()''ed from file
+     and not on a new file descriptor that is `dup()'ed from file
      descriptor 4.  Most of the time this does not matter; however, it
      is important to _not_ close any of the files related to file
      descriptors 0, 1, and 2.  Doing so results in unpredictable
      behavior.
 
 
-File: gawk.info,  Node: Close Files And Pipes,  Next: Output Summary,  Prev: Special Files,  Up: Printing
+File: gawk.info,  Node: Close Files And Pipes,  Next: Nonfatal,  Prev: Special Files,  Up: Printing
 
-5.8 Closing Input and Output Redirections
+5.9 Closing Input and Output Redirections
 =========================================
 
 If the same file name or the same shell command is used with `getline'
@@ -7035,14 +7189,16 @@ terminated;(1) more importantly, the file descriptor for the pipe is
 not closed and released until `close()' is called or `awk' exits.
 
    `close()' silently does nothing if given an argument that does not
-represent a file, pipe or coprocess that was opened with a redirection.
-In such a case, it returns a negative value, indicating an error. In
-addition, `gawk' sets `ERRNO' to a string indicating the error.
+represent a file, pipe, or coprocess that was opened with a
+redirection.  In such a case, it returns a negative value, indicating
+an error. In addition, `gawk' sets `ERRNO' to a string indicating the
+error.
 
    Note also that `close(FILENAME)' has no "magic" effects on the
 implicit loop that reads through the files named on the command line.
 It is, more likely, a close of a file that was never opened with a
-redirection, so `awk' silently does nothing.
+redirection, so `awk' silently does nothing, except return a negative
+value.
 
    When using the `|&' operator to communicate with a coprocess, it is
 occasionally useful to be able to close one end of the two-way pipe
@@ -7051,14 +7207,14 @@ to `close()'.  As in any other call to `close()', the first argument is
 the name of the command or special file used to start the coprocess.
 The second argument should be a string, with either of the values
 `"to"' or `"from"'.  Case does not matter.  As this is an advanced
-feature, a more complete discussion is delayed until *note Two-way
-I/O::, which discusses it in more detail and gives an example.
+feature, discussion is delayed until *note Two-way I/O::, which
+describes it in more detail and gives an example.
 
                     Using `close()''s Return Value
 
    In many older versions of Unix `awk', the `close()' function is
-actually a statement.  It is a syntax error to try and use the return
-value from `close()': (d.c.)
+actually a statement.  (d.c.)  It is a syntax error to try and use the
+return value from `close()':
 
      command = "..."
      command | getline info
@@ -7067,8 +7223,8 @@ value from `close()': (d.c.)
    `gawk' treats `close()' as a function.  The return value is -1 if
 the argument names something that was never opened with a redirection,
 or if there is a system problem closing the file or process.  In these
-cases, `gawk' sets the built-in variable `ERRNO' to a string describing
-the problem.
+cases, `gawk' sets the predefined variable `ERRNO' to a string
+describing the problem.
 
    In `gawk', when closing a pipe or coprocess (input or output), the
 return value is the exit status of the command.(2) Otherwise, it is the
@@ -7077,8 +7233,8 @@ closing input or output files, respectively.  This value is zero if the
 close succeeds, or -1 if it fails.
 
    The POSIX standard is very vague; it says that `close()' returns
-zero on success and nonzero otherwise.  In general, different
-implementations vary in what they report when closing pipes; thus the
+zero on success and a nonzero value otherwise.  In general, different
+implementations vary in what they report when closing pipes; thus, the
 return value cannot be used portably.  (d.c.)  In POSIX mode (*note
 Options::), `gawk' just returns zero when closing a pipe.
 
@@ -7093,10 +7249,69 @@ call. See the system manual pages for information on how to decode this
 value.
 
 
-File: gawk.info,  Node: Output Summary,  Next: Output Exercises,  Prev: Close Files And Pipes,  Up: Printing
+File: gawk.info,  Node: Nonfatal,  Next: Output Summary,  Prev: Close Files And Pipes,  Up: Printing
 
-5.9 Summary
-===========
+5.10 Enabling Nonfatal Output
+=============================
+
+This minor node describes a `gawk'-specific feature.
+
+   In standard `awk', output with `print' or `printf' to a nonexistent
+file, or some other I/O error (such as filling up the disk) is a fatal
+error.
+
+     $ gawk 'BEGIN { print "hi" > "/no/such/file" }'
+     error--> gawk: cmd. line:1: fatal: can't redirect to `/no/such/file' (No such file or directory)
+
+   `gawk' makes it possible to detect that an error has occurred,
+allowing you to possibly recover from the error, or at least print an
+error message of your choosing before exiting.  You can do this in one
+of two ways:
+
+   * For all output files, by assigning any value to
+     `PROCINFO["NONFATAL"]'.
+
+   * On a per-file basis, by assigning any value to `PROCINFO[FILENAME,
+     "NONFATAL"]'.  Here, FILENAME is the name of the file to which you
+     wish output to be nonfatal.
+
+   Once you have enabled nonfatal output, you must check `ERRNO' after
+every relevant `print' or `printf' statement to see if something went
+wrong.  It is also a good idea to initialize `ERRNO' to zero before
+attempting the output. For example:
+
+     $ gawk '
+     > BEGIN {
+     >     PROCINFO["NONFATAL"] = 1
+     >     ERRNO = 0
+     >     print "hi" > "/no/such/file"
+     >     if (ERRNO) {
+     >         print("Output failed:", ERRNO) > "/dev/stderr"
+     >         exit 1
+     >     }
+     > }'
+     error--> Output failed: No such file or directory
+
+   Here, `gawk' did not produce a fatal error; instead it let the `awk'
+program code detect the problem and handle it.
+
+   This mechanism works also for standard output and standard error.
+For standard output, you may use `PROCINFO["-", "NONFATAL"]' or
+`PROCINFO["/dev/stdout", "NONFATAL"]'.  For standard error, use
+`PROCINFO["/dev/stderr", "NONFATAL"]'.
+
+   When attempting to open a TCP/IP socket (*note TCP/IP Networking::),
+`gawk' tries multiple times. The `GAWK_SOCK_RETRIES' environment
+variable (*note Other Environment Variables::) allows you to override
+`gawk''s builtin default number of attempts.  However, once nonfatal
+I/O is enabled for a given socket, `gawk' only retries once, relying on
+`awk'-level code to notice that there was a problem.
+
+
+File: gawk.info,  Node: Output Summary,  Next: Output Exercises,  Prev: Nonfatal,  Up: Printing
+
+5.11 Summary
+============
 
    * The `print' statement prints comma-separated expressions. Each
      expression is separated by the value of `OFS' and terminated by
@@ -7104,24 +7319,29 @@ File: gawk.info,  Node: Output Summary,  Next: Output Exercises,  Prev: Close Fi
      numeric values for the `print' statement.
 
    * The `printf' statement provides finer-grained control over output,
-     with format control letters for different data types and various
-     flags that modify the behavior of the format control letters.
+     with format-control letters for different data types and various
+     flags that modify the behavior of the format-control letters.
 
    * Output from both `print' and `printf' may be redirected to files,
-     pipes, and co-processes.
+     pipes, and coprocesses.
 
    * `gawk' provides special file names for access to standard input,
-     output and error, and for network communications.
+     output, and error, and for network communications.
 
-   * Use `close()' to close open file, pipe and co-process redirections.
-     For co-processes, it is possible to close only one direction of the
+   * Use `close()' to close open file, pipe, and coprocess redirections.
+     For coprocesses, it is possible to close only one direction of the
      communications.
 
+   * Normally errors with `print' or `printf' are fatal.  `gawk' lets
+     you make output errors be nonfatal either for all files or on a
+     per-file basis. You must then check for errors after every
+     relevant output statement.
+
 
 
 File: gawk.info,  Node: Output Exercises,  Prev: Output Summary,  Up: Printing
 
-5.10 Exercises
+5.12 Exercises
 ==============
 
   1. Rewrite the program:
@@ -7156,9 +7376,9 @@ value to a variable or a field by using an assignment operator.
    An expression can serve as a pattern or action statement on its own.
 Most other kinds of statements contain one or more expressions that
 specify the data on which to operate.  As in other languages,
-expressions in `awk' include variables, array references, constants,
-and function calls, as well as combinations of these with various
-operators.
+expressions in `awk' can include variables, array references,
+constants, and function calls, as well as combinations of these with
+various operators.
 
 * Menu:
 
@@ -7173,12 +7393,12 @@ operators.
 
 File: gawk.info,  Node: Values,  Next: All Operators,  Up: Expressions
 
-6.1 Constants, Variables and Conversions
-========================================
+6.1 Constants, Variables, and Conversions
+=========================================
 
 Expressions are built up from values and the operations performed upon
-them. This minor node describes the elementary objects which provide
-the values used in expressions.
+them. This minor node describes the elementary objects that provide the
+values used in expressions.
 
 * Menu:
 
@@ -7200,7 +7420,7 @@ regular expression.
 
    Each is used in the appropriate context when you need a data value
 that isn't going to change.  Numeric constants can have different
-forms, but are stored identically internally.
+forms, but are internally stored in an identical manner.
 
 * Menu:
 
@@ -7223,21 +7443,21 @@ the same value:
      1.05e+2
      1050e-1
 
-   A string constant consists of a sequence of characters enclosed in
-double-quotation marks.  For example:
+   A "string constant" consists of a sequence of characters enclosed in
+double quotation marks.  For example:
 
      "parrot"
 
 represents the string whose contents are `parrot'.  Strings in `gawk'
 can be of any length, and they can contain any of the possible
-eight-bit ASCII characters including ASCII NUL (character code zero).
+eight-bit ASCII characters, including ASCII NUL (character code zero).
 Other `awk' implementations may have difficulty with some character
 codes.
 
    ---------- Footnotes ----------
 
    (1) The internal representation of all numbers, including integers,
-uses double precision floating-point numbers.  On most modern systems,
+uses double-precision floating-point numbers.  On most modern systems,
 these are in IEEE 754 standard format.  *Note Arbitrary Precision
 Arithmetic::, for much more information.
 
@@ -7247,16 +7467,16 @@ File: gawk.info,  Node: Nondecimal-numbers,  Next: Regexp Constants,  Prev: Scal
 6.1.1.2 Octal and Hexadecimal Numbers
 .....................................
 
-In `awk', all numbers are in decimal; i.e., base 10.  Many other
+In `awk', all numbers are in decimal (i.e., base 10).  Many other
 programming languages allow you to specify numbers in other bases, often
 octal (base 8) and hexadecimal (base 16).  In octal, the numbers go 0,
-1, 2, 3, 4, 5, 6, 7, 10, 11, 12, etc.  Just as `11', in decimal, is 1
-times 10 plus 1, so `11', in octal, is 1 times 8, plus 1. This equals 9
-in decimal.  In hexadecimal, there are 16 digits. Since the everyday
+1, 2, 3, 4, 5, 6, 7, 10, 11, 12, and so on.  Just as `11' in decimal is
+1 times 10 plus 1, so `11' in octal is 1 times 8 plus 1. This equals 9
+in decimal.  In hexadecimal, there are 16 digits. Because the everyday
 decimal number system only has ten digits (`0'-`9'), the letters `a'
 through `f' are used to represent the rest.  (Case in the letters is
 usually irrelevant; hexadecimal `a' and `A' have the same value.)
-Thus, `11', in hexadecimal, is 1 times 16 plus 1, which equals 17 in
+Thus, `11' in hexadecimal is 1 times 16 plus 1, which equals 17 in
 decimal.
 
    Just by looking at plain `11', you can't tell what base it's in.
@@ -7265,13 +7485,13 @@ notation to signify the base.  Octal numbers start with a leading `0',
 and hexadecimal numbers start with a leading `0x' or `0X':
 
 `11'
-     Decimal value 11.
+     Decimal value 11
 
 `011'
-     Octal 11, decimal value 9.
+     Octal 11, decimal value 9
 
 `0x11'
-     Hexadecimal 11, decimal value 17.
+     Hexadecimal 11, decimal value 17
 
    This example shows the difference:
 
@@ -7290,12 +7510,12 @@ really need to do this, use the `--non-decimal-data' command-line
 option; *note Nondecimal Data::.)  If you have octal or hexadecimal
 data, you can use the `strtonum()' function (*note String Functions::)
 to convert the data into a number.  Most of the time, you will want to
-use octal or hexadecimal constants when working with the built-in bit
-manipulation functions; see *note Bitwise Functions::, for more
+use octal or hexadecimal constants when working with the built-in
+bit-manipulation functions; see *note Bitwise Functions::, for more
 information.
 
-   Unlike some early C implementations, `8' and `9' are not valid in
-octal constants; e.g., `gawk' treats `018' as decimal 18:
+   Unlike in some early C implementations, `8' and `9' are not valid in
+octal constants.  For example, `gawk' treats `018' as decimal 18:
 
      $ gawk 'BEGIN { print "021 is", 021 ; print 018 }'
      -| 021 is 17
@@ -7321,12 +7541,12 @@ File: gawk.info,  Node: Regexp Constants,  Prev: Nondecimal-numbers,  Up: Consta
 6.1.1.3 Regular Expression Constants
 ....................................
 
-A regexp constant is a regular expression description enclosed in
+A "regexp constant" is a regular expression description enclosed in
 slashes, such as `/^beginning and end$/'.  Most regexps used in `awk'
 programs are constant, but the `~' and `!~' matching operators can also
 match computed or dynamic regexps (which are typically just ordinary
-strings or variables that contain a regexp, but could be a more complex
-expression).
+strings or variables that contain a regexp, but could be more complex
+expressions).
 
 
 File: gawk.info,  Node: Using Constant Regexps,  Next: Variables,  Prev: Constants,  Up: Values
@@ -7338,8 +7558,8 @@ When used on the righthand side of the `~' or `!~' operators, a regexp
 constant merely stands for the regexp that is to be matched.  However,
 regexp constants (such as `/foo/') may be used like simple expressions.
 When a regexp constant appears by itself, it has the same meaning as if
-it appeared in a pattern, i.e., `($0 ~ /foo/)' (d.c.)  *Note Expression
-Patterns::.  This means that the following two code segments:
+it appeared in a pattern (i.e., `($0 ~ /foo/)').  (d.c.)  *Note
+Expression Patterns::.  This means that the following two code segments:
 
      if ($0 ~ /barfly/ || $0 ~ /camelot/)
          print "found"
@@ -7351,7 +7571,7 @@ and:
 
 are exactly equivalent.  One rather bizarre consequence of this rule is
 that the following Boolean expression is valid, but does not do what
-the user probably intended:
+its author probably intended:
 
      # Note that /foo/ is on the left of the ~
      if (/foo/ ~ $1) print "found foo"
@@ -7377,9 +7597,10 @@ of the `match()' function, and as the third argument of the `split()'
 and `patsplit()' functions (*note String Functions::).  Modern
 implementations of `awk', including `gawk', allow the third argument of
 `split()' to be a regexp constant, but some older implementations do
-not.  (d.c.)  This can lead to confusion when attempting to use regexp
-constants as arguments to user-defined functions (*note User-defined::).
-For example:
+not.  (d.c.)  Because some built-in functions accept regexp constants
+as arguments, confusion can arise when attempting to use regexp
+constants as arguments to user-defined functions (*note
+User-defined::).  For example:
 
      function mysub(pat, repl, str, global)
      {
@@ -7400,10 +7621,11 @@ For example:
    In this example, the programmer wants to pass a regexp constant to
 the user-defined function `mysub()', which in turn passes it on to
 either `sub()' or `gsub()'.  However, what really happens is that the
-`pat' parameter is either one or zero, depending upon whether or not
-`$0' matches `/hi/'.  `gawk' issues a warning when it sees a regexp
-constant used as a parameter to a user-defined function, since passing
-a truth value in this way is probably not what was intended.
+`pat' parameter is assigned a value of either one or zero, depending
+upon whether or not `$0' matches `/hi/'.  `gawk' issues a warning when
+it sees a regexp constant used as a parameter to a user-defined
+function, because passing a truth value in this way is probably not
+what was intended.
 
 
 File: gawk.info,  Node: Variables,  Next: Conversion,  Prev: Using Constant Regexps,  Up: Values
@@ -7411,7 +7633,7 @@ File: gawk.info,  Node: Variables,  Next: Conversion,  Prev: Using Constant Rege
 6.1.3 Variables
 ---------------
 
-Variables are ways of storing values at one point in your program for
+"Variables" are ways of storing values at one point in your program for
 use later in another part of your program.  They can be manipulated
 entirely within the program text, and they can also be assigned values
 on the `awk' command line.
@@ -7440,26 +7662,26 @@ variables.
 
    A variable name is a valid expression by itself; it represents the
 variable's current value.  Variables are given new values with
-"assignment operators", "increment operators", and "decrement
-operators".  *Note Assignment Ops::.  In addition, the `sub()' and
-`gsub()' functions can change a variable's value, and the `match()',
-`patsplit()' and `split()' functions can change the contents of their
-array parameters. *Note String Functions::.
+"assignment operators", "increment operators", and "decrement operators"
+(*note Assignment Ops::).  In addition, the `sub()' and `gsub()'
+functions can change a variable's value, and the `match()', `split()',
+and `patsplit()' functions can change the contents of their array
+parameters (*note String Functions::).
 
    A few variables have special built-in meanings, such as `FS' (the
-field separator), and `NF' (the number of fields in the current input
-record).  *Note Built-in Variables::, for a list of the built-in
-variables.  These built-in variables can be used and assigned just like
-all other variables, but their values are also used or changed
-automatically by `awk'.  All built-in variables' names are entirely
+field separator) and `NF' (the number of fields in the current input
+record).  *Note Built-in Variables::, for a list of the predefined
+variables.  These predefined variables can be used and assigned just
+like all other variables, but their values are also used or changed
+automatically by `awk'.  All predefined variables' names are entirely
 uppercase.
 
    Variables in `awk' can be assigned either numeric or string values.
 The kind of value a variable holds can change over the life of a
 program.  By default, variables are initialized to the empty string,
 which is zero if converted to a number.  There is no need to explicitly
-"initialize" a variable in `awk', which is what you would do in C and
-in most other traditional languages.
+initialize a variable in `awk', which is what you would do in C and in
+most other traditional languages.
 
 
 File: gawk.info,  Node: Assignment Options,  Prev: Using Variables,  Up: Variables
@@ -7515,7 +7737,7 @@ File: gawk.info,  Node: Conversion,  Prev: Variables,  Up: Values
 6.1.4 Conversion of Strings and Numbers
 ---------------------------------------
 
-Number to string and string to number conversion are generally
+Number-to-string and string-to-number conversion are generally
 straightforward.  There can be subtleties to be aware of; this minor
 node discusses this important facet of `awk'.
 
@@ -7528,7 +7750,7 @@ node discusses this important facet of `awk'.
 
 File: gawk.info,  Node: Strings And Numbers,  Next: Locale influences conversions,  Up: Conversion
 
-6.1.4.1 How `awk' Converts Between Strings And Numbers
+6.1.4.1 How `awk' Converts Between Strings and Numbers
 ......................................................
 
 Strings are converted to numbers and numbers are converted to strings,
@@ -7551,11 +7773,11 @@ string, concatenate that number with the empty string, `""'.  To force
 a string to be converted to a number, add zero to that string.  A
 string is converted to a number by interpreting any numeric prefix of
 the string as numerals: `"2.5"' converts to 2.5, `"1e3"' converts to
-1000, and `"25fix"' has a numeric value of 25.  Strings that can't be
+1,000, and `"25fix"' has a numeric value of 25.  Strings that can't be
 interpreted as valid numbers convert to zero.
 
    The exact manner in which numbers are converted into strings is
-controlled by the `awk' built-in variable `CONVFMT' (*note Built-in
+controlled by the `awk' predefined variable `CONVFMT' (*note Built-in
 Variables::).  Numbers are converted using the `sprintf()' function
 with `CONVFMT' as the format specifier (*note String Functions::).
 
@@ -7580,7 +7802,7 @@ value of `CONVFMT' may be.  Given the following code fragment:
 
 `b' has the value `"12"', not `"12.00"'.  (d.c.)
 
-           Pre-POSIX `awk' Used `OFMT' For String Conversion
+           Pre-POSIX `awk' Used `OFMT' for String Conversion
 
    Prior to the POSIX standard, `awk' used the value of `OFMT' for
 converting numbers to strings.  `OFMT' specifies the output format to
@@ -7617,7 +7839,7 @@ separator, if they have one.
 decimal point when reading the `awk' program source code, and for
 command-line variable assignments (*note Other Arguments::).  However,
 when interpreting input data, for `print' and `printf' output, and for
-number to string conversion, the local decimal point character is used.
+number-to-string conversion, the local decimal point character is used.
 (d.c.) In all cases, numbers in source code and in input data cannot
 have a thousands separator.  Here are some examples indicating the
 difference in behavior, on a GNU/Linux system:
@@ -7634,17 +7856,17 @@ difference in behavior, on a GNU/Linux system:
 
 The `en_DK.utf-8' locale is for English in Denmark, where the comma
 acts as the decimal point separator.  In the normal `"C"' locale, `gawk'
-treats `4,321' as `4', while in the Danish locale, it's treated as the
-full number, 4.321.
+treats `4,321' as 4, while in the Danish locale, it's treated as the
+full number including the fractional part, 4.321.
 
    Some earlier versions of `gawk' fully complied with this aspect of
 the standard.  However, many users in non-English locales complained
-about this behavior, since their data used a period as the decimal
+about this behavior, because their data used a period as the decimal
 point, so the default behavior was restored to use a period as the
 decimal point character.  You can use the `--use-lc-numeric' option
 (*note Options::) to force `gawk' to use the locale's decimal point
 character.  (`gawk' also uses the locale's decimal point character when
-in POSIX mode, either via `--posix', or the `POSIXLY_CORRECT'
+in POSIX mode, either via `--posix' or the `POSIXLY_CORRECT'
 environment variable, as shown previously.)
 
    *note table-locale-affects:: describes the cases in which the
@@ -7658,20 +7880,20 @@ Feature     Default        `--posix' or `--use-lc-numeric'
 Input       Use period     Use locale
 `strtonum()'Use period     Use locale
 
-Table 6.1: Locale Decimal Point versus A Period
+Table 6.1: Locale decimal point versus a period
 
-   Finally, modern day formal standards and IEEE standard floating point
-representation can have an unusual but important effect on the way
-`gawk' converts some special string values to numbers.  The details are
-presented in *note POSIX Floating Point Problems::.
+   Finally, modern-day formal standards and the IEEE standard
+floating-point representation can have an unusual but important effect
+on the way `gawk' converts some special string values to numbers.  The
+details are presented in *note POSIX Floating Point Problems::.
 
 
 File: gawk.info,  Node: All Operators,  Next: Truth Values and Conditions,  Prev: Values,  Up: Expressions
 
-6.2 Operators: Doing Something With Values
+6.2 Operators: Doing Something with Values
 ==========================================
 
-This minor node introduces the "operators" which make use of the values
+This minor node introduces the "operators" that make use of the values
 provided by constants and variables.
 
 * Menu:
@@ -7730,9 +7952,9 @@ order from the highest precedence to the lowest:
      Division;  because all numbers in `awk' are floating-point
      numbers, the result is _not_ rounded to an integer--`3 / 4' has
      the value 0.75.  (It is a common mistake, especially for C
-     programmers, to forget that _all_ numbers in `awk' are
-     floating-point, and that division of integer-looking constants
-     produces a real number, not an integer.)
+     programmers, to forget that _all_ numbers in `awk' are floating
+     point, and that division of integer-looking constants produces a
+     real number, not an integer.)
 
 `X % Y'
      Remainder; further discussion is provided in the text, just after
@@ -7794,7 +8016,7 @@ runs together.  For example:
      ...
 
    Because string concatenation does not have an explicit operator, it
-is often necessary to insure that it happens at the right time by using
+is often necessary to ensure that it happens at the right time by using
 parentheses to enclose the items to concatenate.  For example, you
 might expect that the following code fragment concatenates `file' and
 `name':
@@ -7852,7 +8074,7 @@ you'll get.
 
    ---------- Footnotes ----------
 
-   (1) It happens that BWK `awk', `gawk' and `mawk' all "get it right,"
+   (1) It happens that BWK `awk', `gawk', and `mawk' all "get it right,"
 but you should not rely on this.
 
 
@@ -7969,7 +8191,7 @@ righthand expression.  For example:
 The indices of `bar' are practically guaranteed to be different, because
 `rand()' returns different values each time it is called.  (Arrays and
 the `rand()' function haven't been covered yet.  *Note Arrays::, and
-see *note Numeric Functions::, for more information).  This example
+*note Numeric Functions::, for more information.)  This example
 illustrates an important fact about assignment operators: the lefthand
 expression is only evaluated _once_.
 
@@ -7993,10 +8215,10 @@ LVALUE `*='            Multiply the value of LVALUE by COEFFICIENT.
 COEFFICIENT            
 LVALUE `/=' DIVISOR    Divide the value of LVALUE by DIVISOR.
 LVALUE `%=' MODULUS    Set LVALUE to its remainder by MODULUS.
-LVALUE `^=' POWER      
+LVALUE `^=' POWER      Raise LVALUE to the power POWER.
 LVALUE `**=' POWER     Raise LVALUE to the power POWER. (c.e.)
 
-Table 6.2: Arithmetic Assignment Operators
+Table 6.2: Arithmetic assignment operators
 
      NOTE: Only the `^=' operator is specified by POSIX.  For maximum
      portability, do not use the `**=' operator.
@@ -8017,8 +8239,7 @@ A workaround is:
 
      awk '/[=]=/' /dev/null
 
-   `gawk' does not have this problem; BWK `awk' and `mawk' also do not
-(*note Other Versions::).
+   `gawk' does not have this problem; BWK `awk' and `mawk' also do not.
 
 
 File: gawk.info,  Node: Increment Ops,  Prev: Assignment Ops,  Up: All Operators
@@ -8046,7 +8267,7 @@ effect of incrementing it.
 
    The post-increment `foo++' is nearly the same as writing `(foo += 1)
 - 1'.  It is not perfectly equivalent because all numbers in `awk' are
-floating-point--in floating-point, `foo + 1 - 1' does not necessarily
+floating point--in floating point, `foo + 1 - 1' does not necessarily
 equal `foo'.  But the difference is minute as long as you stick to
 numbers that are fairly small (less than 10e12).
 
@@ -8080,8 +8301,8 @@ is a summary of increment and decrement expressions:
 
                        Operator Evaluation Order
 
-     Doctor, doctor!  It hurts when I do this!
-     So don't do that!  -- Groucho Marx
+     Doctor, it hurts when I do this!
+     Then don't do that!  -- Groucho Marx
 
 What happens for something like the following?
 
@@ -8096,7 +8317,7 @@ Or something even stranger?
 
    In other words, when do the various side effects prescribed by the
 postfix operators (`b++') take effect?  When side effects happen is
-"implementation defined".  In other words, it is up to the particular
+"implementation-defined".  In other words, it is up to the particular
 version of `awk'.  The result for the first example may be 12 or 13,
 and for the second, it may be 22 or 23.
 
@@ -8110,7 +8331,7 @@ File: gawk.info,  Node: Truth Values and Conditions,  Next: Function Calls,  Pre
 6.3 Truth Values and Conditions
 ===============================
 
-In certain contexts, expression values also serve as "truth values;"
+In certain contexts, expression values also serve as "truth values";
 i.e., they determine what should happen next as the program runs. This
 minor node describes how `awk' defines "true" and "false" and how
 values are compared.
@@ -8162,13 +8383,13 @@ File: gawk.info,  Node: Typing and Comparison,  Next: Boolean Ops,  Prev: Truth
 6.3.2 Variable Typing and Comparison Expressions
 ------------------------------------------------
 
-     The Guide is definitive. Reality is frequently inaccurate.  -- The
-     Hitchhiker's Guide to the Galaxy
+     The Guide is definitive. Reality is frequently inaccurate.  --
+     Douglas Adams, `The Hitchhiker's Guide to the Galaxy'
 
-   Unlike other programming languages, `awk' variables do not have a
-fixed type. Instead, they can be either a number or a string, depending
-upon the value that is assigned to them.  We look now at how variables
-are typed, and how `awk' compares variables.
+   Unlike in other programming languages, in `awk' variables do not
+have a fixed type. Instead, they can be either a number or a string,
+depending upon the value that is assigned to them.  We look now at how
+variables are typed, and how `awk' compares variables.
 
 * Menu:
 
@@ -8179,7 +8400,7 @@ are typed, and how `awk' compares variables.
 
 File: gawk.info,  Node: Variable Typing,  Next: Comparison Operators,  Up: Typing and Comparison
 
-6.3.2.1 String Type Versus Numeric Type
+6.3.2.1 String Type versus Numeric Type
 .......................................
 
 The POSIX standard introduced the concept of a "numeric string", which
@@ -8189,16 +8410,16 @@ of the variable is important because the types of two variables
 determine how they are compared.  Variable typing follows these rules:
 
    * A numeric constant or the result of a numeric operation has the
-     NUMERIC attribute.
+     "numeric" attribute.
 
    * A string constant or the result of a string operation has the
-     STRING attribute.
+     "string" attribute.
 
    * Fields, `getline' input, `FILENAME', `ARGV' elements, `ENVIRON'
-     elements, and the elements of an array created by `patsplit()',
-     `split()' and `match()' that are numeric strings have the STRNUM
-     attribute.  Otherwise, they have the STRING attribute.
-     Uninitialized variables also have the STRNUM attribute.
+     elements, and the elements of an array created by `match()',
+     `split()', and `patsplit()' that are numeric strings have the
+     "strnum" attribute.  Otherwise, they have the "string" attribute.
+     Uninitialized variables also have the "strnum" attribute.
 
    * Attributes propagate across assignments but are not changed by any
      use.
@@ -8240,28 +8461,29 @@ constant, then a string comparison is performed.  Otherwise, a numeric
 comparison is performed.
 
    This point bears additional emphasis: All user input is made of
-characters, and so is first and foremost of STRING type; input strings
-that look numeric are additionally given the STRNUM attribute.  Thus,
-the six-character input string ` +3.14' receives the STRNUM attribute.
+characters, and so is first and foremost of string type; input strings
+that look numeric are additionally given the strnum attribute.  Thus,
+the six-character input string ` +3.14' receives the strnum attribute.
 In contrast, the eight characters `" +3.14"' appearing in program text
 comprise a string constant.  The following examples print `1' when the
-comparison between the two different constants is true, `0' otherwise:
+comparison between the two different constants is true, and `0'
+otherwise:
 
-     $ echo ' +3.14' | gawk '{ print $0 == " +3.14" }'    True
+     $ echo ' +3.14' | awk '{ print($0 == " +3.14") }'    True
      -| 1
-     $ echo ' +3.14' | gawk '{ print $0 == "+3.14" }'     False
+     $ echo ' +3.14' | awk '{ print($0 == "+3.14") }'     False
      -| 0
-     $ echo ' +3.14' | gawk '{ print $0 == "3.14" }'      False
+     $ echo ' +3.14' | awk '{ print($0 == "3.14") }'      False
      -| 0
-     $ echo ' +3.14' | gawk '{ print $0 == 3.14 }'        True
+     $ echo ' +3.14' | awk '{ print($0 == 3.14) }'        True
      -| 1
-     $ echo ' +3.14' | gawk '{ print $1 == " +3.14" }'    False
+     $ echo ' +3.14' | awk '{ print($1 == " +3.14") }'    False
      -| 0
-     $ echo ' +3.14' | gawk '{ print $1 == "+3.14" }'     True
+     $ echo ' +3.14' | awk '{ print($1 == "+3.14") }'     True
      -| 1
-     $ echo ' +3.14' | gawk '{ print $1 == "3.14" }'      False
+     $ echo ' +3.14' | awk '{ print($1 == "3.14") }'      False
      -| 0
-     $ echo ' +3.14' | gawk '{ print $1 == 3.14 }'        True
+     $ echo ' +3.14' | awk '{ print($1 == 3.14) }'        True
      -| 1
 
 
@@ -8277,19 +8499,19 @@ them.
 
 Expression         Result
 -------------------------------------------------------------------------- 
-X `<' Y            True if X is less than Y.
-X `<=' Y           True if X is less than or equal to Y.
-X `>' Y            True if X is greater than Y.
-X `>=' Y           True if X is greater than or equal to Y.
-X `==' Y           True if X is equal to Y.
-X `!=' Y           True if X is not equal to Y.
-X `~' Y            True if the string X matches the regexp denoted by Y.
+X `<' Y            True if X is less than Y
+X `<=' Y           True if X is less than or equal to Y
+X `>' Y            True if X is greater than Y
+X `>=' Y           True if X is greater than or equal to Y
+X `==' Y           True if X is equal to Y
+X `!=' Y           True if X is not equal to Y
+X `~' Y            True if the string X matches the regexp denoted by Y
 X `!~' Y           True if the string X does not match the regexp
-                   denoted by Y.
+                   denoted by Y
 SUBSCRIPT `in'     True if the array ARRAY has an element with the
-ARRAY              subscript SUBSCRIPT.
+ARRAY              subscript SUBSCRIPT
 
-Table 6.3: Relational Operators
+Table 6.3: Relational operators
 
    Comparison expressions have the value one if true and zero if false.
 When comparing operands of mixed types, numeric operands are converted
@@ -8314,28 +8536,29 @@ Unless `b' happens to be zero or the null string, the `if' part of the
 test always succeeds.  Because the operators are so similar, this kind
 of error is very difficult to spot when scanning the source code.
 
-   The following table of expressions illustrates the kind of comparison
-`gawk' performs, as well as what the result of the comparison is:
+   The following list of expressions illustrates the kinds of
+comparisons `awk' performs, as well as what the result of each
+comparison is:
 
 `1.5 <= 2.0'
-     numeric comparison (true)
+     Numeric comparison (true)
 
 `"abc" >= "xyz"'
-     string comparison (false)
+     String comparison (false)
 
 `1.5 != " +2"'
-     string comparison (true)
+     String comparison (true)
 
 `"1e2" < "3"'
-     string comparison (true)
+     String comparison (true)
 
 `a = 2; b = "2"'
 `a == b'
-     string comparison (true)
+     String comparison (true)
 
 `a = 2; b = " +2"'
 `a == b'
-     string comparison (false)
+     String comparison (false)
 
    In this example:
 
@@ -8343,7 +8566,7 @@ of error is very difficult to spot when scanning the source code.
      -| false
 
 the result is `false' because both `$1' and `$2' are user input.  They
-are numeric strings--therefore both have the STRNUM attribute,
+are numeric strings--therefore both have the strnum attribute,
 dictating a numeric comparison.  The purpose of the comparison rules
 and the use of numeric strings is to attempt to produce the behavior
 that is "least surprising," while still "doing the right thing."
@@ -8366,9 +8589,9 @@ regexp constant (`/'...`/') or an ordinary expression. In the latter
 case, the value of the expression as a string is used as a dynamic
 regexp (*note Regexp Usage::; also *note Computed Regexps::).
 
-   In modern implementations of `awk', a constant regular expression in
-slashes by itself is also an expression.  The regexp `/REGEXP/' is an
-abbreviation for the following comparison expression:
+   A constant regular expression in slashes by itself is also an
+expression.  `/REGEXP/' is an abbreviation for the following comparison
+expression:
 
      $0 ~ /REGEXP/
 
@@ -8379,14 +8602,14 @@ Constant Regexps::, where this is discussed in more detail.
 
 File: gawk.info,  Node: POSIX String Comparison,  Prev: Comparison Operators,  Up: Typing and Comparison
 
-6.3.2.3 String Comparison With POSIX Rules
+6.3.2.3 String Comparison with POSIX Rules
 ..........................................
 
 The POSIX standard says that string comparison is performed based on
 the locale's "collating order". This is the order in which characters
-sort, as defined by the locale (for more discussion, *note Ranges and
-Locales::).  This order is usually very different from the results
-obtained when doing straight character-by-character comparison.(1)
+sort, as defined by the locale (for more discussion, *note Locales::).
+This order is usually very different from the results obtained when
+doing straight character-by-character comparison.(1)
 
    Because this behavior differs considerably from existing practice,
 `gawk' only implements it when in POSIX mode (*note Options::).  Here
@@ -8402,7 +8625,7 @@ is an example to illustrate the difference, in an `en_US.UTF-8' locale:
    ---------- Footnotes ----------
 
    (1) Technically, string comparison is supposed to behave the same
-way as if the strings are compared with the C `strcoll()' function.
+way as if the strings were compared with the C `strcoll()' function.
 
 
 File: gawk.info,  Node: Boolean Ops,  Next: Conditional Exp,  Prev: Typing and Comparison,  Up: Truth Values and Conditions
@@ -8443,13 +8666,15 @@ Boolean operators are:
 `BOOLEAN1 || BOOLEAN2'
      True if at least one of BOOLEAN1 or BOOLEAN2 is true.  For
      example, the following statement prints all records in the input
-     that contain _either_ `edu' or `li' or both:
+     that contain _either_ `edu' or `li':
 
           if ($0 ~ /edu/ || $0 ~ /li/) print
 
      The subexpression BOOLEAN2 is evaluated only if BOOLEAN1 is false.
      This can make a difference when BOOLEAN2 contains expressions that
-     have side effects.
+     have side effects.  (Thus, this test never really distinguishes
+     records that contain both `edu' and `li'--as soon as `edu' is
+     matched, the full test succeeds.)
 
 `! BOOLEAN'
      True if BOOLEAN is false.  For example, the following program
@@ -8457,13 +8682,13 @@ Boolean operators are:
      variable is not defined:
 
           BEGIN { if (! ("HOME" in ENVIRON))
-                         print "no home!" }
+                      print "no home!" }
 
      (The `in' operator is described in *note Reference to Elements::.)
 
    The `&&' and `||' operators are called "short-circuit" operators
 because of the way they work.  Evaluation of the full expression is
-"short-circuited" if the result can be determined part way through its
+"short-circuited" if the result can be determined partway through its
 evaluation.
 
    Statements that end with `&&' or `||' can be continued simply by
@@ -8516,15 +8741,15 @@ File: gawk.info,  Node: Conditional Exp,  Prev: Boolean Ops,  Up: Truth Values a
 
 A "conditional expression" is a special kind of expression that has
 three operands.  It allows you to use one expression's value to select
-one of two other expressions.  The conditional expression is the same
-as in the C language, as shown here:
+one of two other expressions.  The conditional expression in `awk' is
+the same as in the C language, as shown here:
 
      SELECTOR ? IF-TRUE-EXP : IF-FALSE-EXP
 
 There are three subexpressions.  The first, SELECTOR, is always
 computed first.  If it is "true" (not zero or not null), then
-IF-TRUE-EXP is computed next and its value becomes the value of the
-whole expression.  Otherwise, IF-FALSE-EXP is computed next and its
+IF-TRUE-EXP is computed next, and its value becomes the value of the
+whole expression.  Otherwise, IF-FALSE-EXP is computed next, and its
 value becomes the value of the whole expression.  For example, the
 following expression produces the absolute value of `x':
 
@@ -8558,13 +8783,13 @@ A "function" is a name for a particular calculation.  This enables you
 to ask for it by name at any point in the program.  For example, the
 function `sqrt()' computes the square root of a number.
 
-   A fixed set of functions are "built-in", which means they are
+   A fixed set of functions are "built in", which means they are
 available in every `awk' program.  The `sqrt()' function is one of
 these.  *Note Built-in::, for a list of built-in functions and their
 descriptions.  In addition, you can define functions for use in your
 program.  *Note User-defined::, for instructions on how to do this.
 Finally, `gawk' lets you write functions in C or C++ that may be called
-from your program: see *note Dynamic Extensions::.
+from your program (*note Dynamic Extensions::).
 
    The way to use a function is with a "function call" expression,
 which consists of the function name followed immediately by a list of
@@ -8579,7 +8804,7 @@ examples show function calls with and without arguments:
      rand()                 no arguments
 
      CAUTION: Do not put any space between the function name and the
-     open-parenthesis!  A user-defined function name looks just like
+     opening parenthesis!  A user-defined function name looks just like
      the name of a variable--a space would make the expression look
      like concatenation of a variable with an expression inside
      parentheses.  With built-in functions, space before the
@@ -8680,7 +8905,7 @@ violates the precedence rules; for example, `$$0++--' is not a valid
 expression because the first `$' has higher precedence than the `++';
 to avoid the problem the expression can be rewritten as `$($0++)--'.
 
-   This table presents `awk''s operators, in order of highest to lowest
+   This list presents `awk''s operators, in order of highest to lowest
 precedence:
 
 `('...`)'
@@ -8693,7 +8918,7 @@ precedence:
      Increment, decrement.
 
 `^ **'
-     Exponentiation.  These operators group right-to-left.
+     Exponentiation.  These operators group right to left.
 
 `+ - !'
      Unary plus, minus, logical "not."
@@ -8704,7 +8929,7 @@ precedence:
 `+ -'
      Addition, subtraction.
 
-String Concatenation
+String concatenation
      There is no special symbol for concatenation.  The operands are
      simply written side by side (*note Concatenation::).
 
@@ -8719,9 +8944,9 @@ String Concatenation
      redirection does not produce an expression that could be the
      operand of another operator.  As a result, it does not make sense
      to use a redirection operator near another operator of lower
-     precedence without parentheses.  Such combinations (for example,
-     `print foo > a ? b : c'), result in syntax errors.  The correct
-     way to write this statement is `print foo > (a ? b : c)'.
+     precedence without parentheses.  Such combinations (e.g., `print
+     foo > a ? b : c') result in syntax errors.  The correct way to
+     write this statement is `print foo > (a ? b : c)'.
 
 `~ !~'
      Matching, nonmatching.
@@ -8730,16 +8955,16 @@ String Concatenation
      Array membership.
 
 `&&'
-     Logical "and".
+     Logical "and."
 
 `||'
-     Logical "or".
+     Logical "or."
 
 `?:'
-     Conditional.  This operator groups right-to-left.
+     Conditional.  This operator groups right to left.
 
 `= += -= *= /= %= ^= **='
-     Assignment.  These operators group right-to-left.
+     Assignment.  These operators group right to left.
 
      NOTE: The `|&', `**', and `**=' operators are not specified by
      POSIX.  For maximum portability, do not use them.
@@ -8747,7 +8972,7 @@ String Concatenation
 
 File: gawk.info,  Node: Locales,  Next: Expressions Summary,  Prev: Precedence,  Up: Expressions
 
-6.6 Where You Are Makes A Difference
+6.6 Where You Are Makes a Difference
 ====================================
 
 Modern systems support the notion of "locales": a way to tell the
@@ -8755,8 +8980,8 @@ system about the local character set and language.  The ISO C standard
 defines a default `"C"' locale, which is an environment that is typical
 of what many C programmers are used to.
 
-   Once upon a time, the locale setting used to affect regexp matching
-(*note Ranges and Locales::), but this is no longer true.
+   Once upon a time, the locale setting used to affect regexp matching,
+but this is no longer true (*note Ranges and Locales::).
 
    Locales can affect record splitting.  For the normal case of `RS =
 "\n"', the locale is largely irrelevant.  For other single-character
@@ -8767,7 +8992,7 @@ terminator.
 
    Locales can affect how dates and times are formatted (*note Time
 Functions::).  For example, a common way to abbreviate the date
-September 4, 2015 in the United States is "9/4/15."  In many countries
+September 4, 2015, in the United States is "9/4/15."  In many countries
 in Europe, however, it is abbreviated "4.9.15."  Thus, the `%x'
 specification in a `"US"' locale might produce `9/4/15', while in a
 `"EUROPE"' locale, it might produce `4.9.15'.
@@ -8787,12 +9012,12 @@ File: gawk.info,  Node: Expressions Summary,  Prev: Locales,  Up: Expressions
 ===========
 
    * Expressions are the basic elements of computation in programs.
-     They are built from constants, variables, function calls and
+     They are built from constants, variables, function calls, and
      combinations of the various kinds of values with operators.
 
    * `awk' supplies three kinds of constants: numeric, string, and
      regexp.  `gawk' lets you specify numeric constants in octal and
-     hexadecimal (bases 8 and 16) in addition to decimal (base 10).  In
+     hexadecimal (bases 8 and 16) as well as decimal (base 10).  In
      certain contexts, a standalone regexp constant such as `/foo/' has
      the same meaning as `$0 ~ /foo/'.
 
@@ -8807,27 +9032,27 @@ File: gawk.info,  Node: Expressions Summary,  Prev: Locales,  Up: Expressions
 
    * `awk' provides the usual arithmetic operators (addition,
      subtraction, multiplication, division, modulus), and unary plus
-     and minus.  It also provides comparison operators, boolean
-     operators, and regexp matching operators.  String concatenation is
-     accomplished by placing two expressions next to each other; there
-     is no explicit operator.  The three-operand `?:' operator provides
-     an "if-else" test within expressions.
+     and minus.  It also provides comparison operators, Boolean
+     operators, an array membership testing operator, and regexp
+     matching operators.  String concatenation is accomplished by
+     placing two expressions next to each other; there is no explicit
+     operator.  The three-operand `?:' operator provides an "if-else"
+     test within expressions.
 
    * Assignment operators provide convenient shorthands for common
      arithmetic operations.
 
-   * In `awk', a value is considered to be true if it is non-zero _or_
+   * In `awk', a value is considered to be true if it is nonzero _or_
      non-null. Otherwise, the value is false.
 
-   * A value's type is set upon each assignment and may change over its
-     lifetime.  The type determines how it behaves in comparisons
+   * A variable's type is set upon each assignment and may change over
+     its lifetime.  The type determines how it behaves in comparisons
      (string or numeric).
 
-   * Function calls return a value which may be used as part of a larger
+   * Function calls return a value that may be used as part of a larger
      expression.  Expressions used to pass parameter values are fully
      evaluated before the function is called.  `awk' provides built-in
-     and user-defined functions; this is described later on in this
-     Info file.
+     and user-defined functions; this is described in *note Functions::.
 
    * Operator precedence specifies the order in which operations are
      performed, unless explicitly overridden by parentheses.  `awk''s
@@ -8846,7 +9071,7 @@ File: gawk.info,  Node: Patterns and Actions,  Next: Arrays,  Prev: Expressions,
 As you have already seen, each `awk' statement consists of a pattern
 with an associated action.  This major node describes how you build
 patterns and actions, what kinds of things you can do within actions,
-and `awk''s built-in variables.
+and `awk''s predefined variables.
 
    The pattern-action rules and the statements available for use within
 actions form the core of `awk' programming.  In a sense, everything
@@ -8860,7 +9085,7 @@ top of.  Now it's time to start building something useful.
 * Action Overview::             What goes into an action.
 * Statements::                  Describes the various control statements in
                                 detail.
-* Built-in Variables::          Summarizes the built-in variables.
+* Built-in Variables::          Summarizes the predefined variables.
 * Pattern Action Summary::      Patterns and Actions summary.
 
 
@@ -8891,7 +9116,7 @@ summary of the types of `awk' patterns:
      number) or non-null (if a string).  (*Note Expression Patterns::.)
 
 `BEGPAT, ENDPAT'
-     A pair of patterns separated by a comma, specifying a range of
+     A pair of patterns separated by a comma, specifying a "range" of
      records.  The range includes both the initial record that matches
      BEGPAT and the final record that matches ENDPAT.  (*Note Ranges::.)
 
@@ -8996,10 +9221,10 @@ _not_ contain the string `li':
 constant regular expressions, comparisons, or any other `awk'
 expressions.  Range patterns are not expressions, so they cannot appear
 inside Boolean patterns.  Likewise, the special patterns `BEGIN', `END',
-`BEGINFILE' and `ENDFILE', which never match any input record, are not
+`BEGINFILE', and `ENDFILE', which never match any input record, are not
 expressions and cannot appear inside Boolean patterns.
 
-   The precedence of the different operators which can appear in
+   The precedence of the different operators that can appear in
 patterns is described in *note Precedence::.
 
 
@@ -9019,8 +9244,8 @@ following:
 prints every record in `myfile' between `on'/`off' pairs, inclusive.
 
    A range pattern starts out by matching BEGPAT against every input
-record.  When a record matches BEGPAT, the range pattern is "turned on"
-and the range pattern matches this record as well.  As long as the
+record.  When a record matches BEGPAT, the range pattern is "turned
+on", and the range pattern matches this record as well.  As long as the
 range pattern stays turned on, it automatically matches every input
 record read.  The range pattern also matches ENDPAT against every input
 record; when this succeeds, the range pattern is "turned off" again for
@@ -9082,8 +9307,7 @@ All the patterns described so far are for matching input records.  The
 and cleanup actions for `awk' programs.  `BEGIN' and `END' rules must
 have actions; there is no default action for these rules because there
 is no current record when they run.  `BEGIN' and `END' rules are often
-referred to as "`BEGIN' and `END' blocks" by long-time `awk'
-programmers.
+referred to as "`BEGIN' and `END' blocks" by longtime `awk' programmers.
 
 * Menu:
 
@@ -9102,7 +9326,7 @@ input is read.  For example:
 
      $ awk '
      > BEGIN { print "Analysis of \"li\"" }
-     > /li/ { ++n }
+     > /li/  { ++n }
      > END   { print "\"li\" appears in", n, "records." }' mail-list
      -| Analysis of "li"
      -| "li" appears in 4 records.
@@ -9110,7 +9334,7 @@ input is read.  For example:
    This program finds the number of records in the input file
 `mail-list' that contain the string `li'.  The `BEGIN' rule prints a
 title for the report.  There is no need to use the `BEGIN' rule to
-initialize the counter `n' to zero, since `awk' does this automatically
+initialize the counter `n' to zero, as `awk' does this automatically
 (*note Variables::).  The second rule increments the variable `n' every
 time a record containing the pattern `li' is read.  The `END' rule
 prints the value of `n' at the end of the run.
@@ -9139,7 +9363,7 @@ for more information on using library functions.  *Note Library
 Functions::, for a number of useful library functions.
 
    If an `awk' program has only `BEGIN' rules and no other rules, then
-the program exits after the `BEGIN' rule is run.(1)  However, if an
+the program exits after the `BEGIN' rules are run.(1)  However, if an
 `END' rule exists, then the input is read, even if there are no other
 rules in the program.  This is necessary in case the `END' rule checks
 the `FNR' and `NR' variables.
@@ -9165,32 +9389,33 @@ give `$0' a real value is to execute a `getline' command without a
 variable (*note Getline::).  Another way is simply to assign a value to
 `$0'.
 
-   The second point is similar to the first but from the other
+   The second point is similar to the first, but from the other
 direction.  Traditionally, due largely to implementation issues, `$0'
 and `NF' were _undefined_ inside an `END' rule.  The POSIX standard
 specifies that `NF' is available in an `END' rule. It contains the
 number of fields from the last input record.  Most probably due to an
 oversight, the standard does not say that `$0' is also preserved,
-although logically one would think that it should be.  In fact, `gawk'
-does preserve the value of `$0' for use in `END' rules.  Be aware,
-however, that BWK `awk', and possibly other implementations, do not.
+although logically one would think that it should be.  In fact, all of
+BWK `awk', `mawk', and `gawk' preserve the value of `$0' for use in
+`END' rules.  Be aware, however, that some other implementations and
+many older versions of Unix `awk' do not.
 
    The third point follows from the first two.  The meaning of `print'
 inside a `BEGIN' or `END' rule is the same as always: `print $0'.  If
-`$0' is the null string, then this prints an empty record.  Many long
-time `awk' programmers use an unadorned `print' in `BEGIN' and `END'
-rules, to mean `print ""', relying on `$0' being null.  Although one
-might generally get away with this in `BEGIN' rules, it is a very bad
-idea in `END' rules, at least in `gawk'.  It is also poor style, since
-if an empty line is needed in the output, the program should print one
-explicitly.
+`$0' is the null string, then this prints an empty record.  Many
+longtime `awk' programmers use an unadorned `print' in `BEGIN' and
+`END' rules, to mean `print ""', relying on `$0' being null.  Although
+one might generally get away with this in `BEGIN' rules, it is a very
+bad idea in `END' rules, at least in `gawk'.  It is also poor style,
+because if an empty line is needed in the output, the program should
+print one explicitly.
 
    Finally, the `next' and `nextfile' statements are not allowed in a
 `BEGIN' rule, because the implicit
 read-a-record-and-match-against-the-rules loop has not started yet.
-Similarly, those statements are not valid in an `END' rule, since all
-the input has been read.  (*Note Next Statement::, and see *note
-Nextfile Statement::.)
+Similarly, those statements are not valid in an `END' rule, because all
+the input has been read.  (*Note Next Statement::, and *note Nextfile
+Statement::,.)
 
 
 File: gawk.info,  Node: BEGINFILE/ENDFILE,  Next: Empty,  Prev: BEGIN/END,  Up: Pattern Overview
@@ -9225,7 +9450,7 @@ tasks that would otherwise be difficult or impossible to perform:
      entirely.  Otherwise, `gawk' exits with the usual fatal error.
 
    * If you have written extensions that modify the record handling (by
-     inserting an "input parser," *note Input Parsers::), you can invoke
+     inserting an "input parser"; *note Input Parsers::), you can invoke
      them at this point, before `gawk' has started processing the file.
      (This is a _very_ advanced feature, currently used only by the
      `gawkextlib' project (http://gawkextlib.sourceforge.net).)
@@ -9235,16 +9460,15 @@ last record in an input file.  For the last input file, it will be
 called before any `END' rules.  The `ENDFILE' rule is executed even for
 empty input files.
 
-   Normally, when an error occurs when reading input in the normal input
-processing loop, the error is fatal.  However, if an `ENDFILE' rule is
-present, the error becomes non-fatal, and instead `ERRNO' is set.  This
-makes it possible to catch and process I/O errors at the level of the
-`awk' program.
+   Normally, when an error occurs when reading input in the normal
+input-processing loop, the error is fatal.  However, if an `ENDFILE'
+rule is present, the error becomes non-fatal, and instead `ERRNO' is
+set.  This makes it possible to catch and process I/O errors at the
+level of the `awk' program.
 
    The `next' statement (*note Next Statement::) is not allowed inside
-either a `BEGINFILE' or and `ENDFILE' rule.  The `nextfile' statement
-(*note Nextfile Statement::) is allowed only inside a `BEGINFILE' rule,
-but not inside an `ENDFILE' rule.
+either a `BEGINFILE' or an `ENDFILE' rule.  The `nextfile' statement is
+allowed only inside a `BEGINFILE' rule, not inside an `ENDFILE' rule.
 
    The `getline' statement (*note Getline::) is restricted inside both
 `BEGINFILE' and `ENDFILE': only redirected forms of `getline' are
@@ -9279,9 +9503,9 @@ hold a pattern that the `awk' program searches for.  There are two ways
 to get the value of the shell variable into the body of the `awk'
 program.
 
-   The most common method is to use shell quoting to substitute the
-variable's value into the program inside the script.  For example,
-consider the following program:
+   A common method is to use shell quoting to substitute the variable's
+value into the program inside the script.  For example, consider the
+following program:
 
      printf "Enter search pattern: "
      read pattern
@@ -9293,7 +9517,7 @@ concatenated together to form the program.  The first part is
 double-quoted, which allows substitution of the `pattern' shell
 variable inside the quotes.  The second part is single-quoted.
 
-   Variable substitution via quoting works, but can be potentially
+   Variable substitution via quoting works, but can potentially be
 messy.  It requires a good understanding of the shell's quoting rules
 (*note Quoting::), and it's often difficult to correctly match up the
 quotes when reading the program.
@@ -9313,10 +9537,10 @@ Now, the `awk' program is just one single-quoted string.  The
 assignment `-v pat="$pattern"' still requires double quotes, in case
 there is whitespace in the value of `$pattern'.  The `awk' variable
 `pat' could be named `pattern' too, but that would be more confusing.
-Using a variable also provides more flexibility, since the variable can
-be used anywhere inside the program--for printing, as an array
-subscript, or for any other use--without requiring the quoting tricks
-at every point in the program.
+Using a variable also provides more flexibility, as the variable can be
+used anywhere inside the program--for printing, as an array subscript,
+or for any other use--without requiring the quoting tricks at every
+point in the program.
 
 
 File: gawk.info,  Node: Action Overview,  Next: Statements,  Prev: Using Shell Variables,  Up: Patterns and Actions
@@ -9368,7 +9592,7 @@ Compound statements
 
 Input statements
      Use the `getline' command (*note Getline::).  Also supplied in
-     `awk' are the `next' statement (*note Next Statement::), and the
+     `awk' are the `next' statement (*note Next Statement::) and the
      `nextfile' statement (*note Nextfile Statement::).
 
 Output statements
@@ -9436,7 +9660,7 @@ following:
      else
          print "x is odd"
 
-   In this example, if the expression `x % 2 == 0' is true (that is, if
+   In this example, if the expression `x % 2 == 0' is true (i.e., if
 the value of `x' is evenly divisible by two), then the first `print'
 statement is executed; otherwise, the second `print' statement is
 executed.  If the `else' keyword appears on the same line as THEN-BODY
@@ -9472,33 +9696,33 @@ thing the `while' statement does is test the CONDITION.  If the
 CONDITION is true, it executes the statement BODY.  (The CONDITION is
 true when the value is not zero and not a null string.)  After BODY has
 been executed, CONDITION is tested again, and if it is still true, BODY
-is executed again.  This process repeats until the CONDITION is no
-longer true.  If the CONDITION is initially false, the body of the loop
-is never executed and `awk' continues with the statement following the
-loop.  This example prints the first three fields of each record, one
-per line:
-
-     awk '{
-            i = 1
-            while (i <= 3) {
-                print $i
-                i++
-            }
+executes again.  This process repeats until the CONDITION is no longer
+true.  If the CONDITION is initially false, the body of the loop never
+executes and `awk' continues with the statement following the loop.
+This example prints the first three fields of each record, one per line:
+
+     awk '
+     {
+         i = 1
+         while (i <= 3) {
+             print $i
+             i++
+         }
      }' inventory-shipped
 
 The body of this loop is a compound statement enclosed in braces,
 containing two statements.  The loop works in the following manner:
 first, the value of `i' is set to one.  Then, the `while' statement
 tests whether `i' is less than or equal to three.  This is true when
-`i' equals one, so the `i'-th field is printed.  Then the `i++'
+`i' equals one, so the `i'th field is printed.  Then the `i++'
 increments the value of `i' and the loop repeats.  The loop terminates
 when `i' reaches four.
 
    A newline is not required between the condition and the body;
-however using one makes the program clearer unless the body is a
-compound statement or else is very simple.  The newline after the
-open-brace that begins the compound statement is not required either,
-but the program is harder to read without it.
+however, using one makes the program clearer unless the body is a
+compound statement or else is very simple.  The newline after the open
+brace that begins the compound statement is not required either, but the
+program is harder to read without it.
 
 
 File: gawk.info,  Node: Do Statement,  Next: For Statement,  Prev: While Statement,  Up: Statements
@@ -9514,27 +9738,27 @@ the CONDITION is true.  It looks like this:
        BODY
      while (CONDITION)
 
-   Even if the CONDITION is false at the start, the BODY is executed at
+   Even if the CONDITION is false at the start, the BODY executes at
 least once (and only once, unless executing BODY makes CONDITION true).
 Contrast this with the corresponding `while' statement:
 
      while (CONDITION)
-       BODY
+         BODY
 
-This statement does not execute BODY even once if the CONDITION is
+This statement does not execute the BODY even once if the CONDITION is
 false to begin with.  The following is an example of a `do' statement:
 
      {
-            i = 1
-            do {
-               print $0
-               i++
-            } while (i <= 10)
+         i = 1
+         do {
+             print $0
+             i++
+         } while (i <= 10)
      }
 
 This program prints each input record 10 times.  However, it isn't a
-very realistic example, since in this case an ordinary `while' would do
-just as well.  This situation reflects actual experience; only
+very realistic example, because in this case an ordinary `while' would
+do just as well.  This situation reflects actual experience; only
 occasionally is there a real use for a `do' statement.
 
 
@@ -9558,9 +9782,10 @@ INCREMENT.  Typically, INITIALIZATION sets a variable to either zero or
 one, INCREMENT adds one to it, and CONDITION compares it against the
 desired number of iterations.  For example:
 
-     awk '{
-            for (i = 1; i <= 3; i++)
-               print $i
+     awk '
+     {
+         for (i = 1; i <= 3; i++)
+             print $i
      }' inventory-shipped
 
 This prints the first three fields of each input record, with one field
@@ -9576,7 +9801,7 @@ loop.)
    The same is true of the INCREMENT part. Incrementing additional
 variables requires separate statements at the end of the loop.  The C
 compound expression, using C's comma operator, is useful in this
-context but it is not supported in `awk'.
+context, but it is not supported in `awk'.
 
    Most often, INCREMENT is an increment expression, as in the previous
 example.  But this is not required; it can be any expression
@@ -9584,7 +9809,7 @@ whatsoever.  For example, the following statement prints all the powers
 of two between 1 and 100:
 
      for (i = 1; i <= 100; i *= 2)
-       print i
+         print i
 
    If there is nothing to be done, any of the three expressions in the
 parentheses following the `for' keyword may be omitted.  Thus,
@@ -9612,7 +9837,7 @@ natural to think of.  Counting the number of iterations is very common
 in loops.  It can be easier to think of this counting as part of
 looping rather than as something to do inside the loop.
 
-   There is an alternate version of the `for' loop, for iterating over
+   There is an alternative version of the `for' loop, for iterating over
 all the indices of an array:
 
      for (i in array)
@@ -9652,7 +9877,7 @@ statement looks like this:
 
    Control flow in the `switch' statement works as it does in C. Once a
 match to a given case is made, the case statement bodies execute until
-a `break', `continue', `next', `nextfile'  or `exit' is encountered, or
+a `break', `continue', `next', `nextfile', or `exit' is encountered, or
 the end of the `switch' statement itself. For example:
 
      while ((c = getopt(ARGC, ARGV, "aksx")) != -1) {
@@ -9679,12 +9904,12 @@ the end of the `switch' statement itself. For example:
          }
      }
 
-   Note that if none of the statements specified above halt execution
-of a matched `case' statement, execution falls through to the next
-`case' until execution halts. In the above example, the `case' for
-`"?"' falls through to the `default' case, which is to call a function
-named `usage()'.  (The `getopt()' function being called here is
-described in *note Getopt Function::.)
+   Note that if none of the statements specified here halt execution of
+a matched `case' statement, execution falls through to the next `case'
+until execution halts. In this example, the `case' for `"?"' falls
+through to the `default' case, which is to call a function named
+`usage()'.  (The `getopt()' function being called here is described in
+*note Getopt Function::.)
 
 
 File: gawk.info,  Node: Break Statement,  Next: Continue Statement,  Prev: Switch Statement,  Up: Statements
@@ -9699,12 +9924,12 @@ divisor of any integer, and also identifies prime numbers:
      # find smallest divisor of num
      {
          num = $1
-         for (div = 2; div * div <= num; div++) {
-             if (num % div == 0)
+         for (divisor = 2; divisor * divisor <= num; divisor++) {
+             if (num % divisor == 0)
                  break
          }
-         if (num % div == 0)
-             printf "Smallest divisor of %d is %d\n", num, div
+         if (num % divisor == 0)
+             printf "Smallest divisor of %d is %d\n", num, divisor
          else
              printf "%d is prime\n", num
      }
@@ -9722,12 +9947,12 @@ Statement::.)
      # find smallest divisor of num
      {
          num = $1
-         for (div = 2; ; div++) {
-             if (num % div == 0) {
-                 printf "Smallest divisor of %d is %d\n", num, div
+         for (divisor = 2; ; divisor++) {
+             if (num % divisor == 0) {
+                 printf "Smallest divisor of %d is %d\n", num, divisor
                  break
              }
-             if (div * div > num) {
+             if (divisor * divisor > num) {
                  printf "%d is prime\n", num
                  break
              }
@@ -9785,7 +10010,7 @@ the previous example with the following `while' loop:
           print ""
      }
 
-This program loops forever once `x' reaches 5, since the increment
+This program loops forever once `x' reaches 5, because the increment
 (`x++') is never reached.
 
    The `continue' statement has no special meaning with respect to the
@@ -9831,7 +10056,7 @@ beginning, in the following manner:
 
 Because of the `next' statement, the program's subsequent rules won't
 see the bad record.  The error message is redirected to the standard
-error output stream, as error messages should be.  For more detail see
+error output stream, as error messages should be.  For more detail, see
 *note Special Files::.
 
    If the `next' statement causes the end of the input to be reached,
@@ -9842,11 +10067,11 @@ rules. *Note BEGINFILE/ENDFILE::.
 
    According to the POSIX standard, the behavior is undefined if the
 `next' statement is used in a `BEGIN' or `END' rule.  `gawk' treats it
-as a syntax error.  Although POSIX permits it, most other `awk'
-implementations don't allow the `next' statement inside function bodies
-(*note User-defined::).  Just as with any other `next' statement, a
-`next' statement inside a function body reads the next record and
-starts processing it with the first rule in the program.
+as a syntax error.  Although POSIX does not disallow it, most other
+`awk' implementations don't allow the `next' statement inside function
+bodies (*note User-defined::).  Just as with any other `next'
+statement, a `next' statement inside a function body reads the next
+record and starts processing it with the first rule in the program.
 
 
 File: gawk.info,  Node: Nextfile Statement,  Next: Exit Statement,  Prev: Next Statement,  Up: Statements
@@ -9884,23 +10109,22 @@ over a file that would otherwise cause `gawk' to exit with a fatal
 error. In this case, `ENDFILE' rules are not executed. *Note
 BEGINFILE/ENDFILE::.
 
-   While one might think that `close(FILENAME)' would accomplish the
+   Although it might seem that `close(FILENAME)' would accomplish the
 same as `nextfile', this isn't true.  `close()' is reserved for closing
 files, pipes, and coprocesses that are opened with redirections.  It is
 not related to the main processing that `awk' does with the files
 listed in `ARGV'.
 
-     NOTE: For many years, `nextfile' was a `gawk' extension. As of
-     September, 2012, it was accepted for inclusion into the POSIX
+     NOTE: For many years, `nextfile' was a common extension. In
+     September 2012, it was accepted for inclusion into the POSIX
      standard.  See the Austin Group website
      (http://austingroupbugs.net/view.php?id=607).
 
-   The current version of BWK `awk', and `mawk' (*note Other
-Versions::) also support `nextfile'.  However, they don't allow the
-`nextfile' statement inside function bodies (*note User-defined::).
-`gawk' does; a `nextfile' inside a function body reads the next record
-and starts processing it with the first rule in the program, just as
-any other `nextfile' statement.
+   The current version of BWK `awk' and `mawk' also support `nextfile'.
+However, they don't allow the `nextfile' statement inside function
+bodies (*note User-defined::).  `gawk' does; a `nextfile' inside a
+function body reads the next record and starts processing it with the
+first rule in the program, just as any other `nextfile' statement.
 
 
 File: gawk.info,  Node: Exit Statement,  Prev: Nextfile Statement,  Up: Statements
@@ -9924,13 +10148,13 @@ stop immediately.
    An `exit' statement that is not part of a `BEGIN' or `END' rule
 stops the execution of any further automatic rules for the current
 record, skips reading any remaining input records, and executes the
-`END' rule if there is one.  Any `ENDFILE' rules are also skipped; they
-are not executed.
+`END' rule if there is one.  `gawk' also skips any `ENDFILE' rules;
+they do not execute.
 
    In such a case, if you don't want the `END' rule to do its job, set
-a variable to nonzero before the `exit' statement and check that
-variable in the `END' rule.  *Note Assert Function::, for an example
-that does this.
+a variable to a nonzero value before the `exit' statement and check
+that variable in the `END' rule.  *Note Assert Function::, for an
+example that does this.
 
    If an argument is supplied to `exit', its value is used as the exit
 status code for the `awk' process.  If no argument is supplied, `exit'
@@ -9962,8 +10186,8 @@ statement with a nonzero argument, as shown in the following example:
 
 File: gawk.info,  Node: Built-in Variables,  Next: Pattern Action Summary,  Prev: Statements,  Up: Patterns and Actions
 
-7.5 Built-in Variables
-======================
+7.5 Predefined Variables
+========================
 
 Most `awk' variables are available to use for your own purposes; they
 never change unless your program assigns values to them, and they never
@@ -9973,7 +10197,7 @@ of these automatically, so that they enable you to tell `awk' how to do
 certain things.  Others are set automatically by `awk', so that they
 carry information from the internal workings of `awk' to your program.
 
-   This minor node documents all of `gawk''s built-in variables, most
+   This minor node documents all of `gawk''s predefined variables, most
 of which are also documented in the major nodes describing their areas
 of activity.
 
@@ -10012,11 +10236,11 @@ description of each variable.)
      use binary I/O.  Any other string value is treated the same as
      `"rw"', but causes `gawk' to generate a warning message.
      `BINMODE' is described in more detail in *note PC Using::.  `mawk'
-     *note Other Versions::), also supports this variable, but only
+     (*note Other Versions::) also supports this variable, but only
      using numeric values.
 
 ``CONVFMT''
-     This string controls conversion of numbers to strings (*note
+     A string that controls the conversion of numbers to strings (*note
      Conversion::).  It works by being passed, in effect, as the first
      argument to the `sprintf()' function (*note String Functions::).
      Its default value is `"%.6g"'.  `CONVFMT' was introduced by the
@@ -10063,15 +10287,14 @@ description of each variable.)
 
 `IGNORECASE #'
      If `IGNORECASE' is nonzero or non-null, then all string comparisons
-     and all regular expression matching are case independent.  Thus,
-     regexp matching with `~' and `!~', as well as the `gensub()',
+     and all regular expression matching are case-independent.  This
+     applies to regexp matching with `~' and `!~', the `gensub()',
      `gsub()', `index()', `match()', `patsplit()', `split()', and
      `sub()' functions, record termination with `RS', and field
-     splitting with `FS' and `FPAT', all ignore case when doing their
-     particular regexp operations.  However, the value of `IGNORECASE'
-     does _not_ affect array subscripting and it does not affect field
-     splitting when using a single-character field separator.  *Note
-     Case-sensitivity::.
+     splitting with `FS' and `FPAT'.  However, the value of
+     `IGNORECASE' does _not_ affect array subscripting and it does not
+     affect field splitting when using a single-character field
+     separator.  *Note Case-sensitivity::.
 
 `LINT #'
      When this variable is true (nonzero or non-null), `gawk' behaves
@@ -10083,7 +10306,7 @@ description of each variable.)
      Assigning a false value to `LINT' turns off the lint warnings.
 
      This variable is a `gawk' extension.  It is not special in other
-     `awk' implementations.  Unlike the other special variables,
+     `awk' implementations.  Unlike with the other special variables,
      changing `LINT' does affect the production of lint warnings, even
      if `gawk' is in compatibility mode.  Much as the `--lint' and
      `--traditional' options independently control different aspects of
@@ -10091,18 +10314,18 @@ description of each variable.)
      execution is independent of the flavor of `awk' being executed.
 
 `OFMT'
-     Controls conversion of numbers to strings (*note Conversion::) for
-     printing with the `print' statement.  It works by being passed as
-     the first argument to the `sprintf()' function (*note String
-     Functions::).  Its default value is `"%.6g"'.  Earlier versions of
-     `awk' also used `OFMT' to specify the format for converting
-     numbers to strings in general expressions; this is now done by
-     `CONVFMT'.
+     A string that controls conversion of numbers to strings (*note
+     Conversion::) for printing with the `print' statement.  It works
+     by being passed as the first argument to the `sprintf()' function
+     (*note String Functions::).  Its default value is `"%.6g"'.
+     Earlier versions of `awk' used `OFMT' to specify the format for
+     converting numbers to strings in general expressions; this is now
+     done by `CONVFMT'.
 
 `OFS'
-     This is the output field separator (*note Output Separators::).
-     It is output between the fields printed by a `print' statement.
-     Its default value is `" "', a string consisting of a single space.
+     The output field separator (*note Output Separators::).  It is
+     output between the fields printed by a `print' statement.  Its
+     default value is `" "', a string consisting of a single space.
 
 `ORS'
      The output record separator.  It is output at the end of every
@@ -10110,11 +10333,11 @@ description of each variable.)
      character.  (*Note Output Separators::.)
 
 `PREC #'
-     The working precision of arbitrary precision floating-point
+     The working precision of arbitrary-precision floating-point
      numbers, 53 bits by default (*note Setting precision::).
 
 `ROUNDMODE #'
-     The rounding mode to use for arbitrary precision arithmetic on
+     The rounding mode to use for arbitrary-precision arithmetic on
      numbers, by default `"N"' (`roundTiesToEven' in the IEEE 754
      standard; *note Setting the rounding mode::).
 
@@ -10141,7 +10364,7 @@ description of each variable.)
      Used for internationalization of programs at the `awk' level.  It
      sets the default text domain for specially marked string constants
      in the source text, as well as for the `dcgettext()',
-     `dcngettext()' and `bindtextdomain()' functions (*note
+     `dcngettext()', and `bindtextdomain()' functions (*note
      Internationalization::).  The default value of `TEXTDOMAIN' is
      `"messages"'.
 
@@ -10162,7 +10385,7 @@ your program.
    The variables that are specific to `gawk' are marked with a pound
 sign (`#').  These variables are `gawk' extensions.  In other `awk'
 implementations or if `gawk' is in compatibility mode (*note
-Options::), they are not special.
+Options::), they are not special:
 
 `ARGC', `ARGV'
      The command-line arguments available to `awk' programs are stored
@@ -10206,8 +10429,8 @@ Options::), they are not special.
      the command line.
 
      While you can change the value of `ARGIND' within your `awk'
-     program, `gawk' automatically sets it to a new value when the next
-     file is opened.
+     program, `gawk' automatically sets it to a new value when it opens
+     the next file.
 
 `ENVIRON'
      An associative array containing the values of the environment.
@@ -10226,6 +10449,12 @@ Options::), they are not special.
      `ENVIRON["PATH"]"', which is the search path for finding
      executable programs.
 
+     This can also affect the running `gawk' program, since some of the
+     built-in functions may pay attention to certain environment
+     variables.  The most notable instance of this is `mktime()' (*note
+     Time Functions::), which pays attention the value of the `TZ'
+     environment variable on many systems.
+
      Some operating systems may not have environment variables.  On
      such systems, the `ENVIRON' array is empty (except for
      `ENVIRON["AWKPATH"]' and `ENVIRON["AWKLIBPATH"]'; *note AWKPATH
@@ -10247,34 +10476,40 @@ Options::), they are not special.
      `getline' returning -1.  You are, of course, free to clear it
      yourself before doing an I/O operation.
 
+     If the value of `ERRNO' corresponds to a system error in the C
+     `errno' variable, then `PROCINFO["errno"]' will be set to the value
+     of `errno'.  For non-system errors, `PROCINFO["errno"]' will be
+     zero.
+
 `FILENAME'
      The name of the current input file.  When no data files are listed
      on the command line, `awk' reads from the standard input and
      `FILENAME' is set to `"-"'.  `FILENAME' changes each time a new
      file is read (*note Reading Files::).  Inside a `BEGIN' rule, the
-     value of `FILENAME' is `""', since there are no input files being
-     processed yet.(1) (d.c.) Note, though, that using `getline' (*note
-     Getline::) inside a `BEGIN' rule can give `FILENAME' a value.
+     value of `FILENAME' is `""', because there are no input files
+     being processed yet.(1) (d.c.) Note, though, that using `getline'
+     (*note Getline::) inside a `BEGIN' rule can give `FILENAME' a
+     value.
 
 `FNR'
-     The current record number in the current file.  `FNR' is
-     incremented each time a new record is read (*note Records::).  It
-     is reinitialized to zero each time a new input file is started.
+     The current record number in the current file.  `awk' increments
+     `FNR' each time it reads a new record (*note Records::).  `awk'
+     resets `FNR' to zero each time it starts a new input file.
 
 `NF'
      The number of fields in the current input record.  `NF' is set
-     each time a new record is read, when a new field is created or
+     each time a new record is read, when a new field is created, or
      when `$0' changes (*note Fields::).
 
      Unlike most of the variables described in this node, assigning a
      value to `NF' has the potential to affect `awk''s internal
      workings.  In particular, assignments to `NF' can be used to
-     create or remove fields from the current record. *Note Changing
-     Fields::.
+     create fields in or remove fields from the current record. *Note
+     Changing Fields::.
 
 `FUNCTAB #'
      An array whose indices and corresponding values are the names of
-     all the built-in, user-defined and extension functions in the
+     all the built-in, user-defined, and extension functions in the
      program.
 
           NOTE: Attempting to use the `delete' statement with the
@@ -10283,8 +10518,8 @@ Options::), they are not special.
 
 `NR'
      The number of input records `awk' has processed since the
-     beginning of the program's execution (*note Records::).  `NR' is
-     incremented each time a new record is read.
+     beginning of the program's execution (*note Records::).  `awk'
+     increments `NR' each time it reads a new record.
 
 `PROCINFO #'
      The elements of this array provide access to information about the
@@ -10294,6 +10529,10 @@ Options::), they are not special.
     `PROCINFO["egid"]'
           The value of the `getegid()' system call.
 
+    `PROCINFO["errno"]'
+          The value of the C `errno' variable when `ERRNO' is set to
+          the associated error message.
+
     `PROCINFO["euid"]'
           The value of the `geteuid()' system call.
 
@@ -10305,7 +10544,7 @@ Options::), they are not special.
 
     `PROCINFO["identifiers"]'
           A subarray, indexed by the names of all identifiers used in
-          the text of the AWK program.  An "identifier" is simply the
+          the text of the `awk' program.  An "identifier" is simply the
           name of a variable (be it scalar or array), built-in
           function, user-defined function, or extension function.  For
           each identifier, the value of the element is one of the
@@ -10326,7 +10565,7 @@ Options::), they are not special.
 
          `"untyped"'
                The identifier is untyped (could be used as a scalar or
-               array, `gawk' doesn't know yet).
+               an array; `gawk' doesn't know yet).
 
          `"user"'
                The identifier is a user-defined function.
@@ -10349,9 +10588,9 @@ Options::), they are not special.
 
     `PROCINFO["sorted_in"]'
           If this element exists in `PROCINFO', its value controls the
-          order in which array indices will be processed by `for (INDEX
-          in ARRAY)' loops.  Since this is an advanced feature, we
-          defer the full description until later; see *note Scanning an
+          order in which array indices will be processed by `for (INDX
+          in ARRAY)' loops.  This is an advanced feature, so we defer
+          the full description until later; see *note Scanning an
           Array::.
 
     `PROCINFO["strftime"]'
@@ -10367,7 +10606,7 @@ Options::), they are not special.
 
      The following additional elements in the array are available to
      provide information about the MPFR and GMP libraries if your
-     version of `gawk' supports arbitrary precision numbers (*note
+     version of `gawk' supports arbitrary-precision arithmetic (*note
      Arbitrary Precision Arithmetic::):
 
     `PROCINFO["mpfr_version"]'
@@ -10400,14 +10639,18 @@ Options::), they are not special.
 
      The `PROCINFO' array has the following additional uses:
 
-        * It may be used to cause coprocesses to communicate over
-          pseudo-ttys instead of through two-way pipes; this is
-          discussed further in *note Two-way I/O::.
-
         * It may be used to provide a timeout when reading from any
           open input file, pipe, or coprocess.  *Note Read Timeout::,
           for more information.
 
+        * It may be used to indicate that input may be retried when it
+          fails due to certain errors.  *Note Retrying Input::, for
+          more information.
+
+        * It may be used to cause coprocesses to communicate over
+          pseudo-ttys instead of through two-way pipes; this is
+          discussed further in *note Two-way I/O::.
+
 `RLENGTH'
      The length of the substring matched by the `match()' function
      (*note String Functions::).  `RLENGTH' is set by invoking the
@@ -10415,7 +10658,7 @@ Options::), they are not special.
      string, or -1 if no match is found.
 
 `RSTART'
-     The start-index in characters of the substring that is matched by
+     The start index in characters of the substring that is matched by
      the `match()' function (*note String Functions::).  `RSTART' is
      set by invoking the `match()' function.  Its value is the position
      of the string where the matched substring starts, or zero if no
@@ -10426,9 +10669,14 @@ Options::), they are not special.
      separator.  It is set every time a record is read.
 
 `SYMTAB #'
-     An array whose indices are the names of all currently defined
-     global variables and arrays in the program.  The array may be used
-     for indirect access to read or write the value of a variable:
+     An array whose indices are the names of all defined global
+     variables and arrays in the program.  `SYMTAB' makes `gawk''s
+     symbol table visible to the `awk' programmer.  It is built as
+     `gawk' parses the program and is complete before the program
+     starts to run.
+
+     The array may be used for indirect access to read or write the
+     value of a variable:
 
           foo = 5
           SYMTAB["foo"] = 4
@@ -10460,7 +10708,7 @@ Options::), they are not special.
           }
 
           NOTE: In order to avoid severe time-travel paradoxes,(2)
-          neither `FUNCTAB' nor `SYMTAB' are available as elements
+          neither `FUNCTAB' nor `SYMTAB' is available as an element
           within the `SYMTAB' array.
 
                         Changing `NR' and `FNR'
@@ -10554,7 +10802,7 @@ string.  Another option is to use the `delete' statement to remove
 elements from `ARGV' (*note Delete::).
 
    All of these actions are typically done in the `BEGIN' rule, before
-actual processing of the input begins.  *Note Split Program::, and see
+actual processing of the input begins.  *Note Split Program::, and
 *note Tee Program::, for examples of each way of removing elements from
 `ARGV'.
 
@@ -10565,7 +10813,7 @@ manner:
      awk -f myprog.awk -- -v -q file1 file2 ...
 
    The following fragment processes `ARGV' in order to examine, and
-then remove, the above command-line options:
+then remove, the previously mentioned command-line options:
 
      BEGIN {
          for (i = 1; i < ARGC; i++) {
@@ -10596,6 +10844,12 @@ Because `-q' is not a valid `gawk' option, it and the following `-v'
 are passed on to the `awk' program.  (*Note Getopt Function::, for an
 `awk' library function that parses command-line options.)
 
+   When designing your program, you should choose options that don't
+conflict with `gawk''s, because it will process any options that it
+accepts before passing the rest of the command line on to your program.
+Using `#!' with the `-E' option may help (*note Executable Scripts::,
+and *note Options::,).
+
 
 File: gawk.info,  Node: Pattern Action Summary,  Prev: Built-in Variables,  Up: Patterns and Actions
 
@@ -10604,14 +10858,14 @@ File: gawk.info,  Node: Pattern Action Summary,  Prev: Built-in Variables,  Up:
 
    * Pattern-action pairs make up the basic elements of an `awk'
      program.  Patterns are either normal expressions, range
-     expressions, regexp constants, one of the special keywords
-     `BEGIN', `END', `BEGINFILE', `ENDFILE', or empty.  The action
+     expressions, or regexp constants; one of the special keywords
+     `BEGIN', `END', `BEGINFILE', or `ENDFILE'; or empty.  The action
      executes if the current record matches the pattern.  Empty
      (missing) patterns match all records.
 
-   * I/O from `BEGIN' and `END' rules have certain constraints.  This
-     is also true, only more so, for `BEGINFILE' and `ENDFILE' rules.
-     The latter two give you "hooks" into `gawk''s file processing,
+   * I/O from `BEGIN' and `END' rules has certain constraints.  This is
+     also true, only more so, for `BEGINFILE' and `ENDFILE' rules.  The
+     latter two give you "hooks" into `gawk''s file processing,
      allowing you to recover from a file that otherwise would cause a
      fatal error (such as a file that cannot be opened).
 
@@ -10625,24 +10879,29 @@ File: gawk.info,  Node: Pattern Action Summary,  Prev: Built-in Variables,  Up:
 
    * The control statements in `awk' are `if'-`else', `while', `for',
      and `do'-`while'.  `gawk' adds the `switch' statement.  There are
-     two flavors of `for' statement: one for for performing general
-     looping, and the other iterating through an array.
+     two flavors of `for' statement: one for performing general
+     looping, and the other for iterating through an array.
 
    * `break' and `continue' let you exit early or start the next
      iteration of a loop (or get out of a `switch').
 
    * `next' and `nextfile' let you read the next record and start over
-     at the top of your program, or skip to the next input file and
+     at the top of your program or skip to the next input file and
      start over, respectively.
 
    * The `exit' statement terminates your program. When executed from
-     an action (or function body) it transfers control to the `END'
+     an action (or function body), it transfers control to the `END'
      statements. From an `END' statement body, it exits immediately.
-     You may pass an optional numeric value to be used at `awk''s exit
+     You may pass an optional numeric value to be used as `awk''s exit
      status.
 
-   * Some built-in variables provide control over `awk', mainly for I/O.
-     Other variables convey information from `awk' to your program.
+   * Some predefined variables provide control over `awk', mainly for
+     I/O.  Other variables convey information from `awk' to your
+     program.
+
+   * `ARGC' and `ARGV' make the command-line arguments available to
+     your program. Manipulating them from a `BEGIN' rule lets you
+     control how `awk' will process the provided data files.
 
 
 
@@ -10663,26 +10922,21 @@ about array usage.  The major node moves on to discuss `gawk''s facility
 for sorting arrays, and ends with a brief description of `gawk''s
 ability to support true arrays of arrays.
 
-   `awk' maintains a single set of names that may be used for naming
-variables, arrays, and functions (*note User-defined::).  Thus, you
-cannot have a variable and an array with the same name in the same
-`awk' program.
-
 * Menu:
 
 * Array Basics::                The basics of arrays.
-* Delete::                      The `delete' statement removes an element
-                                from an array.
 * Numeric Array Subscripts::    How to use numbers as subscripts in
                                 `awk'.
 * Uninitialized Subscripts::    Using Uninitialized variables as subscripts.
+* Delete::                      The `delete' statement removes an element
+                                from an array.
 * Multidimensional::            Emulating multidimensional arrays in
                                 `awk'.
 * Arrays of Arrays::            True multidimensional arrays.
 * Arrays Summary::              Summary of arrays.
 
 
-File: gawk.info,  Node: Array Basics,  Next: Delete,  Up: Arrays
+File: gawk.info,  Node: Array Basics,  Next: Numeric Array Subscripts,  Up: Arrays
 
 8.1 The Basics of Arrays
 ========================
@@ -10721,14 +10975,14 @@ program.
    Arrays in `awk' superficially resemble arrays in other programming
 languages, but there are fundamental differences.  In `awk', it isn't
 necessary to specify the size of an array before starting to use it.
-Additionally, any number or string in `awk', not just consecutive
-integers, may be used as an array index.
+Additionally, any number or string, not just consecutive integers, may
+be used as an array index.
 
    In most other languages, arrays must be "declared" before use,
 including a specification of how many elements or components they
 contain.  In such languages, the declaration causes a contiguous block
 of memory to be allocated for that many elements.  Usually, an index in
-the array must be a positive integer.  For example, the index zero
+the array must be a nonnegative integer.  For example, the index zero
 specifies the first element in the array, which is actually stored at
 the beginning of the block of memory.  Index one specifies the second
 element, which is stored in memory right after the first element, and
@@ -10738,28 +10992,30 @@ languages allow arbitrary starting and ending indices--e.g., `15 ..
 27'--but the size of the array is still fixed when the array is
 declared.)
 
-   A contiguous array of four elements might look like the following
-example, conceptually, if the element values are 8, `"foo"', `""', and
-30 as shown in *note figure-array-elements:::
+   A contiguous array of four elements might look like *note
+figure-array-elements::, conceptually, if the element values are eight,
+`"foo"', `""', and 30.
 
 +---------+---------+--------+---------+
 |    8    |  "foo"  |   ""   |    30   |    @r{Value}
 +---------+---------+--------+---------+
      0         1         2         3        @r{Index}
-Figure 8.1: A Contiguous Array
+Figure 8.1: A contiguous array
 
 Only the values are stored; the indices are implicit from the order of
-the values. Here, 8 is the value at index zero, because 8 appears in the
-position with zero elements before it.
+the values. Here, eight is the value at index zero, because eight
+appears in the position with zero elements before it.
 
    Arrays in `awk' are different--they are "associative".  This means
-that each array is a collection of pairs: an index and its corresponding
+that each array is a collection of pairs--an index and its corresponding
 array element value:
 
-     Index 3     Value 30
-     Index 1     Value "foo"
-     Index 0     Value 8
-     Index 2     Value ""
+        Index   Value
+------------------------ 
+        `3'     `30'
+        `1'     `"foo"'
+        `0'     `8'
+        `2'     `""'
 
 The pairs are shown in jumbled order because their order is
 irrelevant.(1)
@@ -10768,32 +11024,36 @@ irrelevant.(1)
 at any time.  For example, suppose a tenth element is added to the array
 whose value is `"number ten"'.  The result is:
 
-     Index 10    Value "number ten"
-     Index 3     Value 30
-     Index 1     Value "foo"
-     Index 0     Value 8
-     Index 2     Value ""
+        Index   Value
+------------------------------- 
+        `10'    `"number ten"'
+        `3'     `30'
+        `1'     `"foo"'
+        `0'     `8'
+        `2'     `""'
 
 Now the array is "sparse", which just means some indices are missing.
 It has elements 0-3 and 10, but doesn't have elements 4, 5, 6, 7, 8, or
 9.
 
    Another consequence of associative arrays is that the indices don't
-have to be positive integers.  Any number, or even a string, can be an
-index.  For example, the following is an array that translates words
+have to be nonnegative integers.  Any number, or even a string, can be
+an index.  For example, the following is an array that translates words
 from English to French:
 
-     Index "dog" Value "chien"
-     Index "cat" Value "chat"
-     Index "one" Value "un"
-     Index 1     Value "un"
+        Index   Value
+------------------------ 
+        `"dog"' `"chien"'
+        `"cat"' `"chat"'
+        `"one"' `"un"'
+        `1'     `"un"'
 
 Here we decided to translate the number one in both spelled-out and
 numeric form--thus illustrating that a single array can have both
 numbers and strings as indices.  (In fact, array subscripts are always
 strings.  There are some subtleties to how numbers work when used as
 array subscripts; this is discussed in more detail in *note Numeric
-Array Subscripts::.)  Here, the number `1' isn't double-quoted, since
+Array Subscripts::.)  Here, the number `1' isn't double-quoted, because
 `awk' automatically converts it to a string.
 
    The value of `IGNORECASE' has no effect upon array subscripting.
@@ -10817,7 +11077,7 @@ File: gawk.info,  Node: Reference to Elements,  Next: Assigning Elements,  Prev:
 -----------------------------------
 
 The principal way to use an array is to refer to one of its elements.
-An array reference is an expression as follows:
+An "array reference" is an expression as follows:
 
      ARRAY[INDEX-EXPRESSION]
 
@@ -10825,8 +11085,8 @@ Here, ARRAY is the name of an array.  The expression INDEX-EXPRESSION is
 the index of the desired element of the array.
 
    The value of the array reference is the current value of that array
-element.  For example, `foo[4.3]' is an expression for the element of
-array `foo' at index `4.3'.
+element.  For example, `foo[4.3]' is an expression referencing the
+element of array `foo' at index `4.3'.
 
    A reference to an array element that has no recorded value yields a
 value of `""', the null string.  This includes elements that have not
@@ -10856,8 +11116,8 @@ index, use the following expression:
 This expression tests whether the particular index INDX exists, without
 the side effect of creating that element if it is not present.  The
 expression has the value one (true) if `ARRAY[INDX]' exists and zero
-(false) if it does not exist.  (We use INDX here, since `index' is the
-name of a built-in function.)  For example, this statement tests
+(false) if it does not exist.  (We use INDX here, because `index' is
+the name of a built-in function.)  For example, this statement tests
 whether the array `frequencies' contains the index `2':
 
      if (2 in frequencies)
@@ -10893,7 +11153,7 @@ File: gawk.info,  Node: Array Example,  Next: Scanning an Array,  Prev: Assignin
 
 The following program takes a list of lines, each beginning with a line
 number, and prints them out in order of line number.  The line numbers
-are not in order when they are first read--instead they are scrambled.
+are not in order when they are first read--instead, they are scrambled.
 This program sorts the lines by making an array using the line numbers
 as subscripts.  The program then prints out the lines in sorted order
 of their numbers.  It is a very simple program and gets confused upon
@@ -10901,14 +11161,14 @@ encountering repeated numbers, gaps, or lines that don't begin with a
 number:
 
      {
-       if ($1 > max)
-         max = $1
-       arr[$1] = $0
+         if ($1 > max)
+             max = $1
+         arr[$1] = $0
      }
 
      END {
-       for (x = 1; x <= max; x++)
-         print arr[x]
+         for (x = 1; x <= max; x++)
+             print arr[x]
      }
 
    The first rule keeps track of the largest line number seen so far;
@@ -10936,9 +11196,9 @@ overrides the others.  Gaps in the line numbers can be handled with an
 easy improvement to the program's `END' rule, as follows:
 
      END {
-       for (x = 1; x <= max; x++)
-         if (x in arr)
-           print arr[x]
+         for (x = 1; x <= max; x++)
+             if (x in arr)
+                 print arr[x]
      }
 
 
@@ -10949,14 +11209,14 @@ File: gawk.info,  Node: Scanning an Array,  Next: Controlling Scanning,  Prev: A
 
 In programs that use arrays, it is often necessary to use a loop that
 executes once for each element of an array.  In other languages, where
-arrays are contiguous and indices are limited to positive integers,
+arrays are contiguous and indices are limited to nonnegative integers,
 this is easy: all the valid indices can be found by counting from the
 lowest index up to the highest.  This technique won't do the job in
 `awk', because any number or string can be an array index.  So `awk'
 has a special kind of `for' statement for scanning an array:
 
      for (VAR in ARRAY)
-       BODY
+         BODY
 
 This loop executes BODY once for each index in ARRAY that the program
 has previously used, with the variable VAR set to that index.
@@ -10964,7 +11224,7 @@ has previously used, with the variable VAR set to that index.
    The following program uses this form of the `for' statement.  The
 first rule scans the input records and notes which words appear (at
 least once) in the input, by storing a one into the array `used' with
-the word as index.  The second rule scans the elements of `used' to
+the word as the index.  The second rule scans the elements of `used' to
 find all the distinct words that appear in the input.  It prints each
 word that is more than 10 characters long and also prints the number of
 such words.  *Note String Functions::, for more information on the
@@ -11013,7 +11273,7 @@ all `awk' versions do so. Consider this program, named `loopcheck.awk':
          }
      }
 
-   Here is what happens when run with `gawk':
+   Here is what happens when run with `gawk' (and `mawk'):
 
      $ gawk -f loopcheck.awk
      -| here
@@ -11033,7 +11293,7 @@ all `awk' versions do so. Consider this program, named `loopcheck.awk':
 
 File: gawk.info,  Node: Controlling Scanning,  Prev: Scanning an Array,  Up: Array Basics
 
-8.1.6 Using Predefined Array Scanning Orders With `gawk'
+8.1.6 Using Predefined Array Scanning Orders with `gawk'
 --------------------------------------------------------
 
 This node describes a feature that is specific to `gawk'.
@@ -11047,14 +11307,14 @@ internal implementation of arrays and will vary from one version of
    Often, though, you may wish to do something simple, such as
 "traverse the array by comparing the indices in ascending order," or
 "traverse the array by comparing the values in descending order."
-`gawk' provides two mechanisms which give you this control.
+`gawk' provides two mechanisms that give you this control:
 
    * Set `PROCINFO["sorted_in"]' to one of a set of predefined values.
      We describe this now.
 
    * Set `PROCINFO["sorted_in"]' to the name of a user-defined function
      to use for comparison of array elements. This advanced feature is
-     described later, in *note Array Sorting::.
+     described later in *note Array Sorting::.
 
    The following special values for `PROCINFO["sorted_in"]' are
 available:
@@ -11095,28 +11355,33 @@ available:
      which `gawk' uses internally to perform the sorting.
 
 `"@ind_str_desc"'
-     String indices ordered from high to low.
+     Like `"@ind_str_asc"', but the string indices are ordered from
+     high to low.
 
 `"@ind_num_desc"'
-     Numeric indices ordered from high to low.
+     Like `"@ind_num_asc"', but the numeric indices are ordered from
+     high to low.
 
 `"@val_type_desc"'
-     Element values, based on type, ordered from high to low.
-     Subarrays, if present, come out first.
+     Like `"@val_type_asc"', but the element values, based on type, are
+     ordered from high to low.  Subarrays, if present, come out first.
 
 `"@val_str_desc"'
-     Element values, treated as strings, ordered from high to low.
-     Subarrays, if present, come out first.
+     Like `"@val_str_asc"', but the element values, treated as strings,
+     are ordered from high to low.  Subarrays, if present, come out
+     first.
 
 `"@val_num_desc"'
-     Element values, treated as numbers, ordered from high to low.
-     Subarrays, if present, come out first.
+     Like `"@val_num_asc"', but the element values, treated as numbers,
+     are ordered from high to low.  Subarrays, if present, come out
+     first.
 
    The array traversal order is determined before the `for' loop starts
 to run. Changing `PROCINFO["sorted_in"]' in the loop body does not
 affect the loop.  For example:
 
-     $ gawk 'BEGIN {
+     $ gawk '
+     > BEGIN {
      >    a[4] = 4
      >    a[3] = 3
      >    for (i in a)
@@ -11124,7 +11389,8 @@ affect the loop.  For example:
      > }'
      -| 4 4
      -| 3 3
-     $ gawk 'BEGIN {
+     $ gawk '
+     > BEGIN {
      >    PROCINFO["sorted_in"] = "@ind_str_asc"
      >    a[4] = 4
      >    a[3] = 3
@@ -11141,7 +11407,7 @@ subarrays are treated as being equal to each other.  Their order
 relative to each other is determined by their index strings.
 
    Here are some additional things to bear in mind about sorted array
-traversal.
+traversal:
 
    * The value of `PROCINFO["sorted_in"]' is global. That is, it affects
      all array traversal `for' loops.  If you need to change it within
@@ -11157,12 +11423,12 @@ traversal.
           if (save_sorted)
               PROCINFO["sorted_in"] = save_sorted
 
-   * As mentioned, the default array traversal order is represented by
-     `"@unsorted"'.  You can also get the default behavior by assigning
-     the null string to `PROCINFO["sorted_in"]' or by just deleting the
-     `"sorted_in"' element from the `PROCINFO' array with the `delete'
-     statement.  (The `delete' statement hasn't been described yet;
-     *note Delete::.)
+   * As already mentioned, the default array traversal order is
+     represented by `"@unsorted"'.  You can also get the default
+     behavior by assigning the null string to `PROCINFO["sorted_in"]'
+     or by just deleting the `"sorted_in"' element from the `PROCINFO'
+     array with the `delete' statement.  (The `delete' statement hasn't
+     been described yet; *note Delete::.)
 
    In addition, `gawk' provides built-in functions for sorting arrays;
 see *note Array Sorting Functions::.
@@ -11176,93 +11442,15 @@ ordering when the numeric values are equal ensures that `gawk' behaves
 consistently across different environments.
 
 
-File: gawk.info,  Node: Delete,  Next: Numeric Array Subscripts,  Prev: Array Basics,  Up: Arrays
-
-8.2 The `delete' Statement
-==========================
+File: gawk.info,  Node: Numeric Array Subscripts,  Next: Uninitialized Subscripts,  Prev: Array Basics,  Up: Arrays
 
-To remove an individual element of an array, use the `delete' statement:
-
-     delete ARRAY[INDEX-EXPRESSION]
-
-   Once an array element has been deleted, any value the element once
-had is no longer available. It is as if the element had never been
-referred to or been given a value.  The following is an example of
-deleting elements in an array:
-
-     for (i in frequencies)
-       delete frequencies[i]
-
-This example removes all the elements from the array `frequencies'.
-Once an element is deleted, a subsequent `for' statement to scan the
-array does not report that element and the `in' operator to check for
-the presence of that element returns zero (i.e., false):
-
-     delete foo[4]
-     if (4 in foo)
-         print "This will never be printed"
-
-   It is important to note that deleting an element is _not_ the same
-as assigning it a null value (the empty string, `""').  For example:
-
-     foo[4] = ""
-     if (4 in foo)
-       print "This is printed, even though foo[4] is empty"
-
-   It is not an error to delete an element that does not exist.
-However, if `--lint' is provided on the command line (*note Options::),
-`gawk' issues a warning message when an element that is not in the
-array is deleted.
-
-   All the elements of an array may be deleted with a single statement
-by leaving off the subscript in the `delete' statement, as follows:
-
-     delete ARRAY
-
-   Using this version of the `delete' statement is about three times
-more efficient than the equivalent loop that deletes each element one
-at a time.
-
-     NOTE: For many years, using `delete' without a subscript was a
-     `gawk' extension.  As of September, 2012, it was accepted for
-     inclusion into the POSIX standard. See the Austin Group website
-     (http://austingroupbugs.net/view.php?id=544).  This form of the
-     `delete' statement is also supported by BWK `awk' and `mawk', as
-     well as by a number of other implementations (*note Other
-     Versions::).
-
-   The following statement provides a portable but nonobvious way to
-clear out an array:(1)
-
-     split("", array)
-
-   The `split()' function (*note String Functions::) clears out the
-target array first. This call asks it to split apart the null string.
-Because there is no data to split out, the function simply clears the
-array and then returns.
-
-     CAUTION: Deleting an array does not change its type; you cannot
-     delete an array and then use the array's name as a scalar (i.e., a
-     regular variable). For example, the following does not work:
-
-          a[1] = 3
-          delete a
-          a = 3
-
-   ---------- Footnotes ----------
-
-   (1) Thanks to Michael Brennan for pointing this out.
-
-
-File: gawk.info,  Node: Numeric Array Subscripts,  Next: Uninitialized Subscripts,  Prev: Delete,  Up: Arrays
-
-8.3 Using Numbers to Subscript Arrays
+8.2 Using Numbers to Subscript Arrays
 =====================================
 
 An important aspect to remember about arrays is that _array subscripts
 are always strings_.  When a numeric value is used as a subscript, it
 is converted to a string value before being used for subscripting
-(*note Conversion::).  This means that the value of the built-in
+(*note Conversion::).  This means that the value of the predefined
 variable `CONVFMT' can affect how your program accesses elements of an
 array.  For example:
 
@@ -11281,13 +11469,13 @@ string value `"12.153"' (using the default conversion value of
 assigned the value one.  The program then changes the value of
 `CONVFMT'.  The test `(xyz in data)' generates a new string value from
 `xyz'--this time `"12.15"'--because the value of `CONVFMT' only allows
-two significant digits.  This test fails, since `"12.15"' is different
-from `"12.153"'.
+two significant digits.  This test fails, because `"12.15"' is
+different from `"12.153"'.
 
    According to the rules for conversions (*note Conversion::), integer
-values are always converted to strings as integers, no matter what the
-value of `CONVFMT' may happen to be.  So the usual case of the
-following works:
+values always convert to strings as integers, no matter what the value
+of `CONVFMT' may happen to be.  So the usual case of the following
+works:
 
      for (i = 1; i <= maxsub; i++)
          do something with array[i]
@@ -11300,14 +11488,14 @@ example, that `array[17]', `array[021]', and `array[0x11]' all refer to
 the same element!
 
    As with many things in `awk', the majority of the time things work
-as one would expect them to.  But it is useful to have a precise
-knowledge of the actual rules since they can sometimes have a subtle
+as you would expect them to.  But it is useful to have a precise
+knowledge of the actual rules, as they can sometimes have a subtle
 effect on your programs.
 
 
-File: gawk.info,  Node: Uninitialized Subscripts,  Next: Multidimensional,  Prev: Numeric Array Subscripts,  Up: Arrays
+File: gawk.info,  Node: Uninitialized Subscripts,  Next: Delete,  Prev: Numeric Array Subscripts,  Up: Arrays
 
-8.4 Using Uninitialized Variables as Subscripts
+8.3 Using Uninitialized Variables as Subscripts
 ===============================================
 
 Suppose it's necessary to write a program to print the input data in
@@ -11353,7 +11541,86 @@ string as a subscript if `--lint' is provided on the command line
 (*note Options::).
 
 
-File: gawk.info,  Node: Multidimensional,  Next: Arrays of Arrays,  Prev: Uninitialized Subscripts,  Up: Arrays
+File: gawk.info,  Node: Delete,  Next: Multidimensional,  Prev: Uninitialized Subscripts,  Up: Arrays
+
+8.4 The `delete' Statement
+==========================
+
+To remove an individual element of an array, use the `delete' statement:
+
+     delete ARRAY[INDEX-EXPRESSION]
+
+   Once an array element has been deleted, any value the element once
+had is no longer available. It is as if the element had never been
+referred to or been given a value.  The following is an example of
+deleting elements in an array:
+
+     for (i in frequencies)
+         delete frequencies[i]
+
+This example removes all the elements from the array `frequencies'.
+Once an element is deleted, a subsequent `for' statement to scan the
+array does not report that element and using the `in' operator to check
+for the presence of that element returns zero (i.e., false):
+
+     delete foo[4]
+     if (4 in foo)
+         print "This will never be printed"
+
+   It is important to note that deleting an element is _not_ the same
+as assigning it a null value (the empty string, `""').  For example:
+
+     foo[4] = ""
+     if (4 in foo)
+       print "This is printed, even though foo[4] is empty"
+
+   It is not an error to delete an element that does not exist.
+However, if `--lint' is provided on the command line (*note Options::),
+`gawk' issues a warning message when an element that is not in the
+array is deleted.
+
+   All the elements of an array may be deleted with a single statement
+by leaving off the subscript in the `delete' statement, as follows:
+
+     delete ARRAY
+
+   Using this version of the `delete' statement is about three times
+more efficient than the equivalent loop that deletes each element one
+at a time.
+
+   This form of the `delete' statement is also supported by BWK `awk'
+and `mawk', as well as by a number of other implementations.
+
+     NOTE: For many years, using `delete' without a subscript was a
+     common extension.  In September 2012, it was accepted for
+     inclusion into the POSIX standard.  See the Austin Group website
+     (http://austingroupbugs.net/view.php?id=544).
+
+   The following statement provides a portable but nonobvious way to
+clear out an array:(1)
+
+     split("", array)
+
+   The `split()' function (*note String Functions::) clears out the
+target array first. This call asks it to split apart the null string.
+Because there is no data to split out, the function simply clears the
+array and then returns.
+
+     CAUTION: Deleting all the elements from an array does not change
+     its type; you cannot clear an array and then use the array's name
+     as a scalar (i.e., a regular variable). For example, the following
+     does not work:
+
+          a[1] = 3
+          delete a
+          a = 3
+
+   ---------- Footnotes ----------
+
+   (1) Thanks to Michael Brennan for pointing this out.
+
+
+File: gawk.info,  Node: Multidimensional,  Next: Arrays of Arrays,  Prev: Delete,  Up: Arrays
 
 8.5 Multidimensional Arrays
 ===========================
@@ -11362,10 +11629,10 @@ File: gawk.info,  Node: Multidimensional,  Next: Arrays of Arrays,  Prev: Uninit
 
 * Multiscanning::               Scanning multidimensional arrays.
 
-   A multidimensional array is an array in which an element is
+   A "multidimensional array" is an array in which an element is
 identified by a sequence of indices instead of a single index.  For
 example, a two-dimensional array requires two indices.  The usual way
-(in most languages, including `awk') to refer to an element of a
+(in many languages, including `awk') to refer to an element of a
 two-dimensional array named `grid' is with `grid[X,Y]'.
 
    Multidimensional arrays are supported in `awk' through concatenation
@@ -11397,7 +11664,7 @@ stored as `foo["a@b@c"]'.
 
    To test whether a particular index sequence exists in a
 multidimensional array, use the same operator (`in') that is used for
-single dimensional arrays.  Write the whole sequence of indices in
+single-dimensional arrays.  Write the whole sequence of indices in
 parentheses, separated by commas, as the left operand:
 
      if ((SUBSCRIPT1, SUBSCRIPT2, ...) in ARRAY)
@@ -11497,21 +11764,22 @@ two-element subarray at index `1' of the main array `a':
    This simulates a true two-dimensional array. Each subarray element
 can contain another subarray as a value, which in turn can hold other
 arrays as well. In this way, you can create arrays of three or more
-dimensions.  The indices can be any `awk' expression, including scalars
-separated by commas (that is, a regular `awk' simulated
-multidimensional subscript). So the following is valid in `gawk':
+dimensions.  The indices can be any `awk' expressions, including scalars
+separated by commas (i.e., a regular `awk' simulated multidimensional
+subscript). So the following is valid in `gawk':
 
      a[1][3][1, "name"] = "barney"
 
    Each subarray and the main array can be of different length. In
 fact, the elements of an array or its subarray do not all have to have
 the same type. This means that the main array and any of its subarrays
-can be non-rectangular, or jagged in structure. One can assign a scalar
-value to the index `4' of the main array `a':
+can be nonrectangular, or jagged in structure. You can assign a scalar
+value to the index `4' of the main array `a', even though `a[1]' is
+itself an array and not a scalar:
 
      a[4] = "An element in a jagged array"
 
-   The terms "dimension", "row" and "column" are meaningless when
+   The terms "dimension", "row", and "column" are meaningless when
 applied to such an array, but we will use "dimension" henceforth to
 imply the maximum number of indices needed to refer to an existing
 element. The type of any element that has already been assigned cannot
@@ -11523,8 +11791,8 @@ the element at that index:
      a[4][5][6][7] = "An element in a four-dimensional array"
 
 This removes the scalar value from index `4' and then inserts a
-subarray of subarray of subarray containing a scalar. You can also
-delete an entire subarray or subarray of subarrays:
+three-level nested subarray containing a scalar. You can also delete an
+entire subarray or subarray of subarrays:
 
      delete a[4][5]
      a[4][5] = "An element in subarray a[4]"
@@ -11532,7 +11800,7 @@ delete an entire subarray or subarray of subarrays:
    But recall that you can not delete the main array `a' and then use it
 as a scalar.
 
-   The built-in functions which take array arguments can also be used
+   The built-in functions that take array arguments can also be used
 with subarrays. For example, the following code fragment uses `length()'
 (*note String Functions::) to determine the number of elements in the
 main array `a' and its subarrays:
@@ -11553,7 +11821,7 @@ be nested to scan all the elements of an array of arrays if it is
 rectangular in structure. In order to print the contents (scalar
 values) of a two-dimensional array of arrays (i.e., in which each
 first-level element is itself an array, not necessarily of the same
-length) you could use the following code:
+length), you could use the following code:
 
      for (i in array)
          for (j in array[i])
@@ -11568,6 +11836,8 @@ an array element is itself an array:
                  print array[i][j]
              }
          }
+         else
+             print array[i]
      }
 
    If the structure of a jagged array of arrays is known in advance,
@@ -11585,7 +11855,7 @@ the following code prints the elements of our main array `a':
      }
 
 *Note Walking Arrays::, for a user-defined function that "walks" an
-arbitrarily-dimensioned array of arrays.
+arbitrarily dimensioned array of arrays.
 
    Recall that a reference to an uninitialized array element yields a
 value of `""', the null string. This has one important implication when
@@ -11626,16 +11896,16 @@ File: gawk.info,  Node: Arrays Summary,  Prev: Arrays of Arrays,  Up: Arrays
      `gawk' lets you control the order by assigning special predefined
      values to `PROCINFO["sorted_in"]'.
 
-   * Use `delete ARRAY[INDX]' to delete an individual element.  You may
-     also use `delete ARRAY' to delete all of the elements in the
-     array.  This latter feature has been a common extension for many
-     years and is now standard, but may not be supported by all
-     commercial versions of `awk'.
+   * Use `delete ARRAY[INDX]' to delete an individual element.  To
+     delete all of the elements in an array, use `delete ARRAY'.  This
+     latter feature has been a common extension for many years and is
+     now standard, but may not be supported by all commercial versions
+     of `awk'.
 
    * Standard `awk' simulates multidimensional arrays by separating
-     subscript values with a comma.  The values are concatenated into a
+     subscript values with commas.  The values are concatenated into a
      single string, separated by the value of `SUBSEP'.  The fact that
-     such a subscript was created in this way is not retained; thus
+     such a subscript was created in this way is not retained; thus,
      changing `SUBSEP' may have unexpected consequences.  You can use
      `(SUB1, SUB2, ...) in ARRAY' to see if such a multidimensional
      subscript exists in ARRAY.
@@ -11643,7 +11913,7 @@ File: gawk.info,  Node: Arrays Summary,  Prev: Arrays of Arrays,  Up: Arrays
    * `gawk' provides true arrays of arrays. You use a separate set of
      square brackets for each dimension in such an array:
      `data[row][col]', for example. Array elements may thus be either
-     scalar values (number or string) or another array.
+     scalar values (number or string) or other arrays.
 
    * Use the `isarray()' built-in function to determine if an array
      element is itself a subarray.
@@ -11658,11 +11928,14 @@ File: gawk.info,  Node: Functions,  Next: Library Functions,  Prev: Arrays,  Up:
 This major node describes `awk''s built-in functions, which fall into
 three categories: numeric, string, and I/O.  `gawk' provides additional
 groups of functions to work with values that represent time, do bit
-manipulation, sort arrays, and internationalize and localize programs.
+manipulation, sort arrays, provide type information, and
+internationalize and localize programs.
 
    Besides the built-in functions, `awk' has provisions for writing new
 functions that the rest of a program can use.  The second half of this
-major node describes these "user-defined" functions.
+major node describes these "user-defined" functions.  Finally, we
+explore indirect function calls, a `gawk'-specific extension that lets
+you determine at runtime what function is to be called.
 
 * Menu:
 
@@ -11707,7 +11980,7 @@ function followed by arguments in parentheses.  For example, `atan2(y +
 z, 1)' is a call to the function `atan2()' and has two arguments.
 
    Whitespace is ignored between the built-in function name and the
-open parenthesis, but nonetheless it is good practice to avoid using
+opening parenthesis, but nonetheless it is good practice to avoid using
 whitespace there.  User-defined functions do not permit whitespace in
 this way, and it is easier to avoid mistakes by following a simple
 convention that always works--no whitespace after a function name.
@@ -11733,12 +12006,13 @@ undefined.  Thus, avoid writing programs that assume that parameters
 are evaluated from left to right or from right to left.  For example:
 
      i = 5
-     j = atan2(i++, i *= 2)
+     j = atan2(++i, i *= 2)
 
    If the order of evaluation is left to right, then `i' first becomes
-6, and then 12, and `atan2()' is called with the two arguments 6 and
-12.  But if the order of evaluation is right to left, `i' first becomes
-10, then 11, and `atan2()' is called with the two arguments 11 and 10.
+six, and then 12, and `atan2()' is called with the two arguments six
+and 12.  But if the order of evaluation is right to left, `i' first
+becomes 10, then 11, and `atan2()' is called with the two arguments 11
+and 10.
 
 
 File: gawk.info,  Node: Numeric Functions,  Next: String Functions,  Prev: Calling Built-in,  Up: Built-in
@@ -11757,7 +12031,17 @@ brackets ([ ]):
 `cos(X)'
      Return the cosine of X, with X in radians.
 
-`div(NUMERATOR, DENOMINATOR, RESULT)'
+`exp(X)'
+     Return the exponential of X (`e ^ X') or report an error if X is
+     out of range.  The range of values X can have depends on your
+     machine's floating-point representation.
+
+`int(X)'
+     Return the nearest integer to X, located between X and zero and
+     truncated toward zero.  For example, `int(3)' is 3, `int(3.9)' is
+     3, `int(-3.9)' is -3, and `int(-3)' is -3 as well.
+
+`intdiv(NUMERATOR, DENOMINATOR, RESULT)'
      Perform integer division, similar to the standard C function of the
      same name.  First, truncate `numerator' and `denominator' towards
      zero, creating integer values.  Clear the `result' array, and then
@@ -11772,18 +12056,6 @@ brackets ([ ]):
      This function is a `gawk' extension.  It is not available in
      compatibility mode (*note Options::).
 
-`exp(X)'
-     Return the exponential of X (`e ^ X') or report an error if X is
-     out of range.  The range of values X can have depends on your
-     machine's floating-point representation.
-
-`int(X)'
-     Return the nearest integer to X, located between X and zero and
-     truncated toward zero.
-
-     For example, `int(3)' is 3, `int(3.9)' is 3, `int(-3.9)' is -3,
-     and `int(-3)' is -3 as well.
-
 `log(X)'
      Return the natural logarithm of X, if X is positive; otherwise,
      return `NaN' ("not a number") on IEEE 754 systems.  Additionally,
@@ -11796,15 +12068,16 @@ brackets ([ ]):
 
      Often random integers are needed instead.  Following is a
      user-defined function that can be used to obtain a random
-     non-negative integer less than N:
+     nonnegative integer less than N:
 
-          function randint(n) {
-               return int(n * rand())
+          function randint(n)
+          {
+              return int(n * rand())
           }
 
-     The multiplication produces a random number greater than zero and
-     less than `n'.  Using `int()', this result is made into an integer
-     between zero and `n' - 1, inclusive.
+     The multiplication produces a random number greater than or equal
+     to zero and less than `n'.  Using `int()', this result is made into
+     an integer between zero and `n' - 1, inclusive.
 
      The following example uses a similar function to produce random
      integers between one and N.  This program prints a new random
@@ -11816,8 +12089,7 @@ brackets ([ ]):
           # Roll 3 six-sided dice and
           # print total number of points.
           {
-                printf("%d points\n",
-                       roll(6)+roll(6)+roll(6))
+              printf("%d points\n", roll(6) + roll(6) + roll(6))
           }
 
           CAUTION: In most `awk' implementations, including `gawk',
@@ -11873,7 +12145,7 @@ numbers.
    (2) `mawk' uses a different seed each time.
 
    (3) Computer-generated random numbers really are not truly random.
-They are technically known as "pseudorandom."  This means that while
+They are technically known as "pseudorandom".  This means that although
 the numbers in a sequence appear to be random, you can in fact generate
 the same sequence of random numbers over and over again.
 
@@ -11886,7 +12158,7 @@ File: gawk.info,  Node: String Functions,  Next: I/O Functions,  Prev: Numeric F
 The functions in this minor node look at or change the text of one or
 more strings.
 
-   `gawk' understands locales (*note Locales::), and does all string
+   `gawk' understands locales (*note Locales::) and does all string
 processing in terms of _characters_, not _bytes_.  This distinction is
 particularly important to understand for locales where one character
 may be represented by multiple bytes.  Thus, for example, `length()'
@@ -11904,8 +12176,8 @@ with character indices, and not byte indices.
    In the following list, optional parameters are enclosed in square
 brackets ([ ]).  Several functions perform string substitution; the
 full discussion is provided in the description of the `sub()' function,
-which comes towards the end since the list is presented in alphabetic
-order.
+which comes toward the end, because the list is presented
+alphabetically.
 
    Those functions that are specific to `gawk' are marked with a pound
 sign (`#').  They are not available in compatibility mode (*note
@@ -11923,10 +12195,10 @@ Options::):
      together.
 
           NOTE: The following description ignores the third argument,
-          HOW, since it requires understanding features that we have
-          not discussed yet.  Thus, the discussion here is a deliberate
-          simplification.  (We do provide all the details later on:
-          *Note Array Sorting Functions::, for the full story.)
+          HOW, as it requires understanding features that we have not
+          discussed yet.  Thus, the discussion here is a deliberate
+          simplification.  (We do provide all the details later on; see
+          *note Array Sorting Functions::, for the full story.)
 
      Both functions return the number of elements in the array SOURCE.
      For `asort()', `gawk' sorts the values of SOURCE and replaces the
@@ -11938,7 +12210,8 @@ Options::):
      When comparing strings, `IGNORECASE' affects the sorting (*note
      Array Sorting Functions::).  If the SOURCE array contains
      subarrays as values (*note Arrays of Arrays::), they will come
-     last, after all scalar values.
+     last, after all scalar values.  Subarrays are _not_ recursively
+     sorted.
 
      For example, if the contents of `a' are as follows:
 
@@ -11956,7 +12229,7 @@ Options::):
           a[2] = "de"
           a[3] = "sac"
 
-     The `asorti()' function works similarly to `asort()', however, the
+     The `asorti()' function works similarly to `asort()'; however, the
      _indices_ are sorted, instead of the values. Thus, in the previous
      example, starting with the same initial set of indices and values
      in `a', calling `asorti(a)' would yield:
@@ -12041,7 +12314,10 @@ Options::):
 
      If FIND is not found, `index()' returns zero.
 
-     It is a fatal error to use a regexp constant for FIND.
+     With BWK `awk' and `gawk', it is a fatal error to use a regexp
+     constant for FIND.  Other implementations allow it, simply
+     treating the regexp constant as an expression meaning `$0 ~
+     /regexp/'. (d.c.)
 
 `length('[STRING]`)'
      Return the number of characters in STRING.  If STRING is a number,
@@ -12085,9 +12361,9 @@ Options::):
 
 `match(STRING, REGEXP' [`, ARRAY']`)'
      Search STRING for the longest, leftmost substring matched by the
-     regular expression, REGEXP and return the character position
-     (index) at which that substring begins (one, if it starts at the
-     beginning of STRING).  If no match is found, return zero.
+     regular expression REGEXP and return the character position (index)
+     at which that substring begins (one, if it starts at the beginning
+     of STRING).  If no match is found, return zero.
 
      The REGEXP argument may be either a regexp constant (`/'...`/') or
      a string constant (`"'...`"').  In the latter case, the string is
@@ -12095,27 +12371,26 @@ Options::):
      discussion of the difference between the two forms, and the
      implications for writing your program correctly.
 
-     The order of the first two arguments is backwards from most other
+     The order of the first two arguments is the opposite of most other
      string functions that work with regular expressions, such as
      `sub()' and `gsub()'.  It might help to remember that for
      `match()', the order is the same as for the `~' operator: `STRING
      ~ REGEXP'.
 
-     The `match()' function sets the built-in variable `RSTART' to the
-     index.  It also sets the built-in variable `RLENGTH' to the length
-     in characters of the matched substring.  If no match is found,
-     `RSTART' is set to zero, and `RLENGTH' to -1.
+     The `match()' function sets the predefined variable `RSTART' to
+     the index.  It also sets the predefined variable `RLENGTH' to the
+     length in characters of the matched substring.  If no match is
+     found, `RSTART' is set to zero, and `RLENGTH' to -1.
 
      For example:
 
           {
-                 if ($1 == "FIND")
-                   regex = $2
-                 else {
-                   where = match($0, regex)
-                   if (where != 0)
-                     print "Match of", regex, "found at",
-                               where, "in", $0
+              if ($1 == "FIND")
+                  regex = $2
+              else {
+                  where = match($0, regex)
+                  if (where != 0)
+                      print "Match of", regex, "found at", where, "in", $0
                  }
           }
 
@@ -12162,9 +12437,9 @@ Options::):
           -| 9 7
 
      There may not be subscripts for the start and index for every
-     parenthesized subexpression, since they may not all have matched
-     text; thus they should be tested for with the `in' operator (*note
-     Reference to Elements::).
+     parenthesized subexpression, because they may not all have matched
+     text; thus, they should be tested for with the `in' operator
+     (*note Reference to Elements::).
 
      The ARRAY argument to `match()' is a `gawk' extension.  In
      compatibility mode (*note Options::), using a third argument is a
@@ -12184,7 +12459,7 @@ Options::):
 
      The `patsplit()' function splits strings into pieces in a manner
      similar to the way input lines are split into fields using `FPAT'
-     (*note Splitting By Content::.
+     (*note Splitting By Content::).
 
      Before splitting the string, `patsplit()' deletes any previously
      existing elements in the arrays ARRAY and SEPS.
@@ -12195,22 +12470,21 @@ Options::):
      first piece is stored in `ARRAY[1]', the second piece in
      `ARRAY[2]', and so forth.  The string value of the third argument,
      FIELDSEP, is a regexp describing where to split STRING (much as
-     `FS' can be a regexp describing where to split input records;
-     *note Regexp Field Splitting::).  If FIELDSEP is omitted, the
-     value of `FS' is used.  `split()' returns the number of elements
-     created.  SEPS is a `gawk' extension with `SEPS[I]' being the
-     separator string between `ARRAY[I]' and `ARRAY[I+1]'.  If FIELDSEP
-     is a single space then any leading whitespace goes into `SEPS[0]'
-     and any trailing whitespace goes into `SEPS[N]' where N is the
-     return value of `split()' (that is, the number of elements in
-     ARRAY).
+     `FS' can be a regexp describing where to split input records).  If
+     FIELDSEP is omitted, the value of `FS' is used.  `split()' returns
+     the number of elements created.  SEPS is a `gawk' extension, with
+     `SEPS[I]' being the separator string between `ARRAY[I]' and
+     `ARRAY[I+1]'.  If FIELDSEP is a single space, then any leading
+     whitespace goes into `SEPS[0]' and any trailing whitespace goes
+     into `SEPS[N]', where N is the return value of `split()' (i.e.,
+     the number of elements in ARRAY).
 
      The `split()' function splits strings into pieces in a manner
      similar to the way input lines are split into fields.  For example:
 
           split("cul-de-sac", a, "-", seps)
 
-     splits the string `cul-de-sac' into three fields using `-' as the
+     splits the string `"cul-de-sac"' into three fields using `-' as the
      separator.  It sets the contents of the array `a' as follows:
 
           a[1] = "cul"
@@ -12227,17 +12501,18 @@ Options::):
      As with input field-splitting, when the value of FIELDSEP is
      `" "', leading and trailing whitespace is ignored in values
      assigned to the elements of ARRAY but not in SEPS, and the elements
-     are separated by runs of whitespace.  Also as with input
-     field-splitting, if FIELDSEP is the null string, each individual
+     are separated by runs of whitespace.  Also, as with input field
+     splitting, if FIELDSEP is the null string, each individual
      character in the string is split into its own array element.
      (c.e.)
 
      Note, however, that `RS' has no effect on the way `split()' works.
-     Even though `RS = ""' causes newline to also be an input field
-     separator, this does not affect how `split()' splits strings.
+     Even though `RS = ""' causes the newline character to also be an
+     input field separator, this does not affect how `split()' splits
+     strings.
 
      Modern implementations of `awk', including `gawk', allow the third
-     argument to be a regexp constant (`/abc/') as well as a string.
+     argument to be a regexp constant (`/'...`/') as well as a string.
      (d.c.)  The POSIX standard allows this as well.  *Note Computed
      Regexps::, for a discussion of the difference between using a
      string constant or a regexp constant, and the implications for
@@ -12338,7 +12613,7 @@ Options::):
           { sub(/\|/, "\\&"); print }
 
      As mentioned, the third argument to `sub()' must be a variable,
-     field or array element.  Some versions of `awk' allow the third
+     field, or array element.  Some versions of `awk' allow the third
      argument to be an expression that is not an lvalue.  In such a
      case, `sub()' still searches for the pattern and returns zero or
      one, but the result of the substitution (if any) is thrown away
@@ -12409,6 +12684,17 @@ Options::):
      Nonalphabetic characters are left unchanged.  For example,
      `toupper("MiXeD cAsE 123")' returns `"MIXED CASE 123"'.
 
+                       Matching the Null String
+
+   In `awk', the `*' operator can match the null string.  This is
+particularly important for the `sub()', `gsub()', and `gensub()'
+functions.  For example:
+
+     $ echo abc | awk '{ gsub(/m*/, "X"); print }'
+     -| XaXbXcX
+
+Although this makes a certain amount of sense, it can be surprising.
+
    ---------- Footnotes ----------
 
    (1) Unless you use the `--non-decimal-data' option, which isn't
@@ -12425,11 +12711,11 @@ is number zero.
 
 File: gawk.info,  Node: Gory Details,  Up: String Functions
 
-9.1.3.1 More About `\' and `&' with `sub()', `gsub()', and `gensub()'
+9.1.3.1 More about `\' and `&' with `sub()', `gsub()', and `gensub()'
 .....................................................................
 
-     CAUTION: This section has been known to cause headaches.  You
-     might want to skip it upon first reading.
+     CAUTION: This subsubsection has been reported to cause headaches.
+     You might want to skip it upon first reading.
 
    When using `sub()', `gsub()', or `gensub()', and trying to get
 literal backslashes and ampersands into the replacement text, you need
@@ -12452,11 +12738,11 @@ example, `"a\qb"' is treated as `"aqb"'.
 
    At the runtime level, the various functions handle sequences of `\'
 and `&' differently.  The situation is (sadly) somewhat complex.
-Historically, the `sub()' and `gsub()' functions treated the two
-character sequence `\&' specially; this sequence was replaced in the
-generated text with a single `&'.  Any other `\' within the REPLACEMENT
-string that did not precede an `&' was passed through unchanged.  This
-is illustrated in *note table-sub-escapes::.
+Historically, the `sub()' and `gsub()' functions treated the
+two-character sequence `\&' specially; this sequence was replaced in
+the generated text with a single `&'.  Any other `\' within the
+REPLACEMENT string that did not precede an `&' was passed through
+unchanged.  This is illustrated in *note table-sub-escapes::.
 
       You type         `sub()' sees          `sub()' generates
       -------         ---------          --------------
@@ -12468,13 +12754,13 @@ is illustrated in *note table-sub-escapes::.
      `\\\\\\&'           `\\\&'            A literal `\\&'
          `\\q'             `\q'            A literal `\q'
 
-Table 9.1: Historical Escape Sequence Processing for `sub()' and
+Table 9.1: Historical escape sequence processing for `sub()' and
 `gsub()'
 
-This table shows both the lexical-level processing, where an odd number
-of backslashes becomes an even number at the runtime level, as well as
-the runtime processing done by `sub()'.  (For the sake of simplicity,
-the rest of the following tables only show the case of even numbers of
+This table shows the lexical-level processing, where an odd number of
+backslashes becomes an even number at the runtime level, as well as the
+runtime processing done by `sub()'.  (For the sake of simplicity, the
+rest of the following tables only show the case of even numbers of
 backslashes entered at the lexical level.)
 
    The problem with the historical approach is that there is no way to
@@ -12498,10 +12784,10 @@ This is shown in *note table-sub-proposed::.
          `\\q'             `\q'            A literal `\q'
         `\\\\'             `\\'            `\\'
 
-Table 9.2: GNU `awk' Rules For `sub()' And Backslash
+Table 9.2: `gawk' rules for `sub()' and backslash
 
    In a nutshell, at the runtime level, there are now three special
-sequences of characters (`\\\&', `\\&' and `\&') whereas historically
+sequences of characters (`\\\&', `\\&', and `\&') whereas historically
 there was only one.  However, as in the historical case, any `\' that
 is not part of one of these three sequences is not special and appears
 in the output literally.
@@ -12525,20 +12811,19 @@ rules are presented in *note table-posix-sub::.
          `\\q'             `\q'            A literal `\q'
         `\\\\'             `\\'            `\'
 
-Table 9.3: POSIX Rules For `sub()' And `gsub()'
+Table 9.3: POSIX rules for `sub()' and `gsub()'
 
    The only case where the difference is noticeable is the last one:
 `\\\\' is seen as `\\' and produces `\' instead of `\\'.
 
    Starting with version 3.1.4, `gawk' followed the POSIX rules when
-`--posix' is specified (*note Options::). Otherwise, it continued to
-follow the proposed rules, since that had been its behavior for many
-years.
+`--posix' was specified (*note Options::). Otherwise, it continued to
+follow the proposed rules, as that had been its behavior for many years.
 
    When version 4.0.0 was released, the `gawk' maintainer made the
 POSIX rules the default, breaking well over a decade's worth of
-backwards compatibility.(1) Needless to say, this was a bad idea, and
-as of version 4.0.1, `gawk' resumed its historical behavior, and only
+backward compatibility.(1) Needless to say, this was a bad idea, and as
+of version 4.0.1, `gawk' resumed its historical behavior, and only
 follows the POSIX rules when `--posix' is given.
 
    The rules for `gensub()' are considerably simpler. At the runtime
@@ -12557,22 +12842,11 @@ the `\' does not, as shown in *note table-gensub-escapes::.
      `\\\\\\&'                 `\\\&'            A literal `\&'
          `\\q'                   `\q'            A literal `q'
 
-Table 9.4: Escape Sequence Processing For `gensub()'
-
-   Because of the complexity of the lexical and runtime level processing
-and the special cases for `sub()' and `gsub()', we recommend the use of
-`gawk' and `gensub()' when you have to do substitutions.
-
-                       Matching the Null String
-
-   In `awk', the `*' operator can match the null string.  This is
-particularly important for the `sub()', `gsub()', and `gensub()'
-functions.  For example:
+Table 9.4: Escape sequence processing for `gensub()'
 
-     $ echo abc | awk '{ gsub(/m*/, "X"); print }'
-     -| XaXbXcX
-
-Although this makes a certain amount of sense, it can be surprising.
+   Because of the complexity of the lexical- and runtime-level
+processing and the special cases for `sub()' and `gsub()', we recommend
+the use of `gawk' and `gensub()' when you have to do substitutions.
 
    ---------- Footnotes ----------
 
@@ -12599,10 +12873,10 @@ parameters are enclosed in square brackets ([ ]):
      When closing a coprocess, it is occasionally useful to first close
      one end of the two-way pipe and then to close the other.  This is
      done by providing a second argument to `close()'.  This second
-     argument should be one of the two string values `"to"' or `"from"',
-     indicating which end of the pipe to close.  Case in the string does
-     not matter.  *Note Two-way I/O::, which discusses this feature in
-     more detail and gives an example.
+     argument (HOW) should be one of the two string values `"to"' or
+     `"from"', indicating which end of the pipe to close.  Case in the
+     string does not matter.  *Note Two-way I/O::, which discusses this
+     feature in more detail and gives an example.
 
      Note that the second argument to `close()' is a `gawk' extension;
      it is not available in compatibility mode (*note Options::).
@@ -12612,24 +12886,23 @@ parameters are enclosed in square brackets ([ ]):
      either a file opened for writing or a shell command for
      redirecting output to a pipe or coprocess.
 
-     Many utility programs "buffer" their output; i.e., they save
+     Many utility programs "buffer" their output (i.e., they save
      information to write to a disk file or the screen in memory until
      there is enough for it to be worthwhile to send the data to the
-     output device.  This is often more efficient than writing every
+     output device).  This is often more efficient than writing every
      little bit of information as soon as it is ready.  However,
      sometimes it is necessary to force a program to "flush" its
-     buffers; that is, write the information to its destination, even
-     if a buffer is not full.  This is the purpose of the `fflush()'
-     function--`gawk' also buffers its output and the `fflush()'
+     buffers (i.e., write the information to its destination, even if a
+     buffer is not full).  This is the purpose of the `fflush()'
+     function--`gawk' also buffers its output, and the `fflush()'
      function forces `gawk' to flush its buffers.
 
-     `fflush()' was added to BWK `awk' in April of 1992.  For two
-     decades, it was not part of the POSIX standard.  As of December,
-     2012, it was accepted for inclusion into the POSIX standard.  See
-     the Austin Group website
-     (http://austingroupbugs.net/view.php?id=634).
+     Brian Kernighan added `fflush()' to his `awk' in April 1992.  For
+     two decades, it was a common extension.  In December 2012, it was
+     accepted for inclusion into the POSIX standard.  See the Austin
+     Group website (http://austingroupbugs.net/view.php?id=634).
 
-     POSIX standardizes `fflush()' as follows: If there is no argument,
+     POSIX standardizes `fflush()' as follows: if there is no argument,
      or if the argument is the null string (`""'), then `awk' flushes
      the buffers for _all_ open output files and pipes.
 
@@ -12638,24 +12911,57 @@ parameters are enclosed in square brackets ([ ]):
           output files and pipes if the argument was the null string.
           This was changed in order to be compatible with Brian
           Kernighan's `awk', in the hope that standardizing this
-          feature in POSIX would then be easier (which indeed helped).
+          feature in POSIX would then be easier (which indeed proved to
+          be the case).
 
           With `gawk', you can use `fflush("/dev/stdout")' if you wish
           to flush only the standard output.
 
      `fflush()' returns zero if the buffer is successfully flushed;
-     otherwise, it returns non-zero. (`gawk' returns -1.)  In the case
-     where all buffers are flushed, the return value is zero only if
-     all buffers were flushed successfully.  Otherwise, it is -1, and
-     `gawk' warns about the problem FILENAME.
+     otherwise, it returns a nonzero value. (`gawk' returns -1.)  In
+     the case where all buffers are flushed, the return value is zero
+     only if all buffers were flushed successfully.  Otherwise, it is
+     -1, and `gawk' warns about the problem FILENAME.
 
      `gawk' also issues a warning message if you attempt to flush a
      file or pipe that was opened for reading (such as with `getline'),
      or if FILENAME is not an open file, pipe, or coprocess.  In such a
      case, `fflush()' returns -1, as well.
 
+                Interactive Versus Noninteractive Buffering
+
+     As a side point, buffering issues can be even more confusing if
+     your program is "interactive" (i.e., communicating with a user
+     sitting at a keyboard).(1)
+
+     Interactive programs generally "line buffer" their output (i.e.,
+     they write out every line).  Noninteractive programs wait until
+     they have a full buffer, which may be many lines of output.  Here
+     is an example of the difference:
+
+          $ awk '{ print $1 + $2 }'
+          1 1
+          -| 2
+          2 3
+          -| 5
+          Ctrl-d
+
+     Each line of output is printed immediately. Compare that behavior
+     with this example:
+
+          $ awk '{ print $1 + $2 }' | cat
+          1 1
+          2 3
+          Ctrl-d
+          -| 2
+          -| 5
+
+     Here, no output is printed until after the `Ctrl-d' is typed,
+     because it is all buffered and sent down the pipe to `cat' in one
+     shot.
+
 `system(COMMAND)'
-     Execute the operating-system command COMMAND and then return to
+     Execute the operating system command COMMAND and then return to
      the `awk' program.  Return COMMAND's exit status.
 
      For example, if the following fragment of code is put in your `awk'
@@ -12687,37 +12993,6 @@ parameters are enclosed in square brackets ([ ]):
           is disabled (*note Options::).
 
 
-              Interactive Versus Noninteractive Buffering
-
-   As a side point, buffering issues can be even more confusing,
-depending upon whether your program is "interactive", i.e.,
-communicating with a user sitting at a keyboard.(1)
-
-   Interactive programs generally "line buffer" their output; i.e., they
-write out every line.  Noninteractive programs wait until they have a
-full buffer, which may be many lines of output.  Here is an example of
-the difference:
-
-     $ awk '{ print $1 + $2 }'
-     1 1
-     -| 2
-     2 3
-     -| 5
-     Ctrl-d
-
-Each line of output is printed immediately. Compare that behavior with
-this example:
-
-     $ awk '{ print $1 + $2 }' | cat
-     1 1
-     2 3
-     Ctrl-d
-     -| 2
-     -| 5
-
-Here, no output is printed until after the `Ctrl-d' is typed, because
-it is all buffered and sent down the pipe to `cat' in one shot.
-
              Controlling Output Buffering with `system()'
 
    The `fflush()' function provides explicit control over output
@@ -12731,8 +13006,8 @@ argument:
 `gawk' treats this use of the `system()' function as a special case and
 is smart enough not to run a shell (or other command interpreter) with
 the empty command.  Therefore, with `gawk', this idiom is not only
-useful, it is also efficient.  While this method should work with other
-`awk' implementations, it does not necessarily avoid starting an
+useful, it is also efficient.  Although this method should work with
+other `awk' implementations, it does not necessarily avoid starting an
 unnecessary shell.  (Other implementations may only flush the buffer
 associated with the standard output and not necessarily all buffered
 output.)
@@ -12775,14 +13050,14 @@ File: gawk.info,  Node: Time Functions,  Next: Bitwise Functions,  Prev: I/O Fun
 
 `awk' programs are commonly used to process log files containing
 timestamp information, indicating when a particular log record was
-written.  Many programs log their timestamp in the form returned by the
-`time()' system call, which is the number of seconds since a particular
-epoch.  On POSIX-compliant systems, it is the number of seconds since
-1970-01-01 00:00:00 UTC, not counting leap seconds.(1) All known
-POSIX-compliant systems support timestamps from 0 through 2^31 - 1,
-which is sufficient to represent times through 2038-01-19 03:14:07 UTC.
-Many systems support a wider range of timestamps, including negative
-timestamps that represent times before the epoch.
+written.  Many programs log their timestamps in the form returned by
+the `time()' system call, which is the number of seconds since a
+particular epoch.  On POSIX-compliant systems, it is the number of
+seconds since 1970-01-01 00:00:00 UTC, not counting leap seconds.(1)
+All known POSIX-compliant systems support timestamps from 0 through
+2^31 - 1, which is sufficient to represent times through 2038-01-19
+03:14:07 UTC.  Many systems support a wider range of timestamps,
+including negative timestamps that represent times before the epoch.
 
    In order to make it easier to process such log files and to produce
 useful reports, `gawk' provides the following functions for working
@@ -12805,16 +13080,16 @@ enclosed in square brackets ([ ]):
      specified; for example, an hour of -1 means 1 hour before midnight.
      The origin-zero Gregorian calendar is assumed, with year 0
      preceding year 1 and year -1 preceding year 0.  The time is
-     assumed to be in the local timezone.  If the daylight-savings flag
-     is positive, the time is assumed to be daylight savings time; if
-     zero, the time is assumed to be standard time; and if negative
+     assumed to be in the local time zone.  If the daylight-savings
+     flag is positive, the time is assumed to be daylight savings time;
+     if zero, the time is assumed to be standard time; and if negative
      (the default), `mktime()' attempts to determine whether daylight
      savings time is in effect for the specified time.
 
      If DATESPEC does not contain enough elements or if the resulting
      time is out of range, `mktime()' returns -1.
 
-`strftime(' [FORMAT [`,' TIMESTAMP [`,' UTC-FLAG] ] ]`)'
+`strftime('[FORMAT [`,' TIMESTAMP [`,' UTC-FLAG] ] ]`)'
      Format the time specified by TIMESTAMP based on the contents of
      the FORMAT string and return the result.  It is similar to the
      function of the same name in ISO C.  If UTC-FLAG is present and is
@@ -12823,14 +13098,14 @@ enclosed in square brackets ([ ]):
      Otherwise, the value is formatted for the local time zone.  The
      TIMESTAMP is in the same format as the value returned by the
      `systime()' function.  If no TIMESTAMP argument is supplied,
-     `gawk' uses the current time of day as the timestamp.  If no
-     FORMAT argument is supplied, `strftime()' uses the value of
+     `gawk' uses the current time of day as the timestamp.  Without a
+     FORMAT argument, `strftime()' uses the value of
      `PROCINFO["strftime"]' as the format string (*note Built-in
      Variables::).  The default string value is
      `"%a %b %e %H:%M:%S %Z %Y"'.  This format string produces output
      that is equivalent to that of the `date' utility.  You can assign
      a new value to `PROCINFO["strftime"]' to change the default
-     format; see below for the various format directives.
+     format; see the following list for the various format directives.
 
 `systime()'
      Return the current time as the number of seconds since the system
@@ -12894,9 +13169,9 @@ the following date format specifications:
 
 `%g'
      The year modulo 100 of the ISO 8601 week number, as a decimal
-     number (00-99).  For example, January 1, 2012 is in week 53 of
+     number (00-99).  For example, January 1, 2012, is in week 53 of
      2011. Thus, the year of its ISO 8601 week number is 2011, even
-     though its year is 2012.  Similarly, December 31, 2012 is in week
+     though its year is 2012.  Similarly, December 31, 2012, is in week
      1 of 2013. Thus, the year of its ISO week number is 2013, even
      though its year is 2012.
 
@@ -12948,23 +13223,23 @@ the following date format specifications:
      The weekday as a decimal number (1-7).  Monday is day one.
 
 `%U'
-     The week number of the year (the first Sunday as the first day of
-     week one) as a decimal number (00-53).
+     The week number of the year (with the first Sunday as the first
+     day of week one) as a decimal number (00-53).
 
 `%V'
-     The week number of the year (the first Monday as the first day of
-     week one) as a decimal number (01-53).  The method for determining
-     the week number is as specified by ISO 8601.  (To wit: if the week
-     containing January 1 has four or more days in the new year, then
-     it is week one; otherwise it is week 53 of the previous year and
-     the next week is week one.)
+     The week number of the year (with the first Monday as the first
+     day of week one) as a decimal number (01-53).  The method for
+     determining the week number is as specified by ISO 8601.  (To wit:
+     if the week containing January 1 has four or more days in the new
+     year, then it is week one; otherwise it is week 53 of the previous
+     year and the next week is week one.)
 
 `%w'
      The weekday as a decimal number (0-6).  Sunday is day zero.
 
 `%W'
-     The week number of the year (the first Monday as the first day of
-     week one) as a decimal number (00-53).
+     The week number of the year (with the first Monday as the first
+     day of week one) as a decimal number (00-53).
 
 `%x'
      The locale's "appropriate" date representation.  (This is `%A %B
@@ -12981,8 +13256,8 @@ the following date format specifications:
      The full year as a decimal number (e.g., 2015).
 
 `%z'
-     The timezone offset in a +HHMM format (e.g., the format necessary
-     to produce RFC 822/RFC 1036 date headers).
+     The time zone offset in a `+HHMM' format (e.g., the format
+     necessary to produce RFC 822/RFC 1036 date headers).
 
 `%Z'
      The time zone name or abbreviation; no characters if no time zone
@@ -12990,15 +13265,15 @@ the following date format specifications:
 
 `%Ec %EC %Ex %EX %Ey %EY %Od %Oe %OH'
 `%OI %Om %OM %OS %Ou %OU %OV %Ow %OW %Oy'
-     "Alternate representations" for the specifications that use only
+     "Alternative representations" for the specifications that use only
      the second letter (`%c', `%C', and so on).(5) (These facilitate
      compliance with the POSIX `date' utility.)
 
 `%%'
      A literal `%'.
 
-   If a conversion specifier is not one of the above, the behavior is
-undefined.(6)
+   If a conversion specifier is not one of those just listed, the
+behavior is undefined.(6)
 
    For systems that are not yet fully standards-compliant, `gawk'
 supplies a copy of `strftime()' from the GNU C Library.  It supports
@@ -13018,8 +13293,8 @@ format specifications are available:
      The time as a decimal timestamp in seconds since the epoch.
 
 
-   Additionally, the alternate representations are recognized but their
-normal representations are used.
+   Additionally, the alternative representations are recognized but
+their normal representations are used.
 
    The following example is an `awk' implementation of the POSIX `date'
 utility.  Normally, the `date' utility prints the current date and time
@@ -13029,7 +13304,7 @@ to the standard output and interprets the current time according to the
 format specifiers in the string.  For example:
 
      $ date '+Today is %A, %B %d, %Y.'
-     -| Today is Monday, May 05, 2014.
+     -| Today is Monday, September 22, 2014.
 
    Here is the `gawk' version of the `date' utility.  It has a shell
 "wrapper" to handle the `-u' option, which requires that `date' run as
@@ -13099,7 +13374,7 @@ each successive pair of bits in the operands.  Three common operations
 are bitwise AND, OR, and XOR.  The operations are described in *note
 table-bitwise-ops::.
 
-                     Bit Operator
+                     Bit operator
                |  AND  |   OR  |  XOR
                |--+--+--+--+--+--
      Operands  | 0 | 1 | 0 | 1 | 0 | 1
@@ -13107,7 +13382,7 @@ table-bitwise-ops::.
          0     | 0   0 | 0   1 | 0   1
          1     | 0   1 | 1   1 | 1   0
 
-Table 9.5: Bitwise Operations
+Table 9.5: Bitwise operations
 
    As you can see, the result of an AND operation is 1 only when _both_
 bits are 1.  The result of an OR operation is 1 if _either_ bit is 1.
@@ -13118,12 +13393,13 @@ a given value.
 
    Finally, two other common operations are to shift the bits left or
 right.  For example, if you have a bit string `10111001' and you shift
-it right by three bits, you end up with `00010111'.(1) If you start over
-again with `10111001' and shift it left by three bits, you end up with
-`11001000'.  `gawk' provides built-in functions that implement the
-bitwise operations just described. They are:
+it right by three bits, you end up with `00010111'.(1) If you start
+over again with `10111001' and shift it left by three bits, you end up
+with `11001000'.  The following list describes `gawk''s built-in
+functions that implement the bitwise operations.  Optional parameters
+are enclosed in square brackets ([ ]):
 
-``and(V1, V2' [`,' ...]`)''
+``and('V1`,' V2 [`,' ...]`)''
      Return the bitwise AND of the arguments. There must be at least
      two.
 
@@ -13133,17 +13409,17 @@ bitwise operations just described. They are:
 ``lshift(VAL, COUNT)''
      Return the value of VAL, shifted left by COUNT bits.
 
-``or(V1, V2' [`,' ...]`)''
+``or('V1`,' V2 [`,' ...]`)''
      Return the bitwise OR of the arguments. There must be at least two.
 
 ``rshift(VAL, COUNT)''
      Return the value of VAL, shifted right by COUNT bits.
 
-``xor(V1, V2' [`,' ...]`)''
+``xor('V1`,' V2 [`,' ...]`)''
      Return the bitwise XOR of the arguments. There must be at least
      two.
 
-   For all of these functions, first the double precision
+   For all of these functions, first the double-precision
 floating-point value is converted to the widest C unsigned integer
 type, then the bitwise operation is performed.  If the result cannot be
 represented exactly as a C `double', leading nonzero bits are removed
@@ -13154,7 +13430,7 @@ paragraph, don't worry about it.)
    Here is a user-defined function (*note User-defined::) that
 illustrates the use of these functions:
 
-     # bits2str --- turn a byte into readable 1's and 0's
+     # bits2str --- turn a byte into readable ones and zeros
 
      function bits2str(bits,        data, mask)
      {
@@ -13193,15 +13469,16 @@ This program produces the following output when run:
      -| lshift(0x99, 2) = 0x264 = 0000001001100100
      -| rshift(0x99, 2) = 0x26 = 00100110
 
-   The `bits2str()' function turns a binary number into a string.  The
-number `1' represents a binary value where the rightmost bit is set to
-1.  Using this mask, the function repeatedly checks the rightmost bit.
-ANDing the mask with the value indicates whether the rightmost bit is 1
-or not. If so, a `"1"' is concatenated onto the front of the string.
-Otherwise, a `"0"' is added.  The value is then shifted right by one
-bit and the loop continues until there are no more 1 bits.
+   The `bits2str()' function turns a binary number into a string.
+Initializing `mask' to one creates a binary value where the rightmost
+bit is set to one.  Using this mask, the function repeatedly checks the
+rightmost bit.  ANDing the mask with the value indicates whether the
+rightmost bit is one or not. If so, a `"1"' is concatenated onto the
+front of the string.  Otherwise, a `"0"' is added.  The value is then
+shifted right by one bit and the loop continues until there are no more
+one bits.
 
-   If the initial value is zero it returns a simple `"0"'.  Otherwise,
+   If the initial value is zero, it returns a simple `"0"'.  Otherwise,
 at the end, it pads the value with zeros to represent multiples of
 8-bit quantities. This is typical in modern computers.
 
@@ -13212,9 +13489,9 @@ Nondecimal-numbers::), and then demonstrates the results of the
 
    ---------- Footnotes ----------
 
-   (1) This example shows that 0's come in on the left side. For
+   (1) This example shows that zeros come in on the left side. For
 `gawk', this is always true, but in some languages, it's possible to
-have the left side fill with 1's. Caveat emptor.
+have the left side fill with ones.
 
 
 File: gawk.info,  Node: Type Functions,  Next: I18N Functions,  Prev: Bitwise Functions,  Up: Built-in
@@ -13224,11 +13501,11 @@ File: gawk.info,  Node: Type Functions,  Next: I18N Functions,  Prev: Bitwise Fu
 
 `gawk' provides a single function that lets you distinguish an array
 from a scalar variable.  This is necessary for writing code that
-traverses every element of an array of arrays.  (*note Arrays of
+traverses every element of an array of arrays (*note Arrays of
 Arrays::).
 
 `isarray(X)'
-     Return a true value if X is an array. Otherwise return false.
+     Return a true value if X is an array. Otherwise, return false.
 
    `isarray()' is meant for use in two circumstances. The first is when
 traversing a multidimensional array: you can test if an element is
@@ -13236,12 +13513,12 @@ itself an array or not.  The second is inside the body of a
 user-defined function (not discussed yet; *note User-defined::), to
 test if a parameter is an array or not.
 
-   Note, however, that using `isarray()' at the global level to test
-variables makes no sense. Since you are the one writing the program, you
-are supposed to know if your variables are arrays or not. And in fact,
-due to the way `gawk' works, if you pass the name of a variable that
-has not been previously used to `isarray()', `gawk' will end up turning
-it into a scalar.
+     NOTE: Using `isarray()' at the global level to test variables
+     makes no sense. Because you are the one writing the program, you
+     are supposed to know if your variables are arrays or not. And in
+     fact, due to the way `gawk' works, if you pass the name of a
+     variable that has not been previously used to `isarray()', `gawk'
+     ends up turning it into a scalar.
 
 
 File: gawk.info,  Node: I18N Functions,  Prev: Type Functions,  Up: Built-in
@@ -13275,8 +13552,8 @@ brackets ([ ]):
      Return the plural form used for NUMBER of the translation of
      STRING1 and STRING2 in text domain DOMAIN for locale category
      CATEGORY. STRING1 is the English singular variant of a message,
-     and STRING2 the English plural variant of the same message.  The
-     default value for DOMAIN is the current value of `TEXTDOMAIN'.
+     and STRING2 is the English plural variant of the same message.
+     The default value for DOMAIN is the current value of `TEXTDOMAIN'.
      The default value for CATEGORY is `"LC_MESSAGES"'.
 
 
@@ -13287,8 +13564,8 @@ File: gawk.info,  Node: User-defined,  Next: Indirect Calls,  Prev: Built-in,  U
 
 Complicated `awk' programs can often be simplified by defining your own
 functions.  User-defined functions can be called just like built-in
-ones (*note Function Calls::), but it is up to you to define them,
-i.e., to tell `awk' what they should do.
+ones (*note Function Calls::), but it is up to you to define them
+(i.e., to tell `awk' what they should do).
 
 * Menu:
 
@@ -13305,7 +13582,7 @@ File: gawk.info,  Node: Definition Syntax,  Next: Function Example,  Up: User-de
 9.2.1 Function Definition Syntax
 --------------------------------
 
-     It's entirely fair to say that the `awk' syntax for local variable
+     It's entirely fair to say that the awk syntax for local variable
      definitions is appallingly awful.  -- Brian Kernighan
 
    Definitions of functions can appear anywhere between the rules of an
@@ -13335,17 +13612,22 @@ the argument names are used to hold the argument values given in the
 call.
 
    A function cannot have two parameters with the same name, nor may it
-have a parameter with the same name as the function itself.  In
-addition, according to the POSIX standard, function parameters cannot
-have the same name as one of the special built-in variables (*note
-Built-in Variables::).  Not all versions of `awk' enforce this
-restriction.
+have a parameter with the same name as the function itself.
+
+     CAUTION: According to the POSIX standard, function parameters
+     cannot have the same name as one of the special predefined
+     variables (*note Built-in Variables::), nor may a function
+     parameter have the same name as another function.
+
+     Not all versions of `awk' enforce these restrictions.  `gawk'
+     always enforces the first restriction.  With `--posix' (*note
+     Options::), it also enforces the second restriction.
 
    Local variables act like the empty string if referenced where a
 string value is required, and like zero if referenced where a numeric
-value is required. This is the same as regular variables that have
-never been assigned a value.  (There is more to understand about local
-variables; *note Dynamic Typing::.)
+value is required. This is the same as the behavior of regular
+variables that have never been assigned a value.  (There is more to
+understand about local variables; *note Dynamic Typing::.)
 
    The BODY-OF-FUNCTION consists of `awk' statements.  It is the most
 important part of the definition, because it says what the function
@@ -13374,9 +13656,9 @@ function is supposed to be used.
 variable values hide, or "shadow", any variables of the same names used
 in the rest of the program.  The shadowed variables are not accessible
 in the function definition, because there is no way to name them while
-their names have been taken away for the local variables.  All other
-variables used in the `awk' program can be referenced or set normally
-in the function's body.
+their names have been taken away for the arguments and local variables.
+All other variables used in the `awk' program can be referenced or set
+normally in the function's body.
 
    The arguments and local variables last only as long as the function
 body is executing.  Once the body finishes, you can once again access
@@ -13401,7 +13683,7 @@ function:
 
      func foo() { a = sqrt($1) ; print a }
 
-Instead it defines a rule that, for each record, concatenates the value
+Instead, it defines a rule that, for each record, concatenates the value
 of the variable `func' with the return value of the function `foo'.  If
 the resulting string is non-null, the action is executed.  This is
 probably not what is desired.  (`awk' accepts this input as
@@ -13413,7 +13695,7 @@ keyword `function' when defining a function.
 
    ---------- Footnotes ----------
 
-   (1) This program won't actually run, since `foo()' is undefined.
+   (1) This program won't actually run, because `foo()' is undefined.
 
 
 File: gawk.info,  Node: Function Example,  Next: Function Caveats,  Prev: Definition Syntax,  Up: User-defined
@@ -13429,7 +13711,7 @@ takes a number and prints it in a specific format:
           printf "%6.3g\n", num
      }
 
-To illustrate, here is an `awk' rule that uses our `myprint' function:
+To illustrate, here is an `awk' rule that uses our `myprint()' function:
 
      $3 > 0     { myprint($3) }
 
@@ -13452,22 +13734,22 @@ extra whitespace signifies the start of the local variable list):
      function delarray(a,    i)
      {
          for (i in a)
-            delete a[i]
+             delete a[i]
      }
 
    When working with arrays, it is often necessary to delete all the
 elements in an array and start over with a new list of elements (*note
 Delete::).  Instead of having to repeat this loop everywhere that you
-need to clear out an array, your program can just call `delarray'.
+need to clear out an array, your program can just call `delarray()'.
 (This guarantees portability.  The use of `delete ARRAY' to delete the
-contents of an entire array is a recent(1) addition to the POSIX
-standard.)
+contents of an entire array is a relatively recent(1) addition to the
+POSIX standard.)
 
    The following is an example of a recursive function.  It takes a
-string as an input parameter and returns the string in backwards order.
+string as an input parameter and returns the string in reverse order.
 Recursive functions must always have a test that stops the recursion.
 In this case, the recursion terminates when the input string is already
-empty.
+empty:
 
      function rev(str)
      {
@@ -13484,7 +13766,7 @@ way:
      > gawk -e '{ print rev($0) }' -f rev.awk
      -| !cinaP t'noD
 
-   The C `ctime()' function takes a timestamp and returns it in a
+   The C `ctime()' function takes a timestamp and returns it as a
 string, formatted in a well-known fashion.  The following example uses
 the built-in `strftime()' function (*note Time Functions::) to create
 an `awk' version of `ctime()':
@@ -13495,12 +13777,18 @@ an `awk' version of `ctime()':
 
      function ctime(ts,    format)
      {
-         format = PROCINFO["strftime"]
+         format = "%a %b %e %H:%M:%S %Z %Y"
+
          if (ts == 0)
              ts = systime()       # use current time as default
          return strftime(format, ts)
      }
 
+   You might think that `ctime()' could use `PROCINFO["strftime"]' for
+its format string. That would be a mistake, because `ctime()' is
+supposed to return the time formatted in a standard fashion, and
+user-level code could have changed `PROCINFO["strftime"]'.
+
    ---------- Footnotes ----------
 
    (1) Late in 2012.
@@ -13524,7 +13812,7 @@ the function.
 
 File: gawk.info,  Node: Calling A Function,  Next: Variable Scope,  Up: Function Caveats
 
-9.2.3.1 Writing A Function Call
+9.2.3.1 Writing a Function Call
 ...............................
 
 A function call consists of the function name followed by the arguments
@@ -13537,10 +13825,10 @@ string concatenation):
      foo(x y, "lose", 4 * z)
 
      CAUTION: Whitespace characters (spaces and TABs) are not allowed
-     between the function name and the open-parenthesis of the argument
-     list.  If you write whitespace by mistake, `awk' might think that
-     you mean to concatenate a variable with an expression in
-     parentheses.  However, it notices that you used a function name
+     between the function name and the opening parenthesis of the
+     argument list.  If you write whitespace by mistake, `awk' might
+     think that you mean to concatenate a variable with an expression
+     in parentheses.  However, it notices that you used a function name
      and not a variable name, and reports an error.
 
 
@@ -13549,14 +13837,14 @@ File: gawk.info,  Node: Variable Scope,  Next: Pass By Value/Reference,  Prev: C
 9.2.3.2 Controlling Variable Scope
 ..................................
 
-Unlike many languages, there is no way to make a variable local to a
+Unlike in many languages, there is no way to make a variable local to a
 `{' ... `}' block in `awk', but you can make a variable local to a
 function. It is good practice to do so whenever a variable is needed
 only in that function.
 
    To make a variable local to a function, simply declare the variable
 as an argument after the actual function arguments (*note Definition
-Syntax::).  Look at the following example where variable `i' is a
+Syntax::).  Look at the following example, where variable `i' is a
 global variable used by both functions `foo()' and `bar()':
 
      function bar()
@@ -13592,8 +13880,8 @@ variable instance:
      foo's i=3
      top's i=3
 
-   If you want `i' to be local to both `foo()' and `bar()' do as
-follows (the extra-space before `i' is a coding convention to indicate
+   If you want `i' to be local to both `foo()' and `bar()', do as
+follows (the extra space before `i' is a coding convention to indicate
 that `i' is a local variable, not an argument):
 
      function bar(    i)
@@ -13666,20 +13954,17 @@ create new arrays.  Consider this example:
 
 File: gawk.info,  Node: Pass By Value/Reference,  Prev: Variable Scope,  Up: Function Caveats
 
-9.2.3.3 Passing Function Arguments By Value Or By Reference
+9.2.3.3 Passing Function Arguments by Value Or by Reference
 ...........................................................
 
 In `awk', when you declare a function, there is no way to declare
 explicitly whether the arguments are passed "by value" or "by
 reference".
 
-   Instead the passing convention is determined at runtime when the
-function is called according to the following rule:
-
-   * If the argument is an array variable, then it is passed by
-     reference,
-
-   * Otherwise the argument is passed by value.
+   Instead, the passing convention is determined at runtime when the
+function is called, according to the following rule: if the argument is
+an array variable, then it is passed by reference.  Otherwise, the
+argument is passed by value.
 
    Passing an argument by value means that when a function is called, it
 is given a _copy_ of the value of this argument.  The caller may use a
@@ -13735,7 +14020,7 @@ function _are_ visible outside that function.
      stores `"two"' in the second element of `a'.
 
    Some `awk' implementations allow you to call a function that has not
-been defined. They only report a problem at runtime when the program
+been defined. They only report a problem at runtime, when the program
 actually tries to call the function. For example:
 
      BEGIN {
@@ -13756,7 +14041,7 @@ undefined functions.
 
    Some `awk' implementations generate a runtime error if you use
 either the `next' statement or the `nextfile' statement (*note Next
-Statement::, also *note Nextfile Statement::) inside a user-defined
+Statement::, and *note Nextfile Statement::) inside a user-defined
 function.  `gawk' does not have this limitation.
 
 
@@ -13780,15 +14065,15 @@ undefined, and therefore, unpredictable.  In practice, though, all
 versions of `awk' simply return the null string, which acts like zero
 if used in a numeric context.
 
-   A `return' statement with no value expression is assumed at the end
-of every function definition.  So if control reaches the end of the
-function body, then technically, the function returns an unpredictable
+   A `return' statement without an EXPRESSION is assumed at the end of
+every function definition.  So, if control reaches the end of the
+function body, then technically the function returns an unpredictable
 value.  In practice, it returns the empty string.  `awk' does _not_
 warn you if you use the return value of such a function.
 
    Sometimes, you want to write a function for what it does, not for
 what it returns.  Such a function corresponds to a `void' function in
-C, C++ or Java, or to a `procedure' in Ada.  Thus, it may be
+C, C++, or Java, or to a `procedure' in Ada.  Thus, it may be
 appropriate to not return any value; simply bear in mind that you
 should not be using the return value of such a function.
 
@@ -13805,11 +14090,12 @@ a value for the largest number among the elements of an array:
      }
 
 You call `maxelt()' with one argument, which is an array name.  The
-local variables `i' and `ret' are not intended to be arguments; while
-there is nothing to stop you from passing more than one argument to
-`maxelt()', the results would be strange.  The extra space before `i'
-in the function parameter list indicates that `i' and `ret' are local
-variables.  You should follow this convention when defining functions.
+local variables `i' and `ret' are not intended to be arguments; there
+is nothing to stop you from passing more than one argument to
+`maxelt()' but the results would be strange.  The extra space before
+`i' in the function parameter list indicates that `i' and `ret' are
+local variables.  You should follow this convention when defining
+functions.
 
    The following program uses the `maxelt()' function.  It loads an
 array, calls `maxelt()', and then reports the maximum number in that
@@ -13893,13 +14179,13 @@ you can specify the name of the function to call as a string variable,
 and then call the function.  Let's look at an example.
 
    Suppose you have a file with your test scores for the classes you
-are taking.  The first field is the class name. The following fields
-are the functions to call to process the data, up to a "marker" field
+are taking, and you wish to get the sum and the average of your test
+scores.  The first field is the class name. The following fields are
+the functions to call to process the data, up to a "marker" field
 `data:'.  Following the marker, to the end of the record, are the
 various numeric test scores.
 
-   Here is the initial file; you wish to get the sum and the average of
-your test scores:
+   Here is the initial file:
 
      Biology_101 sum average data: 87.0 92.4 78.5 94.9
      Chemistry_305 sum average data: 75.2 98.3 94.7 88.2
@@ -13923,15 +14209,15 @@ function calls, you tell `gawk' to use the _value_ of a variable as the
 _name_ of the function to call.
 
    The syntax is similar to that of a regular function call: an
-identifier immediately followed by a left parenthesis, any arguments,
-and then a closing right parenthesis, with the addition of a leading `@'
-character:
+identifier immediately followed by an opening parenthesis, any
+arguments, and then a closing parenthesis, with the addition of a
+leading `@' character:
 
      the_func = "sum"
      result = @the_func()   # calls the sum() function
 
    Here is a full program that processes the previously shown data,
-using indirect function calls.
+using indirect function calls:
 
      # indirectcall.awk --- Demonstrate indirect function calls
 
@@ -13957,9 +14243,9 @@ using indirect function calls.
          return ret
      }
 
-   These two functions expect to work on fields; thus the parameters
+   These two functions expect to work on fields; thus, the parameters
 `first' and `last' indicate where in the fields to start and end.
-Otherwise they perform the expected computations and are not unusual.
+Otherwise, they perform the expected computations and are not unusual:
 
      # For each record, print the class name and the requested statistics
      {
@@ -14012,18 +14298,19 @@ to force it to be a string value.)
 may think at first.  The C and C++ languages provide "function
 pointers," which are a mechanism for calling a function chosen at
 runtime.  One of the most well-known uses of this ability is the C
-`qsort()' function, which sorts an array using the famous "quick sort"
+`qsort()' function, which sorts an array using the famous "quicksort"
 algorithm (see the Wikipedia article
-(http://en.wikipedia.org/wiki/Quick_sort) for more information).  To
-use this function, you supply a pointer to a comparison function.  This
+(http://en.wikipedia.org/wiki/Quicksort) for more information).  To use
+this function, you supply a pointer to a comparison function.  This
 mechanism allows you to sort arbitrary data in an arbitrary fashion.
 
    We can do something similar using `gawk', like this:
 
      # quicksort.awk --- Quicksort algorithm, with user-supplied
      #                   comparison function
-     # quicksort --- C.A.R. Hoare's quick sort algorithm. See Wikipedia
-     #               or almost any algorithms or computer science text
+
+     # quicksort --- C.A.R. Hoare's quicksort algorithm. See Wikipedia
+     #               or almost any algorithms or computer science text.
 
      function quicksort(data, left, right, less_than,    i, last)
      {
@@ -14042,7 +14329,7 @@ mechanism allows you to sort arbitrary data in an arbitrary fashion.
 
      # quicksort_swap --- helper function for quicksort, should really be inline
 
-     function quicksort_swap(data, i, j, temp)
+     function quicksort_swap(data, i, j,      temp)
      {
          temp = data[i]
          data[i] = data[j]
@@ -14052,7 +14339,7 @@ mechanism allows you to sort arbitrary data in an arbitrary fashion.
    The `quicksort()' function receives the `data' array, the starting
 and ending indices to sort (`left' and `right'), and the name of a
 function that performs a "less than" comparison.  It then implements
-the quick sort algorithm.
+the quicksort algorithm.
 
    To make use of the sorting function, we return to our previous
 example. The first thing to do is write some comparison functions:
@@ -14145,14 +14432,25 @@ names of the two comparison functions:
      -|     sort: <87.1 93.4 95.6 100.0>
      -|     rsort: <100.0 95.6 93.4 87.1>
 
+   Another example where indirect functions calls are useful can be
+found in processing arrays. This is described in *note Walking Arrays::.
+
    Remember that you must supply a leading `@' in front of an indirect
 function call.
 
    Starting with version 4.1.2 of `gawk', indirect function calls may
 also be used with built-in functions and with extension functions
-(*note Dynamic Extensions::).  The only thing you cannot do is pass a
-regular expression constant to a built-in function through an indirect
-function call.(1)
+(*note Dynamic Extensions::). There are some limitations when calling
+built-in functions indirectly, as follows.
+
+   * You cannot pass a regular expression constant to a built-in
+     function through an indirect function call.(1) This applies to the
+     `sub()', `gsub()', `gensub()', `match()', `split()' and
+     `patsplit()' functions.
+
+   * If calling `sub()' or `gsub()', you may only pass two arguments,
+     since those functions are unusual in that they update their third
+     argument.  This means that `$0' will be updated.
 
    `gawk' does its best to make indirect function calls efficient.  For
 example, in the following case:
@@ -14177,11 +14475,12 @@ File: gawk.info,  Node: Functions Summary,  Prev: Indirect Calls,  Up: Functions
      functions.
 
    * POSIX `awk' provides three kinds of built-in functions: numeric,
-     string, and I/O.  `gawk' provides functions that work with values
-     representing time, do bit manipulation, sort arrays, and
-     internationalize and localize programs.  `gawk' also provides
-     several extensions to some of standard functions, typically in the
-     form of additional arguments.
+     string, and I/O.  `gawk' provides functions that sort arrays, work
+     with values representing time, do bit manipulation, determine
+     variable type (array versus scalar), and internationalize and
+     localize programs.  `gawk' also provides several extensions to
+     some of standard functions, typically in the form of additional
+     arguments.
 
    * Functions accept zero or more arguments and return a value.  The
      expressions that provide the argument values are completely
@@ -14234,7 +14533,7 @@ File: gawk.info,  Node: Library Functions,  Next: Sample Programs,  Prev: Functi
 *note User-defined::, describes how to write your own `awk' functions.
 Writing functions is important, because it allows you to encapsulate
 algorithms and program tasks in a single place.  It simplifies
-programming, making program development more manageable, and making
+programming, making program development more manageable and making
 programs more readable.
 
    In their seminal 1976 book, `Software Tools',(1) Brian Kernighan and
@@ -14268,8 +14567,8 @@ functions and would like to contribute them to the `awk' user
 community, see *note How To Contribute::, for more information.
 
    The programs in this major node and in *note Sample Programs::,
-freely use features that are `gawk'-specific.  Rewriting these programs
-for different implementations of `awk' is pretty straightforward.
+freely use `gawk'-specific features.  Rewriting these programs for
+different implementations of `awk' is pretty straightforward:
 
    * Diagnostic error messages are sent to `/dev/stderr'.  Use `| "cat
      1>&2"' instead of `> "/dev/stderr"' if your system does not have a
@@ -14327,8 +14626,8 @@ specific function).  There is no intermediate state analogous to
    Library functions often need to have global variables that they can
 use to preserve state information between calls to the function--for
 example, `getopt()''s variable `_opti' (*note Getopt Function::).  Such
-variables are called "private", since the only functions that need to
-use them are the ones in the library.
+variables are called "private", as the only functions that need to use
+them are the ones in the library.
 
    When writing a library function, you should try to choose names for
 your private variables that will not conflict with any variables used by
@@ -14339,35 +14638,36 @@ often use variable names like these for their own purposes.
    The example programs shown in this major node all start the names of
 their private variables with an underscore (`_').  Users generally
 don't use leading underscores in their variable names, so this
-convention immediately decreases the chances that the variable name
+convention immediately decreases the chances that the variable names
 will be accidentally shared with the user's program.
 
    In addition, several of the library functions use a prefix that helps
 indicate what function or set of functions use the variables--for
 example, `_pw_byname()' in the user database routines (*note Passwd
-Functions::).  This convention is recommended, since it even further
+Functions::).  This convention is recommended, as it even further
 decreases the chance of inadvertent conflict among variable names.
 Note that this convention is used equally well for variable names and
 for private function names.(1)
 
    As a final note on variable naming, if a function makes global
 variables available for use by a main program, it is a good convention
-to start that variable's name with a capital letter--for example,
+to start those variables' names with a capital letter--for example,
 `getopt()''s `Opterr' and `Optind' variables (*note Getopt Function::).
 The leading capital letter indicates that it is global, while the fact
 that the variable name is not all capital letters indicates that the
-variable is not one of `awk''s built-in variables, such as `FS'.
+variable is not one of `awk''s predefined variables, such as `FS'.
 
    It is also important that _all_ variables in library functions that
 do not need to save state are, in fact, declared local.(2) If this is
-not done, the variable could accidentally be used in the user's
+not done, the variables could accidentally be used in the user's
 program, leading to bugs that are very difficult to track down:
 
      function lib_func(x, y,    l1, l2)
      {
          ...
-         USE VARIABLE some_var   # some_var should be local
-         ...                     # but is not by oversight
+         # some_var should be local but by oversight is not
+         USE VARIABLE some_var
+         ...
      }
 
    A different convention, common in the Tcl community, is to use a
@@ -14385,9 +14685,9 @@ merely recommend that you do so.
 
    ---------- Footnotes ----------
 
-   (1) While all the library routines could have been rewritten to use
-this convention, this was not done, in order to show how our own `awk'
-programming style has evolved and to provide some basis for this
+   (1) Although all the library routines could have been rewritten to
+use this convention, this was not done, in order to show how our own
+`awk' programming style has evolved and to provide some basis for this
 discussion.
 
    (2) `gawk''s `--dump-variables' command-line option is useful for
@@ -14416,11 +14716,12 @@ programming use.
 * Join Function::               A function to join an array into a string.
 * Getlocaltime Function::       A function to get formatted times.
 * Readfile Function::           A function to read an entire file at once.
+* Shell Quoting::               A function to quote strings for the shell.
 
 
 File: gawk.info,  Node: Strtonum Function,  Next: Assert Function,  Up: General Functions
 
-10.2.1 Converting Strings To Numbers
+10.2.1 Converting Strings to Numbers
 ------------------------------------
 
 The `strtonum()' function (*note String Functions::) is a `gawk'
@@ -14475,7 +14776,7 @@ versions of `awk':
      #     a[5] = "123.45"
      #     a[6] = "1.e3"
      #     a[7] = "1.32"
-     #     a[7] = "1.32E2"
+     #     a[8] = "1.32E2"
      #
      #     for (i = 1; i in a; i++)
      #         print a[i], strtonum(a[i]), mystrtonum(a[i])
@@ -14484,9 +14785,11 @@ versions of `awk':
    The function first looks for C-style octal numbers (base 8).  If the
 input string matches a regular expression describing octal numbers,
 then `mystrtonum()' loops through each character in the string.  It
-sets `k' to the index in `"01234567"' of the current octal digit.
-Since the return value is one-based, the `k--' adjusts `k' so it can be
-used in computing the return value.
+sets `k' to the index in `"1234567"' of the current octal digit.  The
+return value will either be the same number as the digit, or zero if
+the character is not there, which will be true for a `0'.  This is
+safe, because the regexp test in the `if' ensures that only octal
+values are converted.
 
    Similar logic applies to the code that checks for and converts a
 hexadecimal value, which starts with `0x' or `0X'.  The use of
@@ -14512,7 +14815,7 @@ condition or set of conditions is true.  Before proceeding with a
 particular computation, you make a statement about what you believe to
 be the case.  Such a statement is known as an "assertion".  The C
 language provides an `<assert.h>' header file and corresponding
-`assert()' macro that the programmer can use to make assertions.  If an
+`assert()' macro that a programmer can use to make assertions.  If an
 assertion fails, the `assert()' macro arranges to print a diagnostic
 message describing the condition that should have been true but was
 not, and then it kills the program.  In C, using `assert()' looks this:
@@ -14534,7 +14837,7 @@ for use in printing the diagnostic message.  This is not possible in
 `awk', so this `assert()' function also requires a string version of
 the condition that is being tested.  Following is the function:
 
-     # assert --- assert that a condition is true. Otherwise exit.
+     # assert --- assert that a condition is true. Otherwise, exit.
 
      function assert(condition, string)
      {
@@ -14555,7 +14858,7 @@ the condition that is being tested.  Following is the function:
 false, it prints a message to standard error, using the `string'
 parameter to describe the failed condition.  It then sets the variable
 `_assert_exit' to one and executes the `exit' statement.  The `exit'
-statement jumps to the `END' rule. If the `END' rules finds
+statement jumps to the `END' rule. If the `END' rule finds
 `_assert_exit' to be true, it exits immediately.
 
    The purpose of the test in the `END' rule is to keep any other `END'
@@ -14715,8 +15018,8 @@ distant past, at least one minicomputer manufacturer used ASCII, but
 with mark parity, meaning that the leftmost bit in the byte is always
 1.  This means that on those systems, characters have numeric values
 from 128 to 255.  Finally, large mainframe systems use the EBCDIC
-character set, which uses all 256 values.  While there are other
-character sets in use on some older systems, they are not really worth
+character set, which uses all 256 values.  There are other character
+sets in use on some older systems, but they are not really worth
 worrying about:
 
      function ord(str,    c)
@@ -14770,11 +15073,11 @@ the strings in an array into one long string.  The following function,
 `join()', accomplishes this task.  It is used later in several of the
 application programs (*note Sample Programs::).
 
-   Good function design is important; this function needs to be general
-but it should also have a reasonable default behavior.  It is called
-with an array as well as the beginning and ending indices of the
+   Good function design is important; this function needs to be
+general, but it should also have a reasonable default behavior.  It is
+called with an array as well as the beginning and ending indices of the
 elements in the array to be merged.  This assumes that the array
-indices are numeric--a reasonable assumption since the array was likely
+indices are numeric--a reasonable assumption, as the array was likely
 created with `split()' (*note String Functions::):
 
      # join.awk --- join an array into a string
@@ -14814,7 +15117,7 @@ File: gawk.info,  Node: Getlocaltime Function,  Next: Readfile Function,  Prev:
 
 The `systime()' and `strftime()' functions described in *note Time
 Functions::, provide the minimum functionality necessary for dealing
-with the time of day in human readable form.  While `strftime()' is
+with the time of day in human-readable form.  Although `strftime()' is
 extensive, the control formats are not necessarily easy to remember or
 intuitively obvious when reading a program.
 
@@ -14852,7 +15155,7 @@ current time formatted in the same way as the `date' utility:
          now = systime()
 
          # return date(1)-style output
-         ret = strftime(PROCINFO["strftime"], now)
+         ret = strftime("%a %b %e %H:%M:%S %Z %Y", now)
 
          # clear out target array
          delete time
@@ -14889,9 +15192,9 @@ the `getlocaltime()' function would have allowed the user to supply an
 optional timestamp value to use instead of the current time.
 
 
-File: gawk.info,  Node: Readfile Function,  Prev: Getlocaltime Function,  Up: General Functions
+File: gawk.info,  Node: Readfile Function,  Next: Shell Quoting,  Prev: Getlocaltime Function,  Up: General Functions
 
-10.2.8 Reading A Whole File At Once
+10.2.8 Reading a Whole File at Once
 -----------------------------------
 
 Often, it is convenient to have the entire contents of a file available
@@ -14933,13 +15236,13 @@ reads the entire contents of the named file in one shot:
 
    It works by setting `RS' to `^$', a regular expression that will
 never match if the file has contents.  `gawk' reads data from the file
-into `tmp' attempting to match `RS'.  The match fails after each read,
+into `tmp', attempting to match `RS'.  The match fails after each read,
 but fails quickly, such that `gawk' fills `tmp' with the entire
 contents of the file.  (*Note Records::, for information on `RT' and
 `RS'.)
 
    In the case that `file' is empty, the return value is the null
-string.  Thus calling code may use something like:
+string.  Thus, calling code may use something like:
 
      contents = readfile("/some/path")
      if (length(contents) == 0)
@@ -14948,10 +15251,65 @@ string.  Thus calling code may use something like:
    This tests the result to see if it is empty or not. An equivalent
 test would be `contents == ""'.
 
+   *Note Extension Sample Readfile::, for an extension function that
+also reads an entire file into memory.
+
+
+File: gawk.info,  Node: Shell Quoting,  Prev: Readfile Function,  Up: General Functions
+
+10.2.9 Quoting Strings to Pass to the Shell
+-------------------------------------------
+
+Michael Brennan offers the following programming pattern, which he uses
+frequently:
+
+     #! /bin/sh
+
+     awkp='
+        ...
+        '
+
+     INPUT_PROGRAM | awk "$awkp" | /bin/sh
+
+   For example, a program of his named `flac-edit' has this form:
+
+     $ flac-edit -song="Whoope! That's Great" file.flac
+
+   It generates the following output, which is to be piped to the shell
+(`/bin/sh'):
+
+     chmod +w file.flac
+     metaflac --remove-tag=TITLE file.flac
+     LANG=en_US.88591 metaflac --set-tag=TITLE='Whoope! That'"'"'s Great' file.flac
+     chmod -w file.flac
+
+   Note the need for shell quoting.  The function `shell_quote()' does
+it.  `SINGLE' is the one-character string `"'"' and `QSINGLE' is the
+three-character string `"\"'\""':
+
+     # shell_quote --- quote an argument for passing to the shell
+
+     function shell_quote(s,             # parameter
+         SINGLE, QSINGLE, i, X, n, ret)  # locals
+     {
+         if (s == "")
+             return "\"\""
+
+         SINGLE = "\x27"  # single quote
+         QSINGLE = "\"\x27\""
+         n = split(s, X, SINGLE)
+
+         ret = SINGLE X[1] SINGLE
+         for (i = 2; i <= n; i++)
+             ret = ret QSINGLE SINGLE X[i] SINGLE
+
+         return ret
+     }
+
 
 File: gawk.info,  Node: Data File Management,  Next: Getopt Function,  Prev: General Functions,  Up: Library Functions
 
-10.3 Data File Management
+10.3 Data file Management
 =========================
 
 This minor node presents functions that are useful for managing
@@ -14968,14 +15326,15 @@ command-line data files.
 
 File: gawk.info,  Node: Filetrans Function,  Next: Rewind Function,  Up: Data File Management
 
-10.3.1 Noting Data File Boundaries
+10.3.1 Noting Data file Boundaries
 ----------------------------------
 
-The `BEGIN' and `END' rules are each executed exactly once at the
+The `BEGIN' and `END' rules are each executed exactly once, at the
 beginning and end of your `awk' program, respectively (*note
 BEGIN/END::).  We (the `gawk' authors) once had a user who mistakenly
-thought that the `BEGIN' rule is executed at the beginning of each data
-file and the `END' rule is executed at the end of each data file.
+thought that the `BEGIN' rules were executed at the beginning of each
+data file and the `END' rules were executed at the end of each data
+file.
 
    When informed that this was not the case, the user requested that we
 add new special patterns to `gawk', named `BEGIN_FILE' and `END_FILE',
@@ -14997,20 +15356,19 @@ does so _portably_; this works with any implementation of `awk':
      # that each take the name of the file being started or
      # finished, respectively.
 
-     FILENAME != _oldfilename \
-     {
+     FILENAME != _oldfilename {
          if (_oldfilename != "")
              endfile(_oldfilename)
          _oldfilename = FILENAME
          beginfile(FILENAME)
      }
 
-     END   { endfile(FILENAME) }
+     END { endfile(FILENAME) }
 
    This file must be loaded before the user's "main" program, so that
 the rule it supplies is executed first.
 
-   This rule relies on `awk''s `FILENAME' variable that automatically
+   This rule relies on `awk''s `FILENAME' variable, which automatically
 changes for each new data file.  The current file name is saved in a
 private variable, `_oldfilename'.  If `FILENAME' does not equal
 `_oldfilename', then a new data file is being processed and it is
@@ -15025,14 +15383,14 @@ correctly even for the first data file.
    The program also supplies an `END' rule to do the final processing
 for the last file.  Because this `END' rule comes before any `END' rules
 supplied in the "main" program, `endfile()' is called first.  Once
-again the value of multiple `BEGIN' and `END' rules should be clear.
+again, the value of multiple `BEGIN' and `END' rules should be clear.
 
    If the same data file occurs twice in a row on the command line, then
 `endfile()' and `beginfile()' are not executed at the end of the first
 pass and at the beginning of the second pass.  The following version
 solves the problem:
 
-     # ftrans.awk --- handle data file transitions
+     # ftrans.awk --- handle datafile transitions
      #
      # user supplies beginfile() and endfile() functions
 
@@ -15043,24 +15401,25 @@ solves the problem:
          beginfile(FILENAME)
      }
 
-     END  { endfile(_filename_) }
+     END { endfile(_filename_) }
 
    *note Wc Program::, shows how this library function can be used and
 how it simplifies writing the main program.
 
-          So Why Does `gawk' have `BEGINFILE' and `ENDFILE'?
+          So Why Does `gawk' Have `BEGINFILE' and `ENDFILE'?
 
    You are probably wondering, if `beginfile()' and `endfile()'
 functions can do the job, why does `gawk' have `BEGINFILE' and
-`ENDFILE' patterns (*note BEGINFILE/ENDFILE::)?
+`ENDFILE' patterns?
 
    Good question.  Normally, if `awk' cannot open a file, this causes
 an immediate fatal error.  In this case, there is no way for a
-user-defined function to deal with the problem, since the mechanism for
+user-defined function to deal with the problem, as the mechanism for
 calling it relies on the file being open and at the first record.  Thus,
 the main reason for `BEGINFILE' is to give you a "hook" to catch files
 that cannot be processed.  `ENDFILE' exists for symmetry, and because
-it provides an easy way to do per-file cleanup processing.
+it provides an easy way to do per-file cleanup processing.  For more
+information, refer to *note BEGINFILE/ENDFILE::.
 
 
 File: gawk.info,  Node: Rewind Function,  Next: File Checking,  Prev: Filetrans Function,  Up: Data File Management
@@ -15068,15 +15427,14 @@ File: gawk.info,  Node: Rewind Function,  Next: File Checking,  Prev: Filetrans
 10.3.2 Rereading the Current File
 ---------------------------------
 
-Another request for a new built-in function was for a `rewind()'
-function that would make it possible to reread the current file.  The
-requesting user didn't want to have to use `getline' (*note Getline::)
-inside a loop.
+Another request for a new built-in function was for a function that
+would make it possible to reread the current file.  The requesting user
+didn't want to have to use `getline' (*note Getline::) inside a loop.
 
    However, as long as you are not in the `END' rule, it is quite easy
 to arrange to immediately close the current input file and then start
-over with it from the top.  For lack of a better name, we'll call it
-`rewind()':
+over with it from the top.  For lack of a better name, we'll call the
+function `rewind()':
 
      # rewind.awk --- rewind the current file and start over
 
@@ -15096,20 +15454,17 @@ over with it from the top.  For lack of a better name, we'll call it
          nextfile
      }
 
-   This code relies on the `ARGIND' variable (*note Auto-set::), which
-is specific to `gawk'.  If you are not using `gawk', you can use ideas
-presented in *note Filetrans Function::, to either update `ARGIND' on
-your own or modify this code as appropriate.
-
-   The `rewind()' function also relies on the `nextfile' keyword (*note
-Nextfile Statement::).  Because of this, you should not call it from an
-`ENDFILE' rule.  (This isn't necessary anyway, since as soon as an
-`ENDFILE' rule finishes `gawk' goes to the next file!)
+   The `rewind()' function relies on the `ARGIND' variable (*note
+Auto-set::), which is specific to `gawk'.  It also relies on the
+`nextfile' keyword (*note Nextfile Statement::).  Because of this, you
+should not call it from an `ENDFILE' rule.  (This isn't necessary
+anyway, because `gawk' goes to the next file as soon as an `ENDFILE'
+rule finishes!)
 
 
 File: gawk.info,  Node: File Checking,  Next: Empty Files,  Prev: Rewind Function,  Up: Data File Management
 
-10.3.3 Checking for Readable Data Files
+10.3.3 Checking for Readable Data files
 ---------------------------------------
 
 Normally, if you give `awk' a data file that isn't readable, it stops
@@ -15121,7 +15476,7 @@ following program to your `awk' program:
 
      BEGIN {
          for (i = 1; i < ARGC; i++) {
-             if (ARGV[i] ~ /^[[:alpha:]_][[:alnum:]_]*=.*/ \
+             if (ARGV[i] ~ /^[a-zA-Z_][a-zA-Z0-9_]*=.*/ \
                  || ARGV[i] == "-" || ARGV[i] == "/dev/stdin")
                  continue    # assignment or standard input
              else if ((getline junk < ARGV[i]) < 0) # unreadable
@@ -15132,8 +15487,12 @@ following program to your `awk' program:
      }
 
    This works, because the `getline' won't be fatal.  Removing the
-element from `ARGV' with `delete' skips the file (since it's no longer
-in the list).  See also *note ARGC and ARGV::.
+element from `ARGV' with `delete' skips the file (because it's no
+longer in the list).  See also *note ARGC and ARGV::.
+
+   Because `awk' variable names only allow the English letters, the
+regular expression check purposely does not use character classes such
+as `[:alpha:]' and `[:alnum:]' (*note Bracket Expressions::).
 
    ---------- Footnotes ----------
 
@@ -15144,14 +15503,14 @@ opened.  However, the code here provides a portable solution.
 
 File: gawk.info,  Node: Empty Files,  Next: Ignoring Assigns,  Prev: File Checking,  Up: Data File Management
 
-10.3.4 Checking for Zero-length Files
+10.3.4 Checking for Zero-Length Files
 -------------------------------------
 
 All known `awk' implementations silently skip over zero-length files.
 This is a by-product of `awk''s implicit
 read-a-record-and-match-against-the-rules loop: when `awk' tries to
-read a record from an empty file, it immediately receives an end of
-file indication, closes the file, and proceeds on to the next
+read a record from an empty file, it immediately receives an
+end-of-file indication, closes the file, and proceeds on to the next
 command-line data file, _without_ executing any user-level `awk'
 program code.
 
@@ -15195,13 +15554,13 @@ of the `for' loop uses the `<=' operator, not `<'.
 
 File: gawk.info,  Node: Ignoring Assigns,  Prev: Empty Files,  Up: Data File Management
 
-10.3.5 Treating Assignments as File Names
+10.3.5 Treating Assignments as File names
 -----------------------------------------
 
 Occasionally, you might not want `awk' to process command-line variable
 assignments (*note Assignment Options::).  In particular, if you have a
 file name that contains an `=' character, `awk' treats the file name as
-an assignment, and does not process it.
+an assignment and does not process it.
 
    Some users have suggested an additional command-line option for
 `gawk' to disable command-line assignments.  However, some simple
@@ -15213,7 +15572,7 @@ programming with a library file does the trick:
      function disable_assigns(argc, argv,    i)
      {
          for (i = 1; i < argc; i++)
-             if (argv[i] ~ /^[[:alpha:]_][[:alnum:]_]*=.*/)
+             if (argv[i] ~ /^[a-zA-Z_][a-zA-Z0-9_]*=.*/)
                  argv[i] = ("./" argv[i])
      }
 
@@ -15241,11 +15600,11 @@ File: gawk.info,  Node: Getopt Function,  Next: Passwd Functions,  Prev: Data Fi
 10.4 Processing Command-Line Options
 ====================================
 
-Most utilities on POSIX compatible systems take options on the command
+Most utilities on POSIX-compatible systems take options on the command
 line that can be used to change the way a program behaves.  `awk' is an
 example of such a program (*note Options::).  Often, options take
-"arguments"; i.e., data that the program needs to correctly obey the
-command-line option.  For example, `awk''s `-F' option requires a
+"arguments" (i.e., data that the program needs to correctly obey the
+command-line option).  For example, `awk''s `-F' option requires a
 string to use as the field separator.  The first occurrence on the
 command line of either `--' or a string that does not begin with `-'
 ends the options.
@@ -15470,10 +15829,10 @@ next element in `argv'.  If neither condition is true, then only
 on the next call to `getopt()'.
 
    The `BEGIN' rule initializes both `Opterr' and `Optind' to one.
-`Opterr' is set to one, since the default behavior is for `getopt()' to
-print a diagnostic message upon seeing an invalid option.  `Optind' is
-set to one, since there's no reason to look at the program name, which
-is in `ARGV[0]':
+`Opterr' is set to one, because the default behavior is for `getopt()'
+to print a diagnostic message upon seeing an invalid option.  `Optind'
+is set to one, because there's no reason to look at the program name,
+which is in `ARGV[0]':
 
      BEGIN {
          Opterr = 1    # default is to diagnose
@@ -15491,8 +15850,8 @@ is in `ARGV[0]':
          }
      }
 
-   The rest of the `BEGIN' rule is a simple test program.  Here is the
-result of two sample runs of the test program:
+   The rest of the `BEGIN' rule is a simple test program.  Here are the
+results of two sample runs of the test program:
 
      $ awk -f getopt.awk -v _getopt_test=1 -- -a -cbARG bax -x
      -| c = <a>, Optarg = <>
@@ -15513,10 +15872,14 @@ result of two sample runs of the test program:
    In both runs, the first `--' terminates the arguments to `awk', so
 that it does not try to interpret the `-a', etc., as its own options.
 
-     NOTE: After `getopt()' is through, it is the responsibility of the
-     user level code to clear out all the elements of `ARGV' from 1 to
-     `Optind', so that `awk' does not try to process the command-line
-     options as file names.
+     NOTE: After `getopt()' is through, user-level code must clear out
+     all the elements of `ARGV' from 1 to `Optind', so that `awk' does
+     not try to process the command-line options as file names.
+
+   Using `#!' with the `-E' option may help avoid conflicts between
+your program's options and `gawk''s options, as `-E' causes `gawk' to
+abandon processing of further options (*note Executable Scripts::, and
+*note Options::).
 
    Several of the sample programs presented in *note Sample Programs::,
 use `getopt()' to process their arguments.
@@ -15525,7 +15888,7 @@ use `getopt()' to process their arguments.
 
    (1) This function was written before `gawk' acquired the ability to
 split strings into single characters using `""' as the separator.  We
-have left it alone, since using `substr()' is more portable.
+have left it alone, as using `substr()' is more portable.
 
 
 File: gawk.info,  Node: Passwd Functions,  Next: Group Functions,  Prev: Getopt Function,  Up: Library Functions
@@ -15534,10 +15897,10 @@ File: gawk.info,  Node: Passwd Functions,  Next: Group Functions,  Prev: Getopt
 ==============================
 
 The `PROCINFO' array (*note Built-in Variables::) provides access to
-the current user's real and effective user and group ID numbers, and if
-available, the user's supplementary group set.  However, because these
-are numbers, they do not provide very useful information to the average
-user.  There needs to be some way to find the user information
+the current user's real and effective user and group ID numbers, and,
+if available, the user's supplementary group set.  However, because
+these are numbers, they do not provide very useful information to the
+average user.  There needs to be some way to find the user information
 associated with the user and group ID numbers.  This minor node
 presents a suite of functions for retrieving information from the user
 database.  *Note Group Functions::, for a similar suite that retrieves
@@ -15548,9 +15911,9 @@ kept.  Instead, it provides the `<pwd.h>' header file and several C
 language subroutines for obtaining user information.  The primary
 function is `getpwent()', for "get password entry."  The "password"
 comes from the original user database file, `/etc/passwd', which stores
-user information, along with the encrypted passwords (hence the name).
+user information along with the encrypted passwords (hence the name).
 
-   While an `awk' program could simply read `/etc/passwd' directly,
+   Although an `awk' program could simply read `/etc/passwd' directly,
 this file may not contain complete information about the system's set
 of users.(1) To be sure you are able to produce a readable and complete
 version of the user database, it is necessary to write a small C
@@ -15595,13 +15958,13 @@ Encrypted password
      systems.
 
 User-ID
-     The user's numeric user ID number.  (On some systems it's a C
-     `long', and not an `int'.  Thus we cast it to `long' for all
+     The user's numeric user ID number.  (On some systems, it's a C
+     `long', and not an `int'.  Thus, we cast it to `long' for all
      cases.)
 
 Group-ID
      The user's numeric group ID number.  (Similar comments about
-     `long' vs. `int' apply here.)
+     `long' versus `int' apply here.)
 
 Full name
      The user's full name, and perhaps other information associated
@@ -15618,7 +15981,7 @@ Login shell
    A few lines representative of `pwcat''s output are as follows:
 
      $ pwcat
-     -| root:3Ov02d5VaUPB6:0:1:Operator:/:/bin/sh
+     -| root:x:0:1:Operator:/:/bin/sh
      -| nobody:*:65534:65534::/:
      -| daemon:*:1:1::/:
      -| sys:*:2:2::/:/bin/csh
@@ -15675,31 +16038,28 @@ corresponding to the C functions of the same names:
 routine, we have chosen to put it in `/usr/local/libexec/awk'; however,
 you might want it to be in a different directory on your system.
 
-   The function `_pw_init()' keeps three copies of the user information
-in three associative arrays.  The arrays are indexed by username
+   The function `_pw_init()' fills three copies of the user information
+into three associative arrays.  The arrays are indexed by username
 (`_pw_byname'), by user ID number (`_pw_byuid'), and by order of
 occurrence (`_pw_bycount').  The variable `_pw_inited' is used for
-efficiency, since `_pw_init()' needs to be called only once.
+efficiency, as `_pw_init()' needs to be called only once.
 
    Because this function uses `getline' to read information from
 `pwcat', it first saves the values of `FS', `RS', and `$0'.  It notes
 in the variable `using_fw' whether field splitting with `FIELDWIDTHS'
-is in effect or not.  Doing so is necessary, since these functions
-could be called from anywhere within a user's program, and the user may
-have his or her own way of splitting records and fields.
-
-   The `using_fw' variable checks `PROCINFO["FS"]', which is
-`"FIELDWIDTHS"' if field splitting is being done with `FIELDWIDTHS'.
-This makes it possible to restore the correct field-splitting mechanism
-later.  The test can only be true for `gawk'.  It is false if using
-`FS' or `FPAT', or on some other `awk' implementation.
+is in effect or not.  Doing so is necessary, as these functions could
+be called from anywhere within a user's program, and the user may have
+his or her own way of splitting records and fields.  This makes it
+possible to restore the correct field-splitting mechanism later.  The
+test can only be true for `gawk'.  It is false if using `FS' or `FPAT',
+or on some other `awk' implementation.
 
    The code that checks for using `FPAT', using `using_fpat' and
 `PROCINFO["FS"]', is similar.
 
    The main part of the function uses a loop to read database lines,
-split the line into fields, and then store the line into each array as
-necessary.  When the loop is done, `_pw_init()' cleans up by closing
+split the lines into fields, and then store the lines into each array
+as necessary.  When the loop is done, `_pw_init()' cleans up by closing
 the pipeline, setting `_pw_inited' to one, and restoring `FS' (and
 `FIELDWIDTHS' or `FPAT' if necessary), `RS', and `$0'.  The use of
 `_pw_count' is explained shortly.
@@ -15760,8 +16120,8 @@ simplifies the code but runs an extra process that may never be needed.)
 once.  If you are worried about squeezing every last cycle out of your
 `awk' program, the check of `_pw_inited' could be moved out of
 `_pw_init()' and duplicated in all the other functions.  In practice,
-this is not necessary, since most `awk' programs are I/O-bound, and
-such a change would clutter up the code.
+this is not necessary, as most `awk' programs are I/O-bound, and such a
+change would clutter up the code.
 
    The `id' program in *note Id Program::, uses these functions.
 
@@ -15827,11 +16187,11 @@ Group Password
 Group ID Number
      The group's numeric group ID number; the association of name to
      number must be unique within the file.  (On some systems it's a C
-     `long', and not an `int'.  Thus we cast it to `long' for all
+     `long', and not an `int'.  Thus, we cast it to `long' for all
      cases.)
 
 Group Member List
-     A comma-separated list of user names.  These users are members of
+     A comma-separated list of usernames.  These users are members of
      the group.  Modern Unix systems allow users to be members of
      several groups simultaneously.  If your system does, then there
      are elements `"group1"' through `"groupN"' in `PROCINFO' for those
@@ -15888,8 +16248,7 @@ the same names:
              n = split($4, a, "[ \t]*,[ \t]*")
              for (i = 1; i <= n; i++)
                  if (a[i] in _gr_groupsbyuser)
-                     _gr_groupsbyuser[a[i]] = \
-                         _gr_groupsbyuser[a[i]] " " $1
+                     _gr_groupsbyuser[a[i]] = gr_groupsbyuser[a[i]] " " $1
                  else
                      _gr_groupsbyuser[a[i]] = $1
 
@@ -15918,29 +16277,30 @@ to ensure that the database is scanned no more than once.  The
 `_gr_init()' function first saves `FS', `RS', and `$0', and then sets
 `FS' and `RS' to the correct values for scanning the group information.
 It also takes care to note whether `FIELDWIDTHS' or `FPAT' is being
-used, and to restore the appropriate field splitting mechanism.
+used, and to restore the appropriate field-splitting mechanism.
 
-   The group information is stored is several associative arrays.  The
+   The group information is stored in several associative arrays.  The
 arrays are indexed by group name (`_gr_byname'), by group ID number
 (`_gr_bygid'), and by position in the database (`_gr_bycount').  There
-is an additional array indexed by user name (`_gr_groupsbyuser'), which
+is an additional array indexed by username (`_gr_groupsbyuser'), which
 is a space-separated list of groups to which each user belongs.
 
-   Unlike the user database, it is possible to have multiple records in
-the database for the same group.  This is common when a group has a
+   Unlike in the user database, it is possible to have multiple records
+in the database for the same group.  This is common when a group has a
 large number of members.  A pair of such entries might look like the
 following:
 
-     tvpeople:*:101:johny,jay,arsenio
+     tvpeople:*:101:johnny,jay,arsenio
      tvpeople:*:101:david,conan,tom,joan
 
    For this reason, `_gr_init()' looks to see if a group name or group
-ID number is already seen.  If it is, then the user names are simply
+ID number is already seen.  If so, the usernames are simply
 concatenated onto the previous list of users.(1)
 
    Finally, `_gr_init()' closes the pipeline to `grcat', restores `FS'
-(and `FIELDWIDTHS' or `FPAT' if necessary), `RS', and `$0', initializes
-`_gr_count' to zero (it is used later), and makes `_gr_inited' nonzero.
+(and `FIELDWIDTHS' or `FPAT', if necessary), `RS', and `$0',
+initializes `_gr_count' to zero (it is used later), and makes
+`_gr_inited' nonzero.
 
    The `getgrnam()' function takes a group name as its argument, and if
 that group exists, it is returned.  Otherwise, it relies on the array
@@ -15963,7 +16323,7 @@ looks up the information associated with that group ID:
      }
 
    The `getgruser()' function does not have a C counterpart. It takes a
-user name and returns the list of groups that have the user as a member:
+username and returns the list of groups that have the user as a member:
 
      function getgruser(user)
      {
@@ -16003,9 +16363,9 @@ very simple, relying on `awk''s associative arrays to do work.
 
    ---------- Footnotes ----------
 
-   (1) There is actually a subtle problem with the code just presented.
-Suppose that the first time there were no names. This code adds the
-names with a leading comma. It also doesn't check that there is a `$4'.
+   (1) There is a subtle problem with the code just presented.  Suppose
+that the first time there were no names. This code adds the names with
+a leading comma. It also doesn't check that there is a `$4'.
 
 
 File: gawk.info,  Node: Walking Arrays,  Next: Library Functions Summary,  Prev: Group Functions,  Up: Library Functions
@@ -16014,11 +16374,11 @@ File: gawk.info,  Node: Walking Arrays,  Next: Library Functions Summary,  Prev:
 ================================
 
 *note Arrays of Arrays::, described how `gawk' provides arrays of
-arrays.  In particular, any element of an array may be either a scalar,
+arrays.  In particular, any element of an array may be either a scalar
 or another array. The `isarray()' function (*note Type Functions::)
 lets you distinguish an array from a scalar.  The following function,
-`walk_array()', recursively traverses an array, printing each element's
-indices and value.  You call it with the array and a string
+`walk_array()', recursively traverses an array, printing the element
+indices and values.  You call it with the array and a string
 representing the name of the array:
 
      function walk_array(arr, name,      i)
@@ -16051,12 +16411,67 @@ value.  Here is a main program to demonstrate:
    When run, the program produces the following output:
 
      $ gawk -f walk_array.awk
-     -| a[4][1][1] = 411
-     -| a[4][2] = 42
      -| a[1] = 1
      -| a[2][1] = 21
      -| a[2][2] = 22
      -| a[3] = 3
+     -| a[4][1][1] = 411
+     -| a[4][2] = 42
+
+   The function just presented simply prints the name and value of each
+scalar array element. However, it is easy to generalize it, by passing
+in the name of a function to call when walking an array. The modified
+function looks like this:
+
+     function process_array(arr, name, process, do_arrays,   i, new_name)
+     {
+         for (i in arr) {
+             new_name = (name "[" i "]")
+             if (isarray(arr[i])) {
+                 if (do_arrays)
+                     @process(new_name, arr[i])
+                 process_array(arr[i], new_name, process, do_arrays)
+             } else
+                 @process(new_name, arr[i])
+         }
+     }
+
+   The arguments are as follows:
+
+`arr'
+     The array.
+
+`name'
+     The name of the array (a string).
+
+`process'
+     The name of the function to call.
+
+`do_arrays'
+     If this is true, the function can handle elements that are
+     subarrays.
+
+   If subarrays are to be processed, that is done before walking them
+further.
+
+   When run with the following scaffolding, the function produces the
+same results as does the earlier version of `walk_array()':
+
+     BEGIN {
+         a[1] = 1
+         a[2][1] = 21
+         a[2][2] = 22
+         a[3] = 3
+         a[4][1][1] = 411
+         a[4][2] = 42
+
+         process_array(a, "a", "do_print", 0)
+     }
+
+     function do_print(name, element)
+     {
+         printf "%s = %s\n", name, element
+     }
 
 
 File: gawk.info,  Node: Library Functions Summary,  Next: Library Exercises,  Prev: Walking Arrays,  Up: Library Functions
@@ -16065,8 +16480,8 @@ File: gawk.info,  Node: Library Functions Summary,  Next: Library Exercises,  Pr
 ============
 
    * Reading programs is an excellent way to learn Good Programming.
-     The functions provided in this major node and the next are intended
-     to serve that purpose.
+     The functions and programs provided in this major node and the next
+     are intended to serve that purpose.
 
    * When writing general-purpose library functions, put some thought
      into how to name any global variables so that they won't conflict
@@ -16075,24 +16490,24 @@ File: gawk.info,  Node: Library Functions Summary,  Next: Library Exercises,  Pr
    * The functions presented here fit into the following categories:
 
     General problems
-          Number to string conversion, assertions, rounding, random
-          number generation, converting characters to numbers, joining
-          strings, getting easily usable time-of-day information, and
-          reading a whole file in one shot.
+          Number-to-string conversion, testing assertions, rounding,
+          random number generation, converting characters to numbers,
+          joining strings, getting easily usable time-of-day
+          information, and reading a whole file in one shot
 
     Managing data files
           Noting data file boundaries, rereading the current file,
           checking for readable files, checking for zero-length files,
-          and treating assignments as file names.
+          and treating assignments as file names
 
     Processing command-line options
-          An `awk' version of the standard C `getopt()' function.
+          An `awk' version of the standard C `getopt()' function
 
     Reading the user and group databases
-          Two sets of routines that parallel the C library versions.
+          Two sets of routines that parallel the C library versions
 
     Traversing arrays of arrays
-          A simple function to traverse an array of arrays to any depth.
+          Two functions that traverse an array of arrays to any depth
 
 
 
@@ -16187,7 +16602,7 @@ you.
 to replace the installed versions on your system.  Nor may all of these
 programs be fully compliant with the most recent POSIX standard.  This
 is not a problem; their purpose is to illustrate `awk' language
-programming for "real world" tasks.
+programming for "real-world" tasks.
 
    The programs are presented in alphabetical order.
 
@@ -16204,7 +16619,7 @@ programming for "real world" tasks.
 
 File: gawk.info,  Node: Cut Program,  Next: Egrep Program,  Up: Clones
 
-11.2.1 Cutting out Fields and Columns
+11.2.1 Cutting Out Fields and Columns
 -------------------------------------
 
 The `cut' utility selects, or "cuts," characters or fields from its
@@ -16213,7 +16628,7 @@ separated by TABs by default, but you may supply a command-line option
 to change the field "delimiter" (i.e., the field-separator character).
 `cut''s definition of fields is less general than `awk''s.
 
-   A common use of `cut' might be to pull out just the login name of
+   A common use of `cut' might be to pull out just the login names of
 logged-on users from the output of `who'.  For example, the following
 pipeline generates a sorted, unique list of the logged-on users:
 
@@ -16257,18 +16672,13 @@ supplied:
      #
      # Requires getopt() and join() library functions
 
-     function usage(    e1, e2)
+     function usage()
      {
-         e1 = "usage: cut [-f list] [-d c] [-s] [files...]"
-         e2 = "usage: cut [-c list] [files...]"
-         print e1 > "/dev/stderr"
-         print e2 > "/dev/stderr"
+         print("usage: cut [-f list] [-d c] [-s] [files...]") > "/dev/stderr"
+         print("usage: cut [-c list] [files...]") > "/dev/stderr"
          exit 1
      }
 
-The variables `e1' and `e2' are used so that the function fits nicely
-on the screen.
-
    Next comes a `BEGIN' rule that parses the command-line options.  It
 sets `FS' to a single TAB character, because that is `cut''s default
 field separator. The rule then sets the output field separator to be the
@@ -16426,10 +16836,10 @@ filler fields:
          nfields = j - 1
      }
 
-   Next is the rule that actually processes the data.  If the `-s'
-option is given, then `suppress' is true.  The first `if' statement
-makes sure that the input record does have the field separator.  If
-`cut' is processing fields, `suppress' is true, and the field separator
+   Next is the rule that processes the data.  If the `-s' option is
+given, then `suppress' is true.  The first `if' statement makes sure
+that the input record does have the field separator.  If `cut' is
+processing fields, `suppress' is true, and the field separator
 character is not in the record, then the record is skipped.
 
    If the record is valid, then `gawk' has split the data into fields,
@@ -16454,8 +16864,8 @@ out between the fields:
      }
 
    This version of `cut' relies on `gawk''s `FIELDWIDTHS' variable to
-do the character-based cutting.  While it is possible in other `awk'
-implementations to use `substr()' (*note String Functions::), it is
+do the character-based cutting.  It is possible in other `awk'
+implementations to use `substr()' (*note String Functions::), but it is
 also extremely painful.  The `FIELDWIDTHS' variable supplies an elegant
 solution to the problem of picking the input line apart by characters.
 
@@ -16511,7 +16921,7 @@ Function::).
    The program begins with a descriptive comment and then a `BEGIN' rule
 that processes the command-line arguments with `getopt()'.  The `-i'
 (ignore case) option is particularly easy with `gawk'; we just use the
-`IGNORECASE' built-in variable (*note Built-in Variables::):
+`IGNORECASE' predefined variable (*note Built-in Variables::):
 
      # egrep.awk --- simulate egrep in awk
      #
@@ -16566,14 +16976,14 @@ the matched lines in the output:
      #        pattern = tolower(pattern)
      }
 
-   The last two lines are commented out, since they are not needed in
+   The last two lines are commented out, as they are not needed in
 `gawk'.  They should be uncommented if you have to use another version
 of `awk'.
 
    The next set of lines should be uncommented if you are not using
 `gawk'.  This rule translates all the characters in the input line into
 lowercase if the `-i' option is specified.(1) The rule is commented out
-since it is not necessary with `gawk':
+as it is not necessary with `gawk':
 
      #{
      #    if (IGNORECASE)
@@ -16627,7 +17037,7 @@ unsuccessful match.  If the line does not match, the `next' statement
 just moves on to the next record.
 
    A number of additional tests are made, but they are only done if we
-are not counting lines.  First, if the user only wants exit status
+are not counting lines.  First, if the user only wants the exit status
 (`no_print' is true), then it is enough to know that _one_ line in this
 file matched, and we can skip on to the next file with `nextfile'.
 Similarly, if we are only printing file names, we can print the file
@@ -16661,7 +17071,7 @@ line is printed, with a leading file name and colon if necessary:
      }
 
    The `END' rule takes care of producing the correct exit status. If
-there are no matches, the exit status is one; otherwise it is zero:
+there are no matches, the exit status is one; otherwise, it is zero:
 
      END {
          exit (total == 0)
@@ -16670,17 +17080,13 @@ there are no matches, the exit status is one; otherwise it is zero:
    The `usage()' function prints a usage message in case of invalid
 options, and then exits:
 
-     function usage(    e)
+     function usage()
      {
-         e = "Usage: egrep [-csvil] [-e pat] [files ...]"
-         e = e "\n\tegrep [-csvil] pat [files ...]"
-         print e > "/dev/stderr"
+         print("Usage: egrep [-csvil] [-e pat] [files ...]") > "/dev/stderr"
+         print("\n\tegrep [-csvil] pat [files ...]") > "/dev/stderr"
          exit 1
      }
 
-   The variable `e' is used so that the function fits nicely on the
-printed page.
-
    ---------- Footnotes ----------
 
    (1) It also introduces a subtle bug; if a match happens, we output
@@ -16689,7 +17095,7 @@ the translated line, not the original.
 
 File: gawk.info,  Node: Id Program,  Next: Split Program,  Prev: Egrep Program,  Up: Clones
 
-11.2.3 Printing out User Information
+11.2.3 Printing Out User Information
 ------------------------------------
 
 The `id' utility lists a user's real and effective user ID numbers,
@@ -16707,7 +17113,8 @@ a more palatable output than just individual numbers.
 
    Here is a simple version of `id' written in `awk'.  It uses the user
 database library functions (*note Passwd Functions::) and the group
-database library functions (*note Group Functions::):
+database library functions (*note Group Functions::) from *note Library
+Functions::.
 
    The program is fairly straightforward.  All the work is done in the
 `BEGIN' rule.  The user and group ID numbers are obtained from
@@ -16731,26 +17138,22 @@ and the group numbers:
 
          printf("uid=%d", uid)
          pw = getpwuid(uid)
-         if (pw != "")
-             pr_first_field(pw)
+         pr_first_field(pw)
 
          if (euid != uid) {
              printf(" euid=%d", euid)
              pw = getpwuid(euid)
-             if (pw != "")
-                 pr_first_field(pw)
+             pr_first_field(pw)
          }
 
          printf(" gid=%d", gid)
          pw = getgrgid(gid)
-         if (pw != "")
-             pr_first_field(pw)
+         pr_first_field(pw)
 
          if (egid != gid) {
              printf(" egid=%d", egid)
              pw = getgrgid(egid)
-             if (pw != "")
-                 pr_first_field(pw)
+             pr_first_field(pw)
          }
 
          for (i = 1; ("group" i) in PROCINFO; i++) {
@@ -16759,8 +17162,7 @@ and the group numbers:
              group = PROCINFO["group" i]
              printf("%d", group)
              pw = getgrgid(group)
-             if (pw != "")
-                 pr_first_field(pw)
+             pr_first_field(pw)
              if (("group" (i+1)) in PROCINFO)
                  printf(",")
          }
@@ -16770,13 +17172,15 @@ and the group numbers:
 
      function pr_first_field(str,  a)
      {
-         split(str, a, ":")
-         printf("(%s)", a[1])
+         if (str != "") {
+             split(str, a, ":")
+             printf("(%s)", a[1])
+         }
      }
 
    The test in the `for' loop is worth noting.  Any supplementary
 groups in the `PROCINFO' array have the indices `"group1"' through
-`"groupN"' for some N, i.e., the total number of supplementary groups.
+`"groupN"' for some N (i.e., the total number of supplementary groups).
 However, we don't know in advance how many of these groups there are.
 
    This loop works by starting at one, concatenating the value with
@@ -16789,8 +17193,9 @@ then the condition is false the first time it's tested, and the loop
 body never executes.
 
    The `pr_first_field()' function simply isolates out some code that
-is used repeatedly, making the whole program slightly shorter and
-cleaner.
+is used repeatedly, making the whole program shorter and cleaner. In
+particular, moving the check for the empty string into this function
+saves several lines of code.
 
 
 File: gawk.info,  Node: Split Program,  Next: Tee Program,  Prev: Id Program,  Up: Clones
@@ -16804,11 +17209,11 @@ is as follows:(1)
      `split' [`-COUNT'] [FILE] [PREFIX]
 
    By default, the output files are named `xaa', `xab', and so on. Each
-file has 1000 lines in it, with the likely exception of the last file.
+file has 1,000 lines in it, with the likely exception of the last file.
 To change the number of lines in each file, supply a number on the
-command line preceded with a minus; e.g., `-500' for files with 500
-lines in them instead of 1000.  To change the name of the output files
-to something like `myfileaa', `myfileab', and so on, supply an
+command line preceded with a minus sign (e.g., `-500' for files with
+500 lines in them instead of 1,000).  To change the names of the output
+files to something like `myfileaa', `myfileab', and so on, supply an
 additional argument that specifies the file name prefix.
 
    Here is a version of `split' in `awk'. It uses the `ord()' and
@@ -16841,7 +17246,7 @@ output file names:
          }
          # test argv in case reading from stdin instead of file
          if (i in ARGV)
-             i++    # skip data file name
+             i++    # skip datafile name
          if (i in ARGV) {
              outfile = ARGV[i]
              ARGV[i] = ""
@@ -16881,15 +17286,12 @@ moves to the next letter in the alphabet and `s2' starts over again at
 
 The `usage()' function simply prints an error message and exits:
 
-     function usage(   e)
+     function usage()
      {
-         e = "usage: split [-num] [file] [outname]"
-         print e > "/dev/stderr"
+         print("usage: split [-num] [file] [outname]") > "/dev/stderr"
          exit 1
      }
 
-The variable `e' is used so that the function fits nicely on the screen.
-
    This program is a bit sloppy; it relies on `awk' to automatically
 close the last file instead of doing it in an `END' rule.  It also
 assumes that letters are contiguous in the character set, which isn't
@@ -16916,8 +17318,8 @@ files named on the command line.  Its usage is as follows:
 truncating them and starting over.
 
    The `BEGIN' rule first makes a copy of all the command-line arguments
-into an array named `copy'.  `ARGV[0]' is not copied, since it is not
-needed.  `tee' cannot use `ARGV' directly, since `awk' attempts to
+into an array named `copy'.  `ARGV[0]' is not needed, so it is not
+copied.  `tee' cannot use `ARGV' directly, because `awk' attempts to
 process each file name in `ARGV' as input data.
 
    If the first argument is `-a', then the flag variable `append' is
@@ -16949,7 +17351,7 @@ input by setting `ARGV[1]' to `"-"' and `ARGC' to two:
          ARGC = 2
      }
 
-   The following single rule does all the work.  Since there is no
+   The following single rule does all the work.  Because there is no
 pattern, it is executed for each line of input.  The body of the rule
 simply prints the line into each file on the command line, and then to
 the standard output:
@@ -16973,11 +17375,12 @@ It is also possible to write the loop this way:
          else
              print > copy[i]
 
-This is more concise but it is also less efficient.  The `if' is tested
-for each record and for each output file.  By duplicating the loop
-body, the `if' is only tested once for each input record.  If there are
-N input records and M output files, the first method only executes N
-`if' statements, while the second executes N`*'M `if' statements.
+This is more concise, but it is also less efficient.  The `if' is
+tested for each record and for each output file.  By duplicating the
+loop body, the `if' is only tested once for each input record.  If
+there are N input records and M output files, the first method only
+executes N `if' statements, while the second executes N`*'M `if'
+statements.
 
    Finally, the `END' rule cleans up by closing all the output files:
 
@@ -17002,10 +17405,10 @@ usage is as follows:
    The options for `uniq' are:
 
 `-d'
-     Print only repeated lines.
+     Print only repeated (duplicated) lines.
 
 `-u'
-     Print only nonrepeated lines.
+     Print only nonrepeated (unique) lines.
 
 `-c'
      Count lines. This option overrides `-d' and `-u'.  Both repeated
@@ -17055,10 +17458,9 @@ standard output, `/dev/stdout':
      #
      # Requires getopt() and join() library functions
 
-     function usage(    e)
+     function usage()
      {
-         e = "Usage: uniq [-udc [-n]] [+n] [ in [ out ]]"
-         print e > "/dev/stderr"
+         print("Usage: uniq [-udc [-n]] [+n] [ in [ out ]]") > "/dev/stderr"
          exit 1
      }
 
@@ -17112,16 +17514,18 @@ standard output, `/dev/stdout':
    The following function, `are_equal()', compares the current line,
 `$0', to the previous line, `last'.  It handles skipping fields and
 characters.  If no field count and no character count are specified,
-`are_equal()' simply returns one or zero depending upon the result of a
-simple string comparison of `last' and `$0'.  Otherwise, things get more
-complicated.  If fields have to be skipped, each line is broken into an
-array using `split()' (*note String Functions::); the desired fields
-are then joined back into a line using `join()'.  The joined lines are
-stored in `clast' and `cline'.  If no fields are skipped, `clast' and
-`cline' are set to `last' and `$0', respectively.  Finally, if
-characters are skipped, `substr()' is used to strip off the leading
-`charcount' characters in `clast' and `cline'.  The two strings are
-then compared and `are_equal()' returns the result:
+`are_equal()' returns one or zero depending upon the result of a simple
+string comparison of `last' and `$0'.
+
+   Otherwise, things get more complicated.  If fields have to be
+skipped, each line is broken into an array using `split()' (*note
+String Functions::); the desired fields are then joined back into a line
+using `join()'.  The joined lines are stored in `clast' and `cline'.
+If no fields are skipped, `clast' and `cline' are set to `last' and
+`$0', respectively.  Finally, if characters are skipped, `substr()' is
+used to strip off the leading `charcount' characters in `clast' and
+`cline'.  The two strings are then compared and `are_equal()' returns
+the result:
 
      function are_equal(    n, m, clast, cline, alast, aline)
      {
@@ -17154,13 +17558,13 @@ to.
 depending upon the results of `are_equal()''s comparison. If `uniq' is
 counting repeated lines, and the lines are equal, then it increments
 the `count' variable.  Otherwise, it prints the line and resets `count',
-since the two lines are not equal.
+because the two lines are not equal.
 
    If `uniq' is not counting, and if the lines are equal, `count' is
-incremented.  Nothing is printed, since the point is to remove
-duplicates.  Otherwise, if `uniq' is counting repeated lines and more
-than one line is seen, or if `uniq' is counting nonrepeated lines and
-only one line is seen, then the line is printed, and `count' is reset.
+incremented.  Nothing is printed, as the point is to remove duplicates.
+Otherwise, if `uniq' is counting repeated lines and more than one line
+is seen, or if `uniq' is counting nonrepeated lines and only one line
+is seen, then the line is printed, and `count' is reset.
 
    Finally, similar logic is used in the `END' rule to print the final
 line of input data:
@@ -17217,8 +17621,8 @@ one or more input files. Its usage is as follows:
 
    If no files are specified on the command line, `wc' reads its
 standard input. If there are multiple files, it also prints total
-counts for all the files.  The options and their meanings are shown in
-the following list:
+counts for all the files.  The options and their meanings are as
+follows:
 
 `-l'
      Count only lines.
@@ -17232,10 +17636,10 @@ the following list:
 `-c'
      Count only characters.
 
-   Implementing `wc' in `awk' is particularly elegant, since `awk' does
-a lot of the work for us; it splits lines into words (i.e., fields) and
-counts them, it counts lines (i.e., records), and it can easily tell us
-how long a line is.
+   Implementing `wc' in `awk' is particularly elegant, because `awk'
+does a lot of the work for us; it splits lines into words (i.e.,
+fields) and counts them, it counts lines (i.e., records), and it can
+easily tell us how long a line is.
 
    This program uses the `getopt()' library function (*note Getopt
 Function::) and the file-transition functions (*note Filetrans
@@ -17342,7 +17746,7 @@ in its length.  Next, `lines' is incremented for each line read, and
 
    ---------- Footnotes ----------
 
-   (1) Since `gawk' understands multibyte locales, this code counts
+   (1) Because `gawk' understands multibyte locales, this code counts
 characters, not bytes.
 
 
@@ -17445,7 +17849,7 @@ checking and setting of defaults: the delay, the count, and the message
 to print.  If the user supplied a message without the ASCII BEL
 character (known as the "alert" character, `"\a"'), then it is added to
 the message.  (On many systems, printing the ASCII BEL generates an
-audible alert. Thus when the alarm goes off, the system calls attention
+audible alert. Thus, when the alarm goes off, the system calls attention
 to itself in case the user is not looking at the computer.)  Just for a
 change, this program uses a `switch' statement (*note Switch
 Statement::), but the processing could be done with a series of
@@ -17574,26 +17978,26 @@ there are more characters in the "from" list than in the "to" list, the
 last character of the "to" list is used for the remaining characters in
 the "from" list.
 
-   Once upon a time, a user proposed that a transliteration function
-should be added to `gawk'.  The following program was written to prove
-that character transliteration could be done with a user-level
-function.  This program is not as complete as the system `tr' utility
-but it does most of the job.
+   Once upon a time, a user proposed adding a transliteration function
+to `gawk'.  The following program was written to prove that character
+transliteration could be done with a user-level function.  This program
+is not as complete as the system `tr' utility, but it does most of the
+job.
 
-   The `translate' program demonstrates one of the few weaknesses of
-standard `awk': dealing with individual characters is very painful,
-requiring repeated use of the `substr()', `index()', and `gsub()'
-built-in functions (*note String Functions::).(2) There are two
-functions.  The first, `stranslate()', takes three arguments:
+   The `translate' program was written long before `gawk' acquired the
+ability to split each character in a string into separate array
+elements.  Thus, it makes repeated use of the `substr()', `index()',
+and `gsub()' built-in functions (*note String Functions::).  There are
+two functions.  The first, `stranslate()', takes three arguments:
 
 `from'
-     A list of characters from which to translate.
+     A list of characters from which to translate
 
 `to'
-     A list of characters to which to translate.
+     A list of characters to which to translate
 
 `target'
-     The string on which to do the translation.
+     The string on which to do the translation
 
    Associative arrays make the translation part fairly easy. `t_ar'
 holds the "to" characters, indexed by the "from" characters.  Then a
@@ -17601,16 +18005,16 @@ simple loop goes through `from', one character at a time.  For each
 character in `from', if the character appears in `target', it is
 replaced with the corresponding `to' character.
 
-   The `translate()' function simply calls `stranslate()' using `$0' as
-the target.  The main program sets two global variables, `FROM' and
-`TO', from the command line, and then changes `ARGV' so that `awk'
-reads from the standard input.
+   The `translate()' function calls `stranslate()', using `$0' as the
+target.  The main program sets two global variables, `FROM' and `TO',
+from the command line, and then changes `ARGV' so that `awk' reads from
+the standard input.
 
    Finally, the processing rule simply calls `translate()' for each
 record:
 
      # translate.awk --- do tr-like stuff
-     # Bugs: does not handle things like: tr A-Z a-z, it has
+     # Bugs: does not handle things like tr A-Z a-z; it has
      # to be spelled out. However, if `to' is shorter than `from',
      # the last character in `to' is used for the rest of `from'.
 
@@ -17656,14 +18060,15 @@ record:
          print
      }
 
-   While it is possible to do character transliteration in a user-level
-function, it is not necessarily efficient, and we (the `gawk' authors)
-started to consider adding a built-in function.  However, shortly after
-writing this program, we learned that Brian Kernighan had added the
-`toupper()' and `tolower()' functions to his `awk' (*note String
-Functions::).  These functions handle the vast majority of the cases
-where character transliteration is necessary, and so we chose to simply
-add those functions to `gawk' as well and then leave well enough alone.
+   It is possible to do character transliteration in a user-level
+function, but it is not necessarily efficient, and we (the `gawk'
+developers) started to consider adding a built-in function.  However,
+shortly after writing this program, we learned that Brian Kernighan had
+added the `toupper()' and `tolower()' functions to his `awk' (*note
+String Functions::).  These functions handle the vast majority of the
+cases where character transliteration is necessary, and so we chose to
+simply add those functions to `gawk' as well and then leave well enough
+alone.
 
    An obvious improvement to this program would be to set up the `t_ar'
 array only once, in a `BEGIN' rule. However, this assumes that the
@@ -17681,40 +18086,37 @@ program.
 enclosed in square brackets (`[a-z]') and quoted, to prevent the shell
 from attempting a file name expansion.  This is not a feature.
 
-   (2) This program was also written before `gawk' acquired the ability
-to split each character in a string into separate array elements.
-
 
 File: gawk.info,  Node: Labels Program,  Next: Word Sorting,  Prev: Translate Program,  Up: Miscellaneous Programs
 
 11.3.4 Printing Mailing Labels
 ------------------------------
 
-Here is a "real world"(1) program.  This script reads lists of names and
+Here is a "real-world"(1) program.  This script reads lists of names and
 addresses and generates mailing labels.  Each page of labels has 20
 labels on it, two across and 10 down.  The addresses are guaranteed to
 be no more than five lines of data.  Each address is separated from the
 next by a blank line.
 
-   The basic idea is to read 20 labels worth of data.  Each line of
+   The basic idea is to read 20 labels' worth of data.  Each line of
 each label is stored in the `line' array.  The single rule takes care
 of filling the `line' array and printing the page when 20 labels have
 been read.
 
    The `BEGIN' rule simply sets `RS' to the empty string, so that `awk'
 splits records at blank lines (*note Records::).  It sets `MAXLINES' to
-100, since 100 is the maximum number of lines on the page (20 * 5 =
+100, because 100 is the maximum number of lines on the page (20 * 5 =
 100).
 
    Most of the work is done in the `printpage()' function.  The label
 lines are stored sequentially in the `line' array.  But they have to
-print horizontally; `line[1]' next to `line[6]', `line[2]' next to
-`line[7]', and so on.  Two loops are used to accomplish this.  The
-outer loop, controlled by `i', steps through every 10 lines of data;
-this is each row of labels.  The inner loop, controlled by `j', goes
-through the lines within the row.  As `j' goes from 0 to 4, `i+j' is
-the `j'-th line in the row, and `i+j+5' is the entry next to it.  The
-output ends up looking something like this:
+print horizontally: `line[1]' next to `line[6]', `line[2]' next to
+`line[7]', and so on.  Two loops accomplish this.  The outer loop,
+controlled by `i', steps through every 10 lines of data; this is each
+row of labels.  The inner loop, controlled by `j', goes through the
+lines within the row.  As `j' goes from 0 to 4, `i+j' is the `j'th line
+in the row, and `i+j+5' is the entry next to it.  The output ends up
+looking something like this:
 
      line 1          line 6
      line 2          line 7
@@ -17805,7 +18207,7 @@ a useful format.
 
    At first glance, a program like this would seem to do the job:
 
-     # Print list of word frequencies
+     # wordfreq-first-try.awk --- print list of word frequencies
 
      {
          for (i = 1; i <= NF; i++)
@@ -17817,8 +18219,8 @@ a useful format.
              printf "%s\t%d\n", word, freq[word]
      }
 
-   The program relies on `awk''s default field splitting mechanism to
-break each line up into "words," and uses an associative array named
+   The program relies on `awk''s default field-splitting mechanism to
+break each line up into "words" and uses an associative array named
 `freq', indexed by each word, to count the number of times the word
 occurs. In the `END' rule, it prints the counts.
 
@@ -17827,9 +18229,9 @@ on real text files:
 
    * The `awk' language considers upper- and lowercase characters to be
      distinct.  Therefore, "bartender" and "Bartender" are not treated
-     as the same word.  This is undesirable, since in normal text, words
-     are capitalized if they begin sentences, and a frequency analyzer
-     should not be sensitive to capitalization.
+     as the same word.  This is undesirable, because words are
+     capitalized if they begin sentences in normal text, and a
+     frequency analyzer should not be sensitive to capitalization.
 
    * Words are detected using the `awk' convention that fields are
      separated just by whitespace.  Other characters in the input
@@ -17904,7 +18306,7 @@ File: gawk.info,  Node: History Sorting,  Next: Extract Program,  Prev: Word Sor
 11.3.6 Removing Duplicates from Unsorted Text
 ---------------------------------------------
 
-The `uniq' program (*note Uniq Program::), removes duplicate lines from
+The `uniq' program (*note Uniq Program::) removes duplicate lines from
 _sorted_ data.
 
    Suppose, however, you need to remove duplicate lines from a data
@@ -17952,16 +18354,16 @@ File: gawk.info,  Node: Extract Program,  Next: Simple Sed,  Prev: History Sorti
 
 The nodes *note Library Functions::, and *note Sample Programs::, are
 the top level nodes for a large number of `awk' programs.  If you want
-to experiment with these programs, it is tedious to have to type them
-in by hand.  Here we present a program that can extract parts of a
-Texinfo input file into separate files.
+to experiment with these programs, it is tedious to type them in by
+hand.  Here we present a program that can extract parts of a Texinfo
+input file into separate files.
 
 This Info file is written in Texinfo
-(http://www.gnu.org/software/texinfo/), the GNU project's document
+(http://www.gnu.org/software/texinfo/), the GNU Project's document
 formatting language.  A single Texinfo source file can be used to
-produce both printed and online documentation.  The Texinfo language is
-described fully, starting with *note (Texinfo)Top::
-texinfo,Texinfo--The GNU Documentation Format.
+produce both printed documentation, with TeX, and online documentation.
+(The Texinfo language is described fully, starting with *note
+(Texinfo)Top:: texinfo,Texinfo--The GNU Documentation Format.)
 
    For our purposes, it is enough to know three things about Texinfo
 input files:
@@ -17998,7 +18400,7 @@ them in a standard directory where `gawk' can find them.  The Texinfo
 file looks something like this:
 
      ...
-     This program has a @code{BEGIN} rule,
+     This program has a @code{BEGIN} rule
      that prints a nice message:
 
      @example
@@ -18011,7 +18413,7 @@ file looks something like this:
 
      @example
      @c file examples/messages.awk
-     END @{ print "Always avoid bored archeologists!" @}
+     END @{ print "Always avoid bored archaeologists!" @}
      @c end file
      @end example
      ...
@@ -18023,13 +18425,11 @@ upper- and lowercase letters in the directives won't matter.
 given (`NF' is at least three) and also checking that the command exits
 with a zero exit status, signifying OK:
 
-     # extract.awk --- extract files and run programs
-     #                 from texinfo files
+     # extract.awk --- extract files and run programs from Texinfo files
 
      BEGIN    { IGNORECASE = 1 }
 
-     /^@c(omment)?[ \t]+system/    \
-     {
+     /^@c(omment)?[ \t]+system/ {
          if (NF < 3) {
              e = ("extract: " FILENAME ":" FNR)
              e = (e  ": badly formed `system' line")
@@ -18052,11 +18452,11 @@ The variable `e' is used so that the rule fits nicely on the screen.
 file name is given in the directive.  If the file named is not the
 current file, then the current file is closed.  Keeping the current file
 open until a new file is encountered allows the use of the `>'
-redirection for printing the contents, keeping open file management
+redirection for printing the contents, keeping open-file management
 simple.
 
    The `for' loop does the work.  It reads lines using `getline' (*note
-Getline::).  For an unexpected end of file, it calls the
+Getline::).  For an unexpected end-of-file, it calls the
 `unexpected_eof()' function.  If the line is an "endfile" line, then it
 breaks out of the loop.  If the line is an `@group' or `@end group'
 line, then it ignores it and goes on to the next line.  Similarly,
@@ -18077,8 +18477,7 @@ with the value of `SUBSEP' (*note Multidimensional::), to rejoin the
 pieces back into a single line.  That line is then printed to the
 output file:
 
-     /^@c(omment)?[ \t]+file/    \
-     {
+     /^@c(omment)?[ \t]+file/ {
          if (NF != 3) {
              e = ("extract: " FILENAME ":" FNR ": badly formed `file' line")
              print e > "/dev/stderr"
@@ -18132,7 +18531,7 @@ closing the open file:
      function unexpected_eof()
      {
          printf("extract: %s:%d: unexpected EOF or error\n",
-             FILENAME, FNR) > "/dev/stderr"
+                          FILENAME, FNR) > "/dev/stderr"
          exit 1
      }
 
@@ -18147,18 +18546,18 @@ File: gawk.info,  Node: Simple Sed,  Next: Igawk Program,  Prev: Extract Program
 11.3.8 A Simple Stream Editor
 -----------------------------
 
-The `sed' utility is a stream editor, a program that reads a stream of
-data, makes changes to it, and passes it on.  It is often used to make
-global changes to a large file or to a stream of data generated by a
-pipeline of commands.  While `sed' is a complicated program in its own
-right, its most common use is to perform global substitutions in the
-middle of a pipeline:
+The `sed' utility is a "stream editor", a program that reads a stream
+of data, makes changes to it, and passes it on.  It is often used to
+make global changes to a large file or to a stream of data generated by
+a pipeline of commands.  Although `sed' is a complicated program in its
+own right, its most common use is to perform global substitutions in
+the middle of a pipeline:
 
-     command1 < orig.data | sed 's/old/new/g' | command2 > result
+     COMMAND1 < orig.data | sed 's/old/new/g' | COMMAND2 > result
 
    Here, `s/old/new/g' tells `sed' to look for the regexp `old' on each
-input line and globally replace it with the text `new', i.e., all the
-occurrences on a line.  This is similar to `awk''s `gsub()' function
+input line and globally replace it with the text `new' (i.e., all the
+occurrences on a line).  This is similar to `awk''s `gsub()' function
 (*note String Functions::).
 
    The following program, `awksed.awk', accepts at least two
@@ -18219,7 +18618,7 @@ arguments and calling `usage()' if there is a problem. Then it sets
 (*note ARGC and ARGV::).
 
    The `usage()' function prints an error message and exits.  Finally,
-the single rule handles the printing scheme outlined above, using
+the single rule handles the printing scheme outlined earlier, using
 `print' or `printf' as appropriate, depending upon the value of `RT'.
 
 
@@ -18257,14 +18656,14 @@ to be able to write programs in the following manner:
 
    The following program, `igawk.sh', provides this service.  It
 simulates `gawk''s searching of the `AWKPATH' variable and also allows
-"nested" includes; i.e., a file that is included with `@include' can
-contain further `@include' statements.  `igawk' makes an effort to only
-include files once, so that nested includes don't accidentally include
-a library function twice.
+"nested" includes (i.e., a file that is included with `@include' can
+contain further `@include' statements).  `igawk' makes an effort to
+only include files once, so that nested includes don't accidentally
+include a library function twice.
 
    `igawk' should behave just like `gawk' externally.  This means it
 should accept all of `gawk''s command-line arguments, including the
-ability to have multiple source files specified via `-f', and the
+ability to have multiple source files specified via `-f' and the
 ability to mix command-line and library source files.
 
    The program is written using the POSIX Shell (`sh') command
@@ -18281,8 +18680,8 @@ language.(1) It works as follows:
 
        b. Source file names, provided with `-f'.  We use a neat trick
           and append `@include FILENAME' to the shell variable's
-          contents.  Since the file-inclusion program works the way
-          `gawk' does, this gets the text of the file included into the
+          contents.  Because the file-inclusion program works the way
+          `gawk' does, this gets the text of the file included in the
           program at the correct point.
 
   3. Run an `awk' program (naturally) over the shell variable's
@@ -18294,8 +18693,8 @@ language.(1) It works as follows:
      file names).
 
    This program uses shell variables extensively: for storing
-command-line arguments, the text of the `awk' program that will expand
-the user's program, for the user's original program, and for the
+command-line arguments and the text of the `awk' program that will
+expand the user's program, for the user's original program, and for the
 expanded program.  Doing so removes some potential problems that might
 arise were we to use temporary files instead, at the cost of making the
 script somewhat more complicated.
@@ -18341,8 +18740,8 @@ arguments are supplied, then the first nonoption argument should be the
 `awk' program.  If there are no command-line arguments left, `igawk'
 prints an error message and exits.  Otherwise, the first argument is
 appended to `program'.  In any case, after the arguments have been
-processed, `program' contains the complete text of the original `awk'
-program.
+processed, the shell variable `program' contains the complete text of
+the original `awk' program.
 
    The program is as follows:
 
@@ -18542,18 +18941,18 @@ is saved as a single string, even if the results contain whitespace.
 It's done in these steps:
 
   1. Run `gawk' with the `@include'-processing program (the value of
-     the `expand_prog' shell variable) on standard input.
+     the `expand_prog' shell variable) reading standard input.
 
   2. Standard input is the contents of the user's program, from the
-     shell variable `program'.  Its contents are fed to `gawk' via a
-     here document.
+     shell variable `program'.  Feed its contents to `gawk' via a here
+     document.
 
-  3. The results of this processing are saved in the shell variable
+  3. Save the results of this processing in the shell variable
      `processed_program' by using command substitution.
 
    The last step is to call `gawk' with the expanded program, along
 with the original options and command-line arguments that the user
-supplied.
+supplied:
 
      eval gawk $opts -- '"$processed_program"' '"$@"'
 
@@ -18588,7 +18987,7 @@ and it is frequently easier to do certain kinds of string and argument
 manipulation using the shell than it is in `awk'.
 
    Finally, `igawk' shows that it is not always necessary to add new
-features to a program; they can often be layered on top.
+features to a program; they can often be layered on top.(3)
 
    ---------- Footnotes ----------
 
@@ -18597,32 +18996,34 @@ book. We provide some minimal explanations, but see a good shell
 programming book if you wish to understand things in more depth.
 
    (2) On some very old versions of `awk', the test `getline junk < t'
-can loop forever if the file exists but is empty.  Caveat emptor.
+can loop forever if the file exists but is empty.
+
+   (3) `gawk' does `@include' processing itself in order to support the
+use of `awk' programs as Web CGI scripts.
 
 
 File: gawk.info,  Node: Anagram Program,  Next: Signature Program,  Prev: Igawk Program,  Up: Miscellaneous Programs
 
-11.3.10 Finding Anagrams From A Dictionary
+11.3.10 Finding Anagrams from a Dictionary
 ------------------------------------------
 
 An interesting programming challenge is to search for "anagrams" in a
 word list (such as `/usr/share/dict/words' on many GNU/Linux systems).
 One word is an anagram of another if both words contain the same letters
-(for example, "babbling" and "blabbing").
+(e.g., "babbling" and "blabbing").
 
-   An elegant algorithm is presented in Column 2, Problem C of Jon
-Bentley's `Programming Pearls', second edition.  The idea is to give
-words that are anagrams a common signature, sort all the words together
-by their signature, and then print them.  Dr. Bentley observes that
-taking the letters in each word and sorting them produces that common
-signature.
+   Column 2, Problem C, of Jon Bentley's `Programming Pearls', Second
+Edition, presents an elegant algorithm.  The idea is to give words that
+are anagrams a common signature, sort all the words together by their
+signatures, and then print them.  Dr. Bentley observes that taking the
+letters in each word and sorting them produces those common signatures.
 
    The following program uses arrays of arrays to bring together words
 with the same signature and array sorting to print the words in sorted
-order.
+order:
 
-     # anagram.awk --- An implementation of the anagram finding algorithm
-     #                 from Jon Bentley's "Programming Pearls", 2nd edition.
+     # anagram.awk --- An implementation of the anagram-finding algorithm
+     #                 from Jon Bentley's "Programming Pearls," 2nd edition.
      #                 Addison Wesley, 2000, ISBN 0-201-65788-0.
      #                 Column 2, Problem C, section 2.8, pp 18-20.
 
@@ -18642,7 +19043,7 @@ signature; the second dimension is the word itself:
 apart into individual letters, sorts the letters, and then joins them
 back together:
 
-     # word2key --- split word apart into letters, sort, joining back together
+     # word2key --- split word apart into letters, sort, and join back together
 
      function word2key(word,     a, i, n, result)
      {
@@ -18656,8 +19057,8 @@ back together:
      }
 
    Finally, the `END' rule traverses the array and prints out the
-anagram lists.  It sends the output to the system `sort' command, since
-otherwise the anagrams would appear in arbitrary order:
+anagram lists.  It sends the output to the system `sort' command
+because otherwise the anagrams would appear in arbitrary order:
 
      END {
          sort = "sort"
@@ -18692,7 +19093,7 @@ otherwise the anagrams would appear in arbitrary order:
 
 File: gawk.info,  Node: Signature Program,  Prev: Anagram Program,  Up: Miscellaneous Programs
 
-11.3.11 And Now For Something Completely Different
+11.3.11 And Now for Something Completely Different
 --------------------------------------------------
 
 The following program was written by Davide Brini and is published on
@@ -18724,9 +19125,9 @@ File: gawk.info,  Node: Programs Summary,  Next: Programs Exercises,  Prev: Misc
 11.4 Summary
 ============
 
-   * The functions provided in this major node and the previous one
-     continue on the theme that reading programs is an excellent way to
-     learn Good Programming.
+   * The programs provided in this major node continue on the theme
+     that reading programs is an excellent way to learn Good
+     Programming.
 
    * Using `#!' to make `awk' programs directly runnable makes them
      easier to use.  Otherwise, invoke the program using `awk -f ...'.
@@ -18740,12 +19141,13 @@ File: gawk.info,  Node: Programs Summary,  Next: Programs Exercises,  Prev: Misc
      characters.  The ability to use `split()' with the empty string as
      the separator can considerably simplify such tasks.
 
-   * The library functions from *note Library Functions::, proved their
-     usefulness for a number of real (if small) programs.
+   * The examples here demonstrate the usefulness of the library
+     functions from *note Library Functions::, for a number of real (if
+     small) programs.
 
    * Besides reinventing POSIX wheels, other programs solved a
-     selection of interesting problems, such as finding duplicates
-     words in text, printing mailing labels, and finding anagrams.
+     selection of interesting problems, such as finding duplicate words
+     in text, printing mailing labels, and finding anagrams.
 
 
 
@@ -18755,7 +19157,7 @@ File: gawk.info,  Node: Programs Exercises,  Prev: Programs Summary,  Up: Sample
 ==============
 
   1. Rewrite `cut.awk' (*note Cut Program::) using `split()' with `""'
-     as the seperator.
+     as the separator.
 
   2. In *note Egrep Program::, we mentioned that `egrep -i' could be
      simulated in versions of `awk' without `IGNORECASE' by using
@@ -18779,7 +19181,7 @@ File: gawk.info,  Node: Programs Exercises,  Prev: Programs Summary,  Up: Sample
      that can be in one of a set number of stable conditions depending
      on its previous condition and on the present values of its
      inputs."(1) Brian Kernighan suggests that "an alternative approach
-     to state mechines is to just read the input into an array, then
+     to state machines is to just read the input into an array, then
      use indexing.  It's almost always easier code, and for most inputs
      where you would use this, just as fast."  Rewrite the logic to
      follow this suggestion.
@@ -18862,16 +19264,16 @@ File: gawk.info,  Node: Advanced Features,  Next: Internationalization,  Prev: S
 
    This major node discusses advanced features in `gawk'.  It's a bit
 of a "grab bag" of items that are otherwise unrelated to each other.
-First, a command-line option allows `gawk' to recognize nondecimal
-numbers in input data, not just in `awk' programs.  Then, `gawk''s
-special features for sorting arrays are presented.  Next, two-way I/O,
-discussed briefly in earlier parts of this Info file, is described in
-full detail, along with the basics of TCP/IP networking.  Finally,
-`gawk' can "profile" an `awk' program, making it possible to tune it
-for performance.
+First, we look at a command-line option that allows `gawk' to recognize
+nondecimal numbers in input data, not just in `awk' programs.  Then,
+`gawk''s special features for sorting arrays are presented.  Next,
+two-way I/O, discussed briefly in earlier parts of this Info file, is
+described in full detail, along with the basics of TCP/IP networking.
+Finally, we see how `gawk' can "profile" an `awk' program, making it
+possible to tune it for performance.
 
-   A number of advanced features require separate major nodes of their
-own:
+   Additional advanced features are discussed in separate major nodes
+of their own:
 
    * *note Internationalization::, discusses how to internationalize
      your `awk' programs, so that they can speak multiple national
@@ -18903,11 +19305,10 @@ File: gawk.info,  Node: Nondecimal Data,  Next: Array Sorting,  Up: Advanced Fea
 ===================================
 
 If you run `gawk' with the `--non-decimal-data' option, you can have
-nondecimal constants in your input data:
+nondecimal values in your input data:
 
      $ echo 0123 123 0x123 |
-     > gawk --non-decimal-data '{ printf "%d, %d, %d\n",
-     >                                         $1, $2, $3 }'
+     > gawk --non-decimal-data '{ printf "%d, %d, %d\n", $1, $2, $3 }'
      -| 83, 123, 291
 
    For this feature to work, write your program so that `gawk' treats
@@ -18938,13 +19339,15 @@ request it.
      programs easier to write and easier to read, and leads to less
      surprising results.
 
+     This option may disappear in a future version of `gawk'.
+
 
 File: gawk.info,  Node: Array Sorting,  Next: Two-way I/O,  Prev: Nondecimal Data,  Up: Advanced Features
 
 12.2 Controlling Array Traversal and Array Sorting
 ==================================================
 
-`gawk' lets you control the order in which a `for (i in array)' loop
+`gawk' lets you control the order in which a `for (INDX in ARRAY)' loop
 traverses an array.
 
    In addition, two built-in functions, `asort()' and `asorti()', let
@@ -18963,20 +19366,20 @@ File: gawk.info,  Node: Controlling Array Traversal,  Next: Array Sorting Functi
 12.2.1 Controlling Array Traversal
 ----------------------------------
 
-By default, the order in which a `for (i in array)' loop scans an array
-is not defined; it is generally based upon the internal implementation
-of arrays inside `awk'.
+By default, the order in which a `for (INDX in ARRAY)' loop scans an
+array is not defined; it is generally based upon the internal
+implementation of arrays inside `awk'.
 
    Often, though, it is desirable to be able to loop over the elements
 in a particular order that you, the programmer, choose.  `gawk' lets
 you do this.
 
    *note Controlling Scanning::, describes how you can assign special,
-pre-defined values to `PROCINFO["sorted_in"]' in order to control the
+predefined values to `PROCINFO["sorted_in"]' in order to control the
 order in which `gawk' traverses an array during a `for' loop.
 
    In addition, the value of `PROCINFO["sorted_in"]' can be a function
-name.  This lets you traverse an array based on any custom criterion.
+name.(1) This lets you traverse an array based on any custom criterion.
 The array elements are ordered according to the return value of this
 function.  The comparison function should be defined with at least four
 arguments:
@@ -18987,21 +19390,22 @@ arguments:
          RETURN < 0; 0; OR > 0
      }
 
-   Here, I1 and I2 are the indices, and V1 and V2 are the corresponding
-values of the two elements being compared.  Either V1 or V2, or both,
-can be arrays if the array being traversed contains subarrays as values.
-(*Note Arrays of Arrays::, for more information about subarrays.)  The
-three possible return values are interpreted as follows:
+   Here, `i1' and `i2' are the indices, and `v1' and `v2' are the
+corresponding values of the two elements being compared.  Either `v1'
+or `v2', or both, can be arrays if the array being traversed contains
+subarrays as values.  (*Note Arrays of Arrays::, for more information
+about subarrays.)  The three possible return values are interpreted as
+follows:
 
 `comp_func(i1, v1, i2, v2) < 0'
-     Index I1 comes before index I2 during loop traversal.
+     Index `i1' comes before index `i2' during loop traversal.
 
 `comp_func(i1, v1, i2, v2) == 0'
-     Indices I1 and I2 come together but the relative order with
+     Indices `i1' and `i2' come together, but the relative order with
      respect to each other is undefined.
 
 `comp_func(i1, v1, i2, v2) > 0'
-     Index I1 comes after index I2 during loop traversal.
+     Index `i1' comes after index `i2' during loop traversal.
 
    Our first comparison function can be used to scan an array in
 numerical order of the indices:
@@ -19091,7 +19495,7 @@ of the previous functions:
 according to login name.  The following program sorts records by a
 specific field position and can be used for this purpose:
 
-     # sort.awk --- simple program to sort by field position
+     # passwd-sort.awk --- simple program to sort by field position
      # field position is specified by the global variable POS
 
      function cmp_field(i1, v1, i2, v2)
@@ -19129,7 +19533,7 @@ Running the program produces the following output:
 
    The comparison should normally always return the same value when
 given a specific pair of array elements as its arguments.  If
-inconsistent results are returned then the order is undefined.  This
+inconsistent results are returned, then the order is undefined.  This
 behavior can be exploited to introduce random order into otherwise
 seemingly ordered data:
 
@@ -19139,17 +19543,18 @@ seemingly ordered data:
          return (2 - 4 * rand())
      }
 
-   As mentioned above, the order of the indices is arbitrary if two
+   As already mentioned, the order of the indices is arbitrary if two
 elements compare equal.  This is usually not a problem, but letting the
 tied elements come out in arbitrary order can be an issue, especially
 when comparing item values.  The partial ordering of the equal elements
-may change during the next loop traversal, if other elements are added
-or removed from the array.  One way to resolve ties when comparing
-elements with otherwise equal values is to include the indices in the
-comparison rules.  Note that doing this may make the loop traversal
-less efficient, so consider it only if necessary.  The following
-comparison functions force a deterministic order, and are based on the
-fact that the (string) indices of two elements are never equal:
+may change the next time the array is traversed, if other elements are
+added to or removed from the array.  One way to resolve ties when
+comparing elements with otherwise equal values is to include the
+indices in the comparison rules.  Note that doing this may make the
+loop traversal less efficient, so consider it only if necessary.  The
+following comparison functions force a deterministic order, and are
+based on the fact that the (string) indices of two elements are never
+equal:
 
      function cmp_numeric(i1, v1, i2, v2)
      {
@@ -19172,22 +19577,27 @@ such a function.
    When string comparisons are made during a sort, either for element
 values where one or both aren't numbers, or for element indices handled
 as strings, the value of `IGNORECASE' (*note Built-in Variables::)
-controls whether the comparisons treat corresponding uppercase and
+controls whether the comparisons treat corresponding upper- and
 lowercase letters as equivalent or distinct.
 
-   Another point to keep in mind is that in the case of subarrays the
+   Another point to keep in mind is that in the case of subarrays, the
 element values can themselves be arrays; a production comparison
-function should use the `isarray()' function (*note Type Functions::),
+function should use the `isarray()' function (*note Type Functions::)
 to check for this, and choose a defined sorting order for subarrays.
 
    All sorting based on `PROCINFO["sorted_in"]' is disabled in POSIX
-mode, since the `PROCINFO' array is not special in that case.
+mode, because the `PROCINFO' array is not special in that case.
 
    As a side note, sorting the array indices before traversing the
-array has been reported to add 15% to 20% overhead to the execution
+array has been reported to add a 15% to 20% overhead to the execution
 time of `awk' programs. For this reason, sorted array traversal is not
 the default.
 
+   ---------- Footnotes ----------
+
+   (1) This is why the predefined sorting orders start with an `@'
+character, which cannot be part of an identifier.
+
 
 File: gawk.info,  Node: Array Sorting Functions,  Prev: Controlling Array Traversal,  Up: Array Sorting
 
@@ -19195,10 +19605,10 @@ File: gawk.info,  Node: Array Sorting Functions,  Prev: Controlling Array Traver
 ---------------------------------------------------
 
 In most `awk' implementations, sorting an array requires writing a
-`sort()' function.  While this can be educational for exploring
-different sorting algorithms, usually that's not the point of the
-program.  `gawk' provides the built-in `asort()' and `asorti()'
-functions (*note String Functions::) for sorting arrays.  For example:
+`sort()' function.  This can be educational for exploring different
+sorting algorithms, but usually that's not the point of the program.
+`gawk' provides the built-in `asort()' and `asorti()' functions (*note
+String Functions::) for sorting arrays.  For example:
 
      POPULATE THE ARRAY data
      n = asort(data)
@@ -19228,8 +19638,8 @@ array is not affected.
    Often, what's needed is to sort on the values of the _indices_
 instead of the values of the elements.  To do that, use the `asorti()'
 function.  The interface and behavior are identical to that of
-`asort()', except that the index values are used for sorting, and
-become the values of the result array:
+`asort()', except that the index values are used for sorting and become
+the values of the result array:
 
      { source[$0] = some_func($0) }
 
@@ -19261,8 +19671,8 @@ chooses_, taking into account just the indices, just the values, or
 both.  This is extremely powerful.
 
    Once the array is sorted, `asort()' takes the _values_ in their
-final order, and uses them to fill in the result array, whereas
-`asorti()' takes the _indices_ in their final order, and uses them to
+final order and uses them to fill in the result array, whereas
+`asorti()' takes the _indices_ in their final order and uses them to
 fill in the result array.
 
      NOTE: Copying array indices and elements isn't expensive in terms
@@ -19274,13 +19684,13 @@ fill in the result array.
    Because `IGNORECASE' affects string comparisons, the value of
 `IGNORECASE' also affects sorting for both `asort()' and `asorti()'.
 Note also that the locale's sorting order does _not_ come into play;
-comparisons are based on character values only.(1) Caveat Emptor.
+comparisons are based on character values only.(1)
 
    ---------- Footnotes ----------
 
    (1) This is true because locale-based comparison occurs only when in
-POSIX compatibility mode, and since `asort()' and `asorti()' are `gawk'
-extensions, they are not available in that case.
+POSIX-compatibility mode, and because `asort()' and `asorti()' are
+`gawk' extensions, they are not available in that case.
 
 
 File: gawk.info,  Node: Two-way I/O,  Next: TCP/IP Networking,  Prev: Array Sorting,  Up: Advanced Features
@@ -19309,7 +19719,7 @@ the program be run in a directory that cannot be shared among users;
 for example, `/tmp' will not do, as another user might happen to be
 using a temporary file with the same name.(1)  However, with `gawk', it
 is possible to open a _two-way_ pipe to another process.  The second
-process is termed a "coprocess", since it runs in parallel with `gawk'.
+process is termed a "coprocess", as it runs in parallel with `gawk'.
 The two-way connection is created using the `|&' operator (borrowed
 from the Korn shell, `ksh'):(2)
 
@@ -19388,7 +19798,7 @@ per-command basis, by setting a special element in the `PROCINFO' array
 
      command = "sort -nr"           # command, save in convenience variable
      PROCINFO[command, "pty"] = 1   # update PROCINFO
-     print ... |& command       # start two-way pipe
+     print ... |& command           # start two-way pipe
      ...
 
 Using ptys usually avoids the buffer deadlock issues described earlier,
@@ -19400,7 +19810,7 @@ using regular pipes.
 
    (1) Michael Brennan suggests the use of `rand()' to generate unique
 file names. This is a valid point; nevertheless, temporary files remain
-more difficult than two-way pipes.
+more difficult to use than two-way pipes.
 
    (2) This is very different from the same operator in the C shell and
 in Bash.
@@ -19411,11 +19821,11 @@ File: gawk.info,  Node: TCP/IP Networking,  Next: Profiling,  Prev: Two-way I/O,
 12.4 Using `gawk' for Network Programming
 =========================================
 
-     `EMISTERED':
+     `EMRED':
      A host is a host from coast to coast,
-     and no-one can talk to host that's close,
+     and nobody talks to a host that's close,
      unless the host that isn't close
-     is busy hung or dead.
+     is busy, hung, or dead.  -- Mike O'Brien (aka Mr. Protocol)
 
 In addition to being able to open a two-way pipeline to a coprocess on
 the same system (*note Two-way I/O::), it is possible to make a two-way
@@ -19425,7 +19835,7 @@ connection.
    You can think of this as just a _very long_ two-way pipeline to a
 coprocess.  The way `gawk' decides that you want to use TCP/IP
 networking is by recognizing special file names that begin with one of
-`/inet/', `/inet4/' or `/inet6/'.
+`/inet/', `/inet4/', or `/inet6/'.
 
    The full syntax of the special file name is
 `/NET-TYPE/PROTOCOL/LOCAL-PORT/REMOTE-HOST/REMOTE-PORT'.  The
@@ -19439,8 +19849,8 @@ NET-TYPE
 
 PROTOCOL
      The protocol to use over IP.  This must be either `tcp', or `udp',
-     for a TCP or UDP IP connection, respectively.  The use of TCP is
-     recommended for most applications.
+     for a TCP or UDP IP connection, respectively.  TCP should be used
+     for most applications.
 
 LOCAL-PORT
      The local TCP or UDP port number to use.  Use a port number of `0'
@@ -19451,7 +19861,7 @@ LOCAL-PORT
      `getaddrinfo()' function.
 
 REMOTE-HOST
-     The IP address or fully-qualified domain name of the Internet host
+     The IP address or fully qualified domain name of the Internet host
      to which you want to connect.
 
 REMOTE-PORT
@@ -19460,16 +19870,16 @@ REMOTE-PORT
      name.
 
      NOTE: Failure in opening a two-way socket will result in a
-     non-fatal error being returned to the calling code. The value of
+     nonfatal error being returned to the calling code. The value of
      `ERRNO' indicates the error (*note Auto-set::).
 
    Consider the following very simple example:
 
      BEGIN {
-       Service = "/inet/tcp/0/localhost/daytime"
-       Service |& getline
-       print $0
-       close(Service)
+         Service = "/inet/tcp/0/localhost/daytime"
+         Service |& getline
+         print $0
+         close(Service)
      }
 
    This program reads the current date and time from the local system's
@@ -19499,7 +19909,7 @@ used to change the name of the file where `gawk' will write the profile:
 
      gawk --profile=myprog.prof -f myprog.awk data1 data2
 
-In the above example, `gawk' places the profile in `myprog.prof'
+In the preceding example, `gawk' places the profile in `myprog.prof'
 instead of in `awkprof.out'.
 
    Here is a sample session showing a simple `awk' program, its input
@@ -19541,12 +19951,12 @@ First, the `awk' program:
      junk
 
    Here is the `awkprof.out' that results from running the `gawk'
-profiler on this program and data. (This example also illustrates that
-`awk' programmers sometimes get up very early in the morning to work.)
+profiler on this program and data (this example also illustrates that
+`awk' programmers sometimes get up very early in the morning to work):
 
-         # gawk profile, created Thu Feb 27 05:16:21 2014
+         # gawk profile, created Mon Sep 29 05:16:21 2014
 
-         # BEGIN block(s)
+         # BEGIN rule(s)
 
          BEGIN {
       1          print "First BEGIN rule"
@@ -19573,7 +19983,7 @@ profiler on this program and data. (This example also illustrates that
                  }
          }
 
-         # END block(s)
+         # END rule(s)
 
          END {
       1          print "First END rule"
@@ -19595,7 +20005,7 @@ profiler on this program and data. (This example also illustrates that
 output.  They are as follows:
 
    * The program is printed in the order `BEGIN' rules, `BEGINFILE'
-     rules, pattern/action rules, `ENDFILE' rules, `END' rules and
+     rules, pattern-action rules, `ENDFILE' rules, `END' rules, and
      functions, listed alphabetically.  Multiple `BEGIN' and `END'
      rules retain their separate identities, as do multiple `BEGINFILE'
      and `ENDFILE' rules.
@@ -19630,9 +20040,9 @@ output.  They are as follows:
 
    * Parentheses are used only where needed, as indicated by the
      structure of the program and the precedence rules.  For example,
-     `(3 + 5) * 4' means add three plus five, then multiply the total
-     by four.  However, `3 + 5 * 4' has no parentheses, and means `3 +
-     (5 * 4)'.
+     `(3 + 5) * 4' means add three and five, then multiply the total by
+     four.  However, `3 + 5 * 4' has no parentheses, and means `3 + (5
+     * 4)'.
 
    * Parentheses are used around the arguments to `print' and `printf'
      only when the `print' or `printf' statement is followed by a
@@ -19640,16 +20050,15 @@ output.  They are as follows:
      scalar, it gets parenthesized.
 
    * `gawk' supplies leading comments in front of the `BEGIN' and `END'
-     rules, the `BEGINFILE' and `ENDFILE' rules, the pattern/action
+     rules, the `BEGINFILE' and `ENDFILE' rules, the pattern-action
      rules, and the functions.
 
 
    The profiled version of your program may not look exactly like what
 you typed when you wrote it.  This is because `gawk' creates the
-profiled version by "pretty printing" its internal representation of
+profiled version by "pretty-printing" its internal representation of
 the program.  The advantage to this is that `gawk' can produce a
-standard representation.  The disadvantage is that all source-code
-comments are lost.  Also, things such as:
+standard representation.  Also, things such as:
 
      /foo/
 
@@ -19659,7 +20068,7 @@ come out as:
          print $0
      }
 
-which is correct, but possibly surprising.
+which is correct, but possibly unexpected.
 
    Besides creating profiles when a program has completed, `gawk' can
 produce a profile while it is running.  This is useful if your `awk'
@@ -19676,7 +20085,7 @@ The shell prints a job number and process ID number; in this case,
      $ kill -USR1 13992
 
 As usual, the profiled version of the program is written to
-`awkprof.out', or to a different file if one specified with the
+`awkprof.out', or to a different file if one was specified with the
 `--profile' option.
 
    Along with the regular profile, as shown earlier, the profile file
@@ -19697,20 +20106,36 @@ output profile file.
 produces the profile and the function call trace and then exits.
 
    When `gawk' runs on MS-Windows systems, it uses the `INT' and `QUIT'
-signals for producing the profile and, in the case of the `INT' signal,
+signals for producing the profile, and in the case of the `INT' signal,
 `gawk' exits.  This is because these systems don't support the `kill'
 command, so the only signals you can deliver to a program are those
 generated by the keyboard.  The `INT' signal is generated by the
-`Ctrl-<C>' or `Ctrl-<BREAK>' key, while the `QUIT' signal is generated
-by the `Ctrl-<\>' key.
+`Ctrl-c' or `Ctrl-BREAK' key, while the `QUIT' signal is generated by
+the `Ctrl-\' key.
 
    Finally, `gawk' also accepts another option, `--pretty-print'.  When
-called this way, `gawk' "pretty prints" the program into `awkprof.out',
+called this way, `gawk' "pretty-prints" the program into `awkprof.out',
 without any execution counts.
 
      NOTE: Once upon a time, the `--pretty-print' option would also run
      your program.  This is is no longer the case.
 
+   There is a significant difference between the output created when
+profiling, and that created when pretty-printing.  Pretty-printed output
+preserves the original comments that were in the program, although their
+placement may not correspond exactly to their original locations in the
+source code.
+
+   However, as a deliberate design decision, profiling output _omits_
+the original program's comments. This allows you to focus on the
+execution count data and helps you avoid the temptation to use the
+profiler for pretty-printing.
+
+   Additionally, pretty-printed output does not have the leading
+indentation that the profiling output does. This makes it easy to
+pretty-print your code once development is completed, and then use the
+result as the final version of your program.
+
 
 File: gawk.info,  Node: Advanced Features Summary,  Prev: Profiling,  Up: Advanced Features
 
@@ -19720,7 +20145,8 @@ File: gawk.info,  Node: Advanced Features Summary,  Prev: Profiling,  Up: Advanc
    * The `--non-decimal-data' option causes `gawk' to treat octal- and
      hexadecimal-looking input data as octal and hexadecimal.  This
      option should be used with caution or not at all; use of
-     `strtonum()' is preferable.
+     `strtonum()' is preferable.  Note that this option may disappear
+     in a future version of `gawk'.
 
    * You can take over complete control of sorting in `for (INDX in
      ARRAY)' array traversal by setting `PROCINFO["sorted_in"]' to the
@@ -19734,14 +20160,14 @@ File: gawk.info,  Node: Advanced Features Summary,  Prev: Profiling,  Up: Advanc
      `PROCINFO["sorted_in"]'.
 
    * You can use the `|&' operator to create a two-way pipe to a
-     co-process.  You read from the co-process with `getline' and write
+     coprocess.  You read from the coprocess with `getline' and write
      to it with `print' or `printf'. Use `close()' to close off the
-     co-process completely, or optionally, close off one side of the
+     coprocess completely, or optionally, close off one side of the
      two-way communications.
 
-   * By using special "file names" with the `|&' operator, you can open
-     a TCP/IP (or UDP/IP) connection to remote hosts in the Internet.
-     `gawk' supports both IPv4 an IPv6.
+   * By using special file names with the `|&' operator, you can open a
+     TCP/IP (or UDP/IP) connection to remote hosts on the Internet.
+     `gawk' supports both IPv4 and IPv6.
 
    * You can generate statement count profiles of your program. This
      can help you determine which parts of your program may be taking
@@ -19749,7 +20175,7 @@ File: gawk.info,  Node: Advanced Features Summary,  Prev: Profiling,  Up: Advanc
      `USR1' signal while profiling causes `gawk' to dump the profile
      and keep going, including a function call stack.
 
-   * You can also just "pretty print" the program. This currently also
+   * You can also just "pretty-print" the program. This currently also
      runs the program, but that will change in the next major release.
 
 
@@ -19793,7 +20219,7 @@ File: gawk.info,  Node: I18N and L10N,  Next: Explaining gettext,  Up: Internati
 
 "Internationalization" means writing (or modifying) a program once, in
 such a way that it can use multiple languages without requiring further
-source-code changes.  "Localization" means providing the data necessary
+source code changes.  "Localization" means providing the data necessary
 for an internationalized program to work in a particular language.
 Most typically, these terms refer to features such as the language used
 for printing error messages, the language used to read responses, and
@@ -19807,7 +20233,7 @@ File: gawk.info,  Node: Explaining gettext,  Next: Programmer i18n,  Prev: I18N
 ==================
 
 `gawk' uses GNU `gettext' to provide its internationalization features.
-The facilities in GNU `gettext' focus on messages; strings printed by a
+The facilities in GNU `gettext' focus on messages: strings printed by a
 program, either directly or via formatting with `printf' or
 `sprintf()'.(1)
 
@@ -19821,12 +20247,12 @@ components--programs written in C or C++, as well as scripts written in
 named `guide'.  Internationalization consists of the following steps,
 in this order:
 
-  1. The programmer goes through the source for all of `guide''s
-     components and marks each string that is a candidate for
-     translation.  For example, `"`-F': option required"' is a good
-     candidate for translation.  A table with strings of option names
-     is not (e.g., `gawk''s `--profile' option should remain the same,
-     no matter what the local language).
+  1. The programmer reviews the source for all of `guide''s components
+     and marks each string that is a candidate for translation.  For
+     example, `"`-F': option required"' is a good candidate for
+     translation.  A table with strings of option names is not (e.g.,
+     `gawk''s `--profile' option should remain the same, no matter what
+     the local language).
 
   2. The programmer indicates the application's text domain (`"guide"')
      to the `gettext' library, by calling the `textdomain()' function.
@@ -19895,14 +20321,14 @@ are:
      a different category.)
 
 `LC_COLLATE'
-     Text-collation information; i.e., how different characters and/or
-     groups of characters sort in a given language.
+     Text-collation information (i.e., how different characters and/or
+     groups of characters sort in a given language).
 
 `LC_CTYPE'
      Character-type information (alphabetic, digit, upper- or
      lowercase, and so on) as well as character encoding.  This
      information is accessed via the POSIX character classes in regular
-     expressions, such as `/[[:alnum:]]/' (*note Regexp Operators::).
+     expressions, such as `/[[:alnum:]]/' (*note Bracket Expressions::).
 
 `LC_MONETARY'
      Monetary information, such as the currency symbol, and whether the
@@ -19936,8 +20362,7 @@ File: gawk.info,  Node: Programmer i18n,  Next: Translator i18n,  Prev: Explaini
 13.3 Internationalizing `awk' Programs
 ======================================
 
-`gawk' provides the following variables and functions for
-internationalization:
+`gawk' provides the following variables for internationalization:
 
 `TEXTDOMAIN'
      This variable indicates the application's text domain.  For
@@ -19949,6 +20374,8 @@ internationalization:
      for translation at runtime.  String constants without a leading
      underscore are not translated.
 
+   `gawk' provides the following functions for internationalization:
+
 ``dcgettext(STRING' [`,' DOMAIN [`,' CATEGORY]]`)''
      Return the translation of STRING in text domain DOMAIN for locale
      category CATEGORY.  The default value for DOMAIN is the current
@@ -19970,8 +20397,8 @@ internationalization:
      Return the plural form used for NUMBER of the translation of
      STRING1 and STRING2 in text domain DOMAIN for locale category
      CATEGORY. STRING1 is the English singular variant of a message,
-     and STRING2 the English plural variant of the same message.  The
-     default value for DOMAIN is the current value of `TEXTDOMAIN'.
+     and STRING2 is the English plural variant of the same message.
+     The default value for DOMAIN is the current value of `TEXTDOMAIN'.
      The default value for CATEGORY is `"LC_MESSAGES"'.
 
      The same remarks about argument order as for the `dcgettext()'
@@ -19987,8 +20414,7 @@ internationalization:
      the null string (`""'), then `bindtextdomain()' returns the
      current binding for the given DOMAIN.
 
-   To use these facilities in your `awk' program, follow the steps
-outlined in *note Explaining gettext::, like so:
+   To use these facilities in your `awk' program, follow these steps:
 
   1. Set the variable `TEXTDOMAIN' to the text domain of your program.
      This is best done in a `BEGIN' rule (*note BEGIN/END::), or it can
@@ -20024,9 +20450,11 @@ outlined in *note Explaining gettext::, like so:
      one.  This example would be better done with `dcngettext()':
 
           if (groggy)
-              message = dcngettext("%d customer disturbing me\n", "%d customers disturbing me\n", "adminprog")
+              message = dcngettext("%d customer disturbing me\n",
+                                   "%d customers disturbing me\n", "adminprog")
           else
-              message = dcngettext("enjoying %d customer\n", "enjoying %d customers\n", "adminprog")
+              message = dcngettext("enjoying %d customer\n",
+                                   "enjoying %d customers\n", "adminprog")
           printf(message, ncustomers)
 
   4. During development, you might want to put the `.gmo' file in a
@@ -20084,7 +20512,7 @@ marked and you've set (and perhaps bound) the text domain, it is time
 to produce translations.  First, use the `--gen-pot' command-line
 option to create the initial `.pot' file:
 
-     $ gawk --gen-pot -f guide.awk > guide.pot
+     gawk --gen-pot -f guide.awk > guide.pot
 
    When run with `--gen-pot', `gawk' does not execute your program.
 Instead, it parses it as usual and prints all marked strings to
@@ -20136,11 +20564,11 @@ example, `string' is the first argument and `length(string)' is the
 second:
 
      $ gawk 'BEGIN {
-     >     string = "Dont Panic"
+     >     string = "Don\47t Panic"
      >     printf "%2$d characters live in \"%1$s\"\n",
      >                         string, length(string)
      > }'
-     -| 10 characters live in "Dont Panic"
+     -| 11 characters live in "Don't Panic"
 
    If present, positional specifiers come first in the format
 specification, before the flags, the field width, and/or the precision.
@@ -20199,7 +20627,7 @@ them to other versions of `awk'.  Consider this program:
 As written, it won't work on other versions of `awk'.  However, it is
 actually almost portable, requiring very little change:
 
-   * Assignments to `TEXTDOMAIN' won't have any effect, since
+   * Assignments to `TEXTDOMAIN' won't have any effect, because
      `TEXTDOMAIN' is not special in other `awk' implementations.
 
    * Non-GNU versions of `awk' treat marked strings as the
@@ -20208,7 +20636,7 @@ actually almost portable, requiring very little change:
      its value, leaving the original string constant as the result.
 
    * By defining "dummy" functions to replace `dcgettext()',
-     `dcngettext()' and `bindtextdomain()', the `awk' program can be
+     `dcngettext()', and `bindtextdomain()', the `awk' program can be
      made to run, but all the messages are output in the original
      language.  For example:
 
@@ -20235,10 +20663,10 @@ actually almost portable, requiring very little change:
      and arguments unchanged to the underlying C library version of
      `sprintf()', but only one format and argument at a time.  What
      happens if a positional specification is used is anybody's guess.
-     However, since the positional specifications are primarily for use
-     in _translated_ format strings, and since non-GNU `awk's never
-     retrieve the translated string, this should not be a problem in
-     practice.
+     However, because the positional specifications are primarily for
+     use in _translated_ format strings, and because non-GNU `awk's
+     never retrieve the translated string, this should not be a problem
+     in practice.
 
    ---------- Footnotes ----------
 
@@ -20301,7 +20729,8 @@ Following are the translations:
 
    The next step is to make the directory to hold the binary message
 object file and then to create the `guide.mo' file.  We pretend that
-our file is to be used in the `en_US.UTF-8' locale.  The directory
+our file is to be used in the `en_US.UTF-8' locale, because we have to
+use a locale name known to the C `gettext' routines.  The directory
 layout shown here is standard for GNU `gettext' on GNU/Linux systems.
 Other versions of `gettext' may use a different layout:
 
@@ -20310,7 +20739,7 @@ Other versions of `gettext' may use a different layout:
    The `msgfmt' utility does the conversion from human-readable `.po'
 file to machine-readable `.mo' file.  By default, `msgfmt' creates a
 file named `messages'.  This file must be renamed and placed in the
-proper directory so that `gawk' can find it:
+proper directory (using the `-o' option) so that `gawk' can find it:
 
      $ msgfmt guide-mellow.po -o en_US.UTF-8/LC_MESSAGES/guide.mo
 
@@ -20321,7 +20750,7 @@ proper directory so that `gawk' can find it:
      -| Like, the scoop is 42
      -| Pardon me, Zaphod who?
 
-   If the three replacement functions for `dcgettext()', `dcngettext()'
+   If the three replacement functions for `dcgettext()', `dcngettext()',
 and `bindtextdomain()' (*note I18N Portability::) are in a file named
 `libintl.awk', then we can run `guide.awk' unchanged as follows:
 
@@ -20342,9 +20771,9 @@ File: gawk.info,  Node: Gawk I18N,  Next: I18N Summary,  Prev: I18N Example,  Up
 
 `gawk' itself has been internationalized using the GNU `gettext'
 package.  (GNU `gettext' is described in complete detail in *note (GNU
-`gettext' utilities)Top:: gettext, GNU gettext tools.)  As of this
-writing, the latest version of GNU `gettext' is version 0.19.1
-(ftp://ftp.gnu.org/gnu/gettext/gettext-0.19.1.tar.gz).
+`gettext' utilities)Top:: gettext, GNU `gettext' utilities.)  As of
+this writing, the latest version of GNU `gettext' is version 0.19.4
+(ftp://ftp.gnu.org/gnu/gettext/gettext-0.19.4.tar.gz).
 
    If a translation of `gawk''s messages exists, then `gawk' produces
 usage messages, warnings, and fatal errors in the local language.
@@ -20356,7 +20785,7 @@ File: gawk.info,  Node: I18N Summary,  Prev: Gawk I18N,  Up: Internationalizatio
 ============
 
    * Internationalization means writing a program such that it can use
-     multiple languages without requiring source-code changes.
+     multiple languages without requiring source code changes.
      Localization means providing the data necessary for an
      internationalized program to work in a particular language.
 
@@ -20370,10 +20799,10 @@ File: gawk.info,  Node: I18N Summary,  Prev: Gawk I18N,  Up: Internationalizatio
      file, and the `.po' files are compiled into `.gmo' files for use
      at runtime.
 
-   * You can use position specifications with `sprintf()' and `printf'
-     to rearrange the placement of argument values in formatted strings
-     and output. This is useful for the translations of format control
-     strings.
+   * You can use positional specifications with `sprintf()' and
+     `printf' to rearrange the placement of argument values in formatted
+     strings and output. This is useful for the translation of format
+     control strings.
 
    * The internationalization features have been designed so that they
      can be easily worked around in a standard `awk'.
@@ -20410,7 +20839,7 @@ program is easy.
 
 File: gawk.info,  Node: Debugging,  Next: Sample Debugging Session,  Up: Debugger
 
-14.1 Introduction to The `gawk' Debugger
+14.1 Introduction to the `gawk' Debugger
 ========================================
 
 This minor node introduces debugging in general and begins the
@@ -20429,12 +20858,11 @@ File: gawk.info,  Node: Debugging Concepts,  Next: Debugging Terms,  Up: Debuggi
 ---------------------------
 
 (If you have used debuggers in other languages, you may want to skip
-ahead to the next section on the specific features of the `awk'
-debugger.)
+ahead to *note Awk Debugging::.)
 
-   Of course, a debugging program cannot remove bugs for you, since it
-has no way of knowing what you or your users consider a "bug" and what
-is a "feature."  (Sometimes, we humans have a hard time with this
+   Of course, a debugging program cannot remove bugs for you, because
+it has no way of knowing what you or your users consider a "bug" versus
+a "feature."  (Sometimes, we humans have a hard time with this
 ourselves.)  In that case, what can you expect from such a tool?  The
 answer to that depends on the language being debugged, but in general,
 you can expect at least the following:
@@ -20450,7 +20878,7 @@ you can expect at least the following:
 
    * The chance to see the values of data in the program at any point in
      execution, and also to change that data on the fly, to see how that
-     affects what happens afterwards.  (This often includes the ability
+     affects what happens afterward.  (This often includes the ability
      to look at internal data structures besides the variables you
      actually defined in your code.)
 
@@ -20465,14 +20893,14 @@ functional program that you or someone else wrote).
 
 File: gawk.info,  Node: Debugging Terms,  Next: Awk Debugging,  Prev: Debugging Concepts,  Up: Debugging
 
-14.1.2 Additional Debugging Concepts
-------------------------------------
+14.1.2 Debugging Concepts
+-------------------------
 
 Before diving in to the details, we need to introduce several important
 concepts that apply to just about all debuggers.  The following list
-defines terms used throughout the rest of this major node.
+defines terms used throughout the rest of this major node:
 
-"Stack Frame"
+"Stack frame"
      Programs generally call functions during the course of their
      execution.  One function can call another, or a function can call
      itself (recursion).  You can view the chain of called functions
@@ -20508,39 +20936,39 @@ defines terms used throughout the rest of this major node.
      breakpoints are oriented around the code: stop when a certain
      point in the code is reached.  A watchpoint, however, specifies
      that program execution should stop when a _data value_ is changed.
-     This is useful, since sometimes it happens that a variable
-     receives an erroneous value, and it's hard to track down where
-     this happens just by looking at the code.  By using a watchpoint,
-     you can stop whenever a variable is assigned to, and usually find
-     the errant code quite quickly.
+     This is useful, as sometimes it happens that a variable receives
+     an erroneous value, and it's hard to track down where this happens
+     just by looking at the code.  By using a watchpoint, you can stop
+     whenever a variable is assigned to, and usually find the errant
+     code quite quickly.
 
 
 File: gawk.info,  Node: Awk Debugging,  Prev: Debugging Terms,  Up: Debugging
 
-14.1.3 Awk Debugging
---------------------
+14.1.3 `awk' Debugging
+----------------------
 
 Debugging an `awk' program has some specific aspects that are not
-shared with other programming languages.
-
-   First of all, the fact that `awk' programs usually take input
-line-by-line from a file or files and operate on those lines using
-specific rules makes it especially useful to organize viewing the
-execution of the program in terms of these rules.  As we will see, each
-`awk' rule is treated almost like a function call, with its own
-specific block of instructions.
-
-   In addition, since `awk' is by design a very concise language, it is
-easy to lose sight of everything that is going on "inside" each line of
-`awk' code.  The debugger provides the opportunity to look at the
+shared with programs written in other languages.
+
+   First of all, the fact that `awk' programs usually take input line
+by line from a file or files and operate on those lines using specific
+rules makes it especially useful to organize viewing the execution of
+the program in terms of these rules.  As we will see, each `awk' rule
+is treated almost like a function call, with its own specific block of
+instructions.
+
+   In addition, because `awk' is by design a very concise language, it
+is easy to lose sight of everything that is going on "inside" each line
+of `awk' code.  The debugger provides the opportunity to look at the
 individual primitive instructions carried out by the higher-level `awk'
 commands.
 
 
 File: gawk.info,  Node: Sample Debugging Session,  Next: List of Debugger Commands,  Prev: Debugging,  Up: Debugger
 
-14.2 Sample Debugging Session
-=============================
+14.2 Sample `gawk' Debugging Session
+====================================
 
 In order to illustrate the use of `gawk' as a debugger, let's look at a
 sample debugging session.  We will use the `awk' implementation of the
@@ -20558,22 +20986,22 @@ File: gawk.info,  Node: Debugger Invocation,  Next: Finding The Bug,  Up: Sample
 14.2.1 How to Start the Debugger
 --------------------------------
 
-Starting the debugger is almost exactly like running `gawk', except you
-have to pass an additional option `--debug' or the corresponding short
-option `-D'.  The file(s) containing the program and any supporting
-code are given on the command line as arguments to one or more `-f'
-options. (`gawk' is not designed to debug command-line programs, only
-programs contained in files.)  In our case, we invoke the debugger like
-this:
+Starting the debugger is almost exactly like running `gawk' normally,
+except you have to pass an additional option, `--debug', or the
+corresponding short option, `-D'.  The file(s) containing the program
+and any supporting code are given on the command line as arguments to
+one or more `-f' options. (`gawk' is not designed to debug command-line
+programs, only programs contained in files.)  In our case, we invoke
+the debugger like this:
 
      $ gawk -D -f getopt.awk -f join.awk -f uniq.awk -1 inputfile
 
 where both `getopt.awk' and `uniq.awk' are in `$AWKPATH'.  (Experienced
 users of GDB or similar debuggers should note that this syntax is
-slightly different from what they are used to.  With the `gawk'
+slightly different from what you are used to.  With the `gawk'
 debugger, you give the arguments for running the program in the command
 line to the debugger rather than as part of the `run' command at the
-debugger prompt.)
+debugger prompt.)  The `-1' is an option to `uniq.awk'.
 
    Instead of immediately running the program on `inputfile', as `gawk'
 would ordinarily do, the debugger merely loads all the program source
@@ -20643,8 +21071,8 @@ the current stack frames:
      -| #1  in main() at `awklib/eg/prog/uniq.awk':88
 
    This tells us that `are_equal()' was called by the main program at
-line 88 of `uniq.awk'.  (This is not a big surprise, since this is the
-only call to `are_equal()' in the program, but in more complex
+line 88 of `uniq.awk'.  (This is not a big surprise, because this is
+the only call to `are_equal()' in the program, but in more complex
 programs, knowing who called a function and with what parameters can be
 the key to finding the source of the problem.)
 
@@ -20656,7 +21084,7 @@ Actually, the debugger gives us:
      gawk> p n
      -| n = untyped variable
 
-In this case, `n' is an uninitialized local variable, since the
+In this case, `n' is an uninitialized local variable, because the
 function was called without arguments (*note Function Calls::).
 
    A more useful variable to display might be the current record:
@@ -20664,8 +21092,8 @@ function was called without arguments (*note Function Calls::).
      gawk> p $0
      -| $0 = "gawk is a wonderful program!"
 
-This might be a bit puzzling at first since this is the second line of
-our test input above.  Let's look at `NR':
+This might be a bit puzzling at first, as this is the second line of
+our test input.  Let's look at `NR':
 
      gawk> p NR
      -| NR = 2
@@ -20694,10 +21122,10 @@ typing `n' (for "next"):
      -| 66          if (fcount > 0) {
 
    This tells us that `gawk' is now ready to execute line 66, which
-decides whether to give the lines the special "field skipping" treatment
+decides whether to give the lines the special "field-skipping" treatment
 indicated by the `-1' command-line option.  (Notice that we skipped
-from where we were before at line 63 to here, since the condition in
-line 63 `if (fcount == 0 && charcount == 0)' was false.)
+from where we were before, at line 63, to here, because the condition
+in line 63, `if (fcount == 0 && charcount == 0)', was false.)
 
    Continuing to step, we now get to the splitting of the current and
 last records:
@@ -20721,7 +21149,7 @@ split into, so we try to look:
 
    This is kind of disappointing, though.  All we found out is that
 there are five elements in `alast'; `m' and `aline' don't have values
-yet since we are at line 68 but haven't executed it yet.  This
+because we are at line 68 but haven't executed it yet.  This
 information is useful enough (we now know that none of the words were
 accidentally left out), but what if we want to see inside the array?
 
@@ -20755,15 +21183,15 @@ mentioned):
 
    Well, here we are at our error (sorry to spoil the suspense).  What
 we had in mind was to join the fields starting from the second one to
-make the virtual record to compare, and if the first field was numbered
-zero, this would work.  Let's look at what we've got:
+make the virtual record to compare, and if the first field were
+numbered zero, this would work.  Let's look at what we've got:
 
      gawk> p cline clast
      -| cline = "gawk is a wonderful program!"
      -| clast = "awk is a wonderful program!"
 
    Hey, those look pretty familiar!  They're just our original,
-unaltered, input records.  A little thinking (the human brain is still
+unaltered input records.  A little thinking (the human brain is still
 the best debugging tool), and we realize that we were off by one!
 
    We get out of the debugger:
@@ -20800,12 +21228,12 @@ categories:
    * Miscellaneous
 
    Each of these are discussed in the following subsections.  In the
-following descriptions, commands which may be abbreviated show the
+following descriptions, commands that may be abbreviated show the
 abbreviation on a second description line.  A debugger command name may
 also be truncated if that partial name is unambiguous. The debugger has
 the built-in capability to automatically repeat the previous command
-just by hitting <Enter>.  This works for the commands `list', `next',
-`nexti', `step', `stepi' and `continue' executed without any argument.
+just by hitting `Enter'.  This works for the commands `list', `next',
+`nexti', `step', `stepi', and `continue' executed without any argument.
 
 * Menu:
 
@@ -20823,10 +21251,10 @@ File: gawk.info,  Node: Breakpoint Control,  Next: Debugger Execution Control,
 14.3.1 Control of Breakpoints
 -----------------------------
 
-As we saw above, the first thing you probably want to do in a debugging
-session is to get your breakpoints set up, since otherwise your program
-will just run as if it was not under the debugger.  The commands for
-controlling breakpoints are:
+As we saw earlier, the first thing you probably want to do in a
+debugging session is to get your breakpoints set up, because your
+program will otherwise just run as if it was not under the debugger.
+The commands for controlling breakpoints are:
 
 `break' [[FILENAME`:']N | FUNCTION] [`"EXPRESSION"']
 `b' [[FILENAME`:']N | FUNCTION] [`"EXPRESSION"']
@@ -20844,8 +21272,8 @@ controlling breakpoints are:
           Set a breakpoint at entry to (the first instruction of)
           function FUNCTION.
 
-     Each breakpoint is assigned a number which can be used to delete
-     it from the breakpoint list using the `delete' command.
+     Each breakpoint is assigned a number that can be used to delete it
+     from the breakpoint list using the `delete' command.
 
      With a breakpoint, you may also supply a condition.  This is an
      `awk' expression (enclosed in double quotes) that the debugger
@@ -20873,36 +21301,36 @@ controlling breakpoints are:
 
 `condition' N `"EXPRESSION"'
      Add a condition to existing breakpoint or watchpoint N. The
-     condition is an `awk' expression that the debugger evaluates
-     whenever the breakpoint or watchpoint is reached. If the condition
-     is true, then the debugger stops execution and prompts for a
-     command. Otherwise, the debugger continues executing the program.
-     If the condition expression is not specified, any existing
-     condition is removed; i.e., the breakpoint or watchpoint is made
-     unconditional.
+     condition is an `awk' expression _enclosed in double quotes_ that
+     the debugger evaluates whenever the breakpoint or watchpoint is
+     reached. If the condition is true, then the debugger stops
+     execution and prompts for a command. Otherwise, the debugger
+     continues executing the program. If the condition expression is
+     not specified, any existing condition is removed (i.e., the
+     breakpoint or watchpoint is made unconditional).
 
 `delete' [N1 N2 ...] [N-M]
 `d' [N1 N2 ...] [N-M]
-     Delete specified breakpoints or a range of breakpoints. Deletes
-     all defined breakpoints if no argument is supplied.
+     Delete specified breakpoints or a range of breakpoints. Delete all
+     defined breakpoints if no argument is supplied.
 
 `disable' [N1 N2 ... | N-M]
      Disable specified breakpoints or a range of breakpoints. Without
-     any argument, disables all breakpoints.
+     any argument, disable all breakpoints.
 
 `enable' [`del' | `once'] [N1 N2 ...] [N-M]
 `e' [`del' | `once'] [N1 N2 ...] [N-M]
      Enable specified breakpoints or a range of breakpoints. Without
-     any argument, enables all breakpoints.  Optionally, you can
-     specify how to enable the breakpoint:
+     any argument, enable all breakpoints.  Optionally, you can specify
+     how to enable the breakpoints:
 
     `del'
-          Enable the breakpoint(s) temporarily, then delete it when the
-          program stops at the breakpoint.
+          Enable the breakpoints temporarily, then delete each one when
+          the program stops at it.
 
     `once'
-          Enable the breakpoint(s) temporarily, then disable it when
-          the program stops at the breakpoint.
+          Enable the breakpoints temporarily, then disable each one when
+          the program stops at it.
 
 `ignore' N COUNT
      Ignore breakpoint number N the next COUNT times it is hit.
@@ -20948,7 +21376,7 @@ execution of the program than we saw in our earlier example:
 `continue' [COUNT]
 `c' [COUNT]
      Resume program execution. If continued from a breakpoint and COUNT
-     is specified, ignores the breakpoint at that location the next
+     is specified, ignore the breakpoint at that location the next
      COUNT times before stopping.
 
 `finish'
@@ -20970,7 +21398,7 @@ execution of the program than we saw in our earlier example:
      Cancel execution of a function call. If VALUE (either a string or a
      number) is specified, it is used as the function's return value.
      If used in a frame other than the innermost one (the currently
-     executing function, i.e., frame number 0), discard all inner
+     executing function; i.e., frame number 0), discard all inner
      frames in addition to the selected one, and the caller of that
      frame becomes the innermost frame.
 
@@ -20983,10 +21411,10 @@ execution of the program than we saw in our earlier example:
 `step' [COUNT]
 `s' [COUNT]
      Continue execution until control reaches a different source line
-     in the current stack frame. `step' steps inside any function
-     called within the line.  If the argument COUNT is supplied, steps
-     that many times before stopping, unless it encounters a breakpoint
-     or watchpoint.
+     in the current stack frame, stepping inside any function called
+     within the line.  If the argument COUNT is supplied, steps that
+     many times before stopping, unless it encounters a breakpoint or
+     watchpoint.
 
 `stepi' [COUNT]
 `si' [COUNT]
@@ -20998,9 +21426,9 @@ execution of the program than we saw in our earlier example:
 `until' [[FILENAME`:']N | FUNCTION]
 `u' [[FILENAME`:']N | FUNCTION]
      Without any argument, continue execution until a line past the
-     current line in current stack frame is reached. With an argument,
-     continue execution until the specified location is reached, or the
-     current stack frame returns.
+     current line in the current stack frame is reached. With an
+     argument, continue execution until the specified location is
+     reached, or the current stack frame returns.
 
 
 File: gawk.info,  Node: Viewing And Changing Data,  Next: Execution Stack,  Prev: Debugger Execution Control,  Up: List of Debugger Commands
@@ -21018,7 +21446,7 @@ The commands for viewing and changing variables inside of `gawk' are:
           gawk> display x
           -| 10: x = 1
 
-     displays the assigned item number, the variable name and its
+     This displays the assigned item number, the variable name, and its
      current value.  If the display variable refers to a function
      parameter, it is silently deleted from the list as soon as the
      execution reaches a context where no such variable of the given
@@ -21047,9 +21475,9 @@ AWK STATEMENTS
 
      This prints the third field in the input record (if the specified
      field does not exist, it prints `Null field'). A variable can be
-     an array element, with the subscripts being constant values. To
-     print the contents of an array, prefix the name of the array with
-     the `@' symbol:
+     an array element, with the subscripts being constant string
+     values. To print the contents of an array, prefix the name of the
+     array with the `@' symbol:
 
           gawk> print @a
 
@@ -21067,13 +21495,13 @@ AWK STATEMENTS
      (`"'...`"').
 
      You can also set special `awk' variables, such as `FS', `NF',
-     `NR', etc.
+     `NR', and so on.
 
 `watch' VAR | `$'N [`"EXPRESSION"']
 `w' VAR | `$'N [`"EXPRESSION"']
      Add variable VAR (or field `$N') to the watch list.  The debugger
      then stops whenever the value of the variable or field changes.
-     Each watched item is assigned a number which can be used to delete
+     Each watched item is assigned a number that can be used to delete
      it from the watch list using the `unwatch' command.
 
      With a watchpoint, you may also supply a condition.  This is an
@@ -21094,23 +21522,25 @@ AWK STATEMENTS
 
 File: gawk.info,  Node: Execution Stack,  Next: Debugger Info,  Prev: Viewing And Changing Data,  Up: List of Debugger Commands
 
-14.3.4 Dealing with the Stack
+14.3.4 Working with the Stack
 -----------------------------
 
-Whenever you run a program which contains any function calls, `gawk'
+Whenever you run a program that contains any function calls, `gawk'
 maintains a stack of all of the function calls leading up to where the
 program is right now.  You can see how you got to where you are, and
 also move around in the stack to see what the state of things was in the
-functions which called the one you are in.  The commands for doing this
+functions that called the one you are in.  The commands for doing this
 are:
 
 `backtrace' [COUNT]
 `bt' [COUNT]
+`where' [COUNT]
      Print a backtrace of all function calls (stack frames), or
      innermost COUNT frames if COUNT > 0. Print the outermost COUNT
      frames if COUNT < 0.  The backtrace displays the name and
      arguments to each function, the source file name, and the line
-     number.
+     number.  The alias `where' for `backtrace' is provided for longtime
+     GDB users who may be used to that command.
 
 `down' [COUNT]
      Move COUNT (default 1) frames down the stack toward the innermost
@@ -21119,8 +21549,8 @@ are:
 `frame' [N]
 `f' [N]
      Select and print stack frame N.  Frame 0 is the currently
-     executing, or "innermost", frame (function call), frame 1 is the
-     frame that called the innermost one. The highest numbered frame is
+     executing, or "innermost", frame (function call); frame 1 is the
+     frame that called the innermost one. The highest-numbered frame is
      the one for the main program.  The printed information consists of
      the frame number, function and argument names, source file, and
      the source line.
@@ -21132,12 +21562,12 @@ are:
 
 File: gawk.info,  Node: Debugger Info,  Next: Miscellaneous Debugger Commands,  Prev: Execution Stack,  Up: List of Debugger Commands
 
-14.3.5 Obtaining Information about the Program and the Debugger State
+14.3.5 Obtaining Information About the Program and the Debugger State
 ---------------------------------------------------------------------
 
 Besides looking at the values of variables, there is often a need to get
 other sorts of information about the state of your program and of the
-debugging environment itself.  The `gawk' debugger has one command which
+debugging environment itself.  The `gawk' debugger has one command that
 provides this information, appropriately called `info'.  `info' is used
 with one of a number of arguments that tell it exactly what you want to
 know:
@@ -21147,7 +21577,7 @@ know:
      The value for WHAT should be one of the following:
 
     `args'
-          Arguments of the selected frame.
+          List arguments of the selected frame.
 
     `break'
           List all currently set breakpoints.
@@ -21156,19 +21586,19 @@ know:
           List all items in the automatic display list.
 
     `frame'
-          Description of the selected stack frame.
+          Give a description of the selected stack frame.
 
     `functions'
           List all function definitions including source file names and
           line numbers.
 
     `locals'
-          Local variables of the selected frame.
+          List local variables of the selected frame.
 
     `source'
-          The name of the current source file. Each time the program
-          stops, the current source file is the file containing the
-          current instruction.  When the debugger first starts, the
+          Print the name of the current source file. Each time the
+          program stops, the current source file is the file containing
+          the current instruction.  When the debugger first starts, the
           current source file is the first file included via the `-f'
           option. The `list FILENAME:LINENO' command can be used at any
           time to change the current source.
@@ -21194,11 +21624,12 @@ from a file.  The commands are:
      option.  The available options are:
 
     `history_size'
-          The maximum number of lines to keep in the history file
+          Set the maximum number of lines to keep in the history file
           `./.gawk_history'.  The default is 100.
 
     `listsize'
-          The number of lines that `list' prints. The default is 15.
+          Specify the number of lines that `list' prints. The default
+          is 15.
 
     `outfile'
           Send `gawk' output to a file; debugger output still goes to
@@ -21206,7 +21637,7 @@ from a file.  The commands are:
           standard output.
 
     `prompt'
-          The debugger prompt. The default is `gawk> '.
+          Change the debugger prompt. The default is `gawk> '.
 
     `save_history' [`on' | `off']
           Save command history to file `./.gawk_history'.  The default
@@ -21214,8 +21645,8 @@ from a file.  The commands are:
 
     `save_options' [`on' | `off']
           Save current options to file `./.gawkrc' upon exit.  The
-          default is `on'.  Options are read back in to the next
-          session upon startup.
+          default is `on'.  Options are read back into the next session
+          upon startup.
 
     `trace' [`on' | `off']
           Turn instruction tracing on or off. The default is `off'.
@@ -21234,7 +21665,7 @@ from a file.  The commands are:
      commands; however, the `gawk' debugger will not source the same
      file more than once in order to avoid infinite recursion.
 
-     In addition to, or instead of the `source' command, you can use
+     In addition to, or instead of, the `source' command, you can use
      the `-D FILE' or `--debug=FILE' command-line options to execute
      commands from a file non-interactively (*note Options::).
 
@@ -21244,13 +21675,13 @@ File: gawk.info,  Node: Miscellaneous Debugger Commands,  Prev: Debugger Info,
 14.3.6 Miscellaneous Commands
 -----------------------------
 
-There are a few more commands which do not fit into the previous
+There are a few more commands that do not fit into the previous
 categories, as follows:
 
 `dump' [FILENAME]
-     Dump bytecode of the program to standard output or to the file
+     Dump byte code of the program to standard output or to the file
      named in FILENAME.  This prints a representation of the internal
-     instructions which `gawk' executes to implement the `awk' commands
+     instructions that `gawk' executes to implement the `awk' commands
      in a program.  This can be very enlightening, as the following
      partial dump of Davide Brini's obfuscated code (*note Signature
      Program::) demonstrates:
@@ -21258,39 +21689,39 @@ categories, as follows:
           gawk> dump
           -|        # BEGIN
           -|
-          -| [     1:0xfcd340] Op_rule             : [in_rule = BEGIN] [source_file = brini.awk]
-          -| [     1:0xfcc240] Op_push_i           : "~" [MALLOC|STRING|STRCUR]
-          -| [     1:0xfcc2a0] Op_push_i           : "~" [MALLOC|STRING|STRCUR]
-          -| [     1:0xfcc280] Op_match            :
-          -| [     1:0xfcc1e0] Op_store_var        : O
-          -| [     1:0xfcc2e0] Op_push_i           : "==" [MALLOC|STRING|STRCUR]
-          -| [     1:0xfcc340] Op_push_i           : "==" [MALLOC|STRING|STRCUR]
-          -| [     1:0xfcc320] Op_equal            :
-          -| [     1:0xfcc200] Op_store_var        : o
-          -| [     1:0xfcc380] Op_push             : o
-          -| [     1:0xfcc360] Op_plus_i           : 0 [MALLOC|NUMCUR|NUMBER]
-          -| [     1:0xfcc220] Op_push_lhs         : o [do_reference = true]
-          -| [     1:0xfcc300] Op_assign_plus      :
-          -| [      :0xfcc2c0] Op_pop              :
-          -| [     1:0xfcc400] Op_push             : O
-          -| [     1:0xfcc420] Op_push_i           : "" [MALLOC|STRING|STRCUR]
-          -| [      :0xfcc4a0] Op_no_op            :
-          -| [     1:0xfcc480] Op_push             : O
-          -| [      :0xfcc4c0] Op_concat           : [expr_count = 3] [concat_flag = 0]
-          -| [     1:0xfcc3c0] Op_store_var        : x
-          -| [     1:0xfcc440] Op_push_lhs         : X [do_reference = true]
-          -| [     1:0xfcc3a0] Op_postincrement    :
-          -| [     1:0xfcc4e0] Op_push             : x
-          -| [     1:0xfcc540] Op_push             : o
-          -| [     1:0xfcc500] Op_plus             :
-          -| [     1:0xfcc580] Op_push             : o
-          -| [     1:0xfcc560] Op_plus             :
-          -| [     1:0xfcc460] Op_leq              :
-          -| [      :0xfcc5c0] Op_jmp_false        : [target_jmp = 0xfcc5e0]
-          -| [     1:0xfcc600] Op_push_i           : "%c" [MALLOC|STRING|STRCUR]
-          -| [      :0xfcc660] Op_no_op            :
-          -| [     1:0xfcc520] Op_assign_concat    : c
-          -| [      :0xfcc620] Op_jmp              : [target_jmp = 0xfcc440]
+          -| [  1:0xfcd340] Op_rule           : [in_rule = BEGIN] [source_file = brini.awk]
+          -| [  1:0xfcc240] Op_push_i         : "~" [MALLOC|STRING|STRCUR]
+          -| [  1:0xfcc2a0] Op_push_i         : "~" [MALLOC|STRING|STRCUR]
+          -| [  1:0xfcc280] Op_match          :
+          -| [  1:0xfcc1e0] Op_store_var      : O
+          -| [  1:0xfcc2e0] Op_push_i         : "==" [MALLOC|STRING|STRCUR]
+          -| [  1:0xfcc340] Op_push_i         : "==" [MALLOC|STRING|STRCUR]
+          -| [  1:0xfcc320] Op_equal          :
+          -| [  1:0xfcc200] Op_store_var      : o
+          -| [  1:0xfcc380] Op_push           : o
+          -| [  1:0xfcc360] Op_plus_i         : 0 [MALLOC|NUMCUR|NUMBER]
+          -| [  1:0xfcc220] Op_push_lhs       : o [do_reference = true]
+          -| [  1:0xfcc300] Op_assign_plus    :
+          -| [   :0xfcc2c0] Op_pop            :
+          -| [  1:0xfcc400] Op_push           : O
+          -| [  1:0xfcc420] Op_push_i         : "" [MALLOC|STRING|STRCUR]
+          -| [   :0xfcc4a0] Op_no_op          :
+          -| [  1:0xfcc480] Op_push           : O
+          -| [   :0xfcc4c0] Op_concat         : [expr_count = 3] [concat_flag = 0]
+          -| [  1:0xfcc3c0] Op_store_var      : x
+          -| [  1:0xfcc440] Op_push_lhs       : X [do_reference = true]
+          -| [  1:0xfcc3a0] Op_postincrement  :
+          -| [  1:0xfcc4e0] Op_push           : x
+          -| [  1:0xfcc540] Op_push           : o
+          -| [  1:0xfcc500] Op_plus           :
+          -| [  1:0xfcc580] Op_push           : o
+          -| [  1:0xfcc560] Op_plus           :
+          -| [  1:0xfcc460] Op_leq            :
+          -| [   :0xfcc5c0] Op_jmp_false      : [target_jmp = 0xfcc5e0]
+          -| [  1:0xfcc600] Op_push_i         : "%c" [MALLOC|STRING|STRCUR]
+          -| [   :0xfcc660] Op_no_op          :
+          -| [  1:0xfcc520] Op_assign_concat  : c
+          -| [   :0xfcc620] Op_jmp            : [target_jmp = 0xfcc440]
           -|
           ...
           -|
@@ -21316,7 +21747,7 @@ categories, as follows:
      or the file named FILENAME. The possible arguments to `list' are
      as follows:
 
-    `-'
+    `-' (Minus)
           Print lines before the lines last printed.
 
     `+'
@@ -21334,22 +21765,21 @@ categories, as follows:
           FILENAME. This command may change the current source file.
 
     FUNCTION
-          Print lines centered around beginning of the function
+          Print lines centered around the beginning of the function
           FUNCTION. This command may change the current source file.
 
 `quit'
 `q'
      Exit the debugger.  Debugging is great fun, but sometimes we all
      have to tend to other obligations in life, and sometimes we find
-     the bug, and are free to go on to the next one!  As we saw above,
-     if you are running a program, the debugger warns you if you
-     accidentally type `q' or `quit', to make sure you really want to
-     quit.
+     the bug and are free to go on to the next one!  As we saw earlier,
+     if you are running a program, the debugger warns you when you type
+     `q' or `quit', to make sure you really want to quit.
 
 `trace' [`on' | `off']
-     Turn on or off a continuous printing of instructions which are
-     about to be executed, along with printing the `awk' line which they
-     implement.  The default is `off'.
+     Turn on or off continuous printing of the instructions that are
+     about to be executed, along with the `awk' lines they implement.
+     The default is `off'.
 
      It is to be hoped that most of the "opcodes" in these instructions
      are fairly self-explanatory, and using `stepi' and `nexti' while
@@ -21362,7 +21792,7 @@ File: gawk.info,  Node: Readline Support,  Next: Limitations,  Prev: List of Deb
 14.4 Readline Support
 =====================
 
-If `gawk' is compiled with the `readline' library
+If `gawk' is compiled with the GNU Readline library
 (http://cnswww.cns.cwru.edu/php/chet/readline/readline.html), you can
 take advantage of that library's command completion and history
 expansion features. The following types of completion are available:
@@ -21387,12 +21817,12 @@ Variable name completion
 
 File: gawk.info,  Node: Limitations,  Next: Debugging Summary,  Prev: Readline Support,  Up: Debugger
 
-14.5 Limitations and Future Plans
-=================================
+14.5 Limitations
+================
 
 We hope you find the `gawk' debugger useful and enjoyable to work with,
 but as with any program, especially in its early releases, it still has
-some limitations.  A few which are worth being aware of are:
+some limitations.  A few that it's worth being aware of are:
 
    * At this point, the debugger does not give a detailed explanation of
      what you did wrong when you type in something it doesn't like.
@@ -21403,33 +21833,30 @@ some limitations.  A few which are worth being aware of are:
      Commands:: (or if you are already familiar with `gawk' internals),
      you will realize that much of the internal manipulation of data in
      `gawk', as in many interpreters, is done on a stack.  `Op_push',
-     `Op_pop', etc., are the "bread and butter" of most `gawk' code.
+     `Op_pop', and the like are the "bread and butter" of most `gawk'
+     code.
 
      Unfortunately, as of now, the `gawk' debugger does not allow you
      to examine the stack's contents.  That is, the intermediate
      results of expression evaluation are on the stack, but cannot be
-     printed.  Rather, only variables which are defined in the program
+     printed.  Rather, only variables that are defined in the program
      can be printed.  Of course, a workaround for this is to use more
      explicit variables at the debugging stage and then change back to
      obscure, perhaps more optimal code later.
 
    * There is no way to look "inside" the process of compiling regular
      expressions to see if you got it right.  As an `awk' programmer,
-     you are expected to know what `/[^[:alnum:][:blank:]]/' means.
+     you are expected to know the meaning of `/[^[:alnum:][:blank:]]/'.
 
    * The `gawk' debugger is designed to be used by running a program
      (with all its parameters) on the command line, as described in
      *note Debugger Invocation::.  There is no way (as of now) to
-     attach or "break in" to a running program.  This seems reasonable
-     for a language which is used mainly for quickly executing, short
+     attach or "break into" a running program.  This seems reasonable
+     for a language that is used mainly for quickly executing, short
      programs.
 
-   * The `gawk' debugger only accepts source supplied with the `-f'
-     option.
-
-   Look forward to a future release when these and other missing
-features may be added, and of course feel free to try to add them
-yourself!
+   * The `gawk' debugger only accepts source code supplied with the
+     `-f' option.
 
 
 File: gawk.info,  Node: Debugging Summary,  Prev: Limitations,  Up: Debugger
@@ -21438,8 +21865,8 @@ File: gawk.info,  Node: Debugging Summary,  Prev: Limitations,  Up: Debugger
 ============
 
    * Programs rarely work correctly the first time.  Finding bugs is
-     "debugging" and a program that helps you find bugs is a
-     "debugger".  `gawk' has a built-in debugger that works very
+     called debugging, and a program that helps you find bugs is a
+     debugger.  `gawk' has a built-in debugger that works very
      similarly to the GNU Debugger, GDB.
 
    * Debuggers let you step through your program one statement at a
@@ -21455,26 +21882,25 @@ File: gawk.info,  Node: Debugging Summary,  Prev: Limitations,  Up: Debugger
      breakpoints, execution, viewing and changing data, working with
      the stack, getting information, and other tasks.
 
-   * If the `readline' library is available when `gawk' is compiled, it
-     is used by the debugger to provide command-line history and
+   * If the GNU Readline library is available when `gawk' is compiled,
+     it is used by the debugger to provide command-line history and
      editing.
 
 
 
 File: gawk.info,  Node: Arbitrary Precision Arithmetic,  Next: Dynamic Extensions,  Prev: Debugger,  Up: Top
 
-15 Arithmetic and Arbitrary Precision Arithmetic with `gawk'
+15 Arithmetic and Arbitrary-Precision Arithmetic with `gawk'
 ************************************************************
 
 This major node introduces some basic concepts relating to how
-computers do arithmetic and briefly lists the features in `gawk' for
-performing arbitrary precision floating point computations.  It then
+computers do arithmetic and defines some important terms.  It then
 proceeds to describe floating-point arithmetic, which is what `awk'
-uses for all its computations, including a discussion of arbitrary
-precision floating point arithmetic, which is a feature available only
-in `gawk'. It continues on to present arbitrary precision integers, and
-concludes with a description of some points where `gawk' and the POSIX
-standard are not quite in agreement.
+uses for all its computations, including a discussion of
+arbitrary-precision floating-point arithmetic, which is a feature
+available only in `gawk'. It continues on to present
+arbitrary-precision integers, and concludes with a description of some
+points where `gawk' and the POSIX standard are not quite in agreement.
 
      NOTE: Most users of `gawk' can safely skip this chapter.  But if
      you want to do scientific calculations with `gawk', this is the
@@ -21518,7 +21944,7 @@ Decimal arithmetic
      sides) of the decimal point, and the results of a computation are
      always exact.
 
-     Some modern system can do decimal arithmetic in hardware, but
+     Some modern systems can do decimal arithmetic in hardware, but
      usually you need a special software library to provide access to
      these instructions.  There are also libraries that do decimal
      arithmetic entirely in software.
@@ -21534,49 +21960,45 @@ Integer arithmetic
 
      In computers, integer values come in two flavors: "signed" and
      "unsigned".  Signed values may be negative or positive, whereas
-     unsigned values are always positive (that is, greater than or equal
-     to zero).
+     unsigned values are always greater than or equal to zero.
 
      In computer systems, integer arithmetic is exact, but the possible
      range of values is limited.  Integer arithmetic is generally
-     faster than floating point arithmetic.
+     faster than floating-point arithmetic.
 
-Floating point arithmetic
+Floating-point arithmetic
      Floating-point numbers represent what were called in school "real"
-     numbers; i.e., those that have a fractional part, such as
-     3.1415927.  The advantage to floating-point numbers is that they
+     numbers (i.e., those that have a fractional part, such as
+     3.1415927).  The advantage to floating-point numbers is that they
      can represent a much larger range of values than can integers.
      The disadvantage is that there are numbers that they cannot
      represent exactly.
 
-     Modern systems support floating point arithmetic in hardware, with
+     Modern systems support floating-point arithmetic in hardware, with
      a limited range of values.  There are software libraries that allow
-     the use of arbitrary precision floating point calculations.
+     the use of arbitrary-precision floating-point calculations.
 
-     POSIX `awk' uses "double precision" floating-point numbers, which
-     can hold more digits than "single precision" floating-point
-     numbers.  `gawk' has facilities for performing arbitrary precision
-     floating point arithmetic, which we describe in more detail
+     POSIX `awk' uses "double-precision" floating-point numbers, which
+     can hold more digits than "single-precision" floating-point
+     numbers.  `gawk' has facilities for performing arbitrary-precision
+     floating-point arithmetic, which we describe in more detail
      shortly.
 
-   Computers work with integer and floating point values of different
-ranges. Integer values are usually either 32 or 64 bits in size.  Single
-precision floating point values occupy 32 bits, whereas double precision
-floating point values occupy 64 bits.  Floating point values are always
-signed. The possible ranges of values are shown in the following table.
+   Computers work with integer and floating-point values of different
+ranges. Integer values are usually either 32 or 64 bits in size.
+Single-precision floating-point values occupy 32 bits, whereas
+double-precision floating-point values occupy 64 bits.  Floating-point
+values are always signed. The possible ranges of values are shown in
+*note table-numeric-ranges::.
 
-Numeric representation   Miniumum value           Maximum value
+Numeric representation   Minimum value            Maximum value
 --------------------------------------------------------------------------- 
 32-bit signed integer    -2,147,483,648           2,147,483,647
 32-bit unsigned integer  0                        4,294,967,295
 64-bit signed integer    -9,223,372,036,854,775,8089,223,372,036,854,775,807
 64-bit unsigned integer  0                        18,446,744,073,709,551,615
-Single precision         `1.175494e-38'           `3.402823e+38'
-floating point                                    
-(approximate)                                     
-Double precision         `2.225074e-308'          `1.797693e+308'
-floating point                                    
-(approximate)                                     
+
+Table 15.1: Value ranges for different numeric representations
 
    ---------- Footnotes ----------
 
@@ -21585,12 +22007,12 @@ floating point
 
 File: gawk.info,  Node: Math Definitions,  Next: MPFR features,  Prev: Computer Arithmetic,  Up: Arbitrary Precision Arithmetic
 
-15.2 Other Stuff To Know
+15.2 Other Stuff to Know
 ========================
 
 The rest of this major node uses a number of terms. Here are some
 informal definitions that should help you work your way through the
-material here.
+material here:
 
 "Accuracy"
      A floating-point calculation's accuracy is how close it comes to
@@ -21610,7 +22032,7 @@ material here.
      number and infinity produce infinity.
 
 "NaN"
-     "Not A Number."(1).  A special value that results from attempting a
+     "Not a number."(1) A special value that results from attempting a
      calculation that has no answer as a real number.  In such a case,
      programs can either receive a floating-point exception, or get
      `NaN' back as the result. The IEEE 754 standard recommends that
@@ -21636,15 +22058,15 @@ material here.
 
           PREC = 3.322 * DPS
 
-     Here, PREC denotes the binary precision (measured in bits) and DPS
-     (short for decimal places) is the decimal digits.
+     Here, _prec_ denotes the binary precision (measured in bits) and
+     _dps_ (short for decimal places) is the decimal digits.
 
 "Rounding mode"
      How numbers are rounded up or down when necessary.  More details
      are provided later.
 
 "Significand"
-     A floating point value consists the significand multiplied by 10
+     A floating-point value consists of the significand multiplied by 10
      to the power of the exponent. For example, in `1.2345e67', the
      significand is `1.2345'.
 
@@ -21660,46 +22082,47 @@ information on some of those terms.
 
    On modern systems, floating-point hardware uses the representation
 and operations defined by the IEEE 754 standard.  Three of the standard
-IEEE 754 types are 32-bit single precision, 64-bit double precision and
-128-bit quadruple precision.  The standard also specifies extended
+IEEE 754 types are 32-bit single precision, 64-bit double precision,
+and 128-bit quadruple precision.  The standard also specifies extended
 precision formats to allow greater precisions and larger exponent
-ranges.  (`awk' uses only the 64-bit double precision format.)
+ranges.  (`awk' uses only the 64-bit double-precision format.)
 
    *note table-ieee-formats:: lists the precision and exponent field
-values for the basic IEEE 754 binary formats:
+values for the basic IEEE 754 binary formats.
 
-Name           Total bits     Precision      emin           emax
+Name           Total bits     Precision      Minimum        Maximum
+                                             exponent       exponent
 --------------------------------------------------------------------------- 
 Single         32             24             -126           +127
 Double         64             53             -1022          +1023
 Quadruple      128            113            -16382         +16383
 
-Table 15.1: Basic IEEE Format Context Values
+Table 15.2: Basic IEEE format values
 
      NOTE: The precision numbers include the implied leading one that
      gives them one extra bit of significand.
 
    ---------- Footnotes ----------
 
-   (1) Thanks to Michael Brennan for this description, which I have
-paraphrased, and for the examples
+   (1) Thanks to Michael Brennan for this description, which we have
+paraphrased, and for the examples.
 
 
 File: gawk.info,  Node: MPFR features,  Next: FP Math Caution,  Prev: Math Definitions,  Up: Arbitrary Precision Arithmetic
 
-15.3 Arbitrary Precison Arithmetic Features In `gawk'
-=====================================================
+15.3 Arbitrary-Precision Arithmetic Features in `gawk'
+======================================================
 
-By default, `gawk' uses the double precision floating point values
+By default, `gawk' uses the double-precision floating-point values
 supplied by the hardware of the system it runs on.  However, if it was
-compiled to do, `gawk' uses the GNU MPFR (http://www.mpfr.org) and GNU
-MP (http://gmplib.org) (GMP) libraries for arbitrary precision
+compiled to do so, `gawk' uses the GNU MPFR (http://www.mpfr.org) and
+GNU MP (http://gmplib.org) (GMP) libraries for arbitrary-precision
 arithmetic on numbers.  You can see if MPFR support is available like
 so:
 
      $ gawk --version
-     -| GNU Awk 4.1.1, API: 1.1 (GNU MPFR 3.1.0-p3, GNU MP 5.0.2)
-     -| Copyright (C) 1989, 1991-2014 Free Software Foundation.
+     -| GNU Awk 4.1.2, API: 1.1 (GNU MPFR 3.1.0-p3, GNU MP 5.0.2)
+     -| Copyright (C) 1989, 1991-2015 Free Software Foundation.
      ...
 
 (You may see different version numbers than what's shown here. That's
@@ -21716,20 +22139,21 @@ platform-independent results.  With the `-M' command-line option, all
 floating-point arithmetic operators and numeric functions can yield
 results to any desired precision level supported by MPFR.
 
-   Two built-in variables, `PREC' and `ROUNDMODE', provide control over
-the working precision and the rounding mode.  The precision and the
-rounding mode are set globally for every operation to follow.  *Note
-Auto-set::, for more information.
+   Two predefined variables, `PREC' and `ROUNDMODE', provide control
+over the working precision and the rounding mode.  The precision and
+the rounding mode are set globally for every operation to follow.
+*Note Setting precision::, and *note Setting the rounding mode::, for
+more information.
 
 
 File: gawk.info,  Node: FP Math Caution,  Next: Arbitrary Precision Integers,  Prev: MPFR features,  Up: Arbitrary Precision Arithmetic
 
-15.4 Floating Point Arithmetic: Caveat Emptor!
+15.4 Floating-Point Arithmetic: Caveat Emptor!
 ==============================================
 
      Math class is tough!  -- Teen Talk Barbie, July 1992
 
-   This minor node provides a high level overview of the issues
+   This minor node provides a high-level overview of the issues
 involved when doing lots of floating-point arithmetic.(1) The
 discussion applies to both hardware and arbitrary-precision
 floating-point arithmetic.
@@ -21750,15 +22174,15 @@ floating-point arithmetic.
 
    (1) There is a very nice paper on floating-point arithmetic
 (http://www.validlab.com/goldberg/paper.pdf) by David Goldberg, "What
-Every Computer Scientist Should Know About Floating-point Arithmetic,"
-`ACM Computing Surveys' *23*, 1 (1991-03), 5-48.  This is worth reading
+Every Computer Scientist Should Know About Floating-Point Arithmetic,"
+`ACM Computing Surveys' *23*, 1 (1991-03): 5-48.  This is worth reading
 if you are interested in the details, but it does require a background
 in computer science.
 
 
 File: gawk.info,  Node: Inexactness of computations,  Next: Getting Accuracy,  Up: FP Math Caution
 
-15.4.1 Floating Point Arithmetic Is Not Exact
+15.4.1 Floating-Point Arithmetic Is Not Exact
 ---------------------------------------------
 
 Binary floating-point representations and arithmetic are inexact.
@@ -21766,9 +22190,10 @@ Simple values like 0.1 cannot be precisely represented using binary
 floating-point numbers, and the limited precision of floating-point
 numbers means that slight changes in the order of operations or the
 precision of intermediate storage can change the result. To make
-matters worse, with arbitrary precision floating-point, you can set the
-precision before starting a computation, but then you cannot be sure of
-the number of significant decimal places in the final result.
+matters worse, with arbitrary-precision floating-point arithmetic, you
+can set the precision before starting a computation, but then you
+cannot be sure of the number of significant decimal places in the final
+result.
 
 * Menu:
 
@@ -21790,8 +22215,8 @@ the following example:
      y = 0.425
 
    Unlike the number in `y', the number stored in `x' is exactly
-representable in binary since it can be written as a finite sum of one
-or more fractions whose denominators are all powers of two.  When
+representable in binary because it can be written as a finite sum of
+one or more fractions whose denominators are all powers of two.  When
 `gawk' reads a floating-point number from program source, it
 automatically rounds that number to whatever precision your machine
 supports. If you try to print the numeric content of a variable using
@@ -21804,7 +22229,7 @@ number as you assigned to it:
 
    Often the error is so small you do not even notice it, and if you do,
 you can always specify how much precision you would like in your output.
-Usually this is a format string like `"%.15g"', which when used in the
+Usually this is a format string like `"%.15g"', which, when used in the
 previous example, produces an output identical to the input.
 
 
@@ -21824,7 +22249,7 @@ work like you would expect:
    The general wisdom when comparing floating-point values is to see if
 they are within some small range of each other (called a "delta", or
 "tolerance").  You have to decide how small a delta is important to
-you. Code to do this looks something like this:
+you. Code to do this looks something like the following:
 
      delta = 0.00001                 # for example
      difference = abs(a) - abs(b)    # subtract the two values
@@ -21833,6 +22258,9 @@ you. Code to do this looks something like this:
      else
          # not ok
 
+(We assume that you have a simple absolute value function named `abs()'
+defined elsewhere in your program.)
+
 
 File: gawk.info,  Node: Errors accumulate,  Prev: Comparing FP Values,  Up: Inexactness of computations
 
@@ -21841,7 +22269,7 @@ File: gawk.info,  Node: Errors accumulate,  Prev: Comparing FP Values,  Up: Inex
 
 The loss of accuracy during a single computation with floating-point
 numbers usually isn't enough to worry about. However, if you compute a
-value which is the result of a sequence of floating point operations,
+value that is the result of a sequence of floating-point operations,
 the error can accumulate and greatly affect the computation itself.
 Here is an attempt to compute the value of pi using one of its many
 series representations:
@@ -21884,18 +22312,18 @@ representations yield an unexpected result:
 
 File: gawk.info,  Node: Getting Accuracy,  Next: Try To Round,  Prev: Inexactness of computations,  Up: FP Math Caution
 
-15.4.2 Getting The Accuracy You Need
+15.4.2 Getting the Accuracy You Need
 ------------------------------------
 
-Can arbitrary precision arithmetic give exact results? There are no
+Can arbitrary-precision arithmetic give exact results? There are no
 easy answers. The standard rules of algebra often do not apply when
 using floating-point arithmetic.  Among other things, the distributive
 and associative laws do not hold completely, and order of operation may
 be important for your computation. Rounding error, cumulative precision
-loss and underflow are often troublesome.
+loss, and underflow are often troublesome.
 
    When `gawk' tests the expressions `0.1 + 12.2' and `12.3' for
-equality using the machine double precision arithmetic, it decides that
+equality using the machine double-precision arithmetic, it decides that
 they are not equal!  (*Note Comparing FP Values::.)  You can get the
 result you want by increasing the precision; 56 bits in this case does
 the job:
@@ -21914,21 +22342,22 @@ value of `PREC':
 forget that the finite number of bits used to store the value is often
 just an approximation after proper rounding.  The test for equality
 succeeds if and only if _all_ bits in the two operands are exactly the
-same. Since this is not necessarily true after floating-point
-computations with a particular precision and effective rounding rule, a
+same. Because this is not necessarily true after floating-point
+computations with a particular precision and effective rounding mode, a
 straight test for equality may not work. Instead, compare the two
 numbers to see if they are within the desirable delta of each other.
 
    In applications where 15 or fewer decimal places suffice, hardware
-double precision arithmetic can be adequate, and is usually much faster.
+double-precision arithmetic can be adequate, and is usually much faster.
 But you need to keep in mind that every floating-point operation can
-suffer a new rounding error with catastrophic consequences as
+suffer a new rounding error with catastrophic consequences, as
 illustrated by our earlier attempt to compute the value of pi.  Extra
 precision can greatly enhance the stability and the accuracy of your
 computation in such cases.
 
-   Repeated addition is not necessarily equivalent to multiplication in
-floating-point arithmetic. In the example in *note Errors accumulate:::
+   Additionally, you should understand that repeated addition is not
+necessarily equivalent to multiplication in floating-point arithmetic.
+In the example in *note Errors accumulate:::
 
      $ gawk 'BEGIN {
      >   for (d = 1.1; d <= 1.5; d += 0.1)    # loop five times (?)
@@ -21944,10 +22373,10 @@ hand is often the correct approach in such situations.
 
 File: gawk.info,  Node: Try To Round,  Next: Setting precision,  Prev: Getting Accuracy,  Up: FP Math Caution
 
-15.4.3 Try A Few Extra Bits of Precision and Rounding
+15.4.3 Try a Few Extra Bits of Precision and Rounding
 -----------------------------------------------------
 
-Instead of arbitrary precision floating-point arithmetic, often all you
+Instead of arbitrary-precision floating-point arithmetic, often all you
 need is an adjustment of your logic or a different order for the
 operations in your calculation.  The stability and the accuracy of the
 computation of pi in the earlier example can be enhanced by using the
@@ -21955,7 +22384,7 @@ following simple algebraic transformation:
 
      (sqrt(x * x + 1) - 1) / x == x / (sqrt(x * x + 1) + 1)
 
-After making this, change the program converges to pi in under 30
+After making this change, the program converges to pi in under 30
 iterations:
 
      $ gawk -f pi2.awk
@@ -21971,27 +22400,27 @@ iterations:
 
 File: gawk.info,  Node: Setting precision,  Next: Setting the rounding mode,  Prev: Try To Round,  Up: FP Math Caution
 
-15.4.4 Setting The Precision
+15.4.4 Setting the Precision
 ----------------------------
 
 `gawk' uses a global working precision; it does not keep track of the
 precision or accuracy of individual numbers. Performing an arithmetic
 operation or calling a built-in function rounds the result to the
 current working precision. The default working precision is 53 bits,
-which you can modify using the built-in variable `PREC'. You can also
+which you can modify using the predefined variable `PREC'. You can also
 set the value to one of the predefined case-insensitive strings shown
 in *note table-predefined-precision-strings::, to emulate an IEEE 754
 binary format.
 
-`PREC'       IEEE 754 Binary Format
+`PREC'       IEEE 754 binary format
 --------------------------------------------------- 
-`"half"'     16-bit half-precision.
-`"single"'   Basic 32-bit single precision.
-`"double"'   Basic 64-bit double precision.
-`"quad"'     Basic 128-bit quadruple precision.
-`"oct"'      256-bit octuple precision.
+`"half"'     16-bit half-precision
+`"single"'   Basic 32-bit single precision
+`"double"'   Basic 64-bit double precision
+`"quad"'     Basic 128-bit quadruple precision
+`"oct"'      256-bit octuple precision
 
-Table 15.2: Predefined Precision Strings For `PREC'
+Table 15.3: Predefined precision strings for `PREC'
 
    The following example illustrates the effects of changing precision
 on arithmetic operations:
@@ -22005,7 +22434,7 @@ on arithmetic operations:
      floating-point constant from program source code, `gawk' uses the
      default precision (that of a C `double'), unless overridden by an
      assignment to the special variable `PREC' on the command line, to
-     store it internally as a MPFR number.  Changing the precision
+     store it internally as an MPFR number.  Changing the precision
      using `PREC' in the program text does _not_ change the precision
      of a constant.
 
@@ -22016,41 +22445,41 @@ on arithmetic operations:
      example illustrates the differences among various ways to print a
      floating-point constant:
 
-     $ gawk -M 'BEGIN { PREC = 113; printf("%0.25f\n", 0.1) }'
-     -| 0.1000000000000000055511151
-     $ gawk -M -v PREC=113 'BEGIN { printf("%0.25f\n", 0.1) }'
-     -| 0.1000000000000000000000000
-     $ gawk -M 'BEGIN { PREC = 113; printf("%0.25f\n", "0.1") }'
-     -| 0.1000000000000000000000000
-     $ gawk -M 'BEGIN { PREC = 113; printf("%0.25f\n", 1/10) }'
-     -| 0.1000000000000000000000000
+          $ gawk -M 'BEGIN { PREC = 113; printf("%0.25f\n", 0.1) }'
+          -| 0.1000000000000000055511151
+          $ gawk -M -v PREC=113 'BEGIN { printf("%0.25f\n", 0.1) }'
+          -| 0.1000000000000000000000000
+          $ gawk -M 'BEGIN { PREC = 113; printf("%0.25f\n", "0.1") }'
+          -| 0.1000000000000000000000000
+          $ gawk -M 'BEGIN { PREC = 113; printf("%0.25f\n", 1/10) }'
+          -| 0.1000000000000000000000000
 
 
 File: gawk.info,  Node: Setting the rounding mode,  Prev: Setting precision,  Up: FP Math Caution
 
-15.4.5 Setting The Rounding Mode
+15.4.5 Setting the Rounding Mode
 --------------------------------
 
-The `ROUNDMODE' variable provides program level control over the
+The `ROUNDMODE' variable provides program-level control over the
 rounding mode.  The correspondence between `ROUNDMODE' and the IEEE
 rounding modes is shown in *note table-gawk-rounding-modes::.
 
-Rounding Mode                    IEEE Name              `ROUNDMODE'
+Rounding mode                    IEEE name              `ROUNDMODE'
 --------------------------------------------------------------------------- 
 Round to nearest, ties to even   `roundTiesToEven'      `"N"' or `"n"'
-Round toward plus Infinity       `roundTowardPositive'  `"U"' or `"u"'
-Round toward negative Infinity   `roundTowardNegative'  `"D"' or `"d"'
+Round toward positive infinity   `roundTowardPositive'  `"U"' or `"u"'
+Round toward negative infinity   `roundTowardNegative'  `"D"' or `"d"'
 Round toward zero                `roundTowardZero'      `"Z"' or `"z"'
 Round to nearest, ties away      `roundTiesToAway'      `"A"' or `"a"'
 from zero                                               
 
-Table 15.3: `gawk' Rounding Modes
+Table 15.4: `gawk' rounding modes
 
    `ROUNDMODE' has the default value `"N"', which selects the IEEE 754
-rounding mode `roundTiesToEven'.  In *note Table 15.3:
+rounding mode `roundTiesToEven'.  In *note Table 15.4:
 table-gawk-rounding-modes, the value `"A"' selects `roundTiesToAway'.
 This is only available if your version of the MPFR library supports it;
-otherwise setting `ROUNDMODE' to `"A"' has no effect.
+otherwise, setting `ROUNDMODE' to `"A"' has no effect.
 
    The default mode `roundTiesToEven' is the most preferred, but the
 least intuitive. This method does the obvious thing for most values, by
@@ -22090,8 +22519,8 @@ distributes upward and downward rounds of exact halves, which might
 cause any accumulating round-off error to cancel itself out. This is the
 default rounding mode for IEEE 754 computing functions and operators.
 
-   The other rounding modes are rarely used.  Round toward positive
-infinity (`roundTowardPositive') and round toward negative infinity
+   The other rounding modes are rarely used.  Rounding toward positive
+infinity (`roundTowardPositive') and toward negative infinity
 (`roundTowardNegative') are often used to implement interval
 arithmetic, where you adjust the rounding mode to calculate upper and
 lower bounds for the range of output. The `roundTowardZero' mode can be
@@ -22118,29 +22547,29 @@ to round halfway cases for `printf'.
 
 File: gawk.info,  Node: Arbitrary Precision Integers,  Next: POSIX Floating Point Problems,  Prev: FP Math Caution,  Up: Arbitrary Precision Arithmetic
 
-15.5 Arbitrary Precision Integer Arithmetic with `gawk'
+15.5 Arbitrary-Precision Integer Arithmetic with `gawk'
 =======================================================
 
 When given the `-M' option, `gawk' performs all integer arithmetic
-using GMP arbitrary precision integers.  Any number that looks like an
-integer in a source or data file is stored as an arbitrary precision
+using GMP arbitrary-precision integers.  Any number that looks like an
+integer in a source or data file is stored as an arbitrary-precision
 integer.  The size of the integer is limited only by the available
 memory.  For example, the following computes 5^4^3^2, the result of
 which is beyond the limits of ordinary hardware double-precision
-floating point values:
+floating-point values:
 
      $ gawk -M 'BEGIN {
      >   x = 5^4^3^2
-     >   print "# of digits =", length(x)
+     >   print "number of digits =", length(x)
      >   print substr(x, 1, 20), "...", substr(x, length(x) - 19, 20)
      > }'
-     -| # of digits = 183231
+     -| number of digits = 183231
      -| 62060698786608744707 ... 92256259918212890625
 
-   If instead you were to compute the same value using arbitrary
-precision floating-point values, the precision needed for correct
-output (using the formula `prec = 3.322 * dps'), would be 3.322 x
-183231, or 608693.
+   If instead you were to compute the same value using
+arbitrary-precision floating-point values, the precision needed for
+correct output (using the formula `prec = 3.322 * dps') would be 3.322
+x 183231, or 608693.
 
    The result from an arithmetic operation with an integer and a
 floating-point value is a floating-point value with a precision equal
@@ -22163,14 +22592,14 @@ case), or replace the floating-point constant `2.0' with an integer, to
 perform all computations using integer arithmetic to get the correct
 output.
 
-   Sometimes `gawk' must implicitly convert an arbitrary precision
-integer into an arbitrary precision floating-point value.  This is
+   Sometimes `gawk' must implicitly convert an arbitrary-precision
+integer into an arbitrary-precision floating-point value.  This is
 primarily because the MPFR library does not always provide the relevant
-interface to process arbitrary precision integers or mixed-mode numbers
+interface to process arbitrary-precision integers or mixed-mode numbers
 as needed by an operation or function.  In such a case, the precision is
 set to the minimum value necessary for exact conversion, and the working
 precision is not used for this purpose.  If this is not what you need or
-want, you can employ a subterfuge, and convert the integer to floating
+want, you can employ a subterfuge and convert the integer to floating
 point first, like this:
 
      gawk -M 'BEGIN { n = 13; print (n + 0.0) % 2.0 }'
@@ -22180,8 +22609,8 @@ floating-point value to begin with:
 
      gawk -M 'BEGIN { n = 13.0; print n % 2.0 }'
 
-   Note that for the particular example above, it is likely best to
-just use the following:
+   Note that for this particular example, it is likely best to just use
+the following:
 
      gawk -M 'BEGIN { n = 13; print n % 2 }'
 
@@ -22189,14 +22618,15 @@ just use the following:
 `%', the result is typically an arbitrary precision floating point
 value (unless the denominator evenly divides into the numerator).  In
 order to do integer division or remainder with arbitrary precision
-integers, use the built-in `div()' function (*note Numeric Functions::).
+integers, use the built-in `intdiv()' function (*note Numeric
+Functions::).
 
-   You can simulate the `div()' function in standard `awk' using this
-user-defined function:
+   You can simulate the `intdiv()' function in standard `awk' using
+this user-defined function:
 
-     # div --- do integer division
+     # intdiv --- do integer division
 
-     function div(numerator, denominator, result,    i)
+     function intdiv(numerator, denominator, result)
      {
          split("", result)
 
@@ -22208,6 +22638,39 @@ user-defined function:
          return 0.0
      }
 
+   The following example program, contributed by Katie Wasserman, uses
+`intdiv()' to compute the digits of pi to as many places as you choose
+to set:
+
+     # pi.awk --- compute the digits of pi
+
+     BEGIN {
+         digits = 100000
+         two = 2 * 10 ^ digits
+         pi = two
+         for (m = digits * 4; m > 0; --m) {
+             d = m * 2 + 1
+             x = pi * m
+             intdiv(x, d, result)
+             pi = result["quotient"]
+             pi = pi + two
+         }
+         print pi
+     }
+
+   When asked about the algorithm used, Katie replied:
+
+     It's not that well known but it's not that obscure either.  It's
+     Euler's modification to Newton's method for calculating pi.  Take
+     a look at lines (23) - (25) here:
+     `http://mathworld.wolfram.com/PiFormulas.html'.
+
+     The algorithm I wrote simply expands the multiply by 2 and works
+     from the innermost expression outwards.  I used this to program HP
+     calculators because it's quite easy to modify for tiny memory
+     devices with smallish word sizes. See
+     `http://www.hpmuseum.org/cgi-sys/cgiwrap/hpmuseum/articles.cgi?read=899'.
+
    ---------- Footnotes ----------
 
    (1) Weisstein, Eric W.  `Sylvester's Sequence'. From MathWorld--A
@@ -22220,7 +22683,7 @@ File: gawk.info,  Node: POSIX Floating Point Problems,  Next: Floating point sum
 15.6 Standards Versus Existing Practice
 =======================================
 
-Historically, `awk' has converted any non-numeric looking string to the
+Historically, `awk' has converted any nonnumeric-looking string to the
 numeric value zero, when required.  Furthermore, the original
 definition of the language and the original POSIX standards specified
 that `awk' only understands decimal numbers (base 10), and not octal
@@ -22230,12 +22693,12 @@ that `awk' only understands decimal numbers (base 10), and not octal
 interpreted to imply that `awk' should support additional features.
 These features are:
 
-   * Interpretation of floating point data values specified in
+   * Interpretation of floating-point data values specified in
      hexadecimal notation (e.g., `0xDEADBEEF'). (Note: data values,
      _not_ source code constants.)
 
-   * Support for the special IEEE 754 floating point values "Not A
-     Number" (NaN), positive Infinity ("inf") and negative Infinity
+   * Support for the special IEEE 754 floating-point values "not a
+     number" (NaN), positive infinity ("inf"), and negative infinity
      ("-inf").  In particular, the format for these values is as
      specified by the ISO 1999 C standard, which ignores case and can
      allow implementation-dependent additional characters after the
@@ -22244,29 +22707,29 @@ These features are:
    The first problem is that both of these are clear changes to
 historical practice:
 
-   * The `gawk' maintainer feels that supporting hexadecimal floating
-     point values, in particular, is ugly, and was never intended by the
-     original designers to be part of the language.
+   * The `gawk' maintainer feels that supporting hexadecimal
+     floating-point values, in particular, is ugly, and was never
+     intended by the original designers to be part of the language.
 
    * Allowing completely alphabetic strings to have valid numeric
      values is also a very severe departure from historical practice.
 
    The second problem is that the `gawk' maintainer feels that this
-interpretation of the standard, which requires a certain amount of
+interpretation of the standard, which required a certain amount of
 "language lawyering" to arrive at in the first place, was not even
-intended by the standard developers.  In other words, "we see how you
+intended by the standard developers.  In other words, "We see how you
 got where you are, but we don't think that that's where you want to be."
 
-   Recognizing the above issues, but attempting to provide compatibility
+   Recognizing these issues, but attempting to provide compatibility
 with the earlier versions of the standard, the 2008 POSIX standard
 added explicit wording to allow, but not require, that `awk' support
-hexadecimal floating point values and special values for "Not A Number"
+hexadecimal floating-point values and special values for "not a number"
 and infinity.
 
    Although the `gawk' maintainer continues to feel that providing
 those features is inadvisable, nevertheless, on systems that support
 IEEE floating point, it seems reasonable to provide _some_ way to
-support NaN and Infinity values.  The solution implemented in `gawk' is
+support NaN and infinity values.  The solution implemented in `gawk' is
 as follows:
 
    * With the `--posix' command-line option, `gawk' becomes "hands
@@ -22281,7 +22744,7 @@ as follows:
           $ echo 0xDeadBeef | gawk --posix '{ print $1 + 0 }'
           -| 3735928559
 
-   * Without `--posix', `gawk' interprets the four strings `+inf',
+   * Without `--posix', `gawk' interprets the four string values `+inf',
      `-inf', `+nan', and `-nan' specially, producing the corresponding
      special numeric values.  The leading sign acts a signal to `gawk'
      (and the user) that the value is really numeric.  Hexadecimal
@@ -22295,7 +22758,7 @@ as follows:
           $ echo 0xDeadBeef | gawk '{ print $1 + 0 }'
           -| 0
 
-     `gawk' ignores case in the four special values.  Thus `+nan' and
+     `gawk' ignores case in the four special values.  Thus, `+nan' and
      `+NaN' are the same.
 
    ---------- Footnotes ----------
@@ -22309,12 +22772,12 @@ File: gawk.info,  Node: Floating point summary,  Prev: POSIX Floating Point Prob
 ============
 
    * Most computer arithmetic is done using either integers or
-     floating-point values.  The default for `awk' is to use
-     double-precision floating-point values.
+     floating-point values.  Standard `awk' uses double-precision
+     floating-point values.
 
-   * In the early 1990's, Barbie mistakenly said "Math class is tough!"
-     While math isn't tough, floating-point arithmetic isn't the same
-     as pencil and paper math, and care must be taken:
+   * In the early 1990s Barbie mistakenly said, "Math class is tough!"
+     Although math isn't tough, floating-point arithmetic isn't the same
+     as pencil-and-paper math, and care must be taken:
 
         - Not all numbers can be represented exactly.
 
@@ -22334,19 +22797,19 @@ File: gawk.info,  Node: Floating point summary,  Prev: POSIX Floating Point Prob
      set the precision in bits, and `ROUNDMODE' to set the IEEE 754
      rounding mode.
 
-   * With `-M', `gawk' performs arbitrary precision integer arithmetic
-     using the GMP library.  This is faster and more space efficient
+   * With `-M', `gawk' performs arbitrary-precision integer arithmetic
+     using the GMP library.  This is faster and more space-efficient
      than using MPFR for the same calculations.
 
-   * There are several "dark corners" with respect to floating-point
-     numbers where `gawk' disagrees with the POSIX standard.  It pays
-     to be aware of them.
+   * There are several areas with respect to floating-point numbers
+     where `gawk' disagrees with the POSIX standard.  It pays to be
+     aware of them.
 
    * Overall, there is no need to be unduly suspicious about the
      results from floating-point arithmetic. The lesson to remember is
      that floating-point arithmetic is always more complex than
      arithmetic using pencil and paper. In order to take advantage of
-     the power of computer floating-point, you need to know its
+     the power of floating-point arithmetic, you need to know its
      limitations and work within them. For most casual use of
      floating-point arithmetic, you will often get the expected result
      if you simply round the display of your final results to the
@@ -22405,15 +22868,15 @@ the rest of this Info file.
 `gawk''s functionality. For example, they can provide access to system
 calls (such as `chdir()' to change directory) and to other C library
 routines that could be of use.  As with most software, "the sky is the
-limit;" if you can imagine something that you might want to do and can
+limit"; if you can imagine something that you might want to do and can
 write in C or C++, you can write an extension to do it!
 
-   Extensions are written in C or C++, using the "Application
-Programming Interface" (API) defined for this purpose by the `gawk'
+   Extensions are written in C or C++, using the "application
+programming interface" (API) defined for this purpose by the `gawk'
 developers.  The rest of this major node explains the facilities that
-the API provides and how to use them, and presents a small sample
+the API provides and how to use them, and presents a small example
 extension.  In addition, it documents the sample extensions included in
-the `gawk' distribution, and describes the `gawkextlib' project.  *Note
+the `gawk' distribution and describes the `gawkextlib' project.  *Note
 Extension Design::, for a discussion of the extension mechanism goals
 and design.
 
@@ -22423,10 +22886,13 @@ File: gawk.info,  Node: Plugin License,  Next: Extension Mechanism Outline,  Pre
 16.2 Extension Licensing
 ========================
 
-Every dynamic extension should define the global symbol
-`plugin_is_GPL_compatible' to assert that it has been licensed under a
-GPL-compatible license.  If this symbol does not exist, `gawk' emits a
-fatal error and exits when it tries to load your extension.
+Every dynamic extension must be distributed under a license that is
+compatible with the GNU GPL (*note Copying::).
+
+   In order for the extension to tell `gawk' that it is properly
+licensed, the extension must define the global symbol
+`plugin_is_GPL_compatible'.  If this symbol does not exist, `gawk'
+emits a fatal error and exits when it tries to load your extension.
 
    The declared type of the symbol should be `int'.  It does not need
 to be in any allocated section, though.  The code merely asserts that
@@ -22437,11 +22903,11 @@ the symbol exists in the global scope.  Something like this is enough:
 
 File: gawk.info,  Node: Extension Mechanism Outline,  Next: Extension API Description,  Prev: Plugin License,  Up: Dynamic Extensions
 
-16.3 At A High Level How It Works
+16.3 How It Works at a High Level
 =================================
 
 Communication between `gawk' and an extension is two-way.  First, when
-an extension is loaded, it is passed a pointer to a `struct' whose
+an extension is loaded, `gawk' passes it a pointer to a `struct' whose
 fields are function pointers.  This is shown in *note
 figure-load-extension::.
 
@@ -22469,13 +22935,13 @@ figure-load-extension::.
 +-------+-+---+-+---+-+------------------+--------------------+
 
     gawk Main Program Address Space              Extension
-Figure 16.1: Loading The Extension
+Figure 16.1: Loading the extension
 
    The extension can call functions inside `gawk' through these
 function pointers, at runtime, without needing (link-time) access to
 `gawk''s symbols.  One of these function pointers is to a function for
-"registering" new built-in functions.  This is shown in *note
-figure-load-new-function::.
+"registering" new functions.  This is shown in *note
+figure-register-new-function::.
 
             register_ext_func({ "chdir", do_chdir, 1 });
 
@@ -22489,7 +22955,7 @@ figure-load-new-function::.
 +-------+-+---+-+---+-+------------------+--------------+-+---+
 
     gawk Main Program Address Space              Extension
-Figure 16.2: Loading The New Function
+Figure 16.2: Registering a new function
 
    In the other direction, the extension registers its new functions
 with `gawk' by passing function pointers to the functions that provide
@@ -22510,7 +22976,7 @@ calling convention.  This is shown in *note figure-call-new-function::.
 +-------+-+---+-+---+-+------------------+--------------+-+---+
 
     gawk Main Program Address Space              Extension
-Figure 16.3: Calling The New Function
+Figure 16.3: Calling the new function
 
    The `do_XXX()' function, in turn, then uses the function pointers in
 the API `struct' to do its work, such as updating variables or arrays,
@@ -22522,13 +22988,13 @@ and understandable.
 
    Although all of this sounds somewhat complicated, the result is that
 extension code is quite straightforward to write and to read. You can
-see this in the sample extensions `filefuncs.c' (*note Extension
-Example::) and also the `testext.c' code for testing the APIs.
+see this in the sample extension `filefuncs.c' (*note Extension
+Example::) and also in the `testext.c' code for testing the APIs.
 
    Some other bits and pieces:
 
    * The API provides access to `gawk''s `do_XXX' values, reflecting
-     command-line options, like `do_lint', `do_profiling' and so on
+     command-line options, like `do_lint', `do_profiling', and so on
      (*note Extension API Variables::).  These are informational: an
      extension cannot affect their values inside `gawk'.  In addition,
      attempting to assign to them produces a compile-time error.
@@ -22554,17 +23020,18 @@ describes the API in detail.
 
 * Extension API Functions Introduction:: Introduction to the API functions.
 * General Data Types::                   The data types.
-* Requesting Values::                    How to get a value.
 * Memory Allocation Functions::          Functions for allocating memory.
 * Constructor Functions::                Functions for creating values.
 * Registration Functions::               Functions to register things with
                                          `gawk'.
 * Printing Messages::                    Functions for printing messages.
 * Updating `ERRNO'::                Functions for updating `ERRNO'.
+* Requesting Values::                    How to get a value.
 * Accessing Parameters::                 Functions for accessing parameters.
 * Symbol Table Access::                  Functions for accessing global
                                          variables.
 * Array Manipulation::                   Functions for working with arrays.
+* Redirection API::                      How to access and manipulate redirections.
 * Extension API Variables::              Variables provided by the API.
 * Extension API Boilerplate::            Boilerplate code for using the API.
 
@@ -22574,25 +23041,29 @@ File: gawk.info,  Node: Extension API Functions Introduction,  Next: General Dat
 16.4.1 Introduction
 -------------------
 
-Access to facilities within `gawk' are made available by calling
-through function pointers passed into your extension.
+Access to facilities within `gawk' is achieved by calling through
+function pointers passed into your extension.
 
    API function pointers are provided for the following kinds of
 operations:
 
+   * Allocating, reallocating, and releasing memory.
+
    * Registration functions. You may register:
-        - extension functions,
 
-        - exit callbacks,
+        - Extension functions
+
+        - Exit callbacks
 
-        - a version string,
+        - A version string
 
-        - input parsers,
+        - Input parsers
 
-        - output wrappers,
+        - Output wrappers
 
-        - and two-way processors.
-     All of these are discussed in detail, later in this major node.
+        - Two-way processors
+
+     All of these are discussed in detail later in this major node.
 
    * Printing fatal, warning, and "lint" warning messages.
 
@@ -22604,8 +23075,6 @@ operations:
    * Symbol table access: retrieving a global variable, creating one,
      or changing one.
 
-   * Allocating, reallocating, and releasing memory.
-
    * Creating and releasing cached values; this provides an efficient
      way to use values for multiple variables and can be a big
      performance win.
@@ -22620,16 +23089,19 @@ operations:
 
         - Clearing an array
 
-        - Flattening an array for easy C style looping over all its
+        - Flattening an array for easy C-style looping over all its
           indices and elements
 
+   * Accessing and manipulating redirections.
+
+
    Some points about using the API:
 
-   * The following types and/or macros and/or functions are referenced
-     in `gawkapi.h'.  For correct use, you must therefore include the
+   * The following types, macros, and/or functions are referenced in
+     `gawkapi.h'.  For correct use, you must therefore include the
      corresponding standard header file _before_ including `gawkapi.h':
 
-     C Entity                 Header File
+     C entity                 Header file
      ------------------------------------------- 
      `EOF'                    `<stdio.h>'
      Values for `errno'       `<errno.h>'
@@ -22653,31 +23125,30 @@ operations:
    * Although the API only uses ISO C 90 features, there is an
      exception; the "constructor" functions use the `inline' keyword.
      If your compiler does not support this keyword, you should either
-     place `-Dinline=''' on your command line, or use the GNU Autotools
+     place `-Dinline=''' on your command line or use the GNU Autotools
      and include a `config.h' file in your extensions.
 
    * All pointers filled in by `gawk' point to memory managed by `gawk'
      and should be treated by the extension as read-only.  Memory for
      _all_ strings passed into `gawk' from the extension _must_ come
-     from calling the API-provided function pointers `api_malloc()',
-     `api_calloc()' or `api_realloc()', and is managed by `gawk' from
-     then on.
+     from calling one of `gawk_malloc()', `gawk_calloc()', or
+     `gawk_realloc()', and is managed by `gawk' from then on.
 
    * The API defines several simple `struct's that map values as seen
      from `awk'.  A value can be a `double', a string, or an array (as
      in multidimensional arrays, or when creating a new array).  String
-     values maintain both pointer and length since embedded NUL
+     values maintain both pointer and length, because embedded NUL
      characters are allowed.
 
           NOTE: By intent, strings are maintained using the current
           multibyte encoding (as defined by `LC_XXX' environment
           variables) and not using wide characters.  This matches how
           `gawk' stores strings internally and also how characters are
-          likely to be input and output from files.
+          likely to be input into and output from files.
 
    * When retrieving a value (such as a parameter or that of a global
      variable or array element), the extension requests a specific type
-     (number, string, scalars, value cookie, array, or "undefined").
+     (number, string, scalar, value cookie, array, or "undefined").
      When the request is "undefined," the returned value will have the
      real underlying type.
 
@@ -22687,16 +23158,16 @@ operations:
      message (such as "scalar passed where array expected").
 
 
-   While you may call the API functions by using the function pointers
-directly, the interface is not so pretty. To make extension code look
-more like regular code, the `gawkapi.h' header file defines several
+   You may call the API functions by using the function pointers
+directly, but the interface is not so pretty. To make extension code
+look more like regular code, the `gawkapi.h' header file defines several
 macros that you should use in your code.  This minor node presents the
 macros as if they were functions.
 
 
-File: gawk.info,  Node: General Data Types,  Next: Requesting Values,  Prev: Extension API Functions Introduction,  Up: Extension API Description
+File: gawk.info,  Node: General Data Types,  Next: Memory Allocation Functions,  Prev: Extension API Functions Introduction,  Up: Extension API Description
 
-16.4.2 General Purpose Data Types
+16.4.2 General-Purpose Data Types
 ---------------------------------
 
      I have a true love/hate relationship with unions.  -- Arnold
@@ -22705,10 +23176,12 @@ File: gawk.info,  Node: General Data Types,  Next: Requesting Values,  Prev: Ext
      That's the thing about unions: the compiler will arrange things so
      they can accommodate both love and hate.  -- Chet Ramey
 
-   The extension API defines a number of simple types and structures
-for general purpose use. Additional, more specialized, data structures
-are introduced in subsequent minor nodes, together with the functions
-that use them.
+   The extension API defines a number of simple types and structures for
+general-purpose use. Additional, more specialized, data structures are
+introduced in subsequent minor nodes, together with the functions that
+use them.
+
+   The general-purpose types and structures are as follows:
 
 `typedef void *awk_ext_id_t;'
      A value of this type is received from `gawk' when an extension is
@@ -22725,7 +23198,7 @@ that use them.
 `    awk_false = 0,'
 `    awk_true'
 `} awk_bool_t;'
-     A simple boolean type.
+     A simple Boolean type.
 
 `typedef struct awk_string {'
 `    char *str;      /* data */'
@@ -22733,9 +23206,8 @@ that use them.
 `} awk_string_t;'
      This represents a mutable string. `gawk' owns the memory pointed
      to if it supplied the value. Otherwise, it takes ownership of the
-     memory pointed to.  *Such memory must come from calling the
-     API-provided function pointers `api_malloc()', `api_calloc()', or
-     `api_realloc()'!*
+     memory pointed to.  _Such memory must come from calling one of the
+     `gawk_malloc()', `gawk_calloc()', or `gawk_realloc()' functions!_
 
      As mentioned earlier, strings are maintained using the current
      multibyte encoding.
@@ -22770,19 +23242,19 @@ that use them.
 `#define array_cookie   u.a'
 `#define scalar_cookie  u.scl'
 `#define value_cookie   u.vc'
-     These macros make accessing the fields of the `awk_value_t' more
-     readable.
+     Using these macros makes accessing the fields of the `awk_value_t'
+     more readable.
 
 `typedef void *awk_scalar_t;'
      Scalars can be represented as an opaque type. These values are
      obtained from `gawk' and then passed back into it. This is
-     discussed in a general fashion below, and in more detail in *note
-     Symbol table by cookie::.
+     discussed in a general fashion in the text following this list,
+     and in more detail in *note Symbol table by cookie::.
 
 `typedef void *awk_value_cookie_t;'
      A "value cookie" is an opaque type representing a cached value.
-     This is also discussed in a general fashion below, and in more
-     detail in *note Cached values::.
+     This is also discussed in a general fashion in the text following
+     this list, and in more detail in *note Cached values::.
 
 
    Scalar values in `awk' are either numbers or strings. The
@@ -22790,9 +23262,9 @@ that use them.
 indicates what is in the `union'.
 
    Representing numbers is easy--the API uses a C `double'.  Strings
-require more work. Since `gawk' allows embedded NUL bytes in string
-values, a string must be represented as a pair containing a
-data-pointer and length. This is the `awk_string_t' type.
+require more work. Because `gawk' allows embedded NUL bytes in string
+values, a string must be represented as a pair containing a data
+pointer and length. This is the `awk_string_t' type.
 
    Identifiers (i.e., the names of global variables) can be associated
 with either scalar values or with arrays.  In addition, `gawk' provides
@@ -22802,15 +23274,14 @@ Manipulation::.
 
    The various macros listed earlier make it easier to use the elements
 of the `union' as if they were fields in a `struct'; this is a common
-coding practice in C.  Such code is easier to write and to read,
-however it remains _your_ responsibility to make sure that the
-`val_type' member correctly reflects the type of the value in the
-`awk_value_t'.
+coding practice in C.  Such code is easier to write and to read, but it
+remains _your_ responsibility to make sure that the `val_type' member
+correctly reflects the type of the value in the `awk_value_t' struct.
 
    Conceptually, the first three members of the `union' (number, string,
 and array) are all that is needed for working with `awk' values.
-However, since the API provides routines for accessing and changing the
-value of global scalar variables only by using the variable's name,
+However, because the API provides routines for accessing and changing
+the value of a global scalar variable only by using the variable's name,
 there is a performance penalty: `gawk' must find the variable each time
 it is accessed and changed.  This turns out to be a real issue, not
 just a theoretical one.
@@ -22819,17 +23290,19 @@ just a theoretical one.
 reading and/or changing the value of one or more scalar variables, you
 can obtain a "scalar cookie"(1) object for that variable, and then use
 the cookie for getting the variable's value or for changing the
-variable's value.  This is the `awk_scalar_t' type and `scalar_cookie'
-macro.  Given a scalar cookie, `gawk' can directly retrieve or modify
-the value, as required, without having to first find it.
+variable's value.  The `awk_scalar_t' type holds a scalar cookie, and
+the `scalar_cookie' macro provides access to the value of that type in
+the `awk_value_t' struct.  Given a scalar cookie, `gawk' can directly
+retrieve or modify the value, as required, without having to find it
+first.
 
    The `awk_value_cookie_t' type and `value_cookie' macro are similar.
 If you know that you wish to use the same numeric or string _value_ for
 one or more variables, you can create the value once, retaining a
 "value cookie" for it, and then pass in that value cookie whenever you
-wish to set the value of a variable.  This saves both storage space
-within the running `gawk' process as well as the time needed to create
-the value.
+wish to set the value of a variable.  This saves storage space within
+the running `gawk' process and reduces the time needed to create the
+value.
 
    ---------- Footnotes ----------
 
@@ -22840,63 +23313,31 @@ the value.
 See also the entry for "Cookie" in the *note Glossary::.
 
 
-File: gawk.info,  Node: Requesting Values,  Next: Memory Allocation Functions,  Prev: General Data Types,  Up: Extension API Description
-
-16.4.3 Requesting Values
-------------------------
-
-All of the functions that return values from `gawk' work in the same
-way. You pass in an `awk_valtype_t' value to indicate what kind of
-value you expect.  If the actual value matches what you requested, the
-function returns true and fills in the `awk_value_t' result.
-Otherwise, the function returns false, and the `val_type' member
-indicates the type of the actual value.  You may then print an error
-message, or reissue the request for the actual value type, as
-appropriate.  This behavior is summarized in *note
-table-value-types-returned::.
-
-                                     Type of Actual Value:
--------------------------------------------------------------------------- 
-
-                          String         Number      Array       Undefined
------------------------------------------------------------------------------- 
-             String       String         String      false       false
-             Number       Number if can  Number      false       false
-                          be converted,                          
-                          else false                             
-Type         Array        false          false       Array       false
-Requested:   Scalar       Scalar         Scalar      false       false
-             Undefined    String         Number      Array       Undefined
-             Value        false          false       false       false
-             Cookie                                              
-
-Table 16.1: API Value Types Returned
-
-
-File: gawk.info,  Node: Memory Allocation Functions,  Next: Constructor Functions,  Prev: Requesting Values,  Up: Extension API Description
+File: gawk.info,  Node: Memory Allocation Functions,  Next: Constructor Functions,  Prev: General Data Types,  Up: Extension API Description
 
-16.4.4 Memory Allocation Functions and Convenience Macros
+16.4.3 Memory Allocation Functions and Convenience Macros
 ---------------------------------------------------------
 
 The API provides a number of "memory allocation" functions for
 allocating memory that can be passed to `gawk', as well as a number of
-convenience macros.
+convenience macros.  This node presents them all as function
+prototypes, in the way that extension code would use them:
 
 `void *gawk_malloc(size_t size);'
-     Call `gawk'-provided `api_malloc()' to allocate storage that may
+     Call the correct version of `malloc()' to allocate storage that may
      be passed to `gawk'.
 
 `void *gawk_calloc(size_t nmemb, size_t size);'
-     Call `gawk'-provided `api_calloc()' to allocate storage that may
+     Call the correct version of `calloc()' to allocate storage that may
      be passed to `gawk'.
 
 `void *gawk_realloc(void *ptr, size_t size);'
-     Call `gawk'-provided `api_realloc()' to allocate storage that may
-     be passed to `gawk'.
+     Call the correct version of `realloc()' to allocate storage that
+     may be passed to `gawk'.
 
 `void gawk_free(void *ptr);'
-     Call `gawk'-provided `api_free()' to release storage that was
-     allocated with `gawk_malloc()', `gawk_calloc()' or
+     Call the correct version of `free()' to release storage that was
+     allocated with `gawk_malloc()', `gawk_calloc()', or
      `gawk_realloc()'.
 
    The API has to provide these functions because it is possible for an
@@ -22905,11 +23346,10 @@ C library than was used for the `gawk' executable.(1) If `gawk' were to
 use its version of `free()' when the memory came from an unrelated
 version of `malloc()', unexpected behavior would likely result.
 
-   Two convenience macros may be used for allocating storage from the
-API-provided function pointers `api_malloc()' and `api_realloc()'. If
-the allocation fails, they cause `gawk' to exit with a fatal error
-message.  They should be used as if they were procedure calls that do
-not return a value.
+   Two convenience macros may be used for allocating storage from
+`gawk_malloc()' and `gawk_realloc()'. If the allocation fails, they
+cause `gawk' to exit with a fatal error message.  They should be used
+as if they were procedure calls that do not return a value:
 
 `#define emalloc(pointer, type, size, message) ...'
      The arguments to this macro are as follows:
@@ -22918,8 +23358,8 @@ not return a value.
           The pointer variable to point at the allocated storage.
 
     `type'
-          The type of the pointer variable, used to create a cast for
-          the call to `api_malloc()'.
+          The type of the pointer variable.  This is used to create a
+          cast for the call to `gawk_malloc()'.
 
     `size'
           The total number of bytes to be allocated.
@@ -22939,57 +23379,57 @@ not return a value.
           make_malloced_string(message, strlen(message), & result);
 
 `#define erealloc(pointer, type, size, message) ...'
-     This is like `emalloc()', but it calls `api_realloc()', instead of
-     `api_malloc()'.  The arguments are the same as for the `emalloc()'
-     macro.
+     This is like `emalloc()', but it calls `gawk_realloc()' instead of
+     `gawk_malloc()'.  The arguments are the same as for the
+     `emalloc()' macro.
 
    ---------- Footnotes ----------
 
-   (1) This is more common on MS-Windows systems, but can happen on
+   (1) This is more common on MS-Windows systems, but it can happen on
 Unix-like systems as well.
 
 
 File: gawk.info,  Node: Constructor Functions,  Next: Registration Functions,  Prev: Memory Allocation Functions,  Up: Extension API Description
 
-16.4.5 Constructor Functions
+16.4.4 Constructor Functions
 ----------------------------
 
 The API provides a number of "constructor" functions for creating
 string and numeric values, as well as a number of convenience macros.
 This node presents them all as function prototypes, in the way that
-extension code would use them.
+extension code would use them:
 
 `static inline awk_value_t *'
-`make_const_string(const char *string, size_t length, awk_value_t *result)'
+`make_const_string(const char *string, size_t length, awk_value_t *result);'
      This function creates a string value in the `awk_value_t' variable
      pointed to by `result'. It expects `string' to be a C string
      constant (or other string data), and automatically creates a
      _copy_ of the data for storage in `result'. It returns `result'.
 
 `static inline awk_value_t *'
-`make_malloced_string(const char *string, size_t length, awk_value_t *result)'
+`make_malloced_string(const char *string, size_t length, awk_value_t *result);'
      This function creates a string value in the `awk_value_t' variable
      pointed to by `result'. It expects `string' to be a `char *' value
-     pointing to data previously obtained from the api-provided
-     functions `api_malloc()', `api_calloc()' or `api_realloc()'. The
-     idea here is that the data is passed directly to `gawk', which
-     assumes responsibility for it. It returns `result'.
+     pointing to data previously obtained from `gawk_malloc()',
+     `gawk_calloc()', or `gawk_realloc()'. The idea here is that the
+     data is passed directly to `gawk', which assumes responsibility
+     for it. It returns `result'.
 
 `static inline awk_value_t *'
-`make_null_string(awk_value_t *result)'
+`make_null_string(awk_value_t *result);'
      This specialized function creates a null string (the "undefined"
      value) in the `awk_value_t' variable pointed to by `result'.  It
      returns `result'.
 
 `static inline awk_value_t *'
-`make_number(double num, awk_value_t *result)'
+`make_number(double num, awk_value_t *result);'
      This function simply creates a numeric value in the `awk_value_t'
      variable pointed to by `result'.
 
 
 File: gawk.info,  Node: Registration Functions,  Next: Printing Messages,  Prev: Constructor Functions,  Up: Extension API Description
 
-16.4.6 Registration Functions
+16.4.5 Registration Functions
 -----------------------------
 
 This minor node describes the API functions for registering parts of
@@ -23007,7 +23447,7 @@ your extension with `gawk'.
 
 File: gawk.info,  Node: Extension Functions,  Next: Exit Callback Functions,  Up: Registration Functions
 
-16.4.6.1 Registering An Extension Function
+16.4.5.1 Registering An Extension Function
 ..........................................
 
 Extension functions are described by the following record:
@@ -23021,21 +23461,20 @@ Extension functions are described by the following record:
    The fields are:
 
 `const char *name;'
-     The name of the new function.  `awk' level code calls the function
+     The name of the new function.  `awk'-level code calls the function
      by this name.  This is a regular C string.
 
      Function names must obey the rules for `awk' identifiers. That is,
-     they must begin with either a letter or an underscore, which may
-     be followed by any number of letters, digits, and underscores.
-     Letter case in function names is significant.
+     they must begin with either an English letter or an underscore,
+     which may be followed by any number of letters, digits, and
+     underscores.  Letter case in function names is significant.
 
 `awk_value_t *(*function)(int num_actual_args, awk_value_t *result);'
-     This is a pointer to the C function that provides the desired
-     functionality.  The function must fill in the result with either a
+     This is a pointer to the C function that provides the extension's
+     functionality.  The function must fill in `*result' with either a
      number or a string. `gawk' takes ownership of any string memory.
-     As mentioned earlier, string memory *must* come from the
-     api-provided functions `api_malloc()', `api_calloc()' or
-     `api_realloc()'.
+     As mentioned earlier, string memory _must_ come from one of
+     `gawk_malloc()', `gawk_calloc()', or `gawk_realloc()'.
 
      The `num_actual_args' argument tells the C function how many
      actual parameters were passed from the calling `awk' code.
@@ -23046,7 +23485,7 @@ Extension functions are described by the following record:
 `size_t num_expected_args;'
      This is the number of arguments the function expects to receive.
      Each extension function may decide what to do if the number of
-     arguments isn't what it expected.  Following `awk' functions, it
+     arguments isn't what it expected.  As with real `awk' functions, it
      is likely OK to ignore extra arguments.
 
    Once you have a record representing your extension function, you
@@ -23061,14 +23500,14 @@ register it with `gawk' using this API function:
 
 File: gawk.info,  Node: Exit Callback Functions,  Next: Extension Version String,  Prev: Extension Functions,  Up: Registration Functions
 
-16.4.6.2 Registering An Exit Callback Function
+16.4.5.2 Registering An Exit Callback Function
 ..............................................
 
 An "exit callback" function is a function that `gawk' calls before it
 exits.  Such functions are useful if you have general "cleanup" tasks
 that should be performed in your extension (such as closing database
 connections or other resource deallocations).  You can register such a
-function with `gawk' using the following function.
+function with `gawk' using the following function:
 
 `void awk_atexit(void (*funcp)(void *data, int exit_status),'
 `                void *arg0);'
@@ -23081,25 +23520,26 @@ function with `gawk' using the following function.
           `gawk' intends to pass to the `exit()' system call.
 
     `arg0'
-          A pointer to private data which `gawk' saves in order to pass
+          A pointer to private data that `gawk' saves in order to pass
           to the function pointed to by `funcp'.
 
-   Exit callback functions are called in Last-In-First-Out (LIFO)
+   Exit callback functions are called in last-in, first-out (LIFO)
 order--that is, in the reverse order in which they are registered with
 `gawk'.
 
 
 File: gawk.info,  Node: Extension Version String,  Next: Input Parsers,  Prev: Exit Callback Functions,  Up: Registration Functions
 
-16.4.6.3 Registering An Extension Version String
+16.4.5.3 Registering An Extension Version String
 ................................................
 
-You can register a version string which indicates the name and version
-of your extension, with `gawk', as follows:
+You can register a version string that indicates the name and version
+of your extension with `gawk', as follows:
 
 `void register_ext_version(const char *version);'
-     Register the string pointed to by `version' with `gawk'.  `gawk'
-     does _not_ copy the `version' string, so it should not be changed.
+     Register the string pointed to by `version' with `gawk'.  Note
+     that `gawk' does _not_ copy the `version' string, so it should not
+     be changed.
 
    `gawk' prints all registered extension version strings when it is
 invoked with the `--version' option.
@@ -23107,7 +23547,7 @@ invoked with the `--version' option.
 
 File: gawk.info,  Node: Input Parsers,  Next: Output Wrappers,  Prev: Extension Version String,  Up: Registration Functions
 
-16.4.6.4 Customized Input Parsers
+16.4.5.4 Customized Input Parsers
 .................................
 
 By default, `gawk' reads text files as its input. It uses the value of
@@ -23117,27 +23557,27 @@ Files::).  Additionally, it sets the value of `RT' (*note Built-in
 Variables::).
 
    If you want, you can provide your own custom input parser.  An input
-parser's job is to return a record to the `gawk' record processing
+parser's job is to return a record to the `gawk' record-processing
 code, along with indicators for the value and length of the data to be
 used for `RT', if any.
 
    To provide an input parser, you must first provide two functions
 (where XXX is a prefix name for your extension):
 
-`awk_bool_t XXX_can_take_file(const awk_input_buf_t *iobuf)'
+`awk_bool_t XXX_can_take_file(const awk_input_buf_t *iobuf);'
      This function examines the information available in `iobuf' (which
      we discuss shortly).  Based on the information there, it decides
      if the input parser should be used for this file.  If so, it
      should return true. Otherwise, it should return false.  It should
      not change any state (variable values, etc.) within `gawk'.
 
-`awk_bool_t XXX_take_control_of(awk_input_buf_t *iobuf)'
+`awk_bool_t XXX_take_control_of(awk_input_buf_t *iobuf);'
      When `gawk' decides to hand control of the file over to the input
      parser, it calls this function.  This function in turn must fill
-     in certain fields in the `awk_input_buf_t' structure, and ensure
+     in certain fields in the `awk_input_buf_t' structure and ensure
      that certain conditions are true.  It should then return true. If
-     an error of some kind occurs, it should not fill in any fields,
-     and should return false; then `gawk' will not use the input parser.
+     an error of some kind occurs, it should not fill in any fields and
+     should return false; then `gawk' will not use the input parser.
      The details are presented shortly.
 
    Your extension should package these functions inside an
@@ -23172,7 +23612,7 @@ used for `RT', if any.
 
   2. When your extension is loaded, register your input parser with
      `gawk' using the `register_input_parser()' API function (described
-     below).
+     next).
 
    An `awk_input_buf_t' looks like this:
 
@@ -23210,14 +23650,14 @@ decide if the input parser should be used for the file.  The decision
 can be made based upon `gawk' state (the value of a variable defined
 previously by the extension and set by `awk' code), the name of the
 file, whether or not the file descriptor is valid, the information in
-the `struct stat', or any combination of the above.
+the `struct stat', or any combination of these factors.
 
    Once `XXX_can_take_file()' has returned true, and `gawk' has decided
 to use your input parser, it calls `XXX_take_control_of()'.  That
-function then fills one of either the `get_record' field or the
-`read_func' field in the `awk_input_buf_t'.  It must also ensure that
-`fd' is _not_ set to `INVALID_HANDLE'.  All of the fields that may be
-filled by `XXX_take_control_of()' are as follows:
+function then fills either the `get_record' field or the `read_func'
+field in the `awk_input_buf_t'.  It must also ensure that `fd' is _not_
+set to `INVALID_HANDLE'.  The following list describes the fields that
+may be filled by `XXX_take_control_of()':
 
 `void *opaque;'
      This is used to hold any state information needed by the input
@@ -23231,25 +23671,25 @@ filled by `XXX_take_control_of()' are as follows:
 `                  size_t *rt_len);'
      This function pointer should point to a function that creates the
      input records.  Said function is the core of the input parser.
-     Its behavior is described below.
+     Its behavior is described in the text following this list.
 
 `ssize_t (*read_func)();'
-     This function pointer should point to function that has the same
+     This function pointer should point to a function that has the same
      behavior as the standard POSIX `read()' system call.  It is an
      alternative to the `get_record' pointer.  Its behavior is also
-     described below.
+     described in the text following this list.
 
 `void (*close_func)(struct awk_input *iobuf);'
      This function pointer should point to a function that does the
-     "tear down." It should release any resources allocated by
+     "teardown." It should release any resources allocated by
      `XXX_take_control_of()'.  It may also close the file. If it does
      so, it should set the `fd' field to `INVALID_HANDLE'.
 
      If `fd' is still not `INVALID_HANDLE' after the call to this
      function, `gawk' calls the regular `close()' system call.
 
-     Having a "tear down" function is optional. If your input parser
-     does not need it, do not set this field.  Then, `gawk' calls the
+     Having a "teardown" function is optional. If your input parser does
+     not need it, do not set this field.  Then, `gawk' calls the
      regular `close()' system call on the file descriptor, so it should
      be valid.
 
@@ -23257,7 +23697,7 @@ filled by `XXX_take_control_of()' are as follows:
 records.  The parameters are as follows:
 
 `char **out'
-     This is a pointer to a `char *' variable which is set to point to
+     This is a pointer to a `char *' variable that is set to point to
      the record.  `gawk' makes its own copy of the data, so the
      extension must manage this storage.
 
@@ -23276,7 +23716,7 @@ records.  The parameters are as follows:
      `*rt_start' should be set to point to the data to be used for
      `RT', and `*rt_len' should be set to the length of the data.
      Otherwise, `*rt_len' should be set to zero.  `gawk' makes its own
-     copy of this data, so the extension must manage the storage.
+     copy of this data, so the extension must manage this storage.
 
    The return value is the length of the buffer pointed to by `*out',
 or `EOF' if end-of-file was reached or an error occurred.
@@ -23306,16 +23746,16 @@ explicitly.
      NOTE: You must choose one method or the other: either a function
      that returns a record, or one that returns raw data.  In
      particular, if you supply a function to get a record, `gawk' will
-     call it, and never call the raw read function.
+     call it, and will never call the raw read function.
 
    `gawk' ships with a sample extension that reads directories,
-returning records for each entry in the directory (*note Extension
-Sample Readdir::).  You may wish to use that code as a guide for writing
-your own input parser.
+returning records for each entry in a directory (*note Extension Sample
+Readdir::).  You may wish to use that code as a guide for writing your
+own input parser.
 
    When writing an input parser, you should think about (and document)
 how it is expected to interact with `awk' code.  You may want it to
-always be called, and take effect as appropriate (as the `readdir'
+always be called, and to take effect as appropriate (as the `readdir'
 extension does).  Or you may want it to take effect based upon the
 value of an `awk' variable, as the XML extension from the `gawkextlib'
 project does (*note gawkextlib::).  In the latter case, code in a
@@ -23330,7 +23770,7 @@ whether or not to activate an input parser (*note BEGINFILE/ENDFILE::).
 
 File: gawk.info,  Node: Output Wrappers,  Next: Two-way processors,  Prev: Input Parsers,  Up: Registration Functions
 
-16.4.6.5 Customized Output Wrappers
+16.4.5.5 Customized Output Wrappers
 ...................................
 
 An "output wrapper" is the mirror image of an input parser.  It allows
@@ -23362,8 +23802,8 @@ an extension to take over the output to a file opened with the `>' or
      The function pointed to by this field is called when `gawk'
      decides to let the output wrapper take control of the file. It
      should fill in appropriate members of the `awk_output_buf_t'
-     structure, as described below, and return true if successful,
-     false otherwise.
+     structure, as described next, and return true if successful, false
+     otherwise.
 
 `awk_const struct output_wrapper *awk_const next;'
      This is for use by `gawk'; therefore it is marked `awk_const' so
@@ -23415,17 +23855,17 @@ in the `awk_output_buf_t'.  The data members are as follows:
      These pointers should be set to point to functions that perform
      the equivalent function as the `<stdio.h>' functions do, if
      appropriate.  `gawk' uses these function pointers for all output.
-     `gawk' initializes the pointers to point to internal, "pass
-     through" functions that just call the regular `<stdio.h>'
-     functions, so an extension only needs to redefine those functions
-     that are appropriate for what it does.
+     `gawk' initializes the pointers to point to internal "pass-through"
+     functions that just call the regular `<stdio.h>' functions, so an
+     extension only needs to redefine those functions that are
+     appropriate for what it does.
 
    The `XXX_can_take_file()' function should make a decision based upon
 the `name' and `mode' fields, and any additional state (such as `awk'
 variable values) that is appropriate.
 
    When `gawk' calls `XXX_take_control_of()', that function should fill
-in the other fields, as appropriate, except for `fp', which it should
+in the other fields as appropriate, except for `fp', which it should
 just use normally.
 
    You register your output wrapper with the following function:
@@ -23437,7 +23877,7 @@ just use normally.
 
 File: gawk.info,  Node: Two-way processors,  Prev: Output Wrappers,  Up: Registration Functions
 
-16.4.6.6 Customized Two-way Processors
+16.4.5.6 Customized Two-way Processors
 ......................................
 
 A "two-way processor" combines an input parser and an output wrapper for
@@ -23462,16 +23902,17 @@ structures as described earlier.
      The name of the two-way processor.
 
 `awk_bool_t (*can_take_two_way)(const char *name);'
-     This function returns true if it wants to take over two-way I/O
-     for this file name.  It should not change any state (variable
-     values, etc.) within `gawk'.
+     The function pointed to by this field should return true if it
+     wants to take over two-way I/O for this file name.  It should not
+     change any state (variable values, etc.) within `gawk'.
 
 `awk_bool_t (*take_control_of)(const char *name,'
 `                              awk_input_buf_t *inbuf,'
 `                              awk_output_buf_t *outbuf);'
-     This function should fill in the `awk_input_buf_t' and
-     `awk_outut_buf_t' structures pointed to by `inbuf' and `outbuf',
-     respectively.  These structures were described earlier.
+     The function pointed to by this field should fill in the
+     `awk_input_buf_t' and `awk_outut_buf_t' structures pointed to by
+     `inbuf' and `outbuf', respectively.  These structures were
+     described earlier.
 
 `awk_const struct two_way_processor *awk_const next;'
      This is for use by `gawk'; therefore it is marked `awk_const' so
@@ -23490,12 +23931,12 @@ can take this" and "take over for this" functions,
 
 File: gawk.info,  Node: Printing Messages,  Next: Updating `ERRNO',  Prev: Registration Functions,  Up: Extension API Description
 
-16.4.7 Printing Messages
+16.4.6 Printing Messages
 ------------------------
 
 You can print different kinds of warning messages from your extension,
-as described below.  Note that for these functions, you must pass in
-the extension id received from `gawk' when the extension was loaded.(1)
+as described here.  Note that for these functions, you must pass in the
+extension ID received from `gawk' when the extension was loaded:(1)
 
 `void fatal(awk_ext_id_t id, const char *format, ...);'
      Print a message and then cause `gawk' to exit immediately.
@@ -23519,9 +23960,9 @@ of the ISO C 99 variadic macro feature to hide that parameter. More's
 the pity.
 
 
-File: gawk.info,  Node: Updating `ERRNO',  Next: Accessing Parameters,  Prev: Printing Messages,  Up: Extension API Description
+File: gawk.info,  Node: Updating `ERRNO',  Next: Requesting Values,  Prev: Printing Messages,  Up: Extension API Description
 
-16.4.8 Updating `ERRNO'
+16.4.7 Updating `ERRNO'
 -----------------------
 
 The following functions allow you to update the `ERRNO' variable:
@@ -23536,11 +23977,44 @@ The following functions allow you to update the `ERRNO' variable:
      Set `ERRNO' directly to the string value of `ERRNO'.  `gawk' makes
      a copy of the value of `string'.
 
-`void unset_ERRNO();'
+`void unset_ERRNO(void);'
      Unset `ERRNO'.
 
 
-File: gawk.info,  Node: Accessing Parameters,  Next: Symbol Table Access,  Prev: Updating `ERRNO',  Up: Extension API Description
+File: gawk.info,  Node: Requesting Values,  Next: Accessing Parameters,  Prev: Updating `ERRNO',  Up: Extension API Description
+
+16.4.8 Requesting Values
+------------------------
+
+All of the functions that return values from `gawk' work in the same
+way. You pass in an `awk_valtype_t' value to indicate what kind of
+value you expect.  If the actual value matches what you requested, the
+function returns true and fills in the `awk_value_t' result.
+Otherwise, the function returns false, and the `val_type' member
+indicates the type of the actual value.  You may then print an error
+message or reissue the request for the actual value type, as
+appropriate.  This behavior is summarized in *note
+table-value-types-returned::.
+
+                                     Type of Actual Value
+-------------------------------------------------------------------------- 
+
+                          String         Number      Array       Undefined
+------------------------------------------------------------------------------ 
+             String       String         String      False       False
+             Number       Number if can  Number      False       False
+                          be converted,                          
+                          else false                             
+Type         Array        False          False       Array       False
+Requested    Scalar       Scalar         Scalar      False       False
+             Undefined    String         Number      Array       Undefined
+             Value        False          False       False       False
+             cookie                                              
+
+Table 16.1: API value types returned
+
+
+File: gawk.info,  Node: Accessing Parameters,  Next: Symbol Table Access,  Prev: Requesting Values,  Up: Extension API Description
 
 16.4.9 Accessing and Updating Parameters
 ----------------------------------------
@@ -23552,16 +24026,16 @@ your extension function. They are:
 `                        awk_valtype_t wanted,'
 `                        awk_value_t *result);'
      Fill in the `awk_value_t' structure pointed to by `result' with
-     the `count''th argument.  Return true if the actual type matches
-     `wanted', false otherwise.  In the latter case, `result->val_type'
-     indicates the actual type (*note Table 16.1:
-     table-value-types-returned.).  Counts are zero based--the first
+     the `count'th argument.  Return true if the actual type matches
+     `wanted', and false otherwise.  In the latter case,
+     `result->val_type' indicates the actual type (*note Table 16.1:
+     table-value-types-returned.).  Counts are zero-based--the first
      argument is numbered zero, the second one, and so on. `wanted'
      indicates the type of value expected.
 
 `awk_bool_t set_argument(size_t count, awk_array_t array);'
      Convert a parameter that was undefined into an array; this provides
-     call-by-reference for arrays.  Return false if `count' is too big,
+     call by reference for arrays.  Return false if `count' is too big,
      or if the argument's type is not undefined.  *Note Array
      Manipulation::, for more information on creating arrays.
 
@@ -23589,8 +24063,8 @@ File: gawk.info,  Node: Symbol table by name,  Next: Symbol table by cookie,  Up
 The following routines provide the ability to access and update global
 `awk'-level variables by name.  In compiler terminology, identifiers of
 different kinds are termed "symbols", thus the "sym" in the routines'
-names.  The data structure which stores information about symbols is
-termed a "symbol table".
+names.  The data structure that stores information about symbols is
+termed a "symbol table".  The functions are as follows:
 
 `awk_bool_t sym_lookup(const char *name,'
 `                      awk_valtype_t wanted,'
@@ -23598,14 +24072,14 @@ termed a "symbol table".
      Fill in the `awk_value_t' structure pointed to by `result' with
      the value of the variable named by the string `name', which is a
      regular C string.  `wanted' indicates the type of value expected.
-     Return true if the actual type matches `wanted', false otherwise
-     In the latter case, `result->val_type' indicates the actual type
-     (*note Table 16.1: table-value-types-returned.).
+     Return true if the actual type matches `wanted', and false
+     otherwise.  In the latter case, `result->val_type' indicates the
+     actual type (*note Table 16.1: table-value-types-returned.).
 
 `awk_bool_t sym_update(const char *name, awk_value_t *value);'
      Update the variable named by the string `name', which is a regular
      C string.  The variable is added to `gawk''s symbol table if it is
-     not there.  Return true if everything worked, false otherwise.
+     not there.  Return true if everything worked, and false otherwise.
 
      Changing types (scalar to array or vice versa) of an existing
      variable is _not_ allowed, nor may this routine be used to update
@@ -23616,10 +24090,10 @@ termed a "symbol table".
 However, with the exception of the `PROCINFO' array, an extension
 cannot change any of those variables.
 
-     NOTE: It is possible for the lookup of `PROCINFO' to fail. This
+     CAUTION: It is possible for the lookup of `PROCINFO' to fail. This
      happens if the `awk' program being run does not reference
-     `PROCINFO'; in this case `gawk' doesn't bother to create the array
-     and populate it.
+     `PROCINFO'; in this case, `gawk' doesn't bother to create the
+     array and populate it.
 
 
 File: gawk.info,  Node: Symbol table by cookie,  Next: Cached values,  Prev: Symbol table by name,  Up: Symbol Table Access
@@ -23632,20 +24106,20 @@ variable or array. It is an optimization that avoids looking up
 variables in `gawk''s symbol table every time access is needed. This
 was discussed earlier, in *note General Data Types::.
 
-   The following functions let you work with scalar cookies.
+   The following functions let you work with scalar cookies:
 
 `awk_bool_t sym_lookup_scalar(awk_scalar_t cookie,'
 `                             awk_valtype_t wanted,'
 `                             awk_value_t *result);'
      Retrieve the current value of a scalar cookie.  Once you have
-     obtained a scalar_cookie using `sym_lookup()', you can use this
+     obtained a scalar cookie using `sym_lookup()', you can use this
      function to get its value more efficiently.  Return false if the
      value cannot be retrieved.
 
 `awk_bool_t sym_update_scalar(awk_scalar_t cookie, awk_value_t *value);'
      Update the value associated with a scalar cookie.  Return false if
      the new value is not of type `AWK_STRING' or `AWK_NUMBER'.  Here
-     too, the built-in variables may not be updated.
+     too, the predefined variables may not be updated.
 
    It is not obvious at first glance how to work with scalar cookies or
 what their raison d'e^tre really is.  In theory, the `sym_lookup()' and
@@ -23673,7 +24147,7 @@ variable based on the result of that evaluation, like so:
 This code looks (and is) simple and straightforward. So what's the
 problem?
 
-   Consider what happens if `awk'-level code associated with your
+   Well, consider what happens if `awk'-level code associated with your
 extension calls the `magic()' function (implemented in C by
 `do_magic()'), once per record, while processing hundreds of thousands
 or millions of records.  The `MAGIC_VAR' variable is looked up in the
@@ -23697,7 +24171,7 @@ usual. Then get a scalar cookie for the variable using `sym_lookup()':
          /* install initial value */
          sym_update("MAGIC_VAR", make_number(42.0, & value));
 
-         /* get cookie */
+         /* get the cookie */
          sym_lookup("MAGIC_VAR", AWK_SCALAR, & value);
 
          /* save the cookie */
@@ -23741,14 +24215,14 @@ File: gawk.info,  Node: Cached values,  Prev: Symbol table by cookie,  Up: Symbo
 ..........................................
 
 The routines in this section allow you to create and release cached
-values.  As with scalar cookies, in theory, cached values are not
+values.  Like scalar cookies, in theory, cached values are not
 necessary. You can create numbers and strings using the functions in
 *note Constructor Functions::. You can then assign those values to
 variables using `sym_update()' or `sym_update_scalar()', as you like.
 
    However, you can understand the point of cached values if you
 remember that _every_ string value's storage _must_ come from
-`api_malloc()', `api_calloc()' or `api_realloc()'.  If you have 20
+`gawk_malloc()', `gawk_calloc()', or `gawk_realloc()'.  If you have 20
 variables, all of which have the same string value, you must create 20
 identical copies of the string.(1)
 
@@ -23760,8 +24234,8 @@ follows:
 `awk_bool_t create_value(awk_value_t *value, awk_value_cookie_t *result);'
      Create a cached string or numeric value from `value' for efficient
      later assignment.  Only values of type `AWK_NUMBER' and
-     `AWK_STRING' are allowed.  Any other type is rejected.  While
-     `AWK_UNDEFINED' could be allowed, doing so would result in
+     `AWK_STRING' are allowed.  Any other type is rejected.
+     `AWK_UNDEFINED' could be allowed, but doing so would result in
      inferior performance.
 
 `awk_bool_t release_value(awk_value_cookie_t vc);'
@@ -23808,12 +24282,12 @@ of variables:
          ...
      }
 
-Using value cookies in this way saves considerable storage, since all of
+Using value cookies in this way saves considerable storage, as all of
 `VAR1' through `VAR100' share the same value.
 
    You might be wondering, "Is this sharing problematic?  What happens
-if `awk' code assigns a new value to `VAR1', are all the others be
-changed too?"
+if `awk' code assigns a new value to `VAR1'; are all the others changed
+too?"
 
    That's a great question. The answer is that no, it's not a problem.
 Internally, `gawk' uses "reference-counted strings". This means that
@@ -23832,7 +24306,7 @@ using `release_value()'.
 `double' to store.
 
 
-File: gawk.info,  Node: Array Manipulation,  Next: Extension API Variables,  Prev: Symbol Table Access,  Up: Extension API Description
+File: gawk.info,  Node: Array Manipulation,  Next: Redirection API,  Prev: Symbol Table Access,  Up: Extension API Description
 
 16.4.11 Array Manipulation
 --------------------------
@@ -23856,7 +24330,7 @@ arrays of arrays (*note General Data Types::).
 
    ---------- Footnotes ----------
 
-   (1) Okay, the only data structure.
+   (1) OK, the only data structure.
 
 
 File: gawk.info,  Node: Array Data Types,  Next: Array Functions,  Up: Array Manipulation
@@ -23864,7 +24338,7 @@ File: gawk.info,  Node: Array Data Types,  Next: Array Functions,  Up: Array Man
 16.4.11.1 Array Data Types
 ..........................
 
-The data types associated with arrays are listed below.
+The data types associated with arrays are as follows:
 
 `typedef void *awk_array_t;'
      If you request the value of an array variable, you get back an
@@ -23879,7 +24353,7 @@ The data types associated with arrays are listed below.
 `    struct awk_element *next;'
 `    enum {'
 `        AWK_ELEMENT_DEFAULT = 0,  /* set by gawk */'
-`        AWK_ELEMENT_DELETE = 1    /* set by extension if should be deleted */'
+`        AWK_ELEMENT_DELETE = 1    /* set by extension */'
 `    } flags;'
 `    awk_value_t    index;'
 `    awk_value_t    value;'
@@ -23897,8 +24371,8 @@ The data types associated with arrays are listed below.
           the list.
 
     `enum { ... } flags;'
-          A set of flag values that convey information between `gawk'
-          and the extension. Currently there is only one:
+          A set of flag values that convey information between the
+          extension and `gawk'.  Currently there is only one:
           `AWK_ELEMENT_DELETE'.  Setting it causes `gawk' to delete the
           element from the original array upon release of the flattened
           array.
@@ -23909,8 +24383,8 @@ The data types associated with arrays are listed below.
           memory pointed to by `index' and `value' belongs to `gawk'.
 
 `typedef struct awk_flat_array {'
-`    awk_const void *awk_const opaque1;    /* private data for use by gawk */'
-`    awk_const void *awk_const opaque2;    /* private data for use by gawk */'
+`    awk_const void *awk_const opaque1;    /* for use by gawk */'
+`    awk_const void *awk_const opaque2;    /* for use by gawk */'
 `    awk_const size_t count;     /* how many elements */'
 `    awk_element_t elements[1];  /* will be extended */'
 `} awk_flat_array_t;'
@@ -23931,10 +24405,10 @@ File: gawk.info,  Node: Array Functions,  Next: Flattening Arrays,  Prev: Array
 16.4.11.2 Array Functions
 .........................
 
-The following functions relate to individual array elements.
+The following functions relate to individual array elements:
 
 `awk_bool_t get_element_count(awk_array_t a_cookie, size_t *count);'
-     For the array represented by `a_cookie', return in `*count' the
+     For the array represented by `a_cookie', place in `*count' the
      number of elements it contains. A subarray counts as a single
      element.  Return false if there is an error.
 
@@ -23949,14 +24423,15 @@ The following functions relate to individual array elements.
      (*note Table 16.1: table-value-types-returned.).
 
      The value for `index' can be numeric, in which case `gawk'
-     converts it to a string. Using non-integral values is possible, but
+     converts it to a string. Using nonintegral values is possible, but
      requires that you understand how such values are converted to
-     strings (*note Conversion::); thus using integral values is safest.
+     strings (*note Conversion::); thus, using integral values is
+     safest.
 
      As with _all_ strings passed into `gawk' from an extension, the
-     string value of `index' must come from the API-provided functions
-     `api_malloc()', `api_calloc()' or `api_realloc()' and `gawk'
-     releases the storage.
+     string value of `index' must come from `gawk_malloc()',
+     `gawk_calloc()', or `gawk_realloc()', and `gawk' releases the
+     storage.
 
 `awk_bool_t set_array_element(awk_array_t a_cookie,'
 `                             const awk_value_t *const index,'
@@ -23978,7 +24453,7 @@ The following functions relate to individual array elements.
 
    The following functions relate to arrays as a whole:
 
-`awk_array_t create_array();'
+`awk_array_t create_array(void);'
      Create a new array to which elements may be added.  *Note Creating
      Arrays::, for a discussion of how to create a new array and add
      elements to it.
@@ -23999,9 +24474,9 @@ The following functions relate to individual array elements.
 `awk_bool_t release_flattened_array(awk_array_t a_cookie,'
 `                                   awk_flat_array_t *data);'
      When done with a flattened array, release the storage using this
-     function.  You must pass in both the original array cookie, and
-     the address of the created `awk_flat_array_t' structure.  The
-     function returns true upon success, false otherwise.
+     function.  You must pass in both the original array cookie and the
+     address of the created `awk_flat_array_t' structure.  The function
+     returns true upon success, false otherwise.
 
 
 File: gawk.info,  Node: Flattening Arrays,  Next: Creating Arrays,  Prev: Array Functions,  Up: Array Manipulation
@@ -24009,12 +24484,13 @@ File: gawk.info,  Node: Flattening Arrays,  Next: Creating Arrays,  Prev: Array
 16.4.11.3 Working With All The Elements of an Array
 ...................................................
 
-To "flatten" an array is create a structure that represents the full
+To "flatten" an array is to create a structure that represents the full
 array in a fashion that makes it easy for C code to traverse the entire
-array.  Test code in `extension/testext.c' does this, and also serves
-as a nice example showing how to use the APIs.
+array.  Some of the code in `extension/testext.c' does this, and also
+serves as a nice example showing how to use the APIs.
 
-   First, the `gawk' script that drives the test extension:
+   We walk through that part of the code one step at a time.  First,
+the `gawk' script that drives the test extension:
 
      @load "testext"
      BEGIN {
@@ -24060,9 +24536,8 @@ number of arguments:
          }
 
    The function then proceeds in steps, as follows. First, retrieve the
-name of the array, passed as the first argument. Then retrieve the
-array itself. If either operation fails, print error messages and
-return:
+name of the array, passed as the first argument, followed by the array
+itself. If either operation fails, print an error message and return:
 
          /* get argument named array as flat array and print it */
          if (get_argument(0, AWK_STRING, & value)) {
@@ -24092,9 +24567,9 @@ count of elements in the array and print it:
          printf("dump_array_and_delete: incoming size is %lu\n",
                 (unsigned long) count);
 
-   The third step is to actually flatten the array, and then to double
-check that the count in the `awk_flat_array_t' is the same as the count
-just retrieved:
+   The third step is to actually flatten the array, and then to
+double-check that the count in the `awk_flat_array_t' is the same as
+the count just retrieved:
 
          if (! flatten_array(value2.array_cookie, & flat_array)) {
              printf("dump_array_and_delete: could not flatten array\n");
@@ -24111,7 +24586,7 @@ just retrieved:
 
    The fourth step is to retrieve the index of the element to be
 deleted, which was passed as the second argument.  Remember that
-argument counts passed to `get_argument()' are zero-based, thus the
+argument counts passed to `get_argument()' are zero-based, and thus the
 second argument is numbered one:
 
          if (! get_argument(1, AWK_STRING, & value3)) {
@@ -24124,7 +24599,7 @@ over every element in the array, printing the index and element values.
 In addition, upon finding the element with the index that is supposed
 to be deleted, the function sets the `AWK_ELEMENT_DELETE' bit in the
 `flags' field of the element.  When the array is released, `gawk'
-traverses the flattened array, and deletes any elements which have this
+traverses the flattened array, and deletes any elements that have this
 flag bit set:
 
          for (i = 0; i < flat_array->count; i++) {
@@ -24135,8 +24610,7 @@ flag bit set:
                  valrep2str(& flat_array->elements[i].value));
 
              if (strcmp(value3.str_value.str,
-                        flat_array->elements[i].index.str_value.str)
-                        == 0) {
+                        flat_array->elements[i].index.str_value.str) == 0) {
                  flat_array->elements[i].flags |= AWK_ELEMENT_DELETE;
                  printf("dump_array_and_delete: marking element \"%s\" "
                         "for deletion\n",
@@ -24155,7 +24629,7 @@ this code) once you have called `release_flattened_array()':
              goto out;
          }
 
-   Finally, since everything was successful, the function sets the
+   Finally, because everything was successful, the function sets the
 return value to success, and returns:
 
          make_number(1.0, result);
@@ -24190,7 +24664,7 @@ them and manipulate them.
    There are two important points about creating arrays from extension
 code:
 
-  1. You must install a new array into `gawk''s symbol table
+   * You must install a new array into `gawk''s symbol table
      immediately upon creating it.  Once you have done so, you can then
      populate the array.
 
@@ -24204,7 +24678,7 @@ code:
      previously existing array using `set_array_element()'.  We show
      example code shortly.
 
-  2. Due to gawk internals, after using `sym_update()' to install an
+   * Due to `gawk' internals, after using `sym_update()' to install an
      array into `gawk', you have to retrieve the array cookie from the
      value passed in to `sym_update()' before doing anything else with
      it, like so:
@@ -24226,9 +24700,9 @@ code:
 
    The following C code is a simple test extension to create an array
 with two regular elements and with a subarray. The leading `#include'
-directives and boilerplate variable declarations are omitted for
-brevity.  The first step is to create a new array and then install it
-in the symbol table:
+directives and boilerplate variable declarations (*note Extension API
+Boilerplate::) are omitted for brevity.  The first step is to create a
+new array and then install it in the symbol table:
 
      /* create_new_array --- create a named array */
 
@@ -24288,7 +24762,7 @@ Note how `a_cookie' is reset from the `array_cookie' field in the
          }
      }
 
-   Here is sample script that loads the extension and then dumps the
+   Here is a sample script that loads the extension and then dumps the
 array:
 
      @load "subarray"
@@ -24317,9 +24791,78 @@ array:
 environment variable.)
 
 
-File: gawk.info,  Node: Extension API Variables,  Next: Extension API Boilerplate,  Prev: Array Manipulation,  Up: Extension API Description
+File: gawk.info,  Node: Redirection API,  Next: Extension API Variables,  Prev: Array Manipulation,  Up: Extension API Description
+
+16.4.12 Accessing and Manipulating Redirections
+-----------------------------------------------
+
+The following function allows extensions to access and manipulate
+redirections.
+
+`awk_bool_t get_file(const char *name,'
+`                    size_t name_len,'
+`                    const char *filetype,'
+`                    int fd,'
+`                    const awk_input_buf_t **ibufp,'
+`                    const awk_output_buf_t **obufp);'
+     Look up a file in `gawk''s internal redirection table.  If `name'
+     is `NULL' or `name_len' is zero, return data for the currently
+     open input file corresponding to `FILENAME'.  (This does not
+     access the `filetype' argument, so that may be undefined).  If the
+     file is not already open, attempt to open it.  The `filetype'
+     argument must be zero-terminated and should be one of:
+
+    `">"'
+          A file opened for output.
+
+    `">>"'
+          A file opened for append.
+
+    `"<"'
+          A file opened for input.
+
+    `"|>"'
+          A pipe opened for output.
 
-16.4.12 API Variables
+    `"|<"'
+          A pipe opened for input.
+
+    `"|&"'
+          A two-way coprocess.
+
+     On error, return a `false' value.  Otherwise, return `true', and
+     return additional information about the redirection in the `ibufp'
+     and `obufp' pointers.  For input redirections, the `*ibufp' value
+     should be non-`NULL', and `*obufp' should be `NULL'.  For output
+     redirections, the `*obufp' value should be non-`NULL', and `*ibufp'
+     should be `NULL'.  For two-way coprocesses, both values should be
+     non-`NULL'.
+
+     In the usual case, the extension is interested in `(*ibufp)->fd'
+     and/or `fileno((*obufp)->fp)'.  If the file is not already open,
+     and the `fd' argument is non-negative, `gawk' will use that file
+     descriptor instead of opening the file in the usual way.  If `fd'
+     is non-negative, but the file exists already, `gawk' ignores `fd'
+     and returns the existing file.  It is the caller's responsibility
+     to notice that neither the `fd' in the returned `awk_input_buf_t'
+     nor the `fd' in the returned `awk_output_buf_t' matches the
+     requested value.
+
+     Note that supplying a file descriptor is currently _not_ supported
+     for pipes.  However, supplying a file descriptor should work for
+     input, output, append, and two-way (coprocess) sockets.  If
+     `filetype' is two-way, `gawk' assumes that it is a socket!  Note
+     that in the two-way case, the input and output file descriptors
+     may differ.  To check for success, you must check whether either
+     matches.
+
+   It is anticipated that this API function will be used to implement
+I/O multiplexing and a socket library.
+
+
+File: gawk.info,  Node: Extension API Variables,  Next: Extension API Boilerplate,  Prev: Redirection API,  Up: Extension API Description
+
+16.4.13 API Variables
 ---------------------
 
 The API provides two sets of variables.  The first provides information
@@ -24336,17 +24879,17 @@ information about how `gawk' was invoked.
 
 File: gawk.info,  Node: Extension Versioning,  Next: Extension API Informational Variables,  Up: Extension API Variables
 
-16.4.12.1 API Version Constants and Variables
+16.4.13.1 API Version Constants and Variables
 .............................................
 
 The API provides both a "major" and a "minor" version number.  The API
 versions are available at compile time as constants:
 
 `GAWK_API_MAJOR_VERSION'
-     The major version of the API.
+     The major version of the API
 
 `GAWK_API_MINOR_VERSION'
-     The minor version of the API.
+     The minor version of the API
 
    The minor version increases when new functions are added to the API.
 Such new functions are always added to the end of the API `struct'.
@@ -24361,13 +24904,13 @@ For this reason, the major and minor API versions of the running `gawk'
 are included in the API `struct' as read-only constant integers:
 
 `api->major_version'
-     The major version of the running `gawk'.
+     The major version of the running `gawk'
 
 `api->minor_version'
-     The minor version of the running `gawk'.
+     The minor version of the running `gawk'
 
    It is up to the extension to decide if there are API
-incompatibilities.  Typically a check like this is enough:
+incompatibilities.  Typically, a check like this is enough:
 
      if (api->major_version != GAWK_API_MAJOR_VERSION
          || api->minor_version < GAWK_API_MINOR_VERSION) {
@@ -24379,13 +24922,13 @@ incompatibilities.  Typically a check like this is enough:
      }
 
    Such code is included in the boilerplate `dl_load_func()' macro
-provided in `gawkapi.h' (discussed later, in *note Extension API
+provided in `gawkapi.h' (discussed in *note Extension API
 Boilerplate::).
 
 
 File: gawk.info,  Node: Extension API Informational Variables,  Prev: Extension Versioning,  Up: Extension API Variables
 
-16.4.12.2 Informational Variables
+16.4.13.2 Informational Variables
 .................................
 
 The API provides access to several variables that describe whether the
@@ -24396,8 +24939,7 @@ invoked.  The variables are:
      This variable is true if `gawk' was invoked with `--debug' option.
 
 `do_lint'
-     This variable is true if `gawk' was invoked with `--lint' option
-     (*note Options::).
+     This variable is true if `gawk' was invoked with `--lint' option.
 
 `do_mpfr'
      This variable is true if `gawk' was invoked with `--bignum' option.
@@ -24415,23 +24957,23 @@ invoked.  The variables are:
      option.
 
    The value of `do_lint' can change if `awk' code modifies the `LINT'
-built-in variable (*note Built-in Variables::).  The others should not
-change during execution.
+predefined variable (*note Built-in Variables::).  The others should
+not change during execution.
 
 
 File: gawk.info,  Node: Extension API Boilerplate,  Prev: Extension API Variables,  Up: Extension API Description
 
-16.4.13 Boilerplate Code
+16.4.14 Boilerplate Code
 ------------------------
 
 As mentioned earlier (*note Extension Mechanism Outline::), the function
 definitions as presented are really macros. To use these macros, your
 extension must provide a small amount of boilerplate code (variables and
-functions) towards the top of your source file, using pre-defined names
-as described below.  The boilerplate needed is also provided in comments
+functions) toward the top of your source file, using predefined names
+as described here.  The boilerplate needed is also provided in comments
 in the `gawkapi.h' header file:
 
-     /* Boiler plate code: */
+     /* Boilerplate code: */
      int plugin_is_GPL_compatible;
 
      static gawk_api_t *const api;
@@ -24450,12 +24992,12 @@ in the `gawkapi.h' header file:
      /* OR: */
 
      static awk_bool_t
-     init_my_module(void)
+     init_my_extension(void)
      {
          ...
      }
 
-     static awk_bool_t (*init_func)(void) = init_my_module;
+     static awk_bool_t (*init_func)(void) = init_my_extension;
 
      dl_load_func(func_table, some_name, "name_space_in_quotes")
 
@@ -24481,14 +25023,14 @@ in the `gawkapi.h' header file:
      to point to a string giving the name and version of your extension.
 
 `static awk_ext_func_t func_table[] = { ... };'
-     This is an array of one or more `awk_ext_func_t' structures as
+     This is an array of one or more `awk_ext_func_t' structures, as
      described earlier (*note Extension Functions::).  It can then be
      looped over for multiple calls to `add_ext_func()'.
 
 `static awk_bool_t (*init_func)(void) = NULL;'
 `                   OR'
-`static awk_bool_t init_my_module(void) { ... }'
-`static awk_bool_t (*init_func)(void) = init_my_module;'
+`static awk_bool_t init_my_extension(void) { ... }'
+`static awk_bool_t (*init_func)(void) = init_my_extension;'
      If you need to do some initialization work, you should define a
      function that does it (creates variables, opens files, etc.)  and
      then define the `init_func' pointer to point to your function.
@@ -24502,9 +25044,9 @@ in the `gawkapi.h' header file:
      This macro expands to a `dl_load()' function that performs all the
      necessary initializations.
 
-   The point of the all the variables and arrays is to let the
-`dl_load()' function (from the `dl_load_func()' macro) do all the
-standard work. It does the following:
+   The point of all the variables and arrays is to let the `dl_load()'
+function (from the `dl_load_func()' macro) do all the standard work. It
+does the following:
 
   1. Check the API versions. If the extension major version does not
      match `gawk''s, or if the extension minor version is greater than
@@ -24538,12 +25080,13 @@ File: gawk.info,  Node: Extension Example,  Next: Extension Samples,  Prev: Find
 16.6 Example: Some File Functions
 =================================
 
-     No matter where you go, there you are.  -- Buckaroo Bonzai
+     No matter where you go, there you are.  -- Buckaroo Banzai
 
    Two useful functions that are not in `awk' are `chdir()' (so that an
 `awk' program can change its directory) and `stat()' (so that an `awk'
-program can gather information about a file).  This minor node
-implements these functions for `gawk' in an extension.
+program can gather information about a file).  In order to illustrate
+the API in action, this minor node implements these functions for
+`gawk' in an extension.
 
 * Menu:
 
@@ -24567,8 +25110,7 @@ directory to change to:
      newdir = "/home/arnold/funstuff"
      ret = chdir(newdir)
      if (ret < 0) {
-         printf("could not change to %s: %s\n",
-                        newdir, ERRNO) > "/dev/stderr"
+         printf("could not change to %s: %s\n", newdir, ERRNO) > "/dev/stderr"
          exit 1
      }
      ...
@@ -24594,7 +25136,7 @@ appropriate information:
 `stat()' fails.  It fills in the following elements:
 
 `"name"'
-     The name of the file that was `stat()''ed.
+     The name of the file that was `stat()'ed.
 
 `"dev"'
 `"ino"'
@@ -24642,7 +25184,7 @@ appropriate information:
           The file is a directory.
 
     `"fifo"'
-          The file is a named-pipe (also known as a FIFO).
+          The file is a named pipe (also known as a FIFO).
 
     `"file"'
           The file is just a regular file.
@@ -24662,7 +25204,7 @@ appropriate information:
      systems, "a priori" knowledge is used to provide a value. Where no
      value can be determined, it defaults to 512.
 
-   Several additional elements may be present depending upon the
+   Several additional elements may be present, depending upon the
 operating system and the type of the file.  You can test for them in
 your `awk' program by using the `in' operator (*note Reference to
 Elements::):
@@ -24691,10 +25233,10 @@ File: gawk.info,  Node: Internal File Ops,  Next: Using Internal File Ops,  Prev
 Here is the C code for these extensions.(1)
 
    The file includes a number of standard header files, and then
-includes the `gawkapi.h' header file which provides the API definitions.
-Those are followed by the necessary variable declarations to make use
-of the API macros and boilerplate code (*note Extension API
-Boilerplate::).
+includes the `gawkapi.h' header file, which provides the API
+definitions.  Those are followed by the necessary variable declarations
+to make use of the API macros and boilerplate code (*note Extension API
+Boilerplate::):
 
      #ifdef HAVE_CONFIG_H
      #include <config.h>
@@ -24729,11 +25271,11 @@ Boilerplate::).
 
    By convention, for an `awk' function `foo()', the C function that
 implements it is called `do_foo()'.  The function should have two
-arguments: the first is an `int' usually called `nargs', that
+arguments. The first is an `int', usually called `nargs', that
 represents the number of actual arguments for the function.  The second
-is a pointer to an `awk_value_t', usually named `result'.
+is a pointer to an `awk_value_t' structure, usually named `result':
 
-     /*  do_chdir --- provide dynamically loaded chdir() builtin for gawk */
+     /*  do_chdir --- provide dynamically loaded chdir() function for gawk */
 
      static awk_value_t *
      do_chdir(int nargs, awk_value_t *result)
@@ -24749,11 +25291,11 @@ is a pointer to an `awk_value_t', usually named `result'.
                         "expecting 1"));
 
    The `newdir' variable represents the new directory to change to,
-retrieved with `get_argument()'.  Note that the first argument is
-numbered zero.
+which is retrieved with `get_argument()'.  Note that the first argument
+is numbered zero.
 
    If the argument is retrieved successfully, the function calls the
-`chdir()' system call. If the `chdir()' fails, `ERRNO' is updated.
+`chdir()' system call. If the `chdir()' fails, `ERRNO' is updated:
 
          if (get_argument(0, AWK_STRING, & newdir)) {
              ret = chdir(newdir.str_value.str);
@@ -24767,8 +25309,8 @@ numbered zero.
      }
 
    The `stat()' extension is more involved.  First comes a function
-that turns a numeric mode into a printable representation (e.g., 644
-becomes `-rw-r--r--'). This is omitted here for brevity:
+that turns a numeric mode into a printable representation (e.g., octal
+`0644' becomes `-rw-r--r--'). This is omitted here for brevity:
 
      /* format_mode --- turn a stat mode field into something readable */
 
@@ -24818,8 +25360,8 @@ contain the result of the `stat()':
 
    The following function does most of the work to fill in the
 `awk_array_t' result array with values obtained from a valid `struct
-stat'. It is done in a separate function to support the `stat()'
-function for `gawk' and also to support the `fts()' extension which is
+stat'. This work is done in a separate function to support the `stat()'
+function for `gawk' and also to support the `fts()' extension, which is
 included in the same file but whose code is not shown here (*note
 Extension Sample File Functions::).
 
@@ -24921,12 +25463,20 @@ and/or the type of the file. It then returns zero, for success:
              }
          }
 
-         array_set(array, "type", make_const_string(type, strlen(type), &tmp));
+         array_set(array, "type", make_const_string(type, strlen(type), & tmp));
 
          return 0;
      }
 
-   Finally, here is the `do_stat()' function. It starts with variable
+   The third argument to `stat()' was not discussed previously. This
+argument is optional. If present, it causes `do_stat()' to use the
+`stat()' system call instead of the `lstat()' system call.  This is
+done by using a function pointer: `statfunc'.  `statfunc' is
+initialized to point to `lstat()' (instead of `stat()') to get the file
+information, in case the file is a symbolic link. However, if the third
+argument is included, `statfunc' is set to point to `stat()', instead.
+
+   Here is the `do_stat()' function, which starts with variable
 declarations and argument checking:
 
      /* do_stat --- provide a stat() function for gawk */
@@ -24951,14 +25501,10 @@ declarations and argument checking:
              return make_number(-1, result);
          }
 
-   The third argument to `stat()' was not discussed previously. This
-argument is optional. If present, it causes `stat()' to use the `stat()'
-system call instead of the `lstat()' system call.
-
    Then comes the actual work. First, the function gets the arguments.
-Next, it gets the information for the file.  The code use `lstat()'
-(instead of `stat()') to get the file information, in case the file is
-a symbolic link.  If there's an error, it sets `ERRNO' and returns:
+Next, it gets the information for the file.  If the called function
+(`lstat()' or `stat()') returns an error, the code sets `ERRNO' and
+returns:
 
          /* file is first arg, array to hold results is second */
          if (   ! get_argument(0, AWK_STRING, & file_param)
@@ -24977,7 +25523,7 @@ a symbolic link.  If there's an error, it sets `ERRNO' and returns:
          /* always empty out the array */
          clear_array(array);
 
-         /* stat the file, if error, set ERRNO and return */
+         /* stat the file; if error, set ERRNO and return */
          ret = statfunc(name, & sbuf);
          if (ret < 0) {
              update_ERRNO_int(errno);
@@ -24985,7 +25531,7 @@ a symbolic link.  If there's an error, it sets `ERRNO' and returns:
          }
 
    The tedious work is done by `fill_stat_array()', shown earlier.
-When done, return the result from `fill_stat_array()':
+When done, the function returns the result from `fill_stat_array()':
 
          ret = fill_stat_array(name, array, & sbuf);
 
@@ -24996,7 +25542,8 @@ When done, return the result from `fill_stat_array()':
 function(s) into `gawk'.
 
    The `filefuncs' extension also provides an `fts()' function, which
-we omit here. For its sake there is an initialization function:
+we omit here (*note Extension Sample File Functions::).  For its sake,
+there is an initialization function:
 
      /* init_filefuncs --- initialization routine */
 
@@ -25036,7 +25583,7 @@ version.
 
 File: gawk.info,  Node: Using Internal File Ops,  Prev: Internal File Ops,  Up: Extension Example
 
-16.6.3 Integrating The Extensions
+16.6.3 Integrating the Extensions
 ---------------------------------
 
 Now that the code is written, it must be possible to add it at runtime
@@ -25048,7 +25595,7 @@ create a GNU/Linux shared library:
      $ gcc -fPIC -shared -DHAVE_CONFIG_H -c -O -g -IIDIR filefuncs.c
      $ gcc -o filefuncs.so -shared filefuncs.o
 
-   Once the library exists, it is loaded by using the `@load' keyword.
+   Once the library exists, it is loaded by using the `@load' keyword:
 
      # file testff.awk
      @load "filefuncs"
@@ -25067,14 +25614,14 @@ create a GNU/Linux shared library:
          for (i in data)
              printf "data[\"%s\"] = %s\n", i, data[i]
          print "testff.awk modified:",
-             strftime("%m %d %y %H:%M:%S", data["mtime"])
+             strftime("%m %d %Y %H:%M:%S", data["mtime"])
 
          print "\nInfo for JUNK"
          ret = stat("JUNK", data)
          print "ret =", ret
          for (i in data)
              printf "data[\"%s\"] = %s\n", i, data[i]
-         print "JUNK modified:", strftime("%m %d %y %H:%M:%S", data["mtime"])
+         print "JUNK modified:", strftime("%m %d %Y %H:%M:%S", data["mtime"])
      }
 
    The `AWKLIBPATH' environment variable tells `gawk' where to find
@@ -25086,43 +25633,44 @@ directory and run the program:
      -| Info for testff.awk
      -| ret = 0
      -| data["blksize"] = 4096
-     -| data["mtime"] = 1350838628
+     -| data["devbsize"] = 512
+     -| data["mtime"] = 1412004710
      -| data["mode"] = 33204
      -| data["type"] = file
      -| data["dev"] = 2053
      -| data["gid"] = 1000
-     -| data["ino"] = 1719496
-     -| data["ctime"] = 1350838628
+     -| data["ino"] = 10358899
+     -| data["ctime"] = 1412004710
      -| data["blocks"] = 8
      -| data["nlink"] = 1
      -| data["name"] = testff.awk
-     -| data["atime"] = 1350838632
+     -| data["atime"] = 1412004716
      -| data["pmode"] = -rw-rw-r--
-     -| data["size"] = 662
+     -| data["size"] = 666
      -| data["uid"] = 1000
-     -| testff.awk modified: 10 21 12 18:57:08
+     -| testff.awk modified: 09 29 2014 18:31:50
      -|
      -| Info for JUNK
      -| ret = -1
-     -| JUNK modified: 01 01 70 02:00:00
+     -| JUNK modified: 01 01 1970 02:00:00
 
    ---------- Footnotes ----------
 
-   (1) In practice, you would probably want to use the GNU
-Autotools--Automake, Autoconf, Libtool, and `gettext'--to configure and
-build your libraries. Instructions for doing so are beyond the scope of
-this Info file. *Note gawkextlib::, for WWW links to the tools.
+   (1) In practice, you would probably want to use the GNU Autotools
+(Automake, Autoconf, Libtool, and `gettext') to configure and build
+your libraries. Instructions for doing so are beyond the scope of this
+Info file. *Note gawkextlib::, for Internet links to the tools.
 
 
 File: gawk.info,  Node: Extension Samples,  Next: gawkextlib,  Prev: Extension Example,  Up: Dynamic Extensions
 
-16.7 The Sample Extensions In The `gawk' Distribution
+16.7 The Sample Extensions in the `gawk' Distribution
 =====================================================
 
-This minor node provides brief overviews of the sample extensions that
+This minor node provides a brief overview of the sample extensions that
 come in the `gawk' distribution. Some of them are intended for
-production use, such the `filefuncs', `readdir' and `inplace'
-extensions.  Others mainly provide example code that shows how to use
+production use (e.g., the `filefuncs', `readdir', and `inplace'
+extensions).  Others mainly provide example code that shows how to use
 the extension API.
 
 * Menu:
@@ -25139,32 +25687,32 @@ the extension API.
 * Extension Sample Rev2way::          Reversing data sample two-way processor.
 * Extension Sample Read write array:: Serializing an array to a file.
 * Extension Sample Readfile::         Reading an entire file into a string.
-* Extension Sample API Tests::        Tests for the API.
 * Extension Sample Time::             An interface to `gettimeofday()'
                                       and `sleep()'.
+* Extension Sample API Tests::        Tests for the API.
 
 
 File: gawk.info,  Node: Extension Sample File Functions,  Next: Extension Sample Fnmatch,  Up: Extension Samples
 
-16.7.1 File Related Functions
+16.7.1 File-Related Functions
 -----------------------------
 
 The `filefuncs' extension provides three different functions, as
-follows: The usage is:
+follows.  The usage is:
 
-@load "filefuncs"
+`@load "filefuncs"'
      This is how you load the extension.
 
 `result = chdir("/some/directory")'
      The `chdir()' function is a direct hook to the `chdir()' system
      call to change the current directory.  It returns zero upon
-     success or less than zero upon error.  In the latter case it
-     updates `ERRNO'.
+     success or a value less than zero upon error.  In the latter case,
+     it updates `ERRNO'.
 
 `result = stat("/some/path", statdata' [`, follow']`)'
      The `stat()' function provides a hook into the `stat()' system
-     call.  It returns zero upon success or less than zero upon error.
-     In the latter case it updates `ERRNO'.
+     call.  It returns zero upon success or a value less than zero upon
+     error.  In the latter case, it updates `ERRNO'.
 
      By default, it uses the `lstat()' system call.  However, if passed
      a third argument, it uses `stat()' instead.
@@ -25191,24 +25739,24 @@ follows: The usage is:
      `"minor"'  `st_minor'                         Device files
      `"blksize"'`st_blksize'                       All
      `"pmode"'  A human-readable version of the    All
-                mode value, such as printed by     
-                `ls'.  For example,                
-                `"-rwxr-xr-x"'                     
+                mode value, like that printed by   
+                `ls' (for example,                 
+                `"-rwxr-xr-x"')                    
      `"linkval"'The value of the symbolic link     Symbolic
                                                    links
-     `"type"'   The type of the file as a string.  All
-                One of `"file"', `"blockdev"',     
-                `"chardev"', `"directory"',        
-                `"socket"', `"fifo"', `"symlink"', 
-                `"door"', or `"unknown"'.  Not     
-                all systems support all file       
-                types.                             
+     `"type"'   The type of the file as a          All
+                string--one of `"file"',           
+                `"blockdev"', `"chardev"',         
+                `"directory"', `"socket"',         
+                `"fifo"', `"symlink"', `"door"',   
+                or `"unknown"' (not all systems    
+                support all file types)            
 
 `flags = or(FTS_PHYSICAL, ...)'
 `result = fts(pathlist, flags, filedata)'
      Walk the file trees provided in `pathlist' and fill in the
-     `filedata' array as described below.  `flags' is the bitwise OR of
-     several predefined constant values, also described below.  Return
+     `filedata' array, as described next.  `flags' is the bitwise OR of
+     several predefined values, also described in a moment.  Return
      zero if there were no errors, otherwise return -1.
 
    The `fts()' function provides a hook to the C library `fts()'
@@ -25250,20 +25798,21 @@ requested hierarchies.
           whether or not `FTS_LOGICAL' is set.
 
     `FTS_SEEDOT'
-          By default, the `fts()' routines do not return entries for
-          `.' (dot) and `..' (dot-dot).  This option causes entries for
-          dot-dot to also be included.  (The extension always includes
-          an entry for dot, see below.)
+          By default, the C library `fts()' routines do not return
+          entries for `.' (dot) and `..' (dot-dot).  This option causes
+          entries for dot-dot to also be included.  (The extension
+          always includes an entry for dot; more on this in a moment.)
 
     `FTS_XDEV'
           During a traversal, do not cross onto a different mounted
           filesystem.
 
 `filedata'
-     The `filedata' array is first cleared.  Then, `fts()' creates an
-     element in `filedata' for every element in `pathlist'.  The index
-     is the name of the directory or file given in `pathlist'.  The
-     element for this index is itself an array.  There are two cases.
+     The `filedata' array holds the results.  `fts()' first clears it.
+     Then it creates an element in `filedata' for every element in
+     `pathlist'.  The index is the name of the directory or file given
+     in `pathlist'.  The element for this index is itself an array.
+     There are two cases:
 
     _The path is a file_
           In this case, the array contains two or three elements:
@@ -25286,10 +25835,10 @@ requested hierarchies.
 
     _The path is a directory_
           In this case, the array contains one element for each entry
-          in the directory.  If an entry is a file, that element is as
-          for files, just described.  If the entry is a directory, that
-          element is (recursively), an array describing the
-          subdirectory.  If `FTS_SEEDOT' was provided in the flags,
+          in the directory.  If an entry is a file, that element is the
+          same as for files, just described.  If the entry is a
+          directory, that element is (recursively) an array describing
+          the subdirectory.  If `FTS_SEEDOT' was provided in the flags,
           then there will also be an element named `".."'.  This
           element will be an array containing the data as provided by
           `stat()'.
@@ -25299,24 +25848,25 @@ requested hierarchies.
           elements as for a file: `"path"', `"stat"', and `"error"'.
 
    The `fts()' function returns zero if there were no errors.
-Otherwise it returns -1.
+Otherwise, it returns -1.
 
      NOTE: The `fts()' extension does not exactly mimic the interface
      of the C library `fts()' routines, choosing instead to provide an
-     interface that is based on associative arrays, which should be
-     more comfortable to use from an `awk' program.  This includes the
-     lack of a comparison function, since `gawk' already provides
-     powerful array sorting facilities.  While an `fts_read()'-like
-     interface could have been provided, this felt less natural than
-     simply creating a multidimensional array to represent the file
-     hierarchy and its information.
+     interface that is based on associative arrays, which is more
+     comfortable to use from an `awk' program.  This includes the lack
+     of a comparison function, because `gawk' already provides powerful
+     array sorting facilities.  Although an `fts_read()'-like interface
+     could have been provided, this felt less natural than simply
+     creating a multidimensional array to represent the file hierarchy
+     and its information.
 
-   See `test/fts.awk' in the `gawk' distribution for an example.
+   See `test/fts.awk' in the `gawk' distribution for an example use of
+the `fts()' extension function.
 
 
 File: gawk.info,  Node: Extension Sample Fnmatch,  Next: Extension Sample Fork,  Prev: Extension Sample File Functions,  Up: Extension Samples
 
-16.7.2 Interface To `fnmatch()'
+16.7.2 Interface to `fnmatch()'
 -------------------------------
 
 This extension provides an interface to the C library `fnmatch()'
@@ -25327,25 +25877,26 @@ function.  The usage is:
 
 `result = fnmatch(pattern, string, flags)'
      The return value is zero on success, `FNM_NOMATCH' if the string
-     did not match the pattern, or a different non-zero value if an
+     did not match the pattern, or a different nonzero value if an
      error occurred.
 
-   Besides the `fnmatch()' function, the `fnmatch' extension adds one
-constant (`FNM_NOMATCH'), and an array of flag values named `FNM'.
+   In addition to the `fnmatch()' function, the `fnmatch' extension
+adds one constant (`FNM_NOMATCH'), and an array of flag values named
+`FNM'.
 
    The arguments to `fnmatch()' are:
 
 `pattern'
-     The file name wildcard to match.
+     The file name wildcard to match
 
 `string'
-     The file name string.
+     The file name string
 
 `flag'
      Either zero, or the bitwise OR of one or more of the flags in the
-     `FNM' array.
+     `FNM' array
 
-   The flags are follows:
+   The flags are as follows:
 
 Array element      Corresponding flag defined by `fnmatch()'
 -------------------------------------------------------------------------- 
@@ -25367,23 +25918,23 @@ Array element      Corresponding flag defined by `fnmatch()'
 
 File: gawk.info,  Node: Extension Sample Fork,  Next: Extension Sample Inplace,  Prev: Extension Sample Fnmatch,  Up: Extension Samples
 
-16.7.3 Interface To `fork()', `wait()' and `waitpid()'
-------------------------------------------------------
+16.7.3 Interface to `fork()', `wait()', and `waitpid()'
+-------------------------------------------------------
 
-The `fork' extension adds three functions, as follows.
+The `fork' extension adds three functions, as follows:
 
 `@load "fork"'
      This is how you load the extension.
 
 `pid = fork()'
      This function creates a new process. The return value is zero in
-     the child and the process-ID number of the child in the parent, or
+     the child and the process ID number of the child in the parent, or
      -1 upon error. In the latter case, `ERRNO' indicates the problem.
      In the child, `PROCINFO["pid"]' and `PROCINFO["ppid"]' are updated
      to reflect the correct values.
 
 `ret = waitpid(pid)'
-     This function takes a numeric argument, which is the process-ID to
+     This function takes a numeric argument, which is the process ID to
      wait for. The return value is that of the `waitpid()' system call.
 
 `ret = wait()'
@@ -25407,8 +25958,8 @@ File: gawk.info,  Node: Extension Sample Inplace,  Next: Extension Sample Ord,
 16.7.4 Enabling In-Place File Editing
 -------------------------------------
 
-The `inplace' extension emulates GNU `sed''s `-i' option which performs
-"in place" editing of each input file.  It uses the bundled
+The `inplace' extension emulates GNU `sed''s `-i' option, which
+performs "in-place" editing of each input file.  It uses the bundled
 `inplace.awk' include file to invoke the extension properly:
 
      # inplace --- load and invoke the inplace extension.
@@ -25418,11 +25969,16 @@ The `inplace' extension emulates GNU `sed''s `-i' option which performs
      # Please set INPLACE_SUFFIX to make a backup copy.  For example, you may
      # want to set INPLACE_SUFFIX to .bak on the command line or in a BEGIN rule.
 
+     # N.B. We call inplace_end() in the BEGINFILE and END rules so that any
+     # actions in an ENDFILE rule will be redirected as expected.
+
      BEGINFILE {
-         inplace_begin(FILENAME, INPLACE_SUFFIX)
+         if (_inplace_filename != "")
+             inplace_end(_inplace_filename, INPLACE_SUFFIX)
+         inplace_begin(_inplace_filename = FILENAME, INPLACE_SUFFIX)
      }
 
-     ENDFILE {
+     END {
          inplace_end(FILENAME, INPLACE_SUFFIX)
      }
 
@@ -25434,6 +25990,10 @@ the extension restores standard output to its original destination.  If
 a backup file name created by appending that suffix.  Finally, the
 temporary file is renamed to the original file name.
 
+   The `_inplace_filename' variable serves to keep track of the current
+filename so as to not invoke `inplace_end()' before processing the
+first file.
+
    If any error occurs, the extension issues a fatal error to terminate
 processing immediately without damaging the original file.
 
@@ -25453,7 +26013,7 @@ File: gawk.info,  Node: Extension Sample Ord,  Next: Extension Sample Readdir,
 --------------------------------------------------------
 
 The `ordchr' extension adds two functions, named `ord()' and `chr()',
-as follows.
+as follows:
 
 `@load "ordchr"'
      This is how you load the extension.
@@ -25491,11 +26051,11 @@ returned as a record.
    The record consists of three fields. The first two are the inode
 number and the file name, separated by a forward slash character.  On
 systems where the directory entry contains the file type, the record
-has a third field (also separated by a slash) which is a single letter
-indicating the type of the file. The letters are file types are shown
-in *note table-readdir-file-types::.
+has a third field (also separated by a slash), which is a single letter
+indicating the type of the file. The letters and their corresponding
+file types are shown in *note table-readdir-file-types::.
 
-Letter  File Type
+Letter  File type
 -------------------------------------------------------------------------- 
 `b'     Block device
 `c'     Character device
@@ -25506,7 +26066,7 @@ Letter  File Type
 `s'     Socket
 `u'     Anything else (unknown)
 
-Table 16.2: File Types Returned By `readdir()'
+Table 16.2: File types returned by the `readdir' extension
 
    On systems without the file type information, the third field is
 always `u'.
@@ -25531,7 +26091,7 @@ File: gawk.info,  Node: Extension Sample Revout,  Next: Extension Sample Rev2way
 -----------------------
 
 The `revoutput' extension adds a simple output wrapper that reverses
-the characters in each output line.  It's main purpose is to show how to
+the characters in each output line.  Its main purpose is to show how to
 write an output wrapper, although it may be mildly amusing for the
 unwary.  Here is an example:
 
@@ -25542,7 +26102,7 @@ unwary.  Here is an example:
          print "don't panic" > "/dev/stdout"
      }
 
-   The output from this program is: `cinap t'nod'.
+   The output from this program is `cinap t'nod'.
 
 
 File: gawk.info,  Node: Extension Sample Rev2way,  Next: Extension Sample Read write array,  Prev: Extension Sample Revout,  Up: Extension Samples
@@ -25552,9 +26112,9 @@ File: gawk.info,  Node: Extension Sample Rev2way,  Next: Extension Sample Read w
 
 The `revtwoway' extension adds a simple two-way processor that reverses
 the characters in each line sent to it for reading back by the `awk'
-program.  It's main purpose is to show how to write a two-way
-processor, although it may also be mildly amusing.  The following
-example shows how to use it:
+program.  Its main purpose is to show how to write a two-way processor,
+although it may also be mildly amusing.  The following example shows
+how to use it:
 
      @load "revtwoway"
 
@@ -25571,12 +26131,15 @@ example shows how to use it:
 
 File: gawk.info,  Node: Extension Sample Read write array,  Next: Extension Sample Readfile,  Prev: Extension Sample Rev2way,  Up: Extension Samples
 
-16.7.9 Dumping and Restoring An Array
+16.7.9 Dumping and Restoring an Array
 -------------------------------------
 
 The `rwarray' extension adds two functions, named `writea()' and
 `reada()', as follows:
 
+`@load "rwarray"'
+     This is how you load the extension.
+
 `ret = writea(file, array)'
      This function takes a string argument, which is the name of the
      file to which to dump the array, and the array itself as the
@@ -25587,19 +26150,19 @@ The `rwarray' extension adds two functions, named `writea()' and
      `reada()' is the inverse of `writea()'; it reads the file named as
      its first argument, filling in the array named as the second
      argument. It clears the array first.  Here too, the return value
-     is one on success and zero upon failure.
+     is one on success, or zero upon failure.
 
    The array created by `reada()' is identical to that written by
 `writea()' in the sense that the contents are the same. However, due to
-implementation issues, the array traversal order of the recreated array
-is likely to be different from that of the original array.  As array
-traversal order in `awk' is by default undefined, this is (technically)
-not a problem.  If you need to guarantee a particular traversal order,
-use the array sorting features in `gawk' to do so (*note Array
-Sorting::).
+implementation issues, the array traversal order of the re-created
+array is likely to be different from that of the original array.  As
+array traversal order in `awk' is by default undefined, this is
+(technically) not a problem.  If you need to guarantee a particular
+traversal order, use the array sorting features in `gawk' to do so
+(*note Array Sorting::).
 
    The file contains binary data.  All integral values are written in
-network byte order.  However, double precision floating-point values
+network byte order.  However, double-precision floating-point values
 are written as native binary data.  Thus, arrays containing only string
 data can theoretically be dumped on systems with one byte order and
 restored on systems with a different one, but this has not been tried.
@@ -25613,9 +26176,9 @@ restored on systems with a different one, but this has not been tried.
      ret = reada("arraydump.bin", array)
 
 
-File: gawk.info,  Node: Extension Sample Readfile,  Next: Extension Sample API Tests,  Prev: Extension Sample Read write array,  Up: Extension Samples
+File: gawk.info,  Node: Extension Sample Readfile,  Next: Extension Sample Time,  Prev: Extension Sample Read write array,  Up: Extension Samples
 
-16.7.10 Reading An Entire File
+16.7.10 Reading an Entire File
 ------------------------------
 
 The `readfile' extension adds a single function named `readfile()', and
@@ -25646,21 +26209,9 @@ an input parser:
      }
 
 
-File: gawk.info,  Node: Extension Sample API Tests,  Next: Extension Sample Time,  Prev: Extension Sample Readfile,  Up: Extension Samples
-
-16.7.11 API Tests
------------------
-
-The `testext' extension exercises parts of the extension API that are
-not tested by the other samples.  The `extension/testext.c' file
-contains both the C code for the extension and `awk' test code inside C
-comments that run the tests. The testing framework extracts the `awk'
-code and runs the tests.  See the source file for more information.
+File: gawk.info,  Node: Extension Sample Time,  Next: Extension Sample API Tests,  Prev: Extension Sample Readfile,  Up: Extension Samples
 
-
-File: gawk.info,  Node: Extension Sample Time,  Prev: Extension Sample API Tests,  Up: Extension Samples
-
-16.7.12 Extension Time Functions
+16.7.11 Extension Time Functions
 --------------------------------
 
 The `time' extension adds two functions, named `gettimeofday()' and
@@ -25671,7 +26222,7 @@ The `time' extension adds two functions, named `gettimeofday()' and
 
 `the_time = gettimeofday()'
      Return the time in seconds that has elapsed since 1970-01-01 UTC
-     as a floating point value.  If the time is unavailable on this
+     as a floating-point value.  If the time is unavailable on this
      platform, return -1 and set `ERRNO'.  The returned time should
      have sub-second precision, but the actual precision may vary based
      on the platform.  If the standard C `gettimeofday()' system call
@@ -25683,12 +26234,24 @@ The `time' extension adds two functions, named `gettimeofday()' and
      Attempt to sleep for SECONDS seconds.  If SECONDS is negative, or
      the attempt to sleep fails, return -1 and set `ERRNO'.  Otherwise,
      return zero after sleeping for the indicated amount of time.  Note
-     that SECONDS may be a floating-point (non-integral) value.
+     that SECONDS may be a floating-point (nonintegral) value.
      Implementation details: depending on platform availability, this
      function tries to use `nanosleep()' or `select()' to implement the
      delay.
 
 
+File: gawk.info,  Node: Extension Sample API Tests,  Prev: Extension Sample Time,  Up: Extension Samples
+
+16.7.12 API Tests
+-----------------
+
+The `testext' extension exercises parts of the extension API that are
+not tested by the other samples.  The `extension/testext.c' file
+contains both the C code for the extension and `awk' test code inside C
+comments that run the tests. The testing framework extracts the `awk'
+code and runs the tests.  See the source file for more information.
+
+
 File: gawk.info,  Node: gawkextlib,  Next: Extension summary,  Prev: Extension Samples,  Up: Dynamic Extensions
 
 16.8 The `gawkextlib' Project
@@ -25699,23 +26262,25 @@ provides a number of `gawk' extensions, including one for processing
 XML files.  This is the evolution of the original `xgawk' (XML `gawk')
 project.
 
-   As of this writing, there are five extensions:
+   As of this writing, there are seven extensions:
 
-   * XML parser extension, using the Expat
-     (http://expat.sourceforge.net) XML parsing library.
+   * `errno' extension
+
+   * GD graphics library extension
 
-   * PDF extension.
+   * MPFR library extension (this provides access to a number of MPFR
+     functions that `gawk''s native MPFR support does not)
 
-   * PostgreSQL extension.
+   * PDF extension
 
-   * GD graphics library extension.
+   * PostgreSQL extension
 
-   * MPFR library extension.  This provides access to a number of MPFR
-     functions which `gawk''s native MPFR support does not.
+   * Redis extension
 
-   The `time' extension described earlier (*note Extension Sample
-Time::) was originally from this project but has been moved in to the
-main `gawk' distribution.
+   * Select extension
+
+   * XML parser extension, using the Expat
+     (http://expat.sourceforge.net) XML parsing library
 
    You can check out the code for the `gawkextlib' project using the
 Git (http://git-scm.com) distributed source code control system.  The
@@ -25751,12 +26316,12 @@ follows.  First, build and install `gawk':
 
    If you have installed `gawk' in the standard way, then you will
 likely not need the `--with-gawk' option when configuring `gawkextlib'.
-You may also need to use the `sudo' utility to install both `gawk' and
+You may need to use the `sudo' utility to install both `gawk' and
 `gawkextlib', depending upon how your system works.
 
    If you write an extension that you wish to share with other `gawk'
-users, please consider doing so through the `gawkextlib' project.  See
-the project's web site for more information.
+users, consider doing so through the `gawkextlib' project.  See the
+project's website for more information.
 
 
 File: gawk.info,  Node: Extension summary,  Next: Extension Exercises,  Prev: gawkextlib,  Up: Dynamic Extensions
@@ -25765,7 +26330,7 @@ File: gawk.info,  Node: Extension summary,  Next: Extension Exercises,  Prev: ga
 ============
 
    * You can write extensions (sometimes called plug-ins) for `gawk' in
-     C or C++ using the Application Programming Interface (API) defined
+     C or C++ using the application programming interface (API) defined
      by the `gawk' developers.
 
    * Extensions must have a license compatible with the GNU General
@@ -25773,78 +26338,78 @@ File: gawk.info,  Node: Extension summary,  Next: Extension Exercises,  Prev: ga
      a variable named `plugin_is_GPL_compatible'.
 
    * Communication between `gawk' and an extension is two-way.  `gawk'
-     passes a `struct' to the extension which contains various data
+     passes a `struct' to the extension that contains various data
      fields and function pointers.  The extension can then call into
      `gawk' via the supplied function pointers to accomplish certain
      tasks.
 
    * One of these tasks is to "register" the name and implementation of
-     a new `awk'-level function with `gawk'.  The implementation takes
+     new `awk'-level functions with `gawk'.  The implementation takes
      the form of a C function pointer with a defined signature.  By
      convention, implementation functions are named `do_XXXX()' for
      some `awk'-level function `XXXX()'.
 
-   * The API is defined in a header file named `gawkpi.h'. You must
+   * The API is defined in a header file named `gawkapi.h'. You must
      include a number of standard header files _before_ including it in
      your source file.
 
    * API function pointers are provided for the following kinds of
      operations:
 
-        * Registration functions. You may register extension functions,
+        * Allocating, reallocating, and releasing memory
+
+        * Registration functions (you may register extension functions,
           exit callbacks, a version string, input parsers, output
-          wrappers, and two-way processors.
+          wrappers, and two-way processors)
 
-        * Printing fatal, warning, and "lint" warning messages.
+        * Printing fatal, warning, and "lint" warning messages
 
-        * Updating `ERRNO', or unsetting it.
+        * Updating `ERRNO', or unsetting it
 
         * Accessing parameters, including converting an undefined
-          parameter into an array.
+          parameter into an array
 
-        * Symbol table access: retrieving a global variable, creating
-          one, or changing one.
-
-        * Allocating, reallocating, and releasing memory.
+        * Symbol table access (retrieving a global variable, creating
+          one, or changing one)
 
         * Creating and releasing cached values; this provides an
           efficient way to use values for multiple variables and can be
-          a big performance win.
+          a big performance win
 
-        * Manipulating arrays: retrieving, adding, deleting, and
+        * Manipulating arrays (retrieving, adding, deleting, and
           modifying elements; getting the count of elements in an array;
           creating a new array; clearing an array; and flattening an
-          array for easy C style looping over all its indices and
-          elements
+          array for easy C-style looping over all its indices and
+          elements)
 
    * The API defines a number of standard data types for representing
      `awk' values, array elements, and arrays.
 
-   * The API provide convenience functions for constructing values.  It
-     also provides memory management functions to ensure compatibility
-     between memory allocated by `gawk' and memory allocated by an
-     extension.
+   * The API provides convenience functions for constructing values.
+     It also provides memory management functions to ensure
+     compatibility between memory allocated by `gawk' and memory
+     allocated by an extension.
 
    * _All_ memory passed from `gawk' to an extension must be treated as
      read-only by the extension.
 
    * _All_ memory passed from an extension to `gawk' must come from the
      API's memory allocation functions. `gawk' takes responsibility for
-     the memory and will release it when appropriate.
+     the memory and releases it when appropriate.
 
    * The API provides information about the running version of `gawk' so
      that an extension can make sure it is compatible with the `gawk'
      that loaded it.
 
    * It is easiest to start a new extension by copying the boilerplate
-     code described in this major node.  Macros in the `gawkapi.h' make
-     this easier to do.
+     code described in this major node.  Macros in the `gawkapi.h'
+     header file make this easier to do.
 
    * The `gawk' distribution includes a number of small but useful
-     sample extensions. The `gawkextlib' project includes several more,
-     larger, extensions.  If you wish to write an extension and
+     sample extensions. The `gawkextlib' project includes several more
+     (larger) extensions.  If you wish to write an extension and
      contribute it to the community of `gawk' users, the `gawkextlib'
-     project should be the place to do so.
+     project is the place to do so.
 
 
 
@@ -25857,12 +26422,26 @@ File: gawk.info,  Node: Extension Exercises,  Prev: Extension summary,  Up: Dyna
      `chmod()', and `umask()' to the file operations extension
      presented in *note Internal File Ops::.
 
-  2. (Hard.)  How would you provide namespaces in `gawk', so that the
+  2. Write an input parser that prints a prompt if the input is a from
+     a "terminal" device.  You can use the `isatty()' function to tell
+     if the input file is a terminal. (Hint: this function is usually
+     expensive to call; try to call it just once.)  The content of the
+     prompt should come from a variable settable by `awk'-level code.
+     You can write the prompt to stanard error. However, for best
+     results, open a new file descriptor (or file pointer) on
+     `/dev/tty' and print the prompt there, in case standard error has
+     been redirected.
+
+     Why is standard error a better choice than standard output for
+     writing the prompt?  Which reading mechanism should you replace,
+     the one to get a record, or the one to read raw bytes?
+
+  3. (Hard.)  How would you provide namespaces in `gawk', so that the
      names of functions in different extensions don't conflict with
      each other?  If you come up with a really good scheme, contact the
      `gawk' maintainer to tell him about it.
 
-  3. Write a wrapper script that provides an interface similar to `sed
+  4. Write a wrapper script that provides an interface similar to `sed
      -i' for the "inplace" extension presented in *note Extension
      Sample Inplace::.
 
@@ -25874,14 +26453,14 @@ Appendix A The Evolution of the `awk' Language
 **********************************************
 
 This Info file describes the GNU implementation of `awk', which follows
-the POSIX specification.  Many long-time `awk' users learned `awk'
+the POSIX specification.  Many longtime `awk' users learned `awk'
 programming with the original `awk' implementation in Version 7 Unix.
 (This implementation was the basis for `awk' in Berkeley Unix, through
-4.3-Reno.  Subsequent versions of Berkeley Unix, and some systems
-derived from 4.4BSD-Lite, used various versions of `gawk' for their
-`awk'.)  This major node briefly describes the evolution of the `awk'
-language, with cross-references to other parts of the Info file where
-you can find more information.
+4.3-Reno.  Subsequent versions of Berkeley Unix, and, for a while, some
+systems derived from 4.4BSD-Lite, used various versions of `gawk' for
+their `awk'.)  This major node briefly describes the evolution of the
+`awk' language, with cross-references to other parts of the Info file
+where you can find more information.
 
 * Menu:
 
@@ -25912,58 +26491,56 @@ available in System V Release 3.1 (1987).  This minor node summarizes
 the changes, with cross-references to further details:
 
    * The requirement for `;' to separate rules on a line (*note
-     Statements/Lines::).
+     Statements/Lines::)
 
    * User-defined functions and the `return' statement (*note
-     User-defined::).
+     User-defined::)
 
    * The `delete' statement (*note Delete::).
 
-   * The `do'-`while' statement (*note Do Statement::).
+   * The `do'-`while' statement (*note Do Statement::)
 
    * The built-in functions `atan2()', `cos()', `sin()', `rand()', and
-     `srand()' (*note Numeric Functions::).
+     `srand()' (*note Numeric Functions::)
 
    * The built-in functions `gsub()', `sub()', and `match()' (*note
-     String Functions::).
+     String Functions::)
 
    * The built-in functions `close()' and `system()' (*note I/O
-     Functions::).
+     Functions::)
 
    * The `ARGC', `ARGV', `FNR', `RLENGTH', `RSTART', and `SUBSEP'
-     built-in variables (*note Built-in Variables::).
+     predefined variables (*note Built-in Variables::)
 
-   * Assignable `$0' (*note Changing Fields::).
+   * Assignable `$0' (*note Changing Fields::)
 
    * The conditional expression using the ternary operator `?:' (*note
-     Conditional Exp::).
+     Conditional Exp::)
 
-   * The expression `INDEX-VARIABLE in ARRAY' outside of `for'
-     statements (*note Reference to Elements::).
+   * The expression `INDX in ARRAY' outside of `for' statements (*note
+     Reference to Elements::)
 
    * The exponentiation operator `^' (*note Arithmetic Ops::) and its
-     assignment operator form `^=' (*note Assignment Ops::).
+     assignment operator form `^=' (*note Assignment Ops::)
 
    * C-compatible operator precedence, which breaks some old `awk'
-     programs (*note Precedence::).
+     programs (*note Precedence::)
 
    * Regexps as the value of `FS' (*note Field Separators::) and as the
      third argument to the `split()' function (*note String
-     Functions::), rather than using only the first character of `FS'.
+     Functions::), rather than using only the first character of `FS'
 
    * Dynamic regexps as operands of the `~' and `!~' operators (*note
-     Regexp Usage::).
+     Computed Regexps::)
 
    * The escape sequences `\b', `\f', and `\r' (*note Escape
-     Sequences::).  (Some vendors have updated their old versions of
-     `awk' to recognize `\b', `\f', and `\r', but this is not something
-     you can rely on.)
+     Sequences::)
 
-   * Redirection of input for the `getline' function (*note Getline::).
+   * Redirection of input for the `getline' function (*note Getline::)
 
-   * Multiple `BEGIN' and `END' rules (*note BEGIN/END::).
+   * Multiple `BEGIN' and `END' rules (*note BEGIN/END::)
 
-   * Multidimensional arrays (*note Multidimensional::).
+   * Multidimensional arrays (*note Multidimensional::)
 
 
 File: gawk.info,  Node: SVR4,  Next: POSIX,  Prev: V7/SVR3.1,  Up: Language History
@@ -25974,37 +26551,37 @@ A.2 Changes Between SVR3.1 and SVR4
 The System V Release 4 (1989) version of Unix `awk' added these features
 (some of which originated in `gawk'):
 
-   * The `ENVIRON' array (*note Built-in Variables::).
+   * The `ENVIRON' array (*note Built-in Variables::)
 
-   * Multiple `-f' options on the command line (*note Options::).
+   * Multiple `-f' options on the command line (*note Options::)
 
    * The `-v' option for assigning variables before program execution
-     begins (*note Options::).
+     begins (*note Options::)
 
-   * The `--' option for terminating command-line options.
+   * The `--' signal for terminating command-line options
 
    * The `\a', `\v', and `\x' escape sequences (*note Escape
-     Sequences::).
+     Sequences::)
 
    * A defined return value for the `srand()' built-in function (*note
-     Numeric Functions::).
+     Numeric Functions::)
 
    * The `toupper()' and `tolower()' built-in string functions for case
-     translation (*note String Functions::).
+     translation (*note String Functions::)
 
    * A cleaner specification for the `%c' format-control letter in the
-     `printf' function (*note Control Letters::).
+     `printf' function (*note Control Letters::)
 
    * The ability to dynamically pass the field width and precision
-     (`"%*.*d"') in the argument list of the `printf' function (*note
-     Control Letters::).
+     (`"%*.*d"') in the argument list of `printf' and `sprintf()'
+     (*note Control Letters::)
 
    * The use of regexp constants, such as `/foo/', as expressions, where
      they are equivalent to using the matching operator, as in `$0 ~
-     /foo/' (*note Using Constant Regexps::).
+     /foo/' (*note Using Constant Regexps::)
 
    * Processing of escape sequences inside command-line variable
-     assignments (*note Assignment Options::).
+     assignments (*note Assignment Options::)
 
 
 File: gawk.info,  Node: POSIX,  Next: BTL,  Prev: SVR4,  Up: Language History
@@ -26016,30 +26593,30 @@ The POSIX Command Language and Utilities standard for `awk' (1992)
 introduced the following changes into the language:
 
    * The use of `-W' for implementation-specific options (*note
-     Options::).
+     Options::)
 
    * The use of `CONVFMT' for controlling the conversion of numbers to
-     strings (*note Conversion::).
+     strings (*note Conversion::)
 
    * The concept of a numeric string and tighter comparison rules to go
-     with it (*note Typing and Comparison::).
+     with it (*note Typing and Comparison::)
 
-   * The use of built-in variables as function parameter names is
-     forbidden (*note Definition Syntax::.
+   * The use of predefined variables as function parameter names is
+     forbidden (*note Definition Syntax::)
 
    * More complete documentation of many of the previously undocumented
-     features of the language.
+     features of the language
 
    In 2012, a number of extensions that had been commonly available for
 many years were finally added to POSIX. They are:
 
    * The `fflush()' built-in function for flushing buffered output
-     (*note I/O Functions::).
+     (*note I/O Functions::)
 
-   * The `nextfile' statement (*note Nextfile Statement::).
+   * The `nextfile' statement (*note Nextfile Statement::)
 
    * The ability to delete all of an array at once with `delete ARRAY'
-     (*note Delete::).
+     (*note Delete::)
 
 
    *Note Common Extensions::, for a list of common extensions not
@@ -26058,16 +26635,16 @@ Brian Kernighan has made his version available via his home page (*note
 Other Versions::).
 
    This minor node describes common extensions that originally appeared
-in his version of `awk'.
+in his version of `awk':
 
    * The `**' and `**=' operators (*note Arithmetic Ops:: and *note
-     Assignment Ops::).
+     Assignment Ops::)
 
    * The use of `func' as an abbreviation for `function' (*note
-     Definition Syntax::).
+     Definition Syntax::)
 
    * The `fflush()' built-in function for flushing buffered output
-     (*note I/O Functions::).
+     (*note I/O Functions::)
 
 
    *Note Common Extensions::, for a full list of the extensions
@@ -26087,111 +26664,110 @@ can all be disabled with either the `--traditional' or `--posix' options
 node summarizes the additional features over POSIX `awk' that are in
 the current version of `gawk'.
 
-   * Additional built-in variables:
+   * Additional predefined variables:
 
-        - The `ARGIND' `BINMODE', `ERRNO', `FIELDWIDTHS', `FPAT',
+        - The `ARGIND', `BINMODE', `ERRNO', `FIELDWIDTHS', `FPAT',
           `IGNORECASE', `LINT', `PROCINFO', `RT', and `TEXTDOMAIN'
-          variables (*note Built-in Variables::).
+          variables (*note Built-in Variables::)
 
    * Special files in I/O redirections:
 
-        - The `/dev/stdin', `/dev/stdout', `/dev/stderr' and
-          `/dev/fd/N' special file names (*note Special Files::).
+        - The `/dev/stdin', `/dev/stdout', `/dev/stderr', and
+          `/dev/fd/N' special file names (*note Special Files::)
 
         - The `/inet', `/inet4', and `/inet6' special files for TCP/IP
           networking using `|&' to specify which version of the IP
-          protocol to use.  (*note TCP/IP Networking::).
+          protocol to use (*note TCP/IP Networking::)
 
    * Changes and/or additions to the language:
 
-        - The `\x' escape sequence (*note Escape Sequences::).
+        - The `\x' escape sequence (*note Escape Sequences::)
 
-        - Full support for both POSIX and GNU regexps (*note Regexp::).
+        - Full support for both POSIX and GNU regexps (*note Regexp::)
 
         - The ability for `FS' and for the third argument to `split()'
-          to be null strings (*note Single Character Fields::).
+          to be null strings (*note Single Character Fields::)
 
-        - The ability for `RS' to be a regexp (*note Records::).
+        - The ability for `RS' to be a regexp (*note Records::)
 
         - The ability to use octal and hexadecimal constants in `awk'
-          program source code (*note Nondecimal-numbers::).
+          program source code (*note Nondecimal-numbers::)
 
         - The `|&' operator for two-way I/O to a coprocess (*note
-          Two-way I/O::).
+          Two-way I/O::)
 
-        - Indirect function calls (*note Indirect Calls::).
+        - Indirect function calls (*note Indirect Calls::)
 
         - Directories on the command line produce a warning and are
-          skipped (*note Command-line directories::).
+          skipped (*note Command-line directories::)
 
-   * New keywords:
+        - Output with `print' and `printf' need not be fatal (*note
+          Nonfatal::)
 
-        - The `BEGINFILE' and `ENDFILE' special patterns.  (*note
-          BEGINFILE/ENDFILE::).
-
-        - The ability to delete all of an array at once with `delete
-          ARRAY' (*note Delete::).
+   * New keywords:
 
-        - The `nextfile' statement (*note Nextfile Statement::).
+        - The `BEGINFILE' and `ENDFILE' special patterns (*note
+          BEGINFILE/ENDFILE::)
 
-        - The `switch' statement (*note Switch Statement::).
+        - The `switch' statement (*note Switch Statement::)
 
    * Changes to standard `awk' functions:
 
         - The optional second argument to `close()' that allows closing
-          one end of a two-way pipe to a coprocess (*note Two-way
-          I/O::).
+          one end of a two-way pipe to a coprocess (*note Two-way I/O::)
 
-        - POSIX compliance for `gsub()' and `sub()'.
+        - POSIX compliance for `gsub()' and `sub()' with `--posix'
 
         - The `length()' function accepts an array argument and returns
-          the number of elements in the array (*note String
-          Functions::).
+          the number of elements in the array (*note String Functions::)
 
         - The optional third argument to the `match()' function for
           capturing text-matching subexpressions within a regexp (*note
-          String Functions::).
+          String Functions::)
 
         - Positional specifiers in `printf' formats for making
-          translations easier (*note Printf Ordering::).
+          translations easier (*note Printf Ordering::)
 
-        - The `split()' function's additional optional fourth argument
-          which is an array to hold the text of the field separators.
-          (*note String Functions::).
+        - The `split()' function's additional optional fourth argument,
+          which is an array to hold the text of the field separators
+          (*note String Functions::)
 
    * Additional functions only in `gawk':
 
-        - The `and()', `compl()', `lshift()', `or()', `rshift()', and
-          `xor()' functions for bit manipulation (*note Bitwise
-          Functions::).
+        - The `gensub()', `patsplit()', and `strtonum()' functions for
+          more powerful text manipulation (*note String Functions::)
 
         - The `asort()' and `asorti()' functions for sorting arrays
-          (*note Array Sorting::).
+          (*note Array Sorting::)
 
-        - The `bindtextdomain()', `dcgettext()' and `dcngettext()'
-          functions for internationalization (*note Programmer i18n::).
+        - The `mktime()', `systime()', and `strftime()' functions for
+          working with timestamps (*note Time Functions::)
 
-        - The `fflush()' function from BWK `awk' (*note I/O
-          Functions::).
+        - The `and()', `compl()', `lshift()', `or()', `rshift()', and
+          `xor()' functions for bit manipulation (*note Bitwise
+          Functions::)
 
-        - The `gensub()', `patsplit()', and `strtonum()' functions for
-          more powerful text manipulation (*note String Functions::).
+        - The `isarray()' function to check if a variable is an array
+          or not (*note Type Functions::)
 
-        - The `mktime()', `systime()', and `strftime()' functions for
-          working with timestamps (*note Time Functions::).
+        - The `bindtextdomain()', `dcgettext()', and `dcngettext()'
+          functions for internationalization (*note Programmer i18n::)
+
+        - The `intdiv()' function for doing integer division and
+          remainder (*note Numeric Functions::)
 
    * Changes and/or additions in the command-line options:
 
         - The `AWKPATH' environment variable for specifying a path
-          search for the `-f' command-line option (*note Options::).
+          search for the `-f' command-line option (*note Options::)
 
         - The `AWKLIBPATH' environment variable for specifying a path
-          search for the `-l' command-line option (*note Options::).
+          search for the `-l' command-line option (*note Options::)
 
         - The `-b', `-c', `-C', `-d', `-D', `-e', `-E', `-g', `-h',
           `-i', `-l', `-L', `-M', `-n', `-N', `-o', `-O', `-p', `-P',
           `-r', `-S', `-t', and `-V' short options. Also, the ability
-          to use GNU-style long-named options that start with `--' and
+          to use GNU-style long-named options that start with `--', and
           the `--assign', `--bignum', `--characters-as-bytes',
           `--copyright', `--debug', `--dump-variables', `--exec',
           `--field-separator', `--file', `--gen-pot', `--help',
@@ -26229,12 +26805,15 @@ the current version of `gawk'.
         - GCC for VAX and Alpha has not been tested for a while.
 
 
-   * Support for the following obsolete systems was removed from the
-     code and the documentation for `gawk' version 4.1:
+   * Support for the following obsolete system was removed from the code
+     for `gawk' version 4.1:
 
         - Ultrix
 
-   * Support for MirBSD was removed at `gawk' version 4.2.
+   * Support for the following systems was removed from the code for
+     `gawk' version 4.2:
+
+        - MirBSD
 
 
 
@@ -26605,7 +27184,7 @@ in POSIX `awk', in the order they were added to `gawk'.
 
         - The `-M' and `--bignum' options enable MPFR.
 
-        - The `-o' only does pretty-printing.
+        - The `-o' option only does pretty-printing.
 
         - The `-p' option is used for profiling.
 
@@ -26621,6 +27200,28 @@ in POSIX `awk', in the order they were added to `gawk'.
    * The dynamic extension interface was completely redone (*note
      Dynamic Extensions::).
 
+   * Support for Ultrix was removed.
+
+
+   Version 4.2 introduced the following changes:
+
+   * Changes to `ENVIRON' are reflected into `gawk''s environment and
+     that of programs that it runs.  *Note Auto-set::.
+
+   * The `--pretty-print' option no longer runs the `awk' program too.
+     *Note Options::.
+
+   * The `igawk' program and its manual page are no longer installed
+     when `gawk' is built.  *Note Igawk Program::.
+
+   * The `intdiv()' function.  *Note Numeric Functions::.
+
+   * The maximum number of hexdecimal digits in `\x' escapes is now two.
+     *Note Escape Sequences::.
+
+   * Nonfatal output with `print' and `printf'.  *Note Nonfatal::.
+
+   * Support for MirBSD was removed.
 
 
 File: gawk.info,  Node: Common Extensions,  Next: Ranges and Locales,  Prev: Feature History,  Up: Language History
@@ -26628,30 +27229,26 @@ File: gawk.info,  Node: Common Extensions,  Next: Ranges and Locales,  Prev: Fea
 A.7 Common Extensions Summary
 =============================
 
-This minor node summarizes the common extensions supported by `gawk',
-Brian Kernighan's `awk', and `mawk', the three most widely-used freely
-available versions of `awk' (*note Other Versions::).
-
-Feature                      BWK Awk   Mawk   GNU Awk
--------------------------------------------------------- 
-`\x' Escape sequence         X         X      X
-`FS' as null string          X         X      X
-`/dev/stdin' special file    X         X      X
-`/dev/stdout' special file   X         X      X
-`/dev/stderr' special file   X         X      X
-`delete' without subscript   X         X      X
-`fflush()' function          X         X      X
-`length()' of an array       X         X      X
-`nextfile' statement         X         X      X
-`**' and `**=' operators     X                X
-`func' keyword               X                X
-`BINMODE' variable                     X      X
-`RS' as regexp                         X      X
-Time related functions                 X      X
-
-   (Technically speaking, as of late 2012, `fflush()', `delete ARRAY',
-and `nextfile' are no longer extensions, since they have been added to
-POSIX.)
+The following table summarizes the common extensions supported by
+`gawk', Brian Kernighan's `awk', and `mawk', the three most widely used
+freely available versions of `awk' (*note Other Versions::).
+
+Feature                      BWK `awk'   `mawk'   `gawk'   Now standard
+-------------------------------------------------------------------------- 
+`\x' escape sequence         X           X        X        
+`FS' as null string          X           X        X        
+`/dev/stdin' special file    X           X        X        
+`/dev/stdout' special file   X           X        X        
+`/dev/stderr' special file   X           X        X        
+`delete' without subscript   X           X        X        X
+`fflush()' function          X           X        X        X
+`length()' of an array       X           X        X        
+`nextfile' statement         X           X        X        X
+`**' and `**=' operators     X                    X        
+`func' keyword               X                    X        
+`BINMODE' variable                       X        X        
+`RS' as regexp                           X        X        
+Time-related functions                   X        X        
 
 
 File: gawk.info,  Node: Ranges and Locales,  Next: Contributors,  Prev: Common Extensions,  Up: Language History
@@ -26669,9 +27266,9 @@ first character in the range and the last character in the range,
 inclusive.  Ordering was based on the numeric value of each character
 in the machine's native character set.  Thus, on ASCII-based systems,
 `[a-z]' matched all the lowercase letters, and only the lowercase
-letters, since the numeric values for the letters from `a' through `z'
+letters, as the numeric values for the letters from `a' through `z'
 were contiguous.  (On an EBCDIC system, the range `[a-z]' includes
-additional, non-alphabetic characters as well.)
+additional nonalphabetic characters as well.)
 
    Almost all introductory Unix literature explained range expressions
 as working in this fashion, and in particular, would teach that the
@@ -26680,9 +27277,9 @@ as working in this fashion, and in particular, would teach that the
 this was true.(1)
 
    The 1992 POSIX standard introduced the idea of locales (*note
-Locales::).  Since many locales include other letters besides the plain
-twenty-six letters of the American English alphabet, the POSIX standard
-added character classes (*note Bracket Expressions::) as a way to match
+Locales::).  Because many locales include other letters besides the
+plain 26 letters of the English alphabet, the POSIX standard added
+character classes (*note Bracket Expressions::) as a way to match
 different kinds of characters besides the traditional ones in the ASCII
 character set.
 
@@ -26692,14 +27289,14 @@ like `[a-dx-z]' is still equivalent to `[abcdxyz]', as in ASCII.  But
 outside those locales, the ordering was defined to be based on
 "collation order".
 
-   In many locales, `A' and `a' are both less than `B'.  In other
-words, these locales sort characters in dictionary order, and
-`[a-dx-z]' is typically not equivalent to `[abcdxyz]'; instead it might
-be equivalent to `[ABCXYabcdxyz]', for example.
+   What does that mean?  In many locales, `A' and `a' are both less
+than `B'.  In other words, these locales sort characters in dictionary
+order, and `[a-dx-z]' is typically not equivalent to `[abcdxyz]';
+instead, it might be equivalent to `[ABCXYabcdxyz]', for example.
 
-   This point needs to be emphasized: Much literature teaches that you
+   This point needs to be emphasized: much literature teaches that you
 should use `[a-z]' to match a lowercase character.  But on systems with
-non-ASCII locales, this also matched all of the uppercase characters
+non-ASCII locales, this also matches all of the uppercase characters
 except `A' or `Z'!  This was a continuous cause of confusion, even well
 into the twenty-first century.
 
@@ -26710,22 +27307,22 @@ the intent is to remove trailing uppercase characters:
      $ echo something1234abc | gawk-3.1.8 '{ sub("[A-Z]*$", ""); print }'
      -| something1234a
 
-This output is unexpected, since the `bc' at the end of
-`something1234abc' should not normally match `[A-Z]*'.  This result is
-due to the locale setting (and thus you may not see it on your system).
+This output is unexpected, as the `bc' at the end of `something1234abc'
+should not normally match `[A-Z]*'.  This result is due to the locale
+setting (and thus you may not see it on your system).
 
    Similar considerations apply to other ranges.  For example, `["-/]'
 is perfectly valid in ASCII, but is not valid in many Unicode locales,
 such as `en_US.UTF-8'.
 
    Early versions of `gawk' used regexp matching code that was not
-locale aware, so ranges had their traditional interpretation.
+locale-aware, so ranges had their traditional interpretation.
 
    When `gawk' switched to using locale-aware regexp matchers, the
 problems began; especially as both GNU/Linux and commercial Unix
 vendors started implementing non-ASCII locales, _and making them the
 default_.  Perhaps the most frequently asked question became something
-like "why does `[A-Z]' match lowercase letters?!?"
+like, "Why does `[A-Z]' match lowercase letters?!?"
 
    This situation existed for close to 10 years, if not more, and the
 `gawk' maintainer grew weary of trying to explain that `gawk' was being
@@ -26741,18 +27338,18 @@ of range expressions was _undefined_.(3)
 
    By using this lovely technical term, the standard gives license to
 implementors to implement ranges in whatever way they choose.  The
-`gawk' maintainer chose to apply the pre-POSIX meaning in all cases:
-the default regexp matching; with `--traditional' and with `--posix';
-in all cases, `gawk' remains POSIX compliant.
+`gawk' maintainer chose to apply the pre-POSIX meaning both with the
+default regexp matching and when `--traditional' or `--posix' are used.
+In all cases `gawk' remains POSIX-compliant.
 
    ---------- Footnotes ----------
 
    (1) And Life was good.
 
    (2) And thus was born the Campaign for Rational Range Interpretation
-(or RRI). A number of GNU tools have either implemented this change, or
-will soon.  Thanks to Karl Berry for coining the phrase "Rational Range
-Interpretation."
+(or RRI). A number of GNU tools have already implemented this change,
+or will soon.  Thanks to Karl Berry for coining the phrase "Rational
+Range Interpretation."
 
    (3) See the standard
 (http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_03_05)
@@ -26784,7 +27381,7 @@ Info file, in approximate chronological order:
 
    * Richard Stallman helped finish the implementation and the initial
      draft of this Info file.  He is also the founder of the FSF and
-     the GNU project.
+     the GNU Project.
 
    * John Woods contributed parts of the code (mostly fixes) in the
      initial version of `gawk'.
@@ -26826,7 +27423,7 @@ Info file, in approximate chronological order:
      various PC platforms.
 
    * Christos Zoulas provided the `extension()' built-in function for
-     dynamically adding new modules.  (This was obsoleted at `gawk'
+     dynamically adding new functions.  (This was obsoleted at `gawk'
      4.1.)
 
    * Ju"rgen Kahrs contributed the initial version of the TCP/IP
@@ -26860,7 +27457,7 @@ Info file, in approximate chronological order:
      statements.
 
    * Patrick T.J. McPhee contributed the code for dynamic loading in
-     Windows32 environments.  (This is no longer supported)
+     Windows32 environments.  (This is no longer supported.)
 
    * Anders Wallin helped keep the VMS port going for several years.
 
@@ -26870,22 +27467,22 @@ Info file, in approximate chronological order:
    * John Haque made the following contributions:
 
         - The modifications to convert `gawk' into a byte-code
-          interpreter, including the debugger.
+          interpreter, including the debugger
 
-        - The addition of true arrays of arrays.
+        - The addition of true arrays of arrays
 
-        - The additional modifications for support of arbitrary
-          precision arithmetic.
+        - The additional modifications for support of
+          arbitrary-precision arithmetic
 
-        - The initial text of *note Arbitrary Precision Arithmetic::.
+        - The initial text of *note Arbitrary Precision Arithmetic::
 
         - The work to merge the three versions of `gawk' into one, for
-          the 4.1 release.
+          the 4.1 release
 
-        - Improved array internals for arrays indexed by integers.
+        - Improved array internals for arrays indexed by integers
 
-        - The improved array sorting features were driven by John
-          together with Pat Rankin.
+        - The improved array sorting features were also driven by John,
+          together with Pat Rankin
 
    * Panos Papadopoulos contributed the original text for *note Include
      Files::.
@@ -26896,6 +27493,9 @@ Info file, in approximate chronological order:
      4.1 was driven primarily by Arnold Robbins and Andrew Schorr, with
      notable contributions from the rest of the development team.
 
+   * John Malmberg contributed significant improvements to the OpenVMS
+     port and the related documentation.
+
    * Antonio Giovanni Colombo rewrote a number of examples in the early
      chapters that were severely dated, for which I am incredibly
      grateful.
@@ -26911,11 +27511,11 @@ A.10 Summary
 ============
 
    * The `awk' language has evolved over time. The first release was
-     with V7 Unix circa 1978.  In 1987 for System V Release 3.1, major
-     additions, including user-defined functions, were made to the
-     language.  Additional changes were made for System V Release 4, in
-     1989.  Since then, further minor changes happen under the auspices
-     of the POSIX standard.
+     with V7 Unix, circa 1978.  In 1987, for System V Release 3.1,
+     major additions, including user-defined functions, were made to
+     the language.  Additional changes were made for System V Release
+     4, in 1989.  Since then, further minor changes have happened under
+     the auspices of the POSIX standard.
 
    * Brian Kernighan's `awk' provides a small number of extensions that
      are implemented in common with other versions of `awk'.
@@ -26928,7 +27528,7 @@ A.10 Summary
      been confusing over the years. Today, `gawk' implements Rational
      Range Interpretation, where ranges of the form `[a-z]' match
      _only_ the characters numerically between `a' through `z' in the
-     machine's native character set.  Usually this is ASCII but it can
+     machine's native character set.  Usually this is ASCII, but it can
      be EBCDIC on IBM S/390 systems.
 
    * Many people have contributed to `gawk' development over the years.
@@ -26945,8 +27545,8 @@ Appendix B Installing `gawk'
 This appendix provides instructions for installing `gawk' on the
 various platforms that are supported by the developers.  The primary
 developer supports GNU/Linux (and Unix), whereas the other ports are
-contributed.  *Note Bugs::, for the electronic mail addresses of the
-people who did the respective ports.
+contributed.  *Note Bugs::, for the email addresses of the people who
+maintain the respective ports.
 
 * Menu:
 
@@ -26989,10 +27589,10 @@ There are two ways to get GNU software:
      supported.  If you have the `wget' program, you can use a command
      like the following:
 
-          wget http://ftp.gnu.org/gnu/gawk/gawk-4.1.1.tar.gz
+          wget http://ftp.gnu.org/gnu/gawk/gawk-4.1.2.tar.gz
 
    The GNU software archive is mirrored around the world.  The
-up-to-date list of mirror sites is available from the main FSF web site
+up-to-date list of mirror sites is available from the main FSF website
 (http://www.gnu.org/order/ftp.html).  Try to use one of the mirrors;
 they will be less busy, and you can usually find one closer to your
 site.
@@ -27006,27 +27606,27 @@ B.1.2 Extracting the Distribution
 `gawk' is distributed as several `tar' files compressed with different
 compression programs: `gzip', `bzip2', and `xz'. For simplicity, the
 rest of these instructions assume you are using the one compressed with
-the GNU Zip program, `gzip'.
+the GNU Gzip program (`gzip').
 
-   Once you have the distribution (for example, `gawk-4.1.1.tar.gz'),
-use `gzip' to expand the file and then use `tar' to extract it.  You
-can use the following pipeline to produce the `gawk' distribution:
+   Once you have the distribution (e.g., `gawk-4.1.2.tar.gz'), use
+`gzip' to expand the file and then use `tar' to extract it.  You can
+use the following pipeline to produce the `gawk' distribution:
 
-     gzip -d -c gawk-4.1.1.tar.gz | tar -xvpf -
+     gzip -d -c gawk-4.1.2.tar.gz | tar -xvpf -
 
    On a system with GNU `tar', you can let `tar' do the decompression
 for you:
 
-     tar -xvpzf gawk-4.1.1.tar.gz
+     tar -xvpzf gawk-4.1.2.tar.gz
 
-Extracting the archive creates a directory named `gawk-4.1.1' in the
+Extracting the archive creates a directory named `gawk-4.1.2' in the
 current directory.
 
    The distribution file name is of the form `gawk-V.R.P.tar.gz'.  The
 V represents the major version of `gawk', the R represents the current
 release of version V, and the P represents a "patch level", meaning
 that minor bugs have been fixed in the release.  The current patch
-level is 1, but when retrieving distributions, you should get the
+level is 2, but when retrieving distributions, you should get the
 version with the highest version, release, and patch level.  (Note,
 however, that patch levels greater than or equal to 70 denote "beta" or
 nonproduction software; you might not want to retrieve such a version
@@ -27046,10 +27646,10 @@ files, subdirectories, and files related to the configuration process
 to different non-Unix operating systems:
 
 Various `.c', `.y', and `.h' files
-     The actual `gawk' source code.
+     These files contain the actual `gawk' source code.
 
 `ABOUT-NLS'
-     Information about GNU `gettext' and translations.
+     A file containing information about GNU `gettext' and translations.
 
 `AUTHORS'
      A file with some information about the authorship of `gawk'.  It
@@ -27081,14 +27681,14 @@ Various `.c', `.y', and `.h' files
      The GNU General Public License.
 
 `POSIX.STD'
-     A description of behaviors in the POSIX standard for `awk' which
+     A description of behaviors in the POSIX standard for `awk' that
      are left undefined, or where `gawk' may not comply fully, as well
      as a list of things that the POSIX standard should describe but
      does not.
 
 `doc/awkforai.txt'
      Pointers to the original draft of a short article describing why
-     `gawk' is a good language for Artificial Intelligence (AI)
+     `gawk' is a good language for artificial intelligence (AI)
      programming.
 
 `doc/bc_notes'
@@ -27193,6 +27793,13 @@ Various `.c', `.y', and `.h' files
      sample extensions included with `gawk'.  *Note Dynamic
      Extensions::, for more information.
 
+`extras/*'
+     Additional non-essential files.  Currently, this directory
+     contains some shell startup files to be installed in
+     `/etc/profile.d' to aid in manipulating the `AWKPATH' and
+     `AWKLIBPATH' environment variables.  *Note Shell Startup Files::,
+     for more information.
+
 `posix/*'
      Files needed for building `gawk' on POSIX-compliant systems.
 
@@ -27213,7 +27820,7 @@ Various `.c', `.y', and `.h' files
 
 File: gawk.info,  Node: Unix Installation,  Next: Non-Unix Installation,  Prev: Gawk Distribution,  Up: Installation
 
-B.2 Compiling and Installing `gawk' on Unix-like Systems
+B.2 Compiling and Installing `gawk' on Unix-Like Systems
 ========================================================
 
 Usually, you can compile and install `gawk' by typing only two
@@ -27223,13 +27830,14 @@ configure `gawk' for your system yourself.
 * Menu:
 
 * Quick Installation::               Compiling `gawk' under Unix.
+* Shell Startup Files::              Shell convenience functions.
 * Additional Configuration Options:: Other compile-time options.
 * Configuration Philosophy::         How it's all supposed to work.
 
 
-File: gawk.info,  Node: Quick Installation,  Next: Additional Configuration Options,  Up: Unix Installation
+File: gawk.info,  Node: Quick Installation,  Next: Shell Startup Files,  Up: Unix Installation
 
-B.2.1 Compiling `gawk' for Unix-like Systems
+B.2.1 Compiling `gawk' for Unix-Like Systems
 --------------------------------------------
 
 The normal installation steps should work on all modern commercial
@@ -27237,12 +27845,12 @@ Unix-derived systems, GNU/Linux, BSD-based systems, and the Cygwin
 environment for MS-Windows.
 
    After you have extracted the `gawk' distribution, `cd' to
-`gawk-4.1.1'.  Like most GNU software, `gawk' is configured
-automatically for your system by running the `configure' program.  This
-program is a Bourne shell script that is generated automatically using
-GNU Autoconf.  (The Autoconf software is described fully starting with
-*note (Autoconf)Top:: autoconf,Autoconf--Generating Automatic
-Configuration Scripts.)
+`gawk-4.1.2'.  As with most GNU software, you configure `gawk' for your
+system by running the `configure' program.  This program is a Bourne
+shell script that is generated automatically using GNU Autoconf.  (The
+Autoconf software is described fully starting with *note
+(Autoconf)Top:: autoconf,Autoconf--Generating Automatic Configuration
+Scripts.)
 
    To configure `gawk', simply run `configure':
 
@@ -27272,8 +27880,7 @@ That's all there is to it!  To verify that `gawk' is working properly,
 run `make check'.  All of the tests should succeed.  If these steps do
 not work, or if any of the tests fail, check the files in the
 `README_d' directory to see if you've found a known problem.  If the
-failure is not described there, please send in a bug report (*note
-Bugs::).
+failure is not described there, send in a bug report (*note Bugs::).
 
    Of course, once you've built `gawk', it is likely that you will wish
 to install it.  To do so, you need to run the command `make install',
@@ -27284,9 +27891,43 @@ will be asked for your password, and you will have to have been set up
 previously as a user who is allowed to run the `sudo' command.
 
 
-File: gawk.info,  Node: Additional Configuration Options,  Next: Configuration Philosophy,  Prev: Quick Installation,  Up: Unix Installation
+File: gawk.info,  Node: Shell Startup Files,  Next: Additional Configuration Options,  Prev: Quick Installation,  Up: Unix Installation
+
+B.2.2 Shell Startup Files
+-------------------------
+
+The distribution contains shell startup files `gawk.sh' and `gawk.csh'
+containing functions to aid in manipulating the `AWKPATH' and
+`AWKLIBPATH' environment variables.  On a Fedora system, these files
+should be installed in `/etc/profile.d'; on other platforms, the
+appropriate location may be different.
+
+`gawkpath_default'
+     Reset the `AWKPATH' environment variable to its default value.
+
+`gawkpath_prepend'
+     Add the argument to the front of the `AWKPATH' environment
+     variable.
 
-B.2.2 Additional Configuration Options
+`gawkpath_append'
+     Add the argument to the end of the `AWKPATH' environment variable.
+
+`gawklibpath_default'
+     Reset the `AWKLIBPATH' environment variable to its default value.
+
+`gawklibpath_prepend'
+     Add the argument to the front of the `AWKLIBPATH' environment
+     variable.
+
+`gawklibpath_append'
+     Add the argument to the end of the `AWKLIBPATH' environment
+     variable.
+
+
+
+File: gawk.info,  Node: Additional Configuration Options,  Next: Configuration Philosophy,  Prev: Shell Startup Files,  Up: Unix Installation
+
+B.2.3 Additional Configuration Options
 --------------------------------------
 
 There are several additional options you may use on the `configure'
@@ -27304,14 +27945,16 @@ command line when compiling `gawk' from scratch, including:
      do nothing.  Similarly, setting the `LINT' variable (*note
      User-modified::) has no effect on the running `awk' program.
 
-     When used with GCC's automatic dead-code-elimination, this option
-     cuts almost 200K bytes off the size of the `gawk' executable on
-     GNU/Linux x86 systems.  Results on other systems and with other
-     compilers are likely to vary.  Using this option may bring you
-     some slight performance improvement.
+     When used with the GNU Compiler Collection's (GCC's) automatic
+     dead-code-elimination, this option cuts almost 23K bytes off the
+     size of the `gawk' executable on GNU/Linux x86_64 systems.
+     Results on other systems and with other compilers are likely to
+     vary.  Using this option may bring you some slight performance
+     improvement.
 
-     Using this option will cause some of the tests in the test suite
-     to fail.  This option may be removed at a later date.
+          CAUTION: Using this option will cause some of the tests in
+          the test suite to fail.  This option may be removed at a
+          later date.
 
 `--disable-nls'
      Disable all message-translation facilities.  This is usually not
@@ -27323,12 +27966,12 @@ command line when compiling `gawk' from scratch, including:
      for deficient systems.
 
    Use the command `./configure --help' to see the full list of options
-that `configure' supplies.
+supplied by `configure'.
 
 
 File: gawk.info,  Node: Configuration Philosophy,  Prev: Additional Configuration Options,  Up: Unix Installation
 
-B.2.3 The Configuration Process
+B.2.4 The Configuration Process
 -------------------------------
 
 This minor node is of interest only if you know something about using
@@ -27357,15 +28000,15 @@ element in the `stat' structure.  In this case,
 
    It is possible for your C compiler to lie to `configure'. It may do
 so by not exiting with an error when a library function is not
-available.  To get around this, edit the file `custom.h'.  Use an
+available.  To get around this, edit the `custom.h' file.  Use an
 `#ifdef' that is appropriate for your system, and either `#define' any
 constants that `configure' should have defined but didn't, or `#undef'
-any constants that `configure' defined and should not have.  `custom.h'
-is automatically included by `config.h'.
+any constants that `configure' defined and should not have.  The
+`custom.h' file is automatically included by the `config.h' file.
 
    It is also possible that the `configure' program generated by
 Autoconf will not work on your system in some other fashion.  If you do
-have a problem, the file `configure.ac' is the input for Autoconf.  You
+have a problem, the `configure.ac' file is the input for Autoconf.  You
 may be able to change this file and generate a new version of
 `configure' that works on your system (*note Bugs::, for information on
 how to report problems in configuring `gawk').  The same mechanism may
@@ -27392,17 +28035,17 @@ File: gawk.info,  Node: PC Installation,  Next: VMS Installation,  Up: Non-Unix
 B.3.1 Installation on PC Operating Systems
 ------------------------------------------
 
-This minor node covers installation and usage of `gawk' on x86 machines
-running MS-DOS, any version of MS-Windows, or OS/2.  In this minor
-node, the term "Windows32" refers to any of Microsoft
-Windows-95/98/ME/NT/2000/XP/Vista/7/8.
+This minor node covers installation and usage of `gawk' on Intel
+architecture machines running MS-DOS, any version of MS-Windows, or
+OS/2.  In this minor node, the term "Windows32" refers to any of
+Microsoft Windows 95/98/ME/NT/2000/XP/Vista/7/8.
 
    The limitations of MS-DOS (and MS-DOS shells under the other
-operating systems) has meant that various "DOS extenders" are often
+operating systems) have meant that various "DOS extenders" are often
 used with programs such as `gawk'.  The varying capabilities of
 Microsoft Windows 3.1 and Windows32 can add to the confusion.  For an
-overview of the considerations, please refer to `README_d/README.pc' in
-the distribution.
+overview of the considerations, refer to `README_d/README.pc' in the
+distribution.
 
 * Menu:
 
@@ -27480,7 +28123,7 @@ MS-DOS and Windows32 versions.  A list of targets is printed if the
 `gawk' using the DJGPP tools, enter `make djgpp'.  (The DJGPP tools
 needed for the build may be found at
 `ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/'.)  To build a native
-MS-Windows binary of `gawk', type `make mingw32'.
+MS-Windows binary of `gawk' using the MinGW tools, type `make mingw32'.
 
    The 32 bit EMX version of `gawk' works "out of the box" under OS/2.
 However, it is highly recommended to use GCC 2.95.3 for the compilation.
@@ -27531,8 +28174,8 @@ other set of (self-consistent) environment variables and compiler flags.
 
    ---------- Footnotes ----------
 
-   (1) As of May, 2014, this site is still there, but the author could
-not find a package for GNU Make.
+   (1) As of November 2014, this site is still there, but the author
+could not find a package for GNU Make.
 
 
 File: gawk.info,  Node: PC Testing,  Next: PC Using,  Prev: PC Compiling,  Up: PC Installation
@@ -27572,8 +28215,8 @@ Networking::).  EMX (OS/2 only) supports at least the `|&' operator.
    The MS-DOS and MS-Windows versions of `gawk' search for program
 files as described in *note AWKPATH Variable::.  However, semicolons
 (rather than colons) separate elements in the `AWKPATH' variable.  If
-`AWKPATH' is not set or is empty, then the default search path for
-MS-Windows and MS-DOS versions is `.;c:/lib/awk;c:/gnu/lib/awk'.
+`AWKPATH' is not set or is empty, then the default search path is
+`.;c:/lib/awk;c:/gnu/lib/awk'.
 
    The search path for OS/2 (32 bit, EMX) is determined by the prefix
 directory (most likely `/usr' or `c:/usr') that has been specified as
@@ -27593,14 +28236,14 @@ The DJGPP collection of tools includes an MS-DOS port of Bash, and
 several shells are available for OS/2, including `ksh'.
 
    Under MS-Windows, OS/2 and MS-DOS, `gawk' (and many other text
-programs) silently translate end-of-line `\r\n' to `\n' on input and
+programs) silently translates end-of-line `\r\n' to `\n' on input and
 `\n' to `\r\n' on output.  A special `BINMODE' variable (c.e.)  allows
 control over these translations and is interpreted as follows:
 
-   * If `BINMODE' is `"r"', or one, then binary mode is set on read
+   * If `BINMODE' is `"r"' or one, then binary mode is set on read
      (i.e., no translations on reads).
 
-   * If `BINMODE' is `"w"', or two, then binary mode is set on write
+   * If `BINMODE' is `"w"' or two, then binary mode is set on write
      (i.e., no translations on writes).
 
    * If `BINMODE' is `"rw"' or `"wr"' or three, binary mode is set for
@@ -27615,7 +28258,7 @@ The modes for standard input and standard output are set one time only
 program).  Setting `BINMODE' for standard input or standard output is
 accomplished by using an appropriate `-v BINMODE=N' option on the
 command line.  `BINMODE' is set at the time a file or pipe is opened
-and cannot be changed mid-stream.
+and cannot be changed midstream.
 
    The name `BINMODE' was chosen to match `mawk' (*note Other
 Versions::).  `mawk' and `gawk' handle `BINMODE' similarly; however,
@@ -27659,15 +28302,14 @@ B.3.1.5 Using `gawk' In The Cygwin Environment
 
 `gawk' can be built and used "out of the box" under MS-Windows if you
 are using the Cygwin environment (http://www.cygwin.com).  This
-environment provides an excellent simulation of GNU/Linux, using the
-GNU tools, such as Bash, the GNU Compiler Collection (GCC), GNU Make,
-and other GNU programs.  Compilation and installation for Cygwin is the
-same as for a Unix system:
+environment provides an excellent simulation of GNU/Linux, using Bash,
+GCC, GNU Make, and other GNU programs.  Compilation and installation
+for Cygwin is the same as for a Unix system:
 
-     tar -xvpzf gawk-4.1.1.tar.gz
-     cd gawk-4.1.1
+     tar -xvpzf gawk-4.1.2.tar.gz
+     cd gawk-4.1.2
      ./configure
-     make
+     make && make check
 
    When compared to GNU/Linux on the same system, the `configure' step
 on Cygwin takes considerably longer.  However, it does finish, and then
@@ -27680,18 +28322,18 @@ B.3.1.6 Using `gawk' In The MSYS Environment
 ............................................
 
 In the MSYS environment under MS-Windows, `gawk' automatically uses
-binary mode for reading and writing files.  Thus there is no need to
+binary mode for reading and writing files.  Thus, there is no need to
 use the `BINMODE' variable.
 
    This can cause problems with other Unix-like components that have
 been ported to MS-Windows that expect `gawk' to do automatic
-translation of `"\r\n"', since it won't.  Caveat Emptor!
+translation of `"\r\n"', because it won't.
 
 
 File: gawk.info,  Node: VMS Installation,  Prev: PC Installation,  Up: Non-Unix Installation
 
-B.3.2 How to Compile and Install `gawk' on Vax/VMS and OpenVMS
---------------------------------------------------------------
+B.3.2 Compiling and Installing `gawk' on Vax/VMS and OpenVMS
+------------------------------------------------------------
 
 This node describes how to compile and install `gawk' under VMS.  The
 older designation "VMS" is used throughout to refer to OpenVMS.
@@ -27735,9 +28377,9 @@ available from `https://github.com/endlesssoftware/mmk'.
 target parameter may need to be exact.
 
    `gawk' has been tested under VAX/VMS 7.3 and Alpha/VMS 7.3-1 using
-Compaq C V6.4, and Alpha/VMS 7.3, Alpha/VMS 7.3-2, and IA64/VMS 8.3.
-The most recent builds used HP C V7.3 on Alpha VMS 8.3 and both Alpha
-and IA64 VMS 8.4 used HP C 7.3.(1)
+Compaq C V6.4, and under Alpha/VMS 7.3, Alpha/VMS 7.3-2, and IA64/VMS
+8.3.  The most recent builds used HP C V7.3 on Alpha VMS 8.3 and both
+Alpha and IA64 VMS 8.4 used HP C 7.3.(1)
 
    *Note VMS GNV::, for information on building `gawk' as a PCSI kit
 that is compatible with the GNV product.
@@ -27753,7 +28395,7 @@ B.3.2.2 Compiling `gawk' Dynamic Extensions on VMS
 ..................................................
 
 The extensions that have been ported to VMS can be built using one of
-the following commands.
+the following commands:
 
      $ MMS/DESCRIPTION=[.vms]descrip.mms extensions
 
@@ -27765,7 +28407,7 @@ or:
 logical name to find the dynamic extensions.
 
    Dynamic extensions need to be compiled with the same compiler
-options for floating point, pointer size, and symbol name handling as
+options for floating-point, pointer size, and symbol name handling as
 were used to compile `gawk' itself.  Alpha and Itanium should use IEEE
 floating point.  The pointer size is 32 bits, and the symbol name
 handling should be exact case with CRC shortening for symbols longer
@@ -27780,8 +28422,8 @@ than 32 bits.
 
      /name=(as_is,short)
 
-   Compile time macros need to be defined before the first VMS-supplied
-header file is included.
+   Compile-time macros need to be defined before the first VMS-supplied
+header file is included, as follows:
 
      #if (__CRTL_VER >= 70200000) && !defined (__VAX)
      #define _LARGEFILE 1
@@ -27795,6 +28437,12 @@ header file is included.
      #endif
      #endif
 
+   If you are writing your own extensions to run on VMS, you must
+supply these definitions yourself. The `config.h' file created when
+building `gawk' on VMS does this for you; if instead you use that file
+or a similar one, then you must remember to include it before any
+VMS-supplied header files.
+
 
 File: gawk.info,  Node: VMS Installation Details,  Next: VMS Running,  Prev: VMS Dynamic Extensions,  Up: VMS Installation
 
@@ -27818,14 +28466,14 @@ directory tree, the program will be known as
 `GNV$GNU:[vms_help]gawk.hlp'.
 
    The PCSI kit also installs a `GNV$GNU:[vms_bin]gawk_verb.cld' file
-which can be used to add `gawk' and `awk' as DCL commands.
+that can be used to add `gawk' and `awk' as DCL commands.
 
    For just the current process you can use:
 
      $ set command gnv$gnu:[vms_bin]gawk_verb.cld
 
    Or the system manager can use `GNV$GNU:[vms_bin]gawk_verb.cld' to
-add the `gawk' and `awk' to the system wide `DCLTABLES'.
+add the `gawk' and `awk' to the system-wide `DCLTABLES'.
 
    The DCL syntax is documented in the `gawk.hlp' file.
 
@@ -27875,41 +28523,40 @@ Note that uppercase and mixed-case text must be quoted.
    The VMS port of `gawk' includes a `DCL'-style interface in addition
 to the original shell-style interface (see the help entry for details).
 One side effect of dual command-line parsing is that if there is only a
-single parameter (as in the quoted string program above), the command
-becomes ambiguous.  To work around this, the normally optional `--'
-flag is required to force Unix-style parsing rather than `DCL' parsing.
-If any other dash-type options (or multiple parameters such as data
-files to process) are present, there is no ambiguity and `--' can be
-omitted.
-
-   The `exit' value is a Unix-style value and is encoded to a VMS exit
+single parameter (as in the quoted string program), the command becomes
+ambiguous.  To work around this, the normally optional `--' flag is
+required to force Unix-style parsing rather than `DCL' parsing.  If any
+other dash-type options (or multiple parameters such as data files to
+process) are present, there is no ambiguity and `--' can be omitted.
+
+   The `exit' value is a Unix-style value and is encoded into a VMS exit
 status value when the program exits.
 
    The VMS severity bits will be set based on the `exit' value.  A
-failure is indicated by 1 and VMS sets the `ERROR' status.  A fatal
-error is indicated by 2 and VMS will set the `FATAL' status.  All other
+failure is indicated by 1, and VMS sets the `ERROR' status.  A fatal
+error is indicated by 2, and VMS sets the `FATAL' status.  All other
 values will have the `SUCCESS' status.  The exit value is encoded to
 comply with VMS coding standards and will have the `C_FACILITY_NO' of
 `0x350000' with the constant `0xA000' added to the number shifted over
 by 3 bits to make room for the severity codes.
 
-   To extract the actual `gawk' exit code from the VMS status use:
+   To extract the actual `gawk' exit code from the VMS status, use:
 
      unix_status = (vms_status .and. &x7f8) / 8
 
 A C program that uses `exec()' to call `gawk' will get the original
 Unix-style exit value.
 
-   Older versions of `gawk' treated a Unix exit code 0 as 1, a failure
-as 2, a fatal error as 4, and passed all the other numbers through.
-This violated the VMS exit status coding requirements.
+   Older versions of `gawk' for VMS treated a Unix exit code 0 as 1, a
+failure as 2, a fatal error as 4, and passed all the other numbers
+through.  This violated the VMS exit status coding requirements.
 
    VAX/VMS floating point uses unbiased rounding. *Note Round
 Function::.
 
    VMS reports time values in GMT unless one of the `SYS$TIMEZONE_RULE'
 or `TZ' logical names is set.  Older versions of VMS, such as VAX/VMS
-7.3 do not set these logical names.
+7.3, do not set these logical names.
 
    The default search path, when looking for `awk' program files
 specified by the `-f' option, is `"SYS$DISK:[],AWK_LIBRARY:"'.  The
@@ -27926,15 +28573,15 @@ B.3.2.5 The VMS GNV Project
 
 The VMS GNV package provides a build environment similar to POSIX with
 ports of a collection of open source tools.  The `gawk' found in the GNV
-base kit is an older port.  Currently the GNV project is being
+base kit is an older port.  Currently, the GNV project is being
 reorganized to supply individual PCSI packages for each component.  See
 `https://sourceforge.net/p/gnv/wiki/InstallingGNVPackages/'.
 
    The normal build procedure for `gawk' produces a program that is
 suitable for use with GNV.
 
-   The `vms/gawk_build_steps.txt' in the source documents the procedure
-for building a VMS PCSI kit that is compatible with GNV.
+   The file `vms/gawk_build_steps.txt' in the distribution documents
+the procedure for building a VMS PCSI kit that is compatible with GNV.
 
 
 File: gawk.info,  Node: VMS Old Gawk,  Prev: VMS GNV,  Up: VMS Installation
@@ -27956,80 +28603,80 @@ File: gawk.info,  Node: Bugs,  Next: Other Versions,  Prev: Non-Unix Installatio
 B.4 Reporting Problems and Bugs
 ===============================
 
-     There is nothing more dangerous than a bored archeologist.  -- The
-     Hitchhiker's Guide to the Galaxy
+     There is nothing more dangerous than a bored archaeologist.  --
+     Douglas Adams, `The Hitchhiker's Guide to the Galaxy'
 
    If you have problems with `gawk' or think that you have found a bug,
-please report it to the developers; we cannot promise to do anything
-but we might well want to fix it.
+report it to the developers; we cannot promise to do anything, but we
+might well want to fix it.
 
-   Before reporting a bug, make sure you have actually found a real bug.
-Carefully reread the documentation and see if it really says you can do
+   Before reporting a bug, make sure you have really found a genuine
+bug.  Carefully reread the documentation and see if it says you can do
 what you're trying to do.  If it's not clear whether you should be able
 to do something or not, report that too; it's a bug in the
 documentation!
 
    Before reporting a bug or trying to fix it yourself, try to isolate
 it to the smallest possible `awk' program and input data file that
-reproduces the problem.  Then send us the program and data file, some
+reproduce the problem.  Then send us the program and data file, some
 idea of what kind of Unix system you're using, the compiler you used to
 compile `gawk', and the exact results `gawk' gave you.  Also say what
 you expected to occur; this helps us decide whether the problem is
 really in the documentation.
 
-   Please include the version number of `gawk' you are using.  You can
-get this information with the command `gawk --version'.
+   Make sure to include the version number of `gawk' you are using.
+You can get this information with the command `gawk --version'.
 
-   Once you have a precise problem, send email to <bug-gawk@gnu.org>.
+   Once you have a precise problem description, send email to
+<bug-gawk@gnu.org>.
 
-   The `gawk' maintainers subscribe to this address and thus they will
-receive your bug report.  If necessary, the primary maintainer can be
-reached directly at <arnold@skeeve.com>.  The bug reporting address is
-preferred since the email list is archived at the GNU Project.  _All
-email should be in English. This is the only language understood in
-common by all the maintainers._
+   The `gawk' maintainers subscribe to this address, and thus they will
+receive your bug report.  Although you can send mail to the maintainers
+directly, the bug reporting address is preferred because the email list
+is archived at the GNU Project.  _All email must be in English. This is
+the only language understood in common by all the maintainers._
 
      CAUTION: Do _not_ try to report bugs in `gawk' by posting to the
-     Usenet/Internet newsgroup `comp.lang.awk'.  While the `gawk'
-     developers do occasionally read this newsgroup, there is no
-     guarantee that we will see your posting.  The steps described
-     above are the official recognized ways for reporting bugs.  Really.
+     Usenet/Internet newsgroup `comp.lang.awk'.  The `gawk' developers
+     do occasionally read this newsgroup, but there is no guarantee
+     that we will see your posting.  The steps described here are the
+     only officially recognized way for reporting bugs.  Really.
 
      NOTE: Many distributions of GNU/Linux and the various BSD-based
      operating systems have their own bug reporting systems.  If you
-     report a bug using your distribution's bug reporting system,
-     _please_ also send a copy to <bug-gawk@gnu.org>.
+     report a bug using your distribution's bug reporting system, you
+     should also send a copy to <bug-gawk@gnu.org>.
 
-     This is for two reasons.  First, while some distributions forward
-     bug reports "upstream" to the GNU mailing list, many don't, so
-     there is a good chance that the `gawk'  maintainer won't even see
-     the bug report!  Second, mail to the GNU list is archived, and
-     having everything at the GNU project keeps things self-contained
-     and not dependant on other web sites.
+     This is for two reasons.  First, although some distributions
+     forward bug reports "upstream" to the GNU mailing list, many
+     don't, so there is a good chance that the `gawk'  maintainers
+     won't even see the bug report!  Second, mail to the GNU list is
+     archived, and having everything at the GNU Project keeps things
+     self-contained and not dependent on other organizations.
 
    Non-bug suggestions are always welcome as well.  If you have
 questions about things that are unclear in the documentation or are
-just obscure features, ask me; I will try to help you out, although I
-may not have the time to fix the problem.  You can send me electronic
-mail at the Internet address noted previously.
+just obscure features, ask on the bug list; we will try to help you out
+if we can.
 
-   If you find bugs in one of the non-Unix ports of `gawk', please send
-an electronic mail message to the person who maintains that port.  They
-are named in the following list, as well as in the `README' file in the
-`gawk' distribution.  Information in the `README' file should be
-considered authoritative if it conflicts with this Info file.
+   If you find bugs in one of the non-Unix ports of `gawk', send an
+email to the bug list, with a copy to the person who maintains that
+port.  The maintainers are named in the following list, as well as in
+the `README' file in the `gawk' distribution.  Information in the
+`README' file should be considered authoritative if it conflicts with
+this Info file.
 
-   The people maintaining the non-Unix ports of `gawk' are as follows:
+   The people maintaining the various `gawk' ports are:
 
-MS-DOS with DJGPP       Scott Deifik, <scottd.mail@sbcglobal.net>.
-MS-Windows with MinGW   Eli Zaretskii, <eliz@gnu.org>.
-OS/2                    Andreas Buening, <andreas.buening@nexgo.de>.
-VMS                     Pat Rankin, <r.pat.rankin@gmail.com>, and John
-                        Malmberg, <wb8tyw@qsl.net>.
-z/OS (OS/390)           Dave Pitts, <dpitts@cozx.com>.
+Unix and POSIX systems  Arnold Robbins, <arnold@skeeve.com>
+MS-DOS with DJGPP       Scott Deifik, <scottd.mail@sbcglobal.net>
+MS-Windows with MinGW   Eli Zaretskii, <eliz@gnu.org>
+OS/2                    Andreas Buening, <andreas.buening@nexgo.de>
+VMS                     John Malmberg, <wb8tyw@qsl.net>
+z/OS (OS/390)           Dave Pitts, <dpitts@cozx.com>
 
-   If your bug is also reproducible under Unix, please send a copy of
-your report to the <bug-gawk@gnu.org> email list as well.
+   If your bug is also reproducible under Unix, send a copy of your
+report to the <bug-gawk@gnu.org> email list as well.
 
 
 File: gawk.info,  Node: Other Versions,  Next: Installation summary,  Prev: Bugs,  Up: Installation
@@ -28037,7 +28684,7 @@ File: gawk.info,  Node: Other Versions,  Next: Installation summary,  Prev: Bugs
 B.5 Other Freely Available `awk' Implementations
 ================================================
 
-     It's kind of fun to put comments like this in your awk code.
+     It's kind of fun to put comments like this in your awk code:
      `// Do C++ comments work? answer: yes! of course' -- Michael
      Brennan
 
@@ -28047,7 +28694,7 @@ This minor node briefly describes where to get them:
 Unix `awk'
      Brian Kernighan, one of the original designers of Unix `awk', has
      made his implementation of `awk' freely available.  You can
-     retrieve this version via the World Wide Web from his home page
+     retrieve this version via his home page
      (http://www.cs.princeton.edu/~bwk).  It is available in several
      archive formats:
 
@@ -28060,14 +28707,14 @@ Unix `awk'
     Zip file
           `http://www.cs.princeton.edu/~bwk/btl.mirror/awk.zip'
 
-     You can also retrieve it from Git Hub:
+     You can also retrieve it from GitHub:
 
           git clone git://github.com/onetrueawk/awk bwkawk
 
-     The above command creates a copy of the Git
-     (http://www.git-scm.com) repository in a directory named `bwkawk'.
-     If you leave that argument off the `git' command line, the
-     repository copy is created in a directory named `awk'.
+     This command creates a copy of the Git (http://git-scm.com)
+     repository in a directory named `bwkawk'.  If you leave that
+     argument off the `git' command line, the repository copy is
+     created in a directory named `awk'.
 
      This version requires an ISO C (1990 standard) compiler; the C
      compiler from GCC (the GNU Compiler Collection) works quite nicely.
@@ -28075,6 +28722,10 @@ Unix `awk'
      *Note Common Extensions::, for a list of extensions in this `awk'
      that are not in POSIX `awk'.
 
+     As a side note, Dan Bornstein has created a Git repository tracking
+     all the versions of BWK `awk' that he could find. It's available
+     at `git://github.com/danfuzz/one-true-awk'.
+
 `mawk'
      Michael Brennan wrote an independent implementation of `awk',
      called `mawk'.  It is available under the GPL (*note Copying::),
@@ -28098,7 +28749,7 @@ Unix `awk'
 `awka'
      Written by Andrew Sumner, `awka' translates `awk' programs into C,
      compiles them, and links them with a library of functions that
-     provides the core `awk' functionality.  It also has a number of
+     provide the core `awk' functionality.  It also has a number of
      extensions.
 
      The `awk' translator is released under the GPL, and the library is
@@ -28107,19 +28758,19 @@ Unix `awk'
      To get `awka', go to `http://sourceforge.net/projects/awka'.
 
      The project seems to be frozen; no new code changes have been made
-     since approximately 2003.
+     since approximately 2001.
 
 `pawk'
      Nelson H.F. Beebe at the University of Utah has modified BWK `awk'
      to provide timing and profiling information.  It is different from
-     `gawk' with the `--profile' option.  (*note Profiling::), in that
-     it uses CPU-based profiling, not line-count profiling.  You may
-     find it at either
+     `gawk' with the `--profile' option (*note Profiling::) in that it
+     uses CPU-based profiling, not line-count profiling.  You may find
+     it at either
      `ftp://ftp.math.utah.edu/pub/pawk/pawk-20030606.tar.gz' or
      `http://www.math.utah.edu/pub/pawk/pawk-20030606.tar.gz'.
 
-Busybox Awk
-     Busybox is a GPL-licensed program providing small versions of many
+BusyBox `awk'
+     BusyBox is a GPL-licensed program providing small versions of many
      applications within a single executable. It is aimed at embedded
      systems.  It includes a full implementation of POSIX `awk'.  When
      building it, be careful not to do `make install' as it will
@@ -28129,15 +28780,15 @@ Busybox Awk
 
 The OpenSolaris POSIX `awk'
      The versions of `awk' in `/usr/xpg4/bin' and `/usr/xpg6/bin' on
-     Solaris are more-or-less POSIX-compliant.  They are based on the
-     `awk' from Mortice Kern Systems for PCs.  This author was able to
-     make this code compile and work under GNU/Linux with 1-2 hours of
-     work.  Making it more generally portable (using GNU Autoconf
-     and/or Automake) would take more work, and this has not been done,
-     at least to our knowledge.
-
-     The source code used to be available from the OpenSolaris web site.
-     However, that project was ended and the web site shut down.
+     Solaris are more or less POSIX-compliant.  They are based on the
+     `awk' from Mortice Kern Systems for PCs.  We were able to make
+     this code compile and work under GNU/Linux with 1-2 hours of work.
+     Making it more generally portable (using GNU Autoconf and/or
+     Automake) would take more work, and this has not been done, at
+     least to our knowledge.
+
+     The source code used to be available from the OpenSolaris website.
+     However, that project was ended and the website shut down.
      Fortunately, the Illumos project
      (http://wiki.illumos.org/display/illumos/illumos+Home) makes this
      implementation available.  You can view the files one at a time
@@ -28153,7 +28804,7 @@ The OpenSolaris POSIX `awk'
 
 Libmawk
      This is an embeddable `awk' interpreter derived from `mawk'. For
-     more information see `http://repo.hu/projects/libmawk/'.
+     more information, see `http://repo.hu/projects/libmawk/'.
 
 `pawk'
      This is a Python module that claims to bring `awk'-like features
@@ -28161,8 +28812,8 @@ Libmawk
      information. (This is not related to Nelson Beebe's modified
      version of BWK `awk', described earlier.)
 
-QSE Awk
-     This is an embeddable `awk' interpreter. For more information see
+QSE `awk'
+     This is an embeddable `awk' interpreter. For more information, see
      `http://code.google.com/p/qse/' and `http://awk.info/?tools/qse'.
 
 `QTawk'
@@ -28175,10 +28826,11 @@ QSE Awk
      The project may also be frozen; no new code changes have been made
      since approximately 2008.
 
-Other Versions
-     See also the Wikipedia article
-     (http://en.wikipedia.org/wiki/Awk_language#Versions_and_implementations),
-     for information on additional versions.
+Other versions
+     See also the "Versions and implementations" section of the
+     Wikipedia article
+     (http://en.wikipedia.org/wiki/Awk_language#Versions_and_implementations)
+     on `awk' for information on additional versions.
 
 
 
@@ -28187,26 +28839,26 @@ File: gawk.info,  Node: Installation summary,  Prev: Other Versions,  Up: Instal
 B.6 Summary
 ===========
 
-   * The `gawk' distribution is available from GNU project's main
+   * The `gawk' distribution is available from the GNU Project's main
      distribution site, `ftp.gnu.org'.  The canonical build recipe is:
 
-          wget http://ftp.gnu.org/gnu/gawk/gawk-4.1.1.tar.gz
-          tar -xvpzf gawk-4.1.1.tar.gz
-          cd gawk-4.1.1
+          wget http://ftp.gnu.org/gnu/gawk/gawk-4.1.2.tar.gz
+          tar -xvpzf gawk-4.1.2.tar.gz
+          cd gawk-4.1.2
           ./configure && make && make check
 
    * `gawk' may be built on non-POSIX systems as well. The currently
-     supported systems are MS-Windows using DJGPP, MSYS, MinGW and
+     supported systems are MS-Windows using DJGPP, MSYS, MinGW, and
      Cygwin, OS/2 using EMX, and both Vax/VMS and OpenVMS.
      Instructions for each system are included in this major node.
 
    * Bug reports should be sent via email to <bug-gawk@gnu.org>.  Bug
-     reports should be in English, and should include the version of
+     reports should be in English and should include the version of
      `gawk', how it was compiled, and a short program and data file
-     which demonstrate the problem.
+     that demonstrate the problem.
 
    * There are a number of other freely available `awk'
-     implementations.  Many are POSIX compliant; others are less so.
+     implementations.  Many are POSIX-compliant; others are less so.
 
 
 
@@ -28291,7 +28943,7 @@ released versions of `gawk'.
 changes, you will probably wish to work with the development version.
 To do so, you will need to access the `gawk' source code repository.
 The code is maintained using the Git distributed version control system
-(http://git-scm.com/).  You will need to install it if your system
+(http://git-scm.com).  You will need to install it if your system
 doesn't have it.  Once you have done so, use the command:
 
      git clone git://git.savannah.gnu.org/gawk.git
@@ -28323,9 +28975,9 @@ there are several steps that you need to take in order to make it
 possible to include them:
 
   1. Before building the new feature into `gawk' itself, consider
-     writing it as an extension module (*note Dynamic Extensions::).
-     If that's not possible, continue with the rest of the steps in
-     this list.
+     writing it as an extension (*note Dynamic Extensions::).  If
+     that's not possible, continue with the rest of the steps in this
+     list.
 
   2. Be prepared to sign the appropriate paperwork.  In order for the
      FSF to distribute your changes, you must either place those
@@ -28346,9 +28998,8 @@ possible to include them:
      document describes how GNU software should be written. If you
      haven't read it, please do so, preferably _before_ starting to
      modify `gawk'.  (The `GNU Coding Standards' are available from the
-     GNU Project's web site
-     (http://www.gnu.org/prep/standards_toc.html).  Texinfo, Info, and
-     DVI versions are also available.)
+     GNU Project's website (http://www.gnu.org/prep/standards/).
+     Texinfo, Info, and DVI versions are also available.)
 
   5. Use the `gawk' coding style.  The C code for `gawk' follows the
      instructions in the `GNU Coding Standards', with minor exceptions.
@@ -28492,9 +29143,9 @@ steps:
 
   6. Be willing to continue to maintain the port.  Non-Unix operating
      systems are supported by volunteers who maintain the code needed
-     to compile and run `gawk' on their systems. If noone volunteers to
-     maintain a port, it becomes unsupported and it may be necessary to
-     remove it from the distribution.
+     to compile and run `gawk' on their systems. If no-one volunteers
+     to maintain a port, it becomes unsupported and it may be necessary
+     to remove it from the distribution.
 
   7. Supply an appropriate `gawkmisc.???' file.  Each port has its own
      `gawkmisc.???' that implements certain operating system specific
@@ -28881,7 +29532,7 @@ C.5.3 Other Design Decisions
 ----------------------------
 
 As an arbitrary design decision, extensions can read the values of
-built-in variables and arrays (such as `ARGV' and `FS'), but cannot
+predefined variables and arrays (such as `ARGV' and `FS'), but cannot
 change them, with the exception of `PROCINFO'.
 
    The reason for this is to prevent an extension function from
@@ -29200,6 +29851,11 @@ Action
      pattern matches an input record, `awk' executes the rule's action.
      Actions are always enclosed in braces.  (*Note Action Overview::.)
 
+Ada
+     A programming language originally defined by the U.S. Department of
+     Defense for embedded programming. It was designed to enforce good
+     Software Engineering practices.
+
 Amazing `awk' Assembler
      Henry Spencer at the University of Toronto wrote a retargetable
      assembler completely as `sed' and `awk' scripts.  It is thousands
@@ -29208,11 +29864,6 @@ Amazing `awk' Assembler
      been better written in another language.  You can get it from
      `http://awk.info/?awk100/aaa'.
 
-Ada
-     A programming language originally defined by the U.S. Department of
-     Defense for embedded programming. It was designed to enforce good
-     Software Engineering practices.
-
 Amazingly Workable Formatter (`awf')
      Henry Spencer at the University of Toronto wrote a formatter that
      accepts a large subset of the `nroff -ms' and `nroff -man'
@@ -29229,6 +29880,21 @@ ANSI
      C++ programming languages.  These standards often become
      international standards as well. See also "ISO."
 
+Argument
+     An argument can be two different things.  It can be an option or a
+     file name passed to a command while invoking it from the command
+     line, or it can be something passed to a "function" inside a
+     program, e.g.  inside `awk'.
+
+     In the latter case, an argument can be passed to a function in two
+     ways.  Either it is given to the called function by value, i.e., a
+     copy of the value of the variable is made available to the called
+     function, but the original variable cannot be modified by the
+     function itself; or it is given by reference, i.e., a pointer to
+     the interested variable is passed to the function, which can then
+     directly modify it. In `awk' scalars are passed by value, and
+     arrays are passed by reference.  See "Pass By Value/Reference."
+
 Array
      A grouping of multiple values under the same name.  Most languages
      just provide sequential arrays.  `awk' provides associative arrays.
@@ -29264,6 +29930,26 @@ Bash
      The GNU version of the standard shell (the Bourne-Again SHell).
      See also "Bourne Shell."
 
+Binary
+     Base-two notation, where the digits are `0'-`1'. Since electronic
+     circuitry works "naturally" in base 2 (just think of Off/On),
+     everything inside a computer is calculated using base 2. Each digit
+     represents the presence (or absence) of a power of 2 and is called
+     a "bit". So, for example, the base-two number `10101' is the same
+     as decimal 21, ((1 x 16) + (1 x 4) + (1 x 1)).
+
+     Since base-two numbers quickly become very long to read and write,
+     they are usually grouped by 3 (i.e., they are read as octal
+     numbers), or by 4 (i.e., they are read as hexadecimal numbers).
+     There is no direct way to insert base 2 numbers in a C program.
+     If need arises, such numbers are usually inserted as octal or
+     hexadecimal numbers. The number of base-two digits that fit into
+     registers used for representing integer numbers in computers is a
+     rough indication of the computing power of the computer itself.
+     Most computers nowadays use 64 bits for representing integer
+     numbers in their registers, but 32-bit, 16-bit and 8-bit registers
+     have been widely used in the past.  *Note Nondecimal-numbers::.
+
 Bit
      Short for "Binary Digit."  All values in computer memory
      ultimately reduce to binary digits: values that are either zero or
@@ -29288,6 +29974,23 @@ Bourne Shell
      shells (Bash, `ksh', `pdksh', `zsh') are generally upwardly
      compatible with the Bourne shell.
 
+Braces
+     The characters `{' and `}'.  Braces are used in `awk' for
+     delimiting actions, compound statements, and function bodies.
+
+Bracket Expression
+     Inside a "regular expression", an expression included in square
+     brackets, meant to designate a single character as belonging to a
+     specified character class. A bracket expression can contain a list
+     of one or more characters, like `[abc]', a range of characters,
+     like `[A-Z]', or a name, delimited by `:', that designates a known
+     set of characters, like `[:digit:]'. The form of bracket expression
+     enclosed between `:' is independent of the underlying
+     representation of the character themselves, which could utilize
+     the ASCII, ECBDIC, or Unicode codesets, depending on the
+     architecture of the computer system, and on localization.  See
+     also "Regular Expression."
+
 Built-in Function
      The `awk' language provides built-in functions that perform various
      numerical, I/O-related, and string computations.  Examples are
@@ -29306,10 +30009,6 @@ Built-in Variable
      them affects `awk''s running environment.  (*Note Built-in
      Variables::.)
 
-Braces
-     The characters `{' and `}'.  Braces are used in `awk' for
-     delimiting actions, compound statements, and function bodies.
-
 C
      The system programming language that most GNU software is written
      in.  The `awk' programming language has C-like syntax, and this
@@ -29319,9 +30018,25 @@ C
      In general, `gawk' attempts to be as similar to the 1990 version
      of ISO C as makes sense.
 
+C Shell
+     The C Shell (`csh' or its improved version, `tcsh') is a Unix
+     shell that was created by Bill Joy in the late 1970s. The C shell
+     was differentiated from other shells by its interactive features
+     and overall style, which looks more like C. The C Shell is not
+     backward compatible with the Bourne Shell, so special attention is
+     required when converting scripts written for other Unix shells to
+     the C shell, especially with regard to the management of shell
+     variables.  See also "Bourne Shell."
+
 C++
      A popular object-oriented programming language derived from C.
 
+Character Class
+     See "Bracket Expression."
+
+Character List
+     See "Bracket Expression."
+
 Character Set
      The set of numeric codes used by a computer system to represent the
      characters (letters, numbers, punctuation, etc.) of a particular
@@ -29336,25 +30051,34 @@ CHEM
      A preprocessor for `pic' that reads descriptions of molecules and
      produces `pic' input for drawing them.  It was written in `awk' by
      Brian Kernighan and Jon Bentley, and is available from
-     `http://netlib.sandia.gov/netlib/typesetting/chem.gz'.
+     `http://netlib.org/typesetting/chem'.
 
-Cookie
-     A peculiar goodie, token, saying or remembrance produced by or
-     presented to a program. (With thanks to Professor Doug McIlroy.)
-
-Coprocess
-     A subordinate program with which two-way communications is
-     possible.
+Comparison Expression
+     A relation that is either true or false, such as `a < b'.
+     Comparison expressions are used in `if', `while', `do', and `for'
+     statements, and in patterns to select which input records to
+     process.  (*Note Typing and Comparison::.)
 
 Compiler
      A program that translates human-readable source code into
      machine-executable object code.  The object code is then executed
      directly by the computer.  See also "Interpreter."
 
+Complemented Bracket Expression
+     The negation of a "bracket expression".  All that is _not_
+     described by a given bracket expression. The symbol `^' precedes
+     the negated bracket expression.  E.g.: `[[^:digit:]' designates
+     whatever character is not a digit. `[^bad]' designates whatever
+     character is not one of the letters `b', `a', or `d'.  See
+     "Bracket Expression."
+
 Compound Statement
      A series of `awk' statements, enclosed in curly braces.  Compound
      statements may be nested.  (*Note Statements::.)
 
+Computed Regexps
+     See "Dynamic Regular Expressions."
+
 Concatenation
      Concatenating two strings means sticking them together, one after
      another, producing a new string.  For example, the string `foo'
@@ -29368,11 +30092,19 @@ Conditional Expression
      otherwise the value is EXPR3.  In either case, only one of EXPR2
      and EXPR3 is evaluated. (*Note Conditional Exp::.)
 
-Comparison Expression
-     A relation that is either true or false, such as `a < b'.
-     Comparison expressions are used in `if', `while', `do', and `for'
-     statements, and in patterns to select which input records to
-     process.  (*Note Typing and Comparison::.)
+Control Statement
+     A control statement is an instruction to perform a given operation
+     or a set of operations inside an `awk' program, if a given
+     condition is true. Control statements are: `if', `for', `while',
+     and `do' (*note Statements::).
+
+Cookie
+     A peculiar goodie, token, saying or remembrance produced by or
+     presented to a program. (With thanks to Professor Doug McIlroy.)
+
+Coprocess
+     A subordinate program with which two-way communications is
+     possible.
 
 Curly Braces
      See "Braces."
@@ -29414,15 +30146,15 @@ Dynamic Regular Expression
      `"foo"', but it may also be an expression whose value can vary.
      (*Note Computed Regexps::.)
 
+Empty String
+     See "Null String."
+
 Environment
      A collection of strings, of the form `NAME=VAL', that each program
      has available to it. Users generally place values into the
      environment in order to provide information to various programs.
      Typical examples are the environment variables `HOME' and `PATH'.
 
-Empty String
-     See "Null String."
-
 Epoch
      The date used as the "beginning of time" for timestamps.  Time
      values in most systems are represented as seconds since the epoch,
@@ -29448,11 +30180,11 @@ FDL
 Field
      When `awk' reads an input record, it splits the record into pieces
      separated by whitespace (or by a separator regexp that you can
-     change by setting the built-in variable `FS').  Such pieces are
+     change by setting the predefined variable `FS').  Such pieces are
      called fields.  If the pieces are of fixed length, you can use the
      built-in variable `FIELDWIDTHS' to describe their lengths.  If you
      wish to specify the contents of fields instead of the field
-     separator, you can use the built-in variable `FPAT' to do so.
+     separator, you can use the predefined variable `FPAT' to do so.
      (*Note Field Separators::, *note Constant Size::, and *note
      Splitting By Content::.)
 
@@ -29469,28 +30201,41 @@ Format
      Format strings control the appearance of output in the
      `strftime()' and `sprintf()' functions, and in the `printf'
      statement as well.  Also, data conversions from numbers to strings
-     are controlled by the format strings contained in the built-in
+     are controlled by the format strings contained in the predefined
      variables `CONVFMT' and `OFMT'. (*Note Control Letters::.)
 
+Fortran
+     Shorthand for FORmula TRANslator, one of the first programming
+     languages available for scientific calculations. It was created by
+     John Backus, and has been available since 1957. It is still in use
+     today.
+
 Free Documentation License
      This document describes the terms under which this Info file is
      published and may be copied. (*Note GNU Free Documentation
      License::.)
 
-Function
-     A specialized group of statements used to encapsulate general or
-     program-specific tasks.  `awk' has a number of built-in functions,
-     and also allows you to define your own.  (*Note Functions::.)
-
-FSF
-     See "Free Software Foundation."
-
 Free Software Foundation
      A nonprofit organization dedicated to the production and
      distribution of freely distributable software.  It was founded by
      Richard M. Stallman, the author of the original Emacs editor.  GNU
      Emacs is the most widely used version of Emacs today.
 
+FSF
+     See "Free Software Foundation."
+
+Function
+     A part of an `awk' program that can be invoked from every point of
+     the program, to perform a task.  `awk' has several built-in
+     functions.  Users can define their own functions in every part of
+     the program.  Function can be recursive, i.e., they may invoke
+     themselves.  *Note Functions::.  In `gawk' it is also possible to
+     have functions shared among different programs, and included where
+     required using the `@include' directive (*note Include Files::).
+     In `gawk' the name of the function that should be invoked can be
+     generated at run time, i.e., dynamically.  The `gawk' extension
+     API provides constructor functions (*note Constructor Functions::).
+
 `gawk'
      The GNU implementation of `awk'.
 
@@ -29585,17 +30330,23 @@ Keyword
      `else', `exit', `for...in', `for', `function', `func', `if',
      `next', `nextfile', `switch', and `while'.
 
+Korn Shell
+     The Korn Shell (`ksh') is a Unix shell which was developed by
+     David Korn at Bell Laboratories in the early 1980s. The Korn Shell
+     is backward-compatible with the Bourne shell and includes many
+     features of the C shell.  See also "Bourne Shell."
+
 Lesser General Public License
      This document describes the terms under which binary library
      archives or shared objects, and their source code may be
      distributed.
 
-Linux
-     See "GNU/Linux."
-
 LGPL
      See "Lesser General Public License."
 
+Linux
+     See "GNU/Linux."
+
 Localization
      The process of providing the data necessary for an
      internationalized program to work in a particular language.
@@ -29622,6 +30373,13 @@ Metacharacters
      Instead, they denote regular expression operations, such as
      repetition, grouping, or alternation.
 
+Nesting
+     Nesting is where information is organized in layers, or where
+     objects contain other similar objects.  In `gawk' the `@include'
+     directive can be nested. The "natural" nesting of arithmetic and
+     logical operations can be changed using parentheses (*note
+     Precedence::).
+
 No-op
      An operation that does nothing.
 
@@ -29641,6 +30399,11 @@ Octal
      are written in C using a leading `0', to indicate their base.
      Thus, `013' is 11 ((1 x 8) + 3).  *Note Nondecimal-numbers::.
 
+Output Record
+     A single chunk of data that is written out by `awk'.  Usually, an
+     `awk' output record consists of one or more lines of text.  *Note
+     Records::.
+
 Pattern
      Patterns tell `awk' which input records are interesting to which
      rules.
@@ -29656,6 +30419,9 @@ PEBKAC
      computer usage problems. (Problem Exists Between Keyboard And
      Chair.)
 
+Plug-in
+     See "Extensions."
+
 POSIX
      The name for a series of standards that specify a Portable
      Operating System interface.  The "IX" denotes the Unix heritage of
@@ -29679,6 +30445,9 @@ Range (of input lines)
      can specify ranges of input lines for `awk' to process or it can
      specify single lines. (*Note Pattern Overview::.)
 
+Record
+     See "Input record" and "Output record."
+
 Recursion
      When a function calls itself, either directly or indirectly.  If
      this is clear, stop, and proceed to the next entry.  Otherwise,
@@ -29695,6 +30464,16 @@ Redirection
      using the `>', `>>', `|', and `|&' operators.  (*Note Getline::,
      and *note Redirection::.)
 
+Reference Counts
+     An internal mechanism in `gawk' to minimize the amount of memory
+     needed to store the value of string variables. If the value
+     assumed by a variable is used in more than one place, only one
+     copy of the value itself is kept, and the associated reference
+     count is increased when the same value is used by an additional
+     variable, and decresed when the related variable is no longer in
+     use. When the reference count goes to zero, the memory space used
+     to store the value of the variable is freed.
+
 Regexp
      See "Regular Expression."
 
@@ -29713,6 +30492,15 @@ Regular Expression Constant
      when you write the `awk' program and cannot be changed during its
      execution. (*Note Regexp Usage::.)
 
+Regular Expression Operators
+     See "Metacharacters."
+
+Rounding
+     Rounding the result of an arithmetic operation can be tricky.
+     More than one way of rounding exists, and in `gawk' it is possible
+     to choose which method should be used in a program.  *Note Setting
+     the rounding mode::.
+
 Rule
      A segment of an `awk' program that specifies how to process single
      input records.  A rule consists of a "pattern" and an "action".
@@ -29734,13 +30522,13 @@ Search Path
      source files.  In the shell, a list of directories to search for
      executable programs.
 
+`sed'
+     See "Stream Editor."
+
 Seed
      The initial value, or starting point, for a sequence of random
      numbers.
 
-`sed'
-     See "Stream Editor."
-
 Shell
      The command interpreter for Unix and POSIX-compliant systems.  The
      shell works both interactively, and as a programming language for
@@ -29774,6 +30562,11 @@ Special File
      handed directly to the underlying operating system--for example,
      `/dev/stderr'.  (*Note Special Files::.)
 
+Statement
+     An expression inside an `awk' program in the action part of a
+     pattern-action rule, or inside an `awk' function. A statement can
+     be a variable assignment, an array operation, a loop, etc.
+
 Stream Editor
      A program that reads records from an input stream and processes
      them one or more at a time.  This is in contrast with batch
@@ -29816,10 +30609,15 @@ UTC
      reference time for day and date calculations.  See also "Epoch"
      and "GMT."
 
+Variable
+     A name for a value. In `awk', variables may be either scalars or
+     arrays.
+
 Whitespace
      A sequence of space, TAB, or newline characters occurring inside
      an input record or a string.
 
+
 
 File: gawk.info,  Node: Copying,  Next: GNU Free Documentation License,  Prev: Glossary,  Up: Top
 
@@ -31036,7 +31834,7 @@ Index
 
 * Menu:
 
-* ! (exclamation point), !  operator:    Boolean Ops.         (line  67)
+* ! (exclamation point), !  operator:    Boolean Ops.         (line  69)
 * ! (exclamation point), ! operator <1>: Egrep Program.       (line 175)
 * ! (exclamation point), ! operator <2>: Ranges.              (line  48)
 * ! (exclamation point), ! operator:     Precedence.          (line  52)
@@ -31052,7 +31850,7 @@ Index
 * ! (exclamation point), !~ operator <5>: Case-sensitivity.   (line  26)
 * ! (exclamation point), !~ operator <6>: Computed Regexps.   (line   6)
 * ! (exclamation point), !~ operator:    Regexp Usage.        (line  19)
-* " (double quote), in regexp constants: Computed Regexps.    (line  29)
+* " (double quote), in regexp constants: Computed Regexps.    (line  30)
 * " (double quote), in shell commands:   Quoting.             (line  54)
 * # (number sign), #! (executable scripts): Executable Scripts.
                                                               (line   6)
@@ -31066,22 +31864,22 @@ Index
 * % (percent sign), %= operator <1>:     Precedence.          (line  95)
 * % (percent sign), %= operator:         Assignment Ops.      (line 130)
 * & (ampersand), && operator <1>:        Precedence.          (line  86)
-* & (ampersand), && operator:            Boolean Ops.         (line  57)
+* & (ampersand), && operator:            Boolean Ops.         (line  59)
 * & (ampersand), gsub()/gensub()/sub() functions and: Gory Details.
                                                               (line   6)
 * ' (single quote):                      One-shot.            (line  15)
-* ' (single quote) in gawk command lines: Long.               (line  33)
+* ' (single quote) in gawk command lines: Long.               (line  35)
 * ' (single quote), in shell commands:   Quoting.             (line  48)
 * ' (single quote), vs. apostrophe:      Comments.            (line  27)
-* ' (single quote), with double quotes:  Quoting.             (line  70)
+* ' (single quote), with double quotes:  Quoting.             (line  73)
 * () (parentheses), in a profile:        Profiling.           (line 146)
 * () (parentheses), regexp operator:     Regexp Operators.    (line  81)
 * * (asterisk), * operator, as multiplication operator: Precedence.
                                                               (line  55)
 * * (asterisk), * operator, as regexp operator: Regexp Operators.
                                                               (line  89)
-* * (asterisk), * operator, null strings, matching: Gory Details.
-                                                              (line 143)
+* * (asterisk), * operator, null strings, matching: String Functions.
+                                                              (line 537)
 * * (asterisk), ** operator <1>:         Precedence.          (line  49)
 * * (asterisk), ** operator:             Arithmetic Ops.      (line  81)
 * * (asterisk), **= operator <1>:        Precedence.          (line  95)
@@ -31112,7 +31910,7 @@ Index
 * --disable-lint configuration option:   Additional Configuration Options.
                                                               (line  15)
 * --disable-nls configuration option:    Additional Configuration Options.
-                                                              (line  30)
+                                                              (line  32)
 * --dump-variables option:               Options.             (line  93)
 * --dump-variables option, using for library functions: Library Names.
                                                               (line  45)
@@ -31125,73 +31923,73 @@ Index
 * --include option:                      Options.             (line 159)
 * --lint option <1>:                     Options.             (line 185)
 * --lint option:                         Command Line.        (line  20)
-* --lint-old option:                     Options.             (line 293)
+* --lint-old option:                     Options.             (line 295)
 * --load option:                         Options.             (line 173)
 * --non-decimal-data option <1>:         Nondecimal Data.     (line   6)
 * --non-decimal-data option:             Options.             (line 211)
 * --non-decimal-data option, strtonum() function and: Nondecimal Data.
-                                                              (line  36)
-* --optimize option:                     Options.             (line 235)
-* --posix option:                        Options.             (line 252)
-* --posix option, --traditional option and: Options.          (line 271)
-* --pretty-print option:                 Options.             (line 224)
+                                                              (line  35)
+* --optimize option:                     Options.             (line 236)
+* --posix option:                        Options.             (line 254)
+* --posix option, --traditional option and: Options.          (line 273)
+* --pretty-print option:                 Options.             (line 225)
 * --profile option <1>:                  Profiling.           (line  12)
-* --profile option:                      Options.             (line 240)
-* --re-interval option:                  Options.             (line 277)
-* --sandbox option:                      Options.             (line 284)
+* --profile option:                      Options.             (line 242)
+* --re-interval option:                  Options.             (line 279)
+* --sandbox option:                      Options.             (line 286)
 * --sandbox option, disabling system() function: I/O Functions.
-                                                              (line  97)
+                                                              (line 129)
 * --sandbox option, input redirection with getline: Getline.  (line  19)
 * --sandbox option, output redirection with print, printf: Redirection.
                                                               (line   6)
 * --source option:                       Options.             (line 117)
 * --traditional option:                  Options.             (line  81)
-* --traditional option, --posix option and: Options.          (line 271)
-* --use-lc-numeric option:               Options.             (line 219)
-* --version option:                      Options.             (line 298)
+* --traditional option, --posix option and: Options.          (line 273)
+* --use-lc-numeric option:               Options.             (line 220)
+* --version option:                      Options.             (line 300)
 * --with-whiny-user-strftime configuration option: Additional Configuration Options.
-                                                              (line  35)
+                                                              (line  37)
 * -b option:                             Options.             (line  68)
 * -C option:                             Options.             (line  88)
 * -c option:                             Options.             (line  81)
 * -D option:                             Options.             (line 108)
 * -d option:                             Options.             (line  93)
-* -e option:                             Options.             (line 333)
+* -e option:                             Options.             (line 336)
 * -E option:                             Options.             (line 125)
 * -e option:                             Options.             (line 117)
 * -f option:                             Options.             (line  25)
 * -F option:                             Options.             (line  21)
 * -f option:                             Long.                (line  12)
-* -F option, -Ft sets FS to TAB:         Options.             (line 306)
+* -F option, -Ft sets FS to TAB:         Options.             (line 308)
 * -F option, command-line:               Command Line Field Separator.
                                                               (line   6)
-* -f option, multiple uses:              Options.             (line 311)
+* -f option, multiple uses:              Options.             (line 313)
 * -g option:                             Options.             (line 147)
 * -h option:                             Options.             (line 154)
 * -i option:                             Options.             (line 159)
-* -L option:                             Options.             (line 293)
+* -L option:                             Options.             (line 295)
 * -l option:                             Options.             (line 173)
 * -M option:                             Options.             (line 205)
-* -N option:                             Options.             (line 219)
+* -N option:                             Options.             (line 220)
 * -n option:                             Options.             (line 211)
-* -O option:                             Options.             (line 235)
-* -o option:                             Options.             (line 224)
-* -P option:                             Options.             (line 252)
-* -p option:                             Options.             (line 240)
-* -r option:                             Options.             (line 277)
-* -S option:                             Options.             (line 284)
+* -O option:                             Options.             (line 236)
+* -o option:                             Options.             (line 225)
+* -P option:                             Options.             (line 254)
+* -p option:                             Options.             (line 242)
+* -r option:                             Options.             (line 279)
+* -S option:                             Options.             (line 286)
 * -v option:                             Assignment Options.  (line  12)
-* -V option:                             Options.             (line 298)
+* -V option:                             Options.             (line 300)
 * -v option:                             Options.             (line  32)
 * -W option:                             Options.             (line  46)
 * . (period), regexp operator:           Regexp Operators.    (line  44)
 * .gmo files:                            Explaining gettext.  (line  42)
-* .gmo files, specifying directory of <1>: Programmer i18n.   (line  47)
+* .gmo files, specifying directory of <1>: Programmer i18n.   (line  48)
 * .gmo files, specifying directory of:   Explaining gettext.  (line  54)
-* .mo files, converting from .po:        I18N Example.        (line  63)
+* .mo files, converting from .po:        I18N Example.        (line  64)
 * .po files <1>:                         Translator i18n.     (line   6)
 * .po files:                             Explaining gettext.  (line  37)
-* .po files, converting to .mo:          I18N Example.        (line  63)
+* .po files, converting to .mo:          I18N Example.        (line  64)
 * .pot files:                            Explaining gettext.  (line  31)
 * / (forward slash) to enclose regular expressions: Regexp.   (line  10)
 * / (forward slash), / operator:         Precedence.          (line  55)
@@ -31201,8 +31999,8 @@ Index
                                                               (line 148)
 * / (forward slash), patterns and:       Expression Patterns. (line  24)
 * /= operator vs. /=.../ regexp constant: Assignment Ops.     (line 148)
-* /dev/... special files:                Special FD.          (line  46)
-* /dev/fd/N special files (gawk):        Special FD.          (line  46)
+* /dev/... special files:                Special FD.          (line  48)
+* /dev/fd/N special files (gawk):        Special FD.          (line  48)
 * /inet/... special files (gawk):        TCP/IP Networking.   (line   6)
 * /inet4/... special files (gawk):       TCP/IP Networking.   (line   6)
 * /inet6/... special files (gawk):       TCP/IP Networking.   (line   6)
@@ -31243,10 +32041,10 @@ Index
                                                               (line   8)
 * [] (square brackets), regexp operator: Regexp Operators.    (line  56)
 * \ (backslash):                         Comments.            (line  50)
-* \ (backslash), \" escape sequence:     Escape Sequences.    (line  84)
+* \ (backslash), \" escape sequence:     Escape Sequences.    (line  85)
 * \ (backslash), \' operator (gawk):     GNU Regexp Operators.
                                                               (line  56)
-* \ (backslash), \/ escape sequence:     Escape Sequences.    (line  75)
+* \ (backslash), \/ escape sequence:     Escape Sequences.    (line  76)
 * \ (backslash), \< operator (gawk):     GNU Regexp Operators.
                                                               (line  30)
 * \ (backslash), \> operator (gawk):     GNU Regexp Operators.
@@ -31275,7 +32073,7 @@ Index
 * \ (backslash), \y operator (gawk):     GNU Regexp Operators.
                                                               (line  38)
 * \ (backslash), as field separator:     Command Line Field Separator.
-                                                              (line  27)
+                                                              (line  24)
 * \ (backslash), continuing lines and:   Statements/Lines.    (line  19)
 * \ (backslash), continuing lines and, comments and: Statements/Lines.
                                                               (line  76)
@@ -31286,8 +32084,8 @@ Index
 * \ (backslash), in bracket expressions: Bracket Expressions. (line  17)
 * \ (backslash), in escape sequences:    Escape Sequences.    (line   6)
 * \ (backslash), in escape sequences, POSIX and: Escape Sequences.
-                                                              (line 120)
-* \ (backslash), in regexp constants:    Computed Regexps.    (line  29)
+                                                              (line 108)
+* \ (backslash), in regexp constants:    Computed Regexps.    (line  30)
 * \ (backslash), in shell commands:      Quoting.             (line  48)
 * \ (backslash), regexp operator:        Regexp Operators.    (line  18)
 * ^ (caret), ^ operator:                 Precedence.          (line  49)
@@ -31315,17 +32113,17 @@ Index
 * actions, control statements in:        Statements.          (line   6)
 * actions, default:                      Very Simple.         (line  34)
 * actions, empty:                        Very Simple.         (line  39)
-* Ada programming language:              Glossary.            (line  19)
+* Ada programming language:              Glossary.            (line  11)
 * adding, features to gawk:              Adding Code.         (line   6)
 * adding, fields:                        Changing Fields.     (line  53)
-* advanced features, fixed-width data:   Constant Size.       (line  10)
+* advanced features, fixed-width data:   Constant Size.       (line   6)
 * advanced features, gawk:               Advanced Features.   (line   6)
 * advanced features, network programming: TCP/IP Networking.  (line   6)
 * advanced features, nondecimal input data: Nondecimal Data.  (line   6)
 * advanced features, processes, communicating with: Two-way I/O.
                                                               (line   6)
 * advanced features, specifying field content: Splitting By Content.
-                                                              (line  10)
+                                                              (line   9)
 * Aho, Alfred <1>:                       Contributors.        (line  11)
 * Aho, Alfred:                           History.             (line  17)
 * alarm clock example program:           Alarm Program.       (line  11)
@@ -31333,17 +32131,17 @@ Index
 * algorithms:                            Basic High Level.    (line  68)
 * allocating memory for extensions:      Memory Allocation Functions.
                                                               (line   6)
-* amazing awk assembler (aaa):           Glossary.            (line  11)
+* amazing awk assembler (aaa):           Glossary.            (line  16)
 * amazingly workable formatter (awf):    Glossary.            (line  24)
 * ambiguity, syntactic: /= operator vs. /=.../ regexp constant: Assignment Ops.
                                                               (line 148)
 * ampersand (&), && operator <1>:        Precedence.          (line  86)
-* ampersand (&), && operator:            Boolean Ops.         (line  57)
+* ampersand (&), && operator:            Boolean Ops.         (line  59)
 * ampersand (&), gsub()/gensub()/sub() functions and: Gory Details.
                                                               (line   6)
-* anagram.awk program:                   Anagram Program.     (line  22)
+* anagram.awk program:                   Anagram Program.     (line  21)
 * anagrams, finding:                     Anagram Program.     (line   6)
-* and:                                   Bitwise Functions.   (line  39)
+* and:                                   Bitwise Functions.   (line  40)
 * AND bitwise operation:                 Bitwise Functions.   (line   6)
 * and Boolean-logic operator:            Boolean Ops.         (line   6)
 * ANSI:                                  Glossary.            (line  34)
@@ -31355,37 +32153,37 @@ Index
                                                               (line   6)
 * arbitrary precision integers:          Arbitrary Precision Integers.
                                                               (line   6)
-* archeologists:                         Bugs.                (line   6)
+* archaeologists:                        Bugs.                (line   6)
 * arctangent:                            Numeric Functions.   (line  11)
 * ARGC/ARGV variables:                   Auto-set.            (line  15)
 * ARGC/ARGV variables, command-line arguments: Other Arguments.
-                                                              (line  12)
+                                                              (line  15)
 * ARGC/ARGV variables, how to use:       ARGC and ARGV.       (line   6)
 * ARGC/ARGV variables, portability and:  Executable Scripts.  (line  59)
 * ARGIND variable:                       Auto-set.            (line  44)
-* ARGIND variable, command-line arguments: Other Arguments.   (line  12)
+* ARGIND variable, command-line arguments: Other Arguments.   (line  15)
 * arguments, command-line <1>:           ARGC and ARGV.       (line   6)
 * arguments, command-line <2>:           Auto-set.            (line  15)
 * arguments, command-line:               Other Arguments.     (line   6)
 * arguments, command-line, invoking awk: Command Line.        (line   6)
 * arguments, in function calls:          Function Calls.      (line  18)
 * arguments, processing:                 Getopt Function.     (line   6)
-* ARGV array, indexing into:             Other Arguments.     (line  12)
+* ARGV array, indexing into:             Other Arguments.     (line  15)
 * arithmetic operators:                  Arithmetic Ops.      (line   6)
 * array manipulation in extensions:      Array Manipulation.  (line   6)
 * array members:                         Reference to Elements.
                                                               (line   6)
 * array scanning order, controlling:     Controlling Scanning.
                                                               (line  14)
-* array, number of elements:             String Functions.    (line 197)
+* array, number of elements:             String Functions.    (line 201)
 * arrays:                                Arrays.              (line   6)
 * arrays of arrays:                      Arrays of Arrays.    (line   6)
 * arrays, an example of using:           Array Example.       (line   6)
-* arrays, and IGNORECASE variable:       Array Intro.         (line  94)
+* arrays, and IGNORECASE variable:       Array Intro.         (line 100)
 * arrays, as parameters to functions:    Pass By Value/Reference.
-                                                              (line  47)
+                                                              (line  44)
 * arrays, associative:                   Array Intro.         (line  50)
-* arrays, associative, library functions and: Library Names.  (line  57)
+* arrays, associative, library functions and: Library Names.  (line  58)
 * arrays, deleting entire contents:      Delete.              (line  39)
 * arrays, elements that don't exist:     Reference to Elements.
                                                               (line  23)
@@ -31399,7 +32197,6 @@ Index
 * arrays, merging into strings:          Join Function.       (line   6)
 * arrays, multidimensional:              Multidimensional.    (line  10)
 * arrays, multidimensional, scanning:    Multiscanning.       (line  11)
-* arrays, names of, and names of functions/variables: Arrays. (line  18)
 * arrays, numeric subscripts:            Numeric Array Subscripts.
                                                               (line   6)
 * arrays, referencing elements:          Reference to Elements.
@@ -31409,14 +32206,14 @@ Index
                                                               (line   6)
 * arrays, sorting, and IGNORECASE variable: Array Sorting Functions.
                                                               (line  83)
-* arrays, sparse:                        Array Intro.         (line  72)
+* arrays, sparse:                        Array Intro.         (line  76)
 * arrays, subscripts, uninitialized variables as: Uninitialized Subscripts.
                                                               (line   6)
 * arrays, unassigned elements:           Reference to Elements.
                                                               (line  18)
 * artificial intelligence, gawk and:     Distribution contents.
                                                               (line  52)
-* ASCII <1>:                             Glossary.            (line 133)
+* ASCII <1>:                             Glossary.            (line 197)
 * ASCII:                                 Ordinal Functions.   (line  45)
 * asort <1>:                             Array Sorting Functions.
                                                               (line   6)
@@ -31442,8 +32239,8 @@ Index
                                                               (line  55)
 * asterisk (*), * operator, as regexp operator: Regexp Operators.
                                                               (line  89)
-* asterisk (*), * operator, null strings, matching: Gory Details.
-                                                              (line 143)
+* asterisk (*), * operator, null strings, matching: String Functions.
+                                                              (line 537)
 * asterisk (*), ** operator <1>:         Precedence.          (line  49)
 * asterisk (*), ** operator:             Arithmetic Ops.      (line  81)
 * asterisk (*), **= operator <1>:        Precedence.          (line  95)
@@ -31455,7 +32252,7 @@ Index
 * awf (amazingly workable formatter) program: Glossary.       (line  24)
 * awk debugging, enabling:               Options.             (line 108)
 * awk language, POSIX version:           Assignment Ops.      (line 137)
-* awk profiling, enabling:               Options.             (line 240)
+* awk profiling, enabling:               Options.             (line 242)
 * awk programs <1>:                      Two Rules.           (line   6)
 * awk programs <2>:                      Executable Scripts.  (line   6)
 * awk programs:                          Getting Started.     (line  12)
@@ -31481,7 +32278,7 @@ Index
 * awk, gawk and <1>:                     This Manual.         (line  14)
 * awk, gawk and:                         Preface.             (line  21)
 * awk, history of:                       History.             (line  17)
-* awk, implementation issues, pipes:     Redirection.         (line 135)
+* awk, implementation issues, pipes:     Redirection.         (line 129)
 * awk, implementations:                  Other Versions.      (line   6)
 * awk, implementations, limits:          Getline Notes.       (line  14)
 * awk, invoking:                         Command Line.        (line   6)
@@ -31490,7 +32287,7 @@ Index
 * awk, POSIX and:                        Preface.             (line  21)
 * awk, POSIX and, See Also POSIX awk:    Preface.             (line  21)
 * awk, regexp constants and:             Comparison Operators.
-                                                              (line 102)
+                                                              (line 103)
 * awk, See Also gawk:                    Preface.             (line  34)
 * awk, terms describing:                 This Manual.         (line   6)
 * awk, uses for <1>:                     When.                (line   6)
@@ -31504,7 +32301,7 @@ Index
 * awk, versions of, See Also Brian Kernighan's awk <1>: Other Versions.
                                                               (line  13)
 * awk, versions of, See Also Brian Kernighan's awk: BTL.      (line   6)
-* awka compiler for awk:                 Other Versions.      (line  64)
+* awka compiler for awk:                 Other Versions.      (line  68)
 * AWKLIBPATH environment variable:       AWKLIBPATH Variable. (line   6)
 * AWKPATH environment variable <1>:      PC Using.            (line  10)
 * AWKPATH environment variable:          AWKPATH Variable.    (line   6)
@@ -31513,10 +32310,10 @@ Index
 * awkvars.out file:                      Options.             (line  93)
 * b debugger command (alias for break):  Breakpoint Control.  (line  11)
 * backslash (\):                         Comments.            (line  50)
-* backslash (\), \" escape sequence:     Escape Sequences.    (line  84)
+* backslash (\), \" escape sequence:     Escape Sequences.    (line  85)
 * backslash (\), \' operator (gawk):     GNU Regexp Operators.
                                                               (line  56)
-* backslash (\), \/ escape sequence:     Escape Sequences.    (line  75)
+* backslash (\), \/ escape sequence:     Escape Sequences.    (line  76)
 * backslash (\), \< operator (gawk):     GNU Regexp Operators.
                                                               (line  30)
 * backslash (\), \> operator (gawk):     GNU Regexp Operators.
@@ -31545,7 +32342,7 @@ Index
 * backslash (\), \y operator (gawk):     GNU Regexp Operators.
                                                               (line  38)
 * backslash (\), as field separator:     Command Line Field Separator.
-                                                              (line  27)
+                                                              (line  24)
 * backslash (\), continuing lines and:   Statements/Lines.    (line  19)
 * backslash (\), continuing lines and, comments and: Statements/Lines.
                                                               (line  76)
@@ -31556,12 +32353,12 @@ Index
 * backslash (\), in bracket expressions: Bracket Expressions. (line  17)
 * backslash (\), in escape sequences:    Escape Sequences.    (line   6)
 * backslash (\), in escape sequences, POSIX and: Escape Sequences.
-                                                              (line 120)
-* backslash (\), in regexp constants:    Computed Regexps.    (line  29)
+                                                              (line 108)
+* backslash (\), in regexp constants:    Computed Regexps.    (line  30)
 * backslash (\), in shell commands:      Quoting.             (line  48)
 * backslash (\), regexp operator:        Regexp Operators.    (line  18)
 * backtrace debugger command:            Execution Stack.     (line  13)
-* Beebe, Nelson H.F. <1>:                Other Versions.      (line  78)
+* Beebe, Nelson H.F. <1>:                Other Versions.      (line  82)
 * Beebe, Nelson H.F.:                    Acknowledgments.     (line  60)
 * BEGIN pattern <1>:                     Using BEGIN/END.     (line   6)
 * BEGIN pattern <2>:                     BEGIN/END.           (line   6)
@@ -31576,24 +32373,24 @@ Index
 * BEGIN pattern, next/nextfile statements and <1>: Next Statement.
                                                               (line  44)
 * BEGIN pattern, next/nextfile statements and: I/O And BEGIN/END.
-                                                              (line  36)
+                                                              (line  37)
 * BEGIN pattern, OFS/ORS variables, assigning values to: Output Separators.
-                                                              (line  20)
+                                                              (line  21)
 * BEGIN pattern, operators and:          Using BEGIN/END.     (line  17)
 * BEGIN pattern, print statement and:    I/O And BEGIN/END.   (line  16)
 * BEGIN pattern, pwcat program:          Passwd Functions.    (line 143)
-* BEGIN pattern, running awk programs and: Cut Program.       (line  68)
+* BEGIN pattern, running awk programs and: Cut Program.       (line  63)
 * BEGIN pattern, TEXTDOMAIN variable and: Programmer i18n.    (line  60)
 * BEGINFILE pattern:                     BEGINFILE/ENDFILE.   (line   6)
 * BEGINFILE pattern, Boolean patterns and: Expression Patterns.
                                                               (line  70)
 * beginfile() user-defined function:     Filetrans Function.  (line  62)
-* Bentley, Jon:                          Glossary.            (line 143)
+* Bentley, Jon:                          Glossary.            (line 207)
 * Benzinger, Michael:                    Contributors.        (line  97)
 * Berry, Karl <1>:                       Ranges and Locales.  (line  74)
 * Berry, Karl:                           Acknowledgments.     (line  33)
 * binary input/output:                   User-modified.       (line  15)
-* bindtextdomain <1>:                    Programmer i18n.     (line  47)
+* bindtextdomain <1>:                    Programmer i18n.     (line  48)
 * bindtextdomain:                        I18N Functions.      (line  12)
 * bindtextdomain() function (C library): Explaining gettext.  (line  50)
 * bindtextdomain() function (gawk), portability and: I18N Portability.
@@ -31601,11 +32398,11 @@ Index
 * BINMODE variable <1>:                  PC Using.            (line  33)
 * BINMODE variable:                      User-modified.       (line  15)
 * bit-manipulation functions:            Bitwise Functions.   (line   6)
-* bits2str() user-defined function:      Bitwise Functions.   (line  70)
-* bitwise AND:                           Bitwise Functions.   (line  39)
-* bitwise complement:                    Bitwise Functions.   (line  43)
-* bitwise OR:                            Bitwise Functions.   (line  49)
-* bitwise XOR:                           Bitwise Functions.   (line  55)
+* bits2str() user-defined function:      Bitwise Functions.   (line  71)
+* bitwise AND:                           Bitwise Functions.   (line  40)
+* bitwise complement:                    Bitwise Functions.   (line  44)
+* bitwise OR:                            Bitwise Functions.   (line  50)
+* bitwise XOR:                           Bitwise Functions.   (line  56)
 * bitwise, complement:                   Bitwise Functions.   (line  25)
 * bitwise, operations:                   Bitwise Functions.   (line   6)
 * bitwise, shift:                        Bitwise Functions.   (line  32)
@@ -31645,12 +32442,13 @@ Index
 * Brennan, Michael <1>:                  Other Versions.      (line   6)
 * Brennan, Michael <2>:                  Simple Sed.          (line  25)
 * Brennan, Michael <3>:                  Delete.              (line  56)
-* Brennan, Michael <4>:                  Acknowledgments.     (line  76)
-* Brennan, Michael:                      Foreword.            (line  83)
+* Brennan, Michael <4>:                  Acknowledgments.     (line  78)
+* Brennan, Michael <5>:                  Foreword4.           (line  33)
+* Brennan, Michael:                      Foreword3.           (line  84)
 * Brian Kernighan's awk <1>:             I/O Functions.       (line  43)
 * Brian Kernighan's awk <2>:             Gory Details.        (line  19)
-* Brian Kernighan's awk <3>:             String Functions.    (line 490)
-* Brian Kernighan's awk <4>:             Delete.              (line  48)
+* Brian Kernighan's awk <3>:             String Functions.    (line 493)
+* Brian Kernighan's awk <4>:             Delete.              (line  51)
 * Brian Kernighan's awk <5>:             Nextfile Statement.  (line  47)
 * Brian Kernighan's awk <6>:             Continue Statement.  (line  44)
 * Brian Kernighan's awk <7>:             Break Statement.     (line  51)
@@ -31660,8 +32458,8 @@ Index
 * Brian Kernighan's awk <11>:            Regexp Field Splitting.
                                                               (line  67)
 * Brian Kernighan's awk <12>:            GNU Regexp Operators.
-                                                              (line  83)
-* Brian Kernighan's awk <13>:            Escape Sequences.    (line 124)
+                                                              (line  82)
+* Brian Kernighan's awk <13>:            Escape Sequences.    (line 112)
 * Brian Kernighan's awk:                 When.                (line  21)
 * Brian Kernighan's awk, extensions:     BTL.                 (line   6)
 * Brian Kernighan's awk, source code:    Other Versions.      (line  13)
@@ -31669,14 +32467,14 @@ Index
 * Brink, Jeroen:                         DOS Quoting.         (line  10)
 * Broder, Alan J.:                       Contributors.        (line  88)
 * Brown, Martin:                         Contributors.        (line  82)
-* BSD-based operating systems:           Glossary.            (line 611)
+* BSD-based operating systems:           Glossary.            (line 753)
 * bt debugger command (alias for backtrace): Execution Stack. (line  13)
 * Buening, Andreas <1>:                  Bugs.                (line  71)
 * Buening, Andreas <2>:                  Contributors.        (line  92)
 * Buening, Andreas:                      Acknowledgments.     (line  60)
 * buffering, input/output <1>:           Two-way I/O.         (line  52)
-* buffering, input/output:               I/O Functions.       (line 140)
-* buffering, interactive vs. noninteractive: I/O Functions.   (line 109)
+* buffering, input/output:               I/O Functions.       (line 141)
+* buffering, interactive vs. noninteractive: I/O Functions.   (line  76)
 * buffers, flushing:                     I/O Functions.       (line  32)
 * buffers, operators for:                GNU Regexp Operators.
                                                               (line  48)
@@ -31684,16 +32482,12 @@ Index
 * bug-gawk@gnu.org bug reporting address: Bugs.               (line  30)
 * built-in functions:                    Functions.           (line   6)
 * built-in functions, evaluation order:  Calling Built-in.    (line  30)
-* built-in variables:                    Built-in Variables.  (line   6)
-* built-in variables, -v option, setting with: Options.       (line  40)
-* built-in variables, conveying information: Auto-set.        (line   6)
-* built-in variables, user-modifiable:   User-modified.       (line   6)
-* Busybox Awk:                           Other Versions.      (line  88)
+* BusyBox Awk:                           Other Versions.      (line  92)
 * c.e., See common extensions:           Conventions.         (line  51)
 * call by reference:                     Pass By Value/Reference.
-                                                              (line  47)
+                                                              (line  44)
 * call by value:                         Pass By Value/Reference.
-                                                              (line  18)
+                                                              (line  15)
 * call stack, display in debugger:       Execution Stack.     (line  13)
 * caret (^), ^ operator:                 Precedence.          (line  49)
 * caret (^), ^= operator <1>:            Precedence.          (line  95)
@@ -31705,8 +32499,8 @@ Index
 * case keyword:                          Switch Statement.    (line   6)
 * case sensitivity, and regexps:         User-modified.       (line  76)
 * case sensitivity, and string comparisons: User-modified.    (line  76)
-* case sensitivity, array indices and:   Array Intro.         (line  94)
-* case sensitivity, converting case:     String Functions.    (line 520)
+* case sensitivity, array indices and:   Array Intro.         (line 100)
+* case sensitivity, converting case:     String Functions.    (line 523)
 * case sensitivity, example programs:    Library Functions.   (line  53)
 * case sensitivity, gawk:                Case-sensitivity.    (line  26)
 * case sensitivity, regexps and:         Case-sensitivity.    (line   6)
@@ -31715,7 +32509,7 @@ Index
                                                               (line  56)
 * character lists in regular expression: Bracket Expressions. (line   6)
 * character lists, See bracket expressions: Regexp Operators. (line  56)
-* character sets (machine character encodings) <1>: Glossary. (line 133)
+* character sets (machine character encodings) <1>: Glossary. (line 197)
 * character sets (machine character encodings): Ordinal Functions.
                                                               (line  45)
 * character sets, See Also bracket expressions: Regexp Operators.
@@ -31726,7 +32520,7 @@ Index
 * Chassell, Robert J.:                   Acknowledgments.     (line  33)
 * chdir() extension function:            Extension Sample File Functions.
                                                               (line  12)
-* chem utility:                          Glossary.            (line 143)
+* chem utility:                          Glossary.            (line 207)
 * chr() extension function:              Extension Sample Ord.
                                                               (line  15)
 * chr() user-defined function:           Ordinal Functions.   (line  16)
@@ -31742,14 +32536,14 @@ Index
 * close() function, portability:         Close Files And Pipes.
                                                               (line  81)
 * close() function, return value:        Close Files And Pipes.
-                                                              (line 131)
+                                                              (line 133)
 * close() function, two-way pipes and:   Two-way I/O.         (line  59)
 * Close, Diane <1>:                      Contributors.        (line  20)
 * Close, Diane:                          Manual History.      (line  34)
 * Collado, Manuel:                       Acknowledgments.     (line  60)
 * collating elements:                    Bracket Expressions. (line  79)
 * collating symbols:                     Bracket Expressions. (line  86)
-* Colombo, Antonio <1>:                  Contributors.        (line 137)
+* Colombo, Antonio <1>:                  Contributors.        (line 140)
 * Colombo, Antonio:                      Acknowledgments.     (line  60)
 * columns, aligning:                     Print Examples.      (line  70)
 * columns, cutting:                      Cut Program.         (line   6)
@@ -31778,15 +32572,15 @@ Index
 * commenting, backslash continuation and: Statements/Lines.   (line  76)
 * common extensions, ** operator:        Arithmetic Ops.      (line  30)
 * common extensions, **= operator:       Assignment Ops.      (line 137)
-* common extensions, /dev/stderr special file: Special FD.    (line  46)
-* common extensions, /dev/stdin special file: Special FD.     (line  46)
-* common extensions, /dev/stdout special file: Special FD.    (line  46)
+* common extensions, /dev/stderr special file: Special FD.    (line  48)
+* common extensions, /dev/stdin special file: Special FD.     (line  48)
+* common extensions, /dev/stdout special file: Special FD.    (line  48)
 * common extensions, \x escape sequence: Escape Sequences.    (line  61)
 * common extensions, BINMODE variable:   PC Using.            (line  33)
 * common extensions, delete to delete entire arrays: Delete.  (line  39)
-* common extensions, func keyword:       Definition Syntax.   (line  93)
+* common extensions, func keyword:       Definition Syntax.   (line  98)
 * common extensions, length() applied to an array: String Functions.
-                                                              (line 197)
+                                                              (line 201)
 * common extensions, RS as a regexp:     gawk split records.  (line   6)
 * common extensions, single character fields: Single Character Fields.
                                                               (line   6)
@@ -31795,7 +32589,7 @@ Index
                                                               (line   9)
 * comparison expressions, as patterns:   Expression Patterns. (line  14)
 * comparison expressions, string vs. regexp: Comparison Operators.
-                                                              (line  78)
+                                                              (line  79)
 * compatibility mode (gawk), extensions: POSIX/GNU.           (line   6)
 * compatibility mode (gawk), file names: Special Caveats.     (line   9)
 * compatibility mode (gawk), hexadecimal numbers: Nondecimal-numbers.
@@ -31803,13 +32597,13 @@ Index
 * compatibility mode (gawk), octal numbers: Nondecimal-numbers.
                                                               (line  60)
 * compatibility mode (gawk), specifying: Options.             (line  81)
-* compiled programs <1>:                 Glossary.            (line 157)
+* compiled programs <1>:                 Glossary.            (line 219)
 * compiled programs:                     Basic High Level.    (line  15)
 * compiling gawk for Cygwin:             Cygwin.              (line   6)
 * compiling gawk for MS-DOS and MS-Windows: PC Compiling.     (line  13)
 * compiling gawk for VMS:                VMS Compilation.     (line   6)
 * compiling gawk with EMX for OS/2:      PC Compiling.        (line  28)
-* compl:                                 Bitwise Functions.   (line  43)
+* compl:                                 Bitwise Functions.   (line  44)
 * complement, bitwise:                   Bitwise Functions.   (line  25)
 * compound statements, control statements and: Statements.    (line  10)
 * concatenating:                         Concatenation.       (line   8)
@@ -31820,9 +32614,9 @@ Index
 * configuration option, --disable-lint:  Additional Configuration Options.
                                                               (line  15)
 * configuration option, --disable-nls:   Additional Configuration Options.
-                                                              (line  30)
+                                                              (line  32)
 * configuration option, --with-whiny-user-strftime: Additional Configuration Options.
-                                                              (line  35)
+                                                              (line  37)
 * configuration options, gawk:           Additional Configuration Options.
                                                               (line   6)
 * constant regexps:                      Regexp Usage.        (line  57)
@@ -31835,23 +32629,23 @@ Index
 * control statements:                    Statements.          (line   6)
 * controlling array scanning order:      Controlling Scanning.
                                                               (line  14)
-* convert string to lower case:          String Functions.    (line 521)
-* convert string to number:              String Functions.    (line 388)
-* convert string to upper case:          String Functions.    (line 527)
+* convert string to lower case:          String Functions.    (line 524)
+* convert string to number:              String Functions.    (line 391)
+* convert string to upper case:          String Functions.    (line 530)
 * converting integer array subscripts:   Numeric Array Subscripts.
                                                               (line  31)
 * converting, dates to timestamps:       Time Functions.      (line  76)
-* converting, numbers to strings <1>:    Bitwise Functions.   (line 109)
+* converting, numbers to strings <1>:    Bitwise Functions.   (line 110)
 * converting, numbers to strings:        Strings And Numbers. (line   6)
-* converting, strings to numbers <1>:    Bitwise Functions.   (line 109)
+* converting, strings to numbers <1>:    Bitwise Functions.   (line 110)
 * converting, strings to numbers:        Strings And Numbers. (line   6)
 * CONVFMT variable <1>:                  User-modified.       (line  30)
 * CONVFMT variable:                      Strings And Numbers. (line  29)
 * CONVFMT variable, and array subscripts: Numeric Array Subscripts.
                                                               (line   6)
-* cookie:                                Glossary.            (line 149)
+* cookie:                                Glossary.            (line 258)
 * coprocesses <1>:                       Two-way I/O.         (line  25)
-* coprocesses:                           Redirection.         (line 102)
+* coprocesses:                           Redirection.         (line  96)
 * coprocesses, closing:                  Close Files And Pipes.
                                                               (line   6)
 * coprocesses, getline from:             Getline/Coprocess.   (line   6)
@@ -31859,7 +32653,7 @@ Index
 * cosine:                                Numeric Functions.   (line  15)
 * counting:                              Wc Program.          (line   6)
 * csh utility:                           Statements/Lines.    (line  44)
-* csh utility, POSIXLY_CORRECT environment variable: Options. (line 351)
+* csh utility, POSIXLY_CORRECT environment variable: Options. (line 354)
 * csh utility, |& operator, comparison with: Two-way I/O.     (line  25)
 * ctime() user-defined function:         Function Example.    (line  74)
 * currency symbols, localization:        Explaining gettext.  (line 104)
@@ -31873,7 +32667,7 @@ Index
 * cut.awk program:                       Cut Program.         (line  45)
 * d debugger command (alias for delete): Breakpoint Control.  (line  64)
 * d.c., See dark corner:                 Conventions.         (line  42)
-* dark corner <1>:                       Glossary.            (line 188)
+* dark corner <1>:                       Glossary.            (line 269)
 * dark corner:                           Conventions.         (line  42)
 * dark corner, "0" is actually true:     Truth Values.        (line  24)
 * dark corner, /= operator vs. /=.../ regexp constant: Assignment Ops.
@@ -31884,40 +32678,41 @@ Index
                                                               (line  43)
 * dark corner, break statement:          Break Statement.     (line  51)
 * dark corner, close() function:         Close Files And Pipes.
-                                                              (line 131)
+                                                              (line 133)
 * dark corner, command-line arguments:   Assignment Options.  (line  43)
 * dark corner, continue statement:       Continue Statement.  (line  44)
 * dark corner, CONVFMT variable:         Strings And Numbers. (line  40)
-* dark corner, escape sequences:         Other Arguments.     (line  35)
+* dark corner, escape sequences:         Other Arguments.     (line  38)
 * dark corner, escape sequences, for metacharacters: Escape Sequences.
-                                                              (line 142)
+                                                              (line 143)
 * dark corner, exit statement:           Exit Statement.      (line  30)
-* dark corner, field separators:         Field Splitting Summary.
-                                                              (line  46)
-* dark corner, FILENAME variable <1>:    Auto-set.            (line  98)
+* dark corner, field separators:         Full Line Fields.    (line  22)
+* dark corner, FILENAME variable <1>:    Auto-set.            (line 109)
 * dark corner, FILENAME variable:        Getline Notes.       (line  19)
-* dark corner, FNR/NR variables:         Auto-set.            (line 316)
+* dark corner, FNR/NR variables:         Auto-set.            (line 341)
 * dark corner, format-control characters: Control Letters.    (line  18)
 * dark corner, FS as null string:        Single Character Fields.
                                                               (line  20)
-* dark corner, input files:              awk split records.   (line 110)
+* dark corner, input files:              awk split records.   (line 111)
 * dark corner, invoking awk:             Command Line.        (line  16)
-* dark corner, length() function:        String Functions.    (line 183)
+* dark corner, length() function:        String Functions.    (line 187)
 * dark corner, locale's decimal point character: Locale influences conversions.
                                                               (line  17)
 * dark corner, multiline records:        Multiple Line.       (line  35)
 * dark corner, NF variable, decrementing: Changing Fields.    (line 107)
 * dark corner, OFMT variable:            OFMT.                (line  27)
+* dark corner, regexp as second argument to index(): String Functions.
+                                                              (line 165)
 * dark corner, regexp constants:         Using Constant Regexps.
                                                               (line   6)
 * dark corner, regexp constants, /= operator and: Assignment Ops.
                                                               (line 148)
 * dark corner, regexp constants, as arguments to user-defined functions: Using Constant Regexps.
                                                               (line  43)
-* dark corner, split() function:         String Functions.    (line 359)
+* dark corner, split() function:         String Functions.    (line 362)
 * dark corner, strings, storing:         gawk split records.  (line  83)
 * dark corner, value of ARGV[0]:         Auto-set.            (line  39)
-* data, fixed-width:                     Constant Size.       (line  10)
+* data, fixed-width:                     Constant Size.       (line   6)
 * data-driven languages:                 Basic High Level.    (line  85)
 * database, group, reading:              Group Functions.     (line   6)
 * database, users, reading:              Passwd Functions.    (line   6)
@@ -31928,12 +32723,12 @@ Index
                                                               (line 112)
 * Davies, Stephen <1>:                   Contributors.        (line  74)
 * Davies, Stephen:                       Acknowledgments.     (line  60)
-* Day, Robert P.J.:                      Acknowledgments.     (line  76)
-* dcgettext <1>:                         Programmer i18n.     (line  19)
+* Day, Robert P.J.:                      Acknowledgments.     (line  78)
+* dcgettext <1>:                         Programmer i18n.     (line  20)
 * dcgettext:                             I18N Functions.      (line  22)
 * dcgettext() function (gawk), portability and: I18N Portability.
                                                               (line  33)
-* dcngettext <1>:                        Programmer i18n.     (line  36)
+* dcngettext <1>:                        Programmer i18n.     (line  37)
 * dcngettext:                            I18N Functions.      (line  28)
 * dcngettext() function (gawk), portability and: I18N Portability.
                                                               (line  33)
@@ -31955,7 +32750,7 @@ Index
 * debugger commands, disable:            Breakpoint Control.  (line  69)
 * debugger commands, display:            Viewing And Changing Data.
                                                               (line   8)
-* debugger commands, down:               Execution Stack.     (line  21)
+* debugger commands, down:               Execution Stack.     (line  23)
 * debugger commands, dump:               Miscellaneous Debugger Commands.
                                                               (line   9)
 * debugger commands, e (enable):         Breakpoint Control.  (line  73)
@@ -31964,10 +32759,10 @@ Index
                                                               (line  10)
 * debugger commands, eval:               Viewing And Changing Data.
                                                               (line  23)
-* debugger commands, f (frame):          Execution Stack.     (line  25)
+* debugger commands, f (frame):          Execution Stack.     (line  27)
 * debugger commands, finish:             Debugger Execution Control.
                                                               (line  39)
-* debugger commands, frame:              Execution Stack.     (line  25)
+* debugger commands, frame:              Execution Stack.     (line  27)
 * debugger commands, h (help):           Miscellaneous Debugger Commands.
                                                               (line  66)
 * debugger commands, help:               Miscellaneous Debugger Commands.
@@ -32020,7 +32815,7 @@ Index
 * debugger commands, t (tbreak):         Breakpoint Control.  (line  90)
 * debugger commands, tbreak:             Breakpoint Control.  (line  90)
 * debugger commands, trace:              Miscellaneous Debugger Commands.
-                                                              (line 108)
+                                                              (line 107)
 * debugger commands, u (until):          Debugger Execution Control.
                                                               (line  83)
 * debugger commands, undisplay:          Viewing And Changing Data.
@@ -32029,21 +32824,22 @@ Index
                                                               (line  83)
 * debugger commands, unwatch:            Viewing And Changing Data.
                                                               (line  84)
-* debugger commands, up:                 Execution Stack.     (line  34)
+* debugger commands, up:                 Execution Stack.     (line  36)
 * debugger commands, w (watch):          Viewing And Changing Data.
                                                               (line  67)
 * debugger commands, watch:              Viewing And Changing Data.
                                                               (line  67)
+* debugger commands, where (backtrace):  Execution Stack.     (line  13)
 * debugger default list amount:          Debugger Info.       (line  69)
-* debugger history file:                 Debugger Info.       (line  80)
+* debugger history file:                 Debugger Info.       (line  81)
 * debugger history size:                 Debugger Info.       (line  65)
 * debugger options:                      Debugger Info.       (line  57)
-* debugger prompt:                       Debugger Info.       (line  77)
+* debugger prompt:                       Debugger Info.       (line  78)
 * debugger, how to start:                Debugger Invocation. (line   6)
-* debugger, read commands from a file:   Debugger Info.       (line  96)
+* debugger, read commands from a file:   Debugger Info.       (line  97)
 * debugging awk programs:                Debugger.            (line   6)
 * debugging gawk, bug reports:           Bugs.                (line   9)
-* decimal point character, locale specific: Options.          (line 268)
+* decimal point character, locale specific: Options.          (line 270)
 * decrement operators:                   Increment Ops.       (line  35)
 * default keyword:                       Switch Statement.    (line   6)
 * Deifik, Scott <1>:                     Bugs.                (line  71)
@@ -32060,7 +32856,7 @@ Index
 * deleting entire arrays:                Delete.              (line  39)
 * Demaille, Akim:                        Acknowledgments.     (line  60)
 * describe call stack frame, in debugger: Debugger Info.      (line  27)
-* differences between gawk and awk:      String Functions.    (line 197)
+* differences between gawk and awk:      String Functions.    (line 201)
 * differences in awk and gawk, ARGC/ARGV variables: ARGC and ARGV.
                                                               (line  90)
 * differences in awk and gawk, ARGIND variable: Auto-set.     (line  44)
@@ -32082,55 +32878,57 @@ Index
                                                               (line  81)
 * differences in awk and gawk, command-line directories: Command-line directories.
                                                               (line   6)
-* differences in awk and gawk, ERRNO variable: Auto-set.      (line  82)
-* differences in awk and gawk, error messages: Special FD.    (line  16)
+* differences in awk and gawk, ERRNO variable: Auto-set.      (line  88)
+* differences in awk and gawk, error messages: Special FD.    (line  19)
 * differences in awk and gawk, FIELDWIDTHS variable: User-modified.
                                                               (line  37)
 * differences in awk and gawk, FPAT variable: User-modified.  (line  43)
-* differences in awk and gawk, FUNCTAB variable: Auto-set.    (line 123)
+* differences in awk and gawk, FUNCTAB variable: Auto-set.    (line 135)
 * differences in awk and gawk, function arguments (gawk): Calling Built-in.
                                                               (line  16)
 * differences in awk and gawk, getline command: Getline.      (line  19)
 * differences in awk and gawk, IGNORECASE variable: User-modified.
                                                               (line  76)
 * differences in awk and gawk, implementation limitations <1>: Redirection.
-                                                              (line 135)
+                                                              (line 129)
 * differences in awk and gawk, implementation limitations: Getline Notes.
                                                               (line  14)
 * differences in awk and gawk, indirect function calls: Indirect Calls.
                                                               (line   6)
 * differences in awk and gawk, input/output operators <1>: Redirection.
-                                                              (line 102)
+                                                              (line  96)
 * differences in awk and gawk, input/output operators: Getline/Coprocess.
                                                               (line   6)
 * differences in awk and gawk, line continuations: Conditional Exp.
                                                               (line  34)
-* differences in awk and gawk, LINT variable: User-modified.  (line  88)
+* differences in awk and gawk, LINT variable: User-modified.  (line  87)
 * differences in awk and gawk, match() function: String Functions.
-                                                              (line 260)
+                                                              (line 263)
 * differences in awk and gawk, print/printf statements: Format Modifiers.
                                                               (line  13)
-* differences in awk and gawk, PROCINFO array: Auto-set.      (line 137)
+* differences in awk and gawk, PROCINFO array: Auto-set.      (line 149)
 * differences in awk and gawk, read timeouts: Read Timeout.   (line   6)
 * differences in awk and gawk, record separators: awk split records.
-                                                              (line 124)
+                                                              (line 125)
 * differences in awk and gawk, regexp constants: Using Constant Regexps.
                                                               (line  43)
 * differences in awk and gawk, regular expressions: Case-sensitivity.
                                                               (line  26)
+* differences in awk and gawk, retrying input: Retrying Input.
+                                                              (line   6)
 * differences in awk and gawk, RS/RT variables: gawk split records.
                                                               (line  58)
-* differences in awk and gawk, RT variable: Auto-set.         (line 272)
+* differences in awk and gawk, RT variable: Auto-set.         (line 292)
 * differences in awk and gawk, single-character fields: Single Character Fields.
                                                               (line   6)
 * differences in awk and gawk, split() function: String Functions.
-                                                              (line 347)
+                                                              (line 349)
 * differences in awk and gawk, strings:  Scalar Constants.    (line  20)
 * differences in awk and gawk, strings, storing: gawk split records.
                                                               (line  77)
-* differences in awk and gawk, SYMTAB variable: Auto-set.     (line 276)
+* differences in awk and gawk, SYMTAB variable: Auto-set.     (line 296)
 * differences in awk and gawk, TEXTDOMAIN variable: User-modified.
-                                                              (line 152)
+                                                              (line 151)
 * differences in awk and gawk, trunc-mod operation: Arithmetic Ops.
                                                               (line  66)
 * directories, command-line:             Command-line directories.
@@ -32144,7 +32942,6 @@ Index
 * display debugger command:              Viewing And Changing Data.
                                                               (line   8)
 * display debugger options:              Debugger Info.       (line  57)
-* div:                                   Numeric Functions.   (line  18)
 * division:                              Arithmetic Ops.      (line  44)
 * do-while statement:                    Do Statement.        (line   6)
 * do-while statement, use of regexps in: Regexp Usage.        (line  19)
@@ -32156,20 +32953,21 @@ Index
 * dollar sign ($), incrementing fields and arrays: Increment Ops.
                                                               (line  30)
 * dollar sign ($), regexp operator:      Regexp Operators.    (line  35)
-* double quote ("), in regexp constants: Computed Regexps.    (line  29)
+* double quote ("), in regexp constants: Computed Regexps.    (line  30)
 * double quote ("), in shell commands:   Quoting.             (line  54)
-* down debugger command:                 Execution Stack.     (line  21)
+* down debugger command:                 Execution Stack.     (line  23)
 * Drepper, Ulrich:                       Acknowledgments.     (line  52)
+* Duman, Patrice:                        Acknowledgments.     (line  74)
 * dump all variables of a program:       Options.             (line  93)
 * dump debugger command:                 Miscellaneous Debugger Commands.
                                                               (line   9)
 * dupword.awk program:                   Dupword Program.     (line  31)
-* dynamic profiling:                     Profiling.           (line 179)
+* dynamic profiling:                     Profiling.           (line 178)
 * dynamically loaded extensions:         Dynamic Extensions.  (line   6)
 * e debugger command (alias for enable): Breakpoint Control.  (line  73)
 * EBCDIC:                                Ordinal Functions.   (line  45)
-* effective group ID of gawk user:       Auto-set.            (line 142)
-* effective user ID of gawk user:        Auto-set.            (line 146)
+* effective group ID of gawk user:       Auto-set.            (line 154)
+* effective user ID of gawk user:        Auto-set.            (line 162)
 * egrep utility <1>:                     Egrep Program.       (line   6)
 * egrep utility:                         Bracket Expressions. (line  26)
 * egrep.awk program:                     Egrep Program.       (line  54)
@@ -32185,7 +32983,7 @@ Index
 * empty array elements:                  Reference to Elements.
                                                               (line  18)
 * empty pattern:                         Empty.               (line   6)
-* empty strings:                         awk split records.   (line 114)
+* empty strings:                         awk split records.   (line 115)
 * empty strings, See null strings:       Regexp Field Splitting.
                                                               (line  43)
 * enable breakpoint:                     Breakpoint Control.  (line  73)
@@ -32202,7 +33000,7 @@ Index
 * END pattern, next/nextfile statements and <1>: Next Statement.
                                                               (line  44)
 * END pattern, next/nextfile statements and: I/O And BEGIN/END.
-                                                              (line  36)
+                                                              (line  37)
 * END pattern, operators and:            Using BEGIN/END.     (line  17)
 * END pattern, print statement and:      I/O And BEGIN/END.   (line  16)
 * ENDFILE pattern:                       BEGINFILE/ENDFILE.   (line   6)
@@ -32210,27 +33008,27 @@ Index
 * endfile() user-defined function:       Filetrans Function.  (line  62)
 * endgrent() function (C library):       Group Functions.     (line 212)
 * endgrent() user-defined function:      Group Functions.     (line 215)
-* endpwent() function (C library):       Passwd Functions.    (line 210)
-* endpwent() user-defined function:      Passwd Functions.    (line 213)
+* endpwent() function (C library):       Passwd Functions.    (line 207)
+* endpwent() user-defined function:      Passwd Functions.    (line 210)
 * English, Steve:                        Advanced Features.   (line   6)
 * ENVIRON array:                         Auto-set.            (line  60)
 * environment variables used by gawk:    Environment Variables.
                                                               (line   6)
 * environment variables, in ENVIRON array: Auto-set.          (line  60)
-* epoch, definition of:                  Glossary.            (line 234)
+* epoch, definition of:                  Glossary.            (line 315)
 * equals sign (=), = operator:           Assignment Ops.      (line   6)
 * equals sign (=), == operator <1>:      Precedence.          (line  65)
 * equals sign (=), == operator:          Comparison Operators.
                                                               (line  11)
 * EREs (Extended Regular Expressions):   Bracket Expressions. (line  26)
 * ERRNO variable <1>:                    TCP/IP Networking.   (line  54)
-* ERRNO variable:                        Auto-set.            (line  82)
+* ERRNO variable:                        Auto-set.            (line  88)
 * ERRNO variable, with BEGINFILE pattern: BEGINFILE/ENDFILE.  (line  26)
 * ERRNO variable, with close() function: Close Files And Pipes.
-                                                              (line 139)
+                                                              (line 141)
 * ERRNO variable, with getline command:  Getline.             (line  19)
-* error handling:                        Special FD.          (line  16)
-* error handling, ERRNO variable and:    Auto-set.            (line  82)
+* error handling:                        Special FD.          (line  19)
+* error handling, ERRNO variable and:    Auto-set.            (line  88)
 * error output:                          Special FD.          (line   6)
 * escape processing, gsub()/gensub()/sub() functions: Gory Details.
                                                               (line   6)
@@ -32245,7 +33043,7 @@ Index
 * examining fields:                      Fields.              (line   6)
 * exclamation point (!), ! operator <1>: Egrep Program.       (line 175)
 * exclamation point (!), ! operator <2>: Precedence.          (line  52)
-* exclamation point (!), ! operator:     Boolean Ops.         (line  67)
+* exclamation point (!), ! operator:     Boolean Ops.         (line  69)
 * exclamation point (!), != operator <1>: Precedence.         (line  65)
 * exclamation point (!), != operator:    Comparison Operators.
                                                               (line  11)
@@ -32260,13 +33058,13 @@ Index
 * exclamation point (!), !~ operator:    Regexp Usage.        (line  19)
 * exit statement:                        Exit Statement.      (line   6)
 * exit status, of gawk:                  Exit Status.         (line   6)
-* exit status, of VMS:                   VMS Running.         (line  29)
+* exit status, of VMS:                   VMS Running.         (line  28)
 * exit the debugger:                     Miscellaneous Debugger Commands.
                                                               (line  99)
-* exp:                                   Numeric Functions.   (line  33)
-* expand utility:                        Very Simple.         (line  72)
-* Expat XML parser library:              gawkextlib.          (line  35)
-* exponent:                              Numeric Functions.   (line  33)
+* exp:                                   Numeric Functions.   (line  18)
+* expand utility:                        Very Simple.         (line  73)
+* Expat XML parser library:              gawkextlib.          (line  37)
+* exponent:                              Numeric Functions.   (line  18)
 * expressions:                           Expressions.         (line   6)
 * expressions, as patterns:              Expression Patterns. (line   6)
 * expressions, assignment:               Assignment Ops.      (line   6)
@@ -32284,7 +33082,7 @@ Index
                                                               (line   6)
 * extension API version:                 Extension Versioning.
                                                               (line   6)
-* extension API, version number:         Auto-set.            (line 239)
+* extension API, version number:         Auto-set.            (line 255)
 * extension example:                     Extension Example.   (line   6)
 * extension registration:                Registration Functions.
                                                               (line   6)
@@ -32296,16 +33094,16 @@ Index
 * extensions, Brian Kernighan's awk:     BTL.                 (line   6)
 * extensions, common, ** operator:       Arithmetic Ops.      (line  30)
 * extensions, common, **= operator:      Assignment Ops.      (line 137)
-* extensions, common, /dev/stderr special file: Special FD.   (line  46)
-* extensions, common, /dev/stdin special file: Special FD.    (line  46)
-* extensions, common, /dev/stdout special file: Special FD.   (line  46)
+* extensions, common, /dev/stderr special file: Special FD.   (line  48)
+* extensions, common, /dev/stdin special file: Special FD.    (line  48)
+* extensions, common, /dev/stdout special file: Special FD.   (line  48)
 * extensions, common, \x escape sequence: Escape Sequences.   (line  61)
 * extensions, common, BINMODE variable:  PC Using.            (line  33)
 * extensions, common, delete to delete entire arrays: Delete. (line  39)
 * extensions, common, fflush() function: I/O Functions.       (line  43)
-* extensions, common, func keyword:      Definition Syntax.   (line  93)
+* extensions, common, func keyword:      Definition Syntax.   (line  98)
 * extensions, common, length() applied to an array: String Functions.
-                                                              (line 197)
+                                                              (line 201)
 * extensions, common, RS as a regexp:    gawk split records.  (line   6)
 * extensions, common, single character fields: Single Character Fields.
                                                               (line   6)
@@ -32317,7 +33115,7 @@ Index
 * extract.awk program:                   Extract Program.     (line  79)
 * extraction, of marked strings (internationalization): String Extraction.
                                                               (line   6)
-* f debugger command (alias for frame):  Execution Stack.     (line  25)
+* f debugger command (alias for frame):  Execution Stack.     (line  27)
 * false, logical:                        Truth Values.        (line   6)
 * FDL (Free Documentation License):      GNU Free Documentation License.
                                                               (line   7)
@@ -32333,8 +33131,7 @@ Index
 * field separator, in multiline records: Multiple Line.       (line  41)
 * field separator, on command line:      Command Line Field Separator.
                                                               (line   6)
-* field separator, POSIX and:            Field Splitting Summary.
-                                                              (line  40)
+* field separator, POSIX and:            Full Line Fields.    (line  16)
 * field separators <1>:                  User-modified.       (line  50)
 * field separators:                      Field Separators.    (line  15)
 * field separators, choice of:           Field Separators.    (line  51)
@@ -32345,7 +33142,7 @@ Index
                                                               (line   6)
 * field separators, regular expressions as: Field Separators. (line  51)
 * field separators, See Also OFS:        Changing Fields.     (line  64)
-* field separators, spaces as:           Cut Program.         (line 108)
+* field separators, spaces as:           Cut Program.         (line 103)
 * fields <1>:                            Basic High Level.    (line  73)
 * fields <2>:                            Fields.              (line   6)
 * fields:                                Reading Files.       (line  14)
@@ -32360,25 +33157,25 @@ Index
 * fields, single-character:              Single Character Fields.
                                                               (line   6)
 * FIELDWIDTHS variable <1>:              User-modified.       (line  37)
-* FIELDWIDTHS variable:                  Constant Size.       (line  23)
+* FIELDWIDTHS variable:                  Constant Size.       (line  22)
 * file descriptors:                      Special FD.          (line   6)
 * file inclusion, @include directive:    Include Files.       (line   8)
 * file names, distinguishing:            Auto-set.            (line  56)
 * file names, in compatibility mode:     Special Caveats.     (line   9)
-* file names, standard streams in gawk:  Special FD.          (line  46)
-* FILENAME variable <1>:                 Auto-set.            (line  98)
+* file names, standard streams in gawk:  Special FD.          (line  48)
+* FILENAME variable <1>:                 Auto-set.            (line 109)
 * FILENAME variable:                     Reading Files.       (line   6)
 * FILENAME variable, getline, setting with: Getline Notes.    (line  19)
 * filenames, assignments as:             Ignoring Assigns.    (line   6)
 * files, .gmo:                           Explaining gettext.  (line  42)
-* files, .gmo, specifying directory of <1>: Programmer i18n.  (line  47)
+* files, .gmo, specifying directory of <1>: Programmer i18n.  (line  48)
 * files, .gmo, specifying directory of:  Explaining gettext.  (line  54)
-* files, .mo, converting from .po:       I18N Example.        (line  63)
+* files, .mo, converting from .po:       I18N Example.        (line  64)
 * files, .po <1>:                        Translator i18n.     (line   6)
 * files, .po:                            Explaining gettext.  (line  37)
-* files, .po, converting to .mo:         I18N Example.        (line  63)
+* files, .po, converting to .mo:         I18N Example.        (line  64)
 * files, .pot:                           Explaining gettext.  (line  31)
-* files, /dev/... special files:         Special FD.          (line  46)
+* files, /dev/... special files:         Special FD.          (line  48)
 * files, /inet/... (gawk):               TCP/IP Networking.   (line   6)
 * files, /inet4/... (gawk):              TCP/IP Networking.   (line   6)
 * files, /inet6/... (gawk):              TCP/IP Networking.   (line   6)
@@ -32396,12 +33193,12 @@ Index
 * files, managing, data file boundaries: Filetrans Function.  (line   6)
 * files, message object:                 Explaining gettext.  (line  42)
 * files, message object, converting from portable object files: I18N Example.
-                                                              (line  63)
+                                                              (line  64)
 * files, message object, specifying directory of <1>: Programmer i18n.
-                                                              (line  47)
+                                                              (line  48)
 * files, message object, specifying directory of: Explaining gettext.
                                                               (line  54)
-* files, multiple passes over:           Other Arguments.     (line  53)
+* files, multiple passes over:           Other Arguments.     (line  56)
 * files, multiple, duplicating output into: Tee Program.      (line   6)
 * files, output, See output files:       Close Files And Pipes.
                                                               (line   6)
@@ -32410,7 +33207,7 @@ Index
 * files, portable object:                Explaining gettext.  (line  37)
 * files, portable object template:       Explaining gettext.  (line  31)
 * files, portable object, converting to message object files: I18N Example.
-                                                              (line  63)
+                                                              (line  64)
 * files, portable object, generating:    Options.             (line 147)
 * files, processing, ARGIND variable and: Auto-set.           (line  51)
 * files, reading:                        Rewind Function.     (line   6)
@@ -32420,23 +33217,23 @@ Index
 * files, source, search path for:        Programs Exercises.  (line  70)
 * files, splitting:                      Split Program.       (line   6)
 * files, Texinfo, extracting programs from: Extract Program.  (line   6)
-* find substring in string:              String Functions.    (line 155)
+* find substring in string:              String Functions.    (line 156)
 * finding extensions:                    Finding Extensions.  (line   6)
 * finish debugger command:               Debugger Execution Control.
                                                               (line  39)
 * Fish, Fred:                            Contributors.        (line  50)
-* fixed-width data:                      Constant Size.       (line  10)
+* fixed-width data:                      Constant Size.       (line   6)
 * flag variables <1>:                    Tee Program.         (line  20)
-* flag variables:                        Boolean Ops.         (line  67)
+* flag variables:                        Boolean Ops.         (line  69)
 * floating-point, numbers, arbitrary precision: Arbitrary Precision Arithmetic.
                                                               (line   6)
-* floating-point, VAX/VMS:               VMS Running.         (line  51)
+* floating-point, VAX/VMS:               VMS Running.         (line  50)
 * flush buffered output:                 I/O Functions.       (line  28)
 * fnmatch() extension function:          Extension Sample Fnmatch.
                                                               (line  12)
-* FNR variable <1>:                      Auto-set.            (line 107)
+* FNR variable <1>:                      Auto-set.            (line 119)
 * FNR variable:                          Records.             (line   6)
-* FNR variable, changing:                Auto-set.            (line 316)
+* FNR variable, changing:                Auto-set.            (line 341)
 * for statement:                         For Statement.       (line   6)
 * for statement, looping over arrays:    Scanning an Array.   (line  20)
 * fork() extension function:             Extension Sample Fork.
@@ -32450,7 +33247,7 @@ Index
 * format time string:                    Time Functions.      (line  48)
 * formats, numeric output:               OFMT.                (line   6)
 * formatting output:                     Printf.              (line   6)
-* formatting strings:                    String Functions.    (line 381)
+* formatting strings:                    String Functions.    (line 384)
 * forward slash (/) to enclose regular expressions: Regexp.   (line  10)
 * forward slash (/), / operator:         Precedence.          (line  55)
 * forward slash (/), /= operator <1>:    Precedence.          (line  95)
@@ -32460,47 +33257,47 @@ Index
 * forward slash (/), patterns and:       Expression Patterns. (line  24)
 * FPAT variable <1>:                     User-modified.       (line  43)
 * FPAT variable:                         Splitting By Content.
-                                                              (line  27)
-* frame debugger command:                Execution Stack.     (line  25)
+                                                              (line  25)
+* frame debugger command:                Execution Stack.     (line  27)
 * Free Documentation License (FDL):      GNU Free Documentation License.
                                                               (line   7)
-* Free Software Foundation (FSF) <1>:    Glossary.            (line 296)
+* Free Software Foundation (FSF) <1>:    Glossary.            (line 375)
 * Free Software Foundation (FSF) <2>:    Getting.             (line  10)
 * Free Software Foundation (FSF):        Manual History.      (line   6)
-* FreeBSD:                               Glossary.            (line 611)
+* FreeBSD:                               Glossary.            (line 753)
 * FS variable <1>:                       User-modified.       (line  50)
 * FS variable:                           Field Separators.    (line  15)
 * FS variable, --field-separator option and: Options.         (line  21)
 * FS variable, as null string:           Single Character Fields.
                                                               (line  20)
-* FS variable, as TAB character:         Options.             (line 264)
+* FS variable, as TAB character:         Options.             (line 266)
 * FS variable, changing value of:        Field Separators.    (line  35)
-* FS variable, running awk programs and: Cut Program.         (line  68)
+* FS variable, running awk programs and: Cut Program.         (line  63)
 * FS variable, setting from command line: Command Line Field Separator.
                                                               (line   6)
 * FS, containing ^:                      Regexp Field Splitting.
                                                               (line  59)
 * FS, in multiline records:              Multiple Line.       (line  41)
-* FSF (Free Software Foundation) <1>:    Glossary.            (line 296)
+* FSF (Free Software Foundation) <1>:    Glossary.            (line 375)
 * FSF (Free Software Foundation) <2>:    Getting.             (line  10)
 * FSF (Free Software Foundation):        Manual History.      (line   6)
 * fts() extension function:              Extension Sample File Functions.
                                                               (line  61)
-* FUNCTAB array:                         Auto-set.            (line 123)
+* FUNCTAB array:                         Auto-set.            (line 135)
 * function calls:                        Function Calls.      (line   6)
 * function calls, indirect:              Indirect Calls.      (line   6)
 * function calls, indirect, @-notation for: Indirect Calls.   (line  47)
 * function definition example:           Function Example.    (line   6)
 * function pointers:                     Indirect Calls.      (line   6)
 * functions, arrays as parameters to:    Pass By Value/Reference.
-                                                              (line  47)
+                                                              (line  44)
 * functions, built-in <1>:               Functions.           (line   6)
 * functions, built-in:                   Function Calls.      (line  10)
 * functions, built-in, evaluation order: Calling Built-in.    (line  30)
 * functions, defining:                   Definition Syntax.   (line   9)
 * functions, library:                    Library Functions.   (line   6)
 * functions, library, assertions:        Assert Function.     (line   6)
-* functions, library, associative arrays and: Library Names.  (line  57)
+* functions, library, associative arrays and: Library Names.  (line  58)
 * functions, library, C library:         Getopt Function.     (line   6)
 * functions, library, character values as numbers: Ordinal Functions.
                                                               (line   6)
@@ -32520,12 +33317,11 @@ Index
 * functions, library, rounding numbers:  Round Function.      (line   6)
 * functions, library, user database, reading: Passwd Functions.
                                                               (line   6)
-* functions, names of <1>:               Definition Syntax.   (line  23)
-* functions, names of:                   Arrays.              (line  18)
-* functions, recursive:                  Definition Syntax.   (line  83)
+* functions, names of:                   Definition Syntax.   (line  23)
+* functions, recursive:                  Definition Syntax.   (line  88)
 * functions, string-translation:         I18N Functions.      (line   6)
 * functions, undefined:                  Pass By Value/Reference.
-                                                              (line  71)
+                                                              (line  68)
 * functions, user-defined:               User-defined.        (line   6)
 * functions, user-defined, calling:      Function Caveats.    (line   6)
 * functions, user-defined, counts, in a profile: Profiling.   (line 137)
@@ -32534,22 +33330,19 @@ Index
                                                               (line  47)
 * functions, user-defined, next/nextfile statements and: Next Statement.
                                                               (line  44)
-* G-d:                                   Acknowledgments.     (line  92)
+* G-d:                                   Acknowledgments.     (line  94)
 * Garfinkle, Scott:                      Contributors.        (line  34)
-* gawk program, dynamic profiling:       Profiling.           (line 179)
-* gawk version:                          Auto-set.            (line 214)
-* gawk, ARGIND variable in:              Other Arguments.     (line  12)
+* gawk program, dynamic profiling:       Profiling.           (line 178)
+* gawk version:                          Auto-set.            (line 230)
+* gawk, ARGIND variable in:              Other Arguments.     (line  15)
 * gawk, awk and <1>:                     This Manual.         (line  14)
 * gawk, awk and:                         Preface.             (line  21)
-* gawk, bitwise operations in:           Bitwise Functions.   (line  39)
+* gawk, bitwise operations in:           Bitwise Functions.   (line  40)
 * gawk, break statement in:              Break Statement.     (line  51)
-* gawk, built-in variables and:          Built-in Variables.  (line  14)
-* gawk, character classes and:           Bracket Expressions. (line 100)
-* gawk, coding style in:                 Adding Code.         (line  39)
+* gawk, character classes and:           Bracket Expressions. (line 101)
+* gawk, coding style in:                 Adding Code.         (line  38)
 * gawk, command-line options, and regular expressions: GNU Regexp Operators.
                                                               (line  70)
-* gawk, comparison operators and:        Comparison Operators.
-                                                              (line  50)
 * gawk, configuring:                     Configuration Philosophy.
                                                               (line   6)
 * gawk, configuring, options:            Additional Configuration Options.
@@ -32558,30 +33351,30 @@ Index
 * gawk, distribution:                    Distribution contents.
                                                               (line   6)
 * gawk, ERRNO variable in <1>:           TCP/IP Networking.   (line  54)
-* gawk, ERRNO variable in <2>:           Auto-set.            (line  82)
+* gawk, ERRNO variable in <2>:           Auto-set.            (line  88)
 * gawk, ERRNO variable in <3>:           BEGINFILE/ENDFILE.   (line  26)
 * gawk, ERRNO variable in <4>:           Close Files And Pipes.
-                                                              (line 139)
+                                                              (line 141)
 * gawk, ERRNO variable in:               Getline.             (line  19)
-* gawk, escape sequences:                Escape Sequences.    (line 132)
-* gawk, extensions, disabling:           Options.             (line 252)
+* gawk, escape sequences:                Escape Sequences.    (line 120)
+* gawk, extensions, disabling:           Options.             (line 254)
 * gawk, features, adding:                Adding Code.         (line   6)
 * gawk, features, advanced:              Advanced Features.   (line   6)
 * gawk, field separators and:            User-modified.       (line  71)
 * gawk, FIELDWIDTHS variable in <1>:     User-modified.       (line  37)
-* gawk, FIELDWIDTHS variable in:         Constant Size.       (line  23)
+* gawk, FIELDWIDTHS variable in:         Constant Size.       (line  22)
 * gawk, file names in:                   Special Files.       (line   6)
 * gawk, format-control characters:       Control Letters.     (line  18)
 * gawk, FPAT variable in <1>:            User-modified.       (line  43)
 * gawk, FPAT variable in:                Splitting By Content.
-                                                              (line  27)
-* gawk, FUNCTAB array in:                Auto-set.            (line 123)
+                                                              (line  25)
+* gawk, FUNCTAB array in:                Auto-set.            (line 135)
 * gawk, function arguments and:          Calling Built-in.    (line  16)
 * gawk, hexadecimal numbers and:         Nondecimal-numbers.  (line  42)
 * gawk, IGNORECASE variable in <1>:      Array Sorting Functions.
                                                               (line  83)
 * gawk, IGNORECASE variable in <2>:      String Functions.    (line  58)
-* gawk, IGNORECASE variable in <3>:      Array Intro.         (line  94)
+* gawk, IGNORECASE variable in <3>:      Array Intro.         (line 100)
 * gawk, IGNORECASE variable in <4>:      User-modified.       (line  76)
 * gawk, IGNORECASE variable in:          Case-sensitivity.    (line  26)
 * gawk, implementation issues:           Notes.               (line   6)
@@ -32589,7 +33382,7 @@ Index
 * gawk, implementation issues, downward compatibility: Compatibility Mode.
                                                               (line   6)
 * gawk, implementation issues, limits:   Getline Notes.       (line  14)
-* gawk, implementation issues, pipes:    Redirection.         (line 135)
+* gawk, implementation issues, pipes:    Redirection.         (line 129)
 * gawk, installing:                      Installation.        (line   6)
 * gawk, internationalization and, See internationalization: Internationalization.
                                                               (line  13)
@@ -32597,16 +33390,17 @@ Index
                                                               (line   6)
 * gawk, interval expressions and:        Regexp Operators.    (line 139)
 * gawk, line continuation in:            Conditional Exp.     (line  34)
-* gawk, LINT variable in:                User-modified.       (line  88)
+* gawk, LINT variable in:                User-modified.       (line  87)
 * gawk, list of contributors to:         Contributors.        (line   6)
 * gawk, MS-DOS version of:               PC Using.            (line  10)
 * gawk, MS-Windows version of:           PC Using.            (line  10)
 * gawk, newlines in:                     Statements/Lines.    (line  12)
 * gawk, octal numbers and:               Nondecimal-numbers.  (line  42)
 * gawk, OS/2 version of:                 PC Using.            (line  16)
+* gawk, predefined variables and:        Built-in Variables.  (line  14)
 * gawk, PROCINFO array in <1>:           Two-way I/O.         (line  99)
 * gawk, PROCINFO array in <2>:           Time Functions.      (line  47)
-* gawk, PROCINFO array in:               Auto-set.            (line 137)
+* gawk, PROCINFO array in:               Auto-set.            (line 149)
 * gawk, regexp constants and:            Using Constant Regexps.
                                                               (line  28)
 * gawk, regular expressions, case sensitivity: Case-sensitivity.
@@ -32614,27 +33408,33 @@ Index
 * gawk, regular expressions, operators:  GNU Regexp Operators.
                                                               (line   6)
 * gawk, regular expressions, precedence: Regexp Operators.    (line 161)
-* gawk, RT variable in <1>:              Auto-set.            (line 272)
+* gawk, RT variable in <1>:              Auto-set.            (line 292)
 * gawk, RT variable in <2>:              Multiple Line.       (line 129)
-* gawk, RT variable in:                  awk split records.   (line 124)
+* gawk, RT variable in:                  awk split records.   (line 125)
 * gawk, See Also awk:                    Preface.             (line  34)
 * gawk, source code, obtaining:          Getting.             (line   6)
-* gawk, splitting fields and:            Constant Size.       (line  88)
+* gawk, splitting fields and:            Constant Size.       (line  87)
 * gawk, string-translation functions:    I18N Functions.      (line   6)
-* gawk, SYMTAB array in:                 Auto-set.            (line 276)
-* gawk, TEXTDOMAIN variable in:          User-modified.       (line 152)
+* gawk, SYMTAB array in:                 Auto-set.            (line 296)
+* gawk, TEXTDOMAIN variable in:          User-modified.       (line 151)
 * gawk, timestamps:                      Time Functions.      (line   6)
 * gawk, uses for:                        Preface.             (line  34)
-* gawk, versions of, information about, printing: Options.    (line 298)
+* gawk, versions of, information about, printing: Options.    (line 300)
 * gawk, VMS version of:                  VMS Installation.    (line   6)
 * gawk, word-boundary operator:          GNU Regexp Operators.
                                                               (line  63)
 * gawkextlib:                            gawkextlib.          (line   6)
 * gawkextlib project:                    gawkextlib.          (line   6)
-* General Public License (GPL):          Glossary.            (line 305)
+* gawklibpath_append shell function:     Shell Startup Files. (line  29)
+* gawklibpath_default shell function:    Shell Startup Files. (line  22)
+* gawklibpath_prepend shell function:    Shell Startup Files. (line  25)
+* gawkpath_append shell function:        Shell Startup Files. (line  19)
+* gawkpath_default shell function:       Shell Startup Files. (line  12)
+* gawkpath_prepend shell function:       Shell Startup Files. (line  15)
+* General Public License (GPL):          Glossary.            (line 399)
 * General Public License, See GPL:       Manual History.      (line  11)
 * generate time values:                  Time Functions.      (line  25)
-* gensub <1>:                            String Functions.    (line  89)
+* gensub <1>:                            String Functions.    (line  90)
 * gensub:                                Using Constant Regexps.
                                                               (line  43)
 * gensub() function (gawk), escape processing: Gory Details.  (line   6)
@@ -32663,56 +33463,56 @@ Index
 * getline from a file:                   Getline/File.        (line   6)
 * getline into a variable:               Getline/Variable.    (line   6)
 * getline statement, BEGINFILE/ENDFILE patterns and: BEGINFILE/ENDFILE.
-                                                              (line  54)
+                                                              (line  53)
 * getlocaltime() user-defined function:  Getlocaltime Function.
                                                               (line  16)
 * getopt() function (C library):         Getopt Function.     (line  15)
 * getopt() user-defined function:        Getopt Function.     (line 108)
 * getpwent() function (C library):       Passwd Functions.    (line  16)
 * getpwent() user-defined function:      Passwd Functions.    (line  16)
-* getpwnam() function (C library):       Passwd Functions.    (line 177)
-* getpwnam() user-defined function:      Passwd Functions.    (line 182)
-* getpwuid() function (C library):       Passwd Functions.    (line 188)
-* getpwuid() user-defined function:      Passwd Functions.    (line 192)
+* getpwnam() function (C library):       Passwd Functions.    (line 174)
+* getpwnam() user-defined function:      Passwd Functions.    (line 179)
+* getpwuid() function (C library):       Passwd Functions.    (line 185)
+* getpwuid() user-defined function:      Passwd Functions.    (line 189)
 * gettext library:                       Explaining gettext.  (line   6)
 * gettext library, locale categories:    Explaining gettext.  (line  81)
 * gettext() function (C library):        Explaining gettext.  (line  63)
 * gettimeofday() extension function:     Extension Sample Time.
                                                               (line  12)
-* git utility <1>:                       Adding Code.         (line 112)
+* git utility <1>:                       Adding Code.         (line 111)
 * git utility <2>:                       Accessing The Source.
                                                               (line  10)
 * git utility <3>:                       Other Versions.      (line  29)
-* git utility:                           gawkextlib.          (line  29)
+* git utility:                           gawkextlib.          (line  31)
 * Git, use of for gawk source code:      Derived Files.       (line   6)
 * GNITS mailing list:                    Acknowledgments.     (line  52)
 * GNU awk, See gawk:                     Preface.             (line  51)
 * GNU Free Documentation License:        GNU Free Documentation License.
                                                               (line   7)
-* GNU General Public License:            Glossary.            (line 305)
-* GNU Lesser General Public License:     Glossary.            (line 396)
+* GNU General Public License:            Glossary.            (line 399)
+* GNU Lesser General Public License:     Glossary.            (line 496)
 * GNU long options <1>:                  Options.             (line   6)
 * GNU long options:                      Command Line.        (line  13)
 * GNU long options, printing list of:    Options.             (line 154)
-* GNU Project <1>:                       Glossary.            (line 314)
+* GNU Project <1>:                       Glossary.            (line 408)
 * GNU Project:                           Manual History.      (line  11)
-* GNU/Linux <1>:                         Glossary.            (line 611)
+* GNU/Linux <1>:                         Glossary.            (line 753)
 * GNU/Linux <2>:                         I18N Example.        (line  55)
 * GNU/Linux:                             Manual History.      (line  28)
 * Gordon, Assaf:                         Contributors.        (line 105)
-* GPL (General Public License) <1>:      Glossary.            (line 305)
+* GPL (General Public License) <1>:      Glossary.            (line 399)
 * GPL (General Public License):          Manual History.      (line  11)
 * GPL (General Public License), printing: Options.            (line  88)
 * grcat program:                         Group Functions.     (line  16)
 * Grigera, Juan:                         Contributors.        (line  57)
 * group database, reading:               Group Functions.     (line   6)
 * group file:                            Group Functions.     (line   6)
-* group ID of gawk user:                 Auto-set.            (line 187)
+* group ID of gawk user:                 Auto-set.            (line 203)
 * groups, information about:             Group Functions.     (line   6)
-* gsub <1>:                              String Functions.    (line 139)
+* gsub <1>:                              String Functions.    (line 140)
 * gsub:                                  Using Constant Regexps.
                                                               (line  43)
-* gsub() function, arguments of:         String Functions.    (line 460)
+* gsub() function, arguments of:         String Functions.    (line 463)
 * gsub() function, escape processing:    Gory Details.        (line   6)
 * h debugger command (alias for help):   Miscellaneous Debugger Commands.
                                                               (line  66)
@@ -32729,7 +33529,7 @@ Index
 * history expansion, in debugger:        Readline Support.    (line   6)
 * histsort.awk program:                  History Sorting.     (line  25)
 * Hughes, Phil:                          Acknowledgments.     (line  43)
-* HUP signal, for dynamic profiling:     Profiling.           (line 211)
+* HUP signal, for dynamic profiling:     Profiling.           (line 210)
 * hyphen (-), - operator:                Precedence.          (line  52)
 * hyphen (-), -- operator <1>:           Precedence.          (line  46)
 * hyphen (-), -- operator:               Increment Ops.       (line  48)
@@ -32739,7 +33539,7 @@ Index
 * hyphen (-), in bracket expressions:    Bracket Expressions. (line  17)
 * i debugger command (alias for info):   Debugger Info.       (line  13)
 * id utility:                            Id Program.          (line   6)
-* id.awk program:                        Id Program.          (line  30)
+* id.awk program:                        Id Program.          (line  31)
 * if statement:                          If Statement.        (line   6)
 * if statement, actions, changing:       Ranges.              (line  25)
 * if statement, use of regexps in:       Regexp Usage.        (line  19)
@@ -32747,20 +33547,20 @@ Index
 * ignore breakpoint:                     Breakpoint Control.  (line  87)
 * ignore debugger command:               Breakpoint Control.  (line  87)
 * IGNORECASE variable:                   User-modified.       (line  76)
-* IGNORECASE variable, and array indices: Array Intro.        (line  94)
+* IGNORECASE variable, and array indices: Array Intro.        (line 100)
 * IGNORECASE variable, and array sorting functions: Array Sorting Functions.
                                                               (line  83)
 * IGNORECASE variable, in example programs: Library Functions.
                                                               (line  53)
 * IGNORECASE variable, with ~ and !~ operators: Case-sensitivity.
                                                               (line  26)
-* Illumos:                               Other Versions.      (line 105)
-* Illumos, POSIX-compliant awk:          Other Versions.      (line 105)
+* Illumos:                               Other Versions.      (line 109)
+* Illumos, POSIX-compliant awk:          Other Versions.      (line 109)
 * implementation issues, gawk:           Notes.               (line   6)
 * implementation issues, gawk, debugging: Compatibility Mode. (line   6)
-* implementation issues, gawk, limits <1>: Redirection.       (line 135)
+* implementation issues, gawk, limits <1>: Redirection.       (line 129)
 * implementation issues, gawk, limits:   Getline Notes.       (line  14)
-* in operator <1>:                       For Statement.       (line  75)
+* in operator <1>:                       For Statement.       (line  76)
 * in operator <2>:                       Precedence.          (line  83)
 * in operator:                           Comparison Operators.
                                                               (line  11)
@@ -32772,7 +33572,7 @@ Index
 * in operator, use in loops:             Scanning an Array.   (line  17)
 * including files, @include directive:   Include Files.       (line   8)
 * increment operators:                   Increment Ops.       (line   6)
-* index:                                 String Functions.    (line 155)
+* index:                                 String Functions.    (line 156)
 * indexing arrays:                       Array Intro.         (line  50)
 * indirect function calls:               Indirect Calls.      (line   6)
 * indirect function calls, @-notation:   Indirect Calls.      (line  47)
@@ -32789,9 +33589,9 @@ Index
 * input files, examples:                 Sample Data Files.   (line   6)
 * input files, reading:                  Reading Files.       (line   6)
 * input files, running awk without:      Read Terminal.       (line   6)
-* input files, variable assignments and: Other Arguments.     (line  23)
+* input files, variable assignments and: Other Arguments.     (line  26)
 * input pipeline:                        Getline/Pipe.        (line   9)
-* input record, length of:               String Functions.    (line 174)
+* input record, length of:               String Functions.    (line 178)
 * input redirection:                     Getline/File.        (line   6)
 * input, data, nondecimal:               Nondecimal Data.     (line   6)
 * input, explicit:                       Getline.             (line   6)
@@ -32807,46 +33607,47 @@ Index
 * insomnia, cure for:                    Alarm Program.       (line   6)
 * installation, VMS:                     VMS Installation.    (line   6)
 * installing gawk:                       Installation.        (line   6)
-* instruction tracing, in debugger:      Debugger Info.       (line  89)
-* int:                                   Numeric Functions.   (line  38)
-* INT signal (MS-Windows):               Profiling.           (line 214)
+* instruction tracing, in debugger:      Debugger Info.       (line  90)
+* int:                                   Numeric Functions.   (line  23)
+* INT signal (MS-Windows):               Profiling.           (line 213)
+* intdiv:                                Numeric Functions.   (line  28)
 * integer array indices:                 Numeric Array Subscripts.
                                                               (line  31)
 * integers, arbitrary precision:         Arbitrary Precision Integers.
                                                               (line   6)
 * integers, unsigned:                    Computer Arithmetic. (line  41)
-* interacting with other programs:       I/O Functions.       (line  75)
+* interacting with other programs:       I/O Functions.       (line 107)
 * internationalization <1>:              I18N and L10N.       (line   6)
 * internationalization:                  I18N Functions.      (line   6)
 * internationalization, localization <1>: Internationalization.
                                                               (line  13)
-* internationalization, localization:    User-modified.       (line 152)
+* internationalization, localization:    User-modified.       (line 151)
 * internationalization, localization, character classes: Bracket Expressions.
-                                                              (line 100)
+                                                              (line 101)
 * internationalization, localization, gawk and: Internationalization.
                                                               (line  13)
 * internationalization, localization, locale categories: Explaining gettext.
                                                               (line  81)
 * internationalization, localization, marked strings: Programmer i18n.
-                                                              (line  14)
+                                                              (line  13)
 * internationalization, localization, portability and: I18N Portability.
                                                               (line   6)
 * internationalizing a program:          Explaining gettext.  (line   6)
-* interpreted programs <1>:              Glossary.            (line 356)
+* interpreted programs <1>:              Glossary.            (line 450)
 * interpreted programs:                  Basic High Level.    (line  15)
 * interval expressions, regexp operator: Regexp Operators.    (line 116)
 * inventory-shipped file:                Sample Data Files.   (line  32)
-* invoke shell command:                  I/O Functions.       (line  75)
+* invoke shell command:                  I/O Functions.       (line 107)
 * isarray:                               Type Functions.      (line  11)
-* ISO:                                   Glossary.            (line 367)
-* ISO 8859-1:                            Glossary.            (line 133)
-* ISO Latin-1:                           Glossary.            (line 133)
+* ISO:                                   Glossary.            (line 461)
+* ISO 8859-1:                            Glossary.            (line 197)
+* ISO Latin-1:                           Glossary.            (line 197)
 * Jacobs, Andrew:                        Passwd Functions.    (line  90)
 * Jaegermann, Michal <1>:                Contributors.        (line  45)
 * Jaegermann, Michal:                    Acknowledgments.     (line  60)
-* Java implementation of awk:            Other Versions.      (line 113)
-* Java programming language:             Glossary.            (line 379)
-* jawk:                                  Other Versions.      (line 113)
+* Java implementation of awk:            Other Versions.      (line 117)
+* Java programming language:             Glossary.            (line 473)
+* jawk:                                  Other Versions.      (line 117)
 * Jedi knights:                          Undocumented.        (line   6)
 * Johansen, Chris:                       Signature Program.   (line  25)
 * join() user-defined function:          Join Function.       (line  18)
@@ -32854,7 +33655,7 @@ Index
 * Kahrs, Ju"rgen:                        Acknowledgments.     (line  60)
 * Kasal, Stepan:                         Acknowledgments.     (line  60)
 * Kenobi, Obi-Wan:                       Undocumented.        (line   6)
-* Kernighan, Brian <1>:                  Glossary.            (line 143)
+* Kernighan, Brian <1>:                  Glossary.            (line 207)
 * Kernighan, Brian <2>:                  Basic Data Typing.   (line  54)
 * Kernighan, Brian <3>:                  Other Versions.      (line  13)
 * Kernighan, Brian <4>:                  Contributors.        (line  11)
@@ -32862,10 +33663,10 @@ Index
 * Kernighan, Brian <6>:                  Library Functions.   (line  12)
 * Kernighan, Brian <7>:                  Concatenation.       (line   6)
 * Kernighan, Brian <8>:                  Getline/Pipe.        (line   6)
-* Kernighan, Brian <9>:                  Acknowledgments.     (line  76)
+* Kernighan, Brian <9>:                  Acknowledgments.     (line  78)
 * Kernighan, Brian <10>:                 Conventions.         (line  38)
 * Kernighan, Brian:                      History.             (line  17)
-* kill command, dynamic profiling:       Profiling.           (line 188)
+* kill command, dynamic profiling:       Profiling.           (line 187)
 * Knights, jedi:                         Undocumented.        (line   6)
 * Kwok, Conrad:                          Contributors.        (line  34)
 * l debugger command (alias for list):   Miscellaneous Debugger Commands.
@@ -32878,7 +33679,7 @@ Index
 * LC_CTYPE locale category:              Explaining gettext.  (line  98)
 * LC_MESSAGES locale category:           Explaining gettext.  (line  88)
 * LC_MESSAGES locale category, bindtextdomain() function (gawk): Programmer i18n.
-                                                              (line  99)
+                                                              (line 101)
 * LC_MONETARY locale category:           Explaining gettext.  (line 104)
 * LC_NUMERIC locale category:            Explaining gettext.  (line 108)
 * LC_TIME locale category:               Explaining gettext.  (line 112)
@@ -32889,19 +33690,19 @@ Index
 * left angle bracket (<), <= operator <1>: Precedence.        (line  65)
 * left angle bracket (<), <= operator:   Comparison Operators.
                                                               (line  11)
-* left shift:                            Bitwise Functions.   (line  46)
+* left shift:                            Bitwise Functions.   (line  47)
 * left shift, bitwise:                   Bitwise Functions.   (line  32)
 * leftmost longest match:                Multiple Line.       (line  26)
-* length:                                String Functions.    (line 167)
-* length of input record:                String Functions.    (line 174)
-* length of string:                      String Functions.    (line 167)
-* Lesser General Public License (LGPL):  Glossary.            (line 396)
-* LGPL (Lesser General Public License):  Glossary.            (line 396)
-* libmawk:                               Other Versions.      (line 121)
+* length:                                String Functions.    (line 171)
+* length of input record:                String Functions.    (line 178)
+* length of string:                      String Functions.    (line 171)
+* Lesser General Public License (LGPL):  Glossary.            (line 496)
+* LGPL (Lesser General Public License):  Glossary.            (line 496)
+* libmawk:                               Other Versions.      (line 125)
 * libraries of awk functions:            Library Functions.   (line   6)
 * libraries of awk functions, assertions: Assert Function.    (line   6)
 * libraries of awk functions, associative arrays and: Library Names.
-                                                              (line  57)
+                                                              (line  58)
 * libraries of awk functions, character values as numbers: Ordinal Functions.
                                                               (line   6)
 * libraries of awk functions, command-line options: Getopt Function.
@@ -32921,7 +33722,7 @@ Index
 * libraries of awk functions, user database, reading: Passwd Functions.
                                                               (line   6)
 * line breaks:                           Statements/Lines.    (line   6)
-* line continuations:                    Boolean Ops.         (line  62)
+* line continuations:                    Boolean Ops.         (line  64)
 * line continuations, gawk:              Conditional Exp.     (line  34)
 * line continuations, in print statement: Print Examples.     (line  76)
 * line continuations, with C shell:      More Complex.        (line  30)
@@ -32930,18 +33731,18 @@ Index
 * lines, duplicate, removing:            History Sorting.     (line   6)
 * lines, matching ranges of:             Ranges.              (line   6)
 * lines, skipping between markers:       Ranges.              (line  43)
-* lint checking:                         User-modified.       (line  88)
+* lint checking:                         User-modified.       (line  87)
 * lint checking, array elements:         Delete.              (line  34)
 * lint checking, array subscripts:       Uninitialized Subscripts.
                                                               (line  43)
 * lint checking, empty programs:         Command Line.        (line  16)
 * lint checking, issuing warnings:       Options.             (line 185)
 * lint checking, POSIXLY_CORRECT environment variable: Options.
-                                                              (line 336)
+                                                              (line 339)
 * lint checking, undefined functions:    Pass By Value/Reference.
-                                                              (line  88)
-* LINT variable:                         User-modified.       (line  88)
-* Linux <1>:                             Glossary.            (line 611)
+                                                              (line  85)
+* LINT variable:                         User-modified.       (line  87)
+* Linux <1>:                             Glossary.            (line 753)
 * Linux <2>:                             I18N Example.        (line  55)
 * Linux:                                 Manual History.      (line  28)
 * list all global variables, in debugger: Debugger Info.      (line  48)
@@ -32953,21 +33754,21 @@ Index
 * loading, extensions:                   Options.             (line 173)
 * local variables, in a function:        Variable Scope.      (line   6)
 * locale categories:                     Explaining gettext.  (line  81)
-* locale decimal point character:        Options.             (line 268)
+* locale decimal point character:        Options.             (line 270)
 * locale, definition of:                 Locales.             (line   6)
 * localization:                          I18N and L10N.       (line   6)
 * localization, See internationalization, localization: I18N and L10N.
                                                               (line   6)
-* log:                                   Numeric Functions.   (line  45)
+* log:                                   Numeric Functions.   (line  43)
 * log files, timestamps in:              Time Functions.      (line   6)
-* logarithm:                             Numeric Functions.   (line  45)
+* logarithm:                             Numeric Functions.   (line  43)
 * logical false/true:                    Truth Values.        (line   6)
 * logical operators, See Boolean expressions: Boolean Ops.    (line   6)
 * login information:                     Passwd Functions.    (line  16)
 * long options:                          Command Line.        (line  13)
 * loops:                                 While Statement.     (line   6)
 * loops, break statement and:            Break Statement.     (line   6)
-* loops, continue statements and:        For Statement.       (line  64)
+* loops, continue statements and:        For Statement.       (line  65)
 * loops, count for header, in a profile: Profiling.           (line 131)
 * loops, do-while:                       Do Statement.        (line   6)
 * loops, exiting:                        Break Statement.     (line   6)
@@ -32976,73 +33777,72 @@ Index
 * loops, See Also while statement:       While Statement.     (line   6)
 * loops, while:                          While Statement.     (line   6)
 * ls utility:                            More Complex.        (line  15)
-* lshift:                                Bitwise Functions.   (line  46)
+* lshift:                                Bitwise Functions.   (line  47)
 * lvalues/rvalues:                       Assignment Ops.      (line  32)
 * mail-list file:                        Sample Data Files.   (line   6)
 * mailing labels, printing:              Labels Program.      (line   6)
 * mailing list, GNITS:                   Acknowledgments.     (line  52)
 * Malmberg, John <1>:                    Bugs.                (line  71)
 * Malmberg, John:                        Acknowledgments.     (line  60)
+* Malmberg, John E.:                     Contributors.        (line 137)
 * mark parity:                           Ordinal Functions.   (line  45)
 * marked string extraction (internationalization): String Extraction.
                                                               (line   6)
 * marked strings, extracting:            String Extraction.   (line   6)
 * Marx, Groucho:                         Increment Ops.       (line  60)
-* match:                                 String Functions.    (line 207)
-* match regexp in string:                String Functions.    (line 207)
+* match:                                 String Functions.    (line 211)
+* match regexp in string:                String Functions.    (line 211)
 * match() function, RSTART/RLENGTH variables: String Functions.
-                                                              (line 224)
+                                                              (line 228)
 * matching, expressions, See comparison expressions: Typing and Comparison.
                                                               (line   9)
 * matching, leftmost longest:            Multiple Line.       (line  26)
-* matching, null strings:                Gory Details.        (line 143)
-* mawk utility <1>:                      Other Versions.      (line  44)
+* matching, null strings:                String Functions.    (line 537)
+* mawk utility <1>:                      Other Versions.      (line  48)
 * mawk utility <2>:                      Nextfile Statement.  (line  47)
 * mawk utility <3>:                      Concatenation.       (line  36)
 * mawk utility <4>:                      Getline/Pipe.        (line  62)
-* mawk utility:                          Escape Sequences.    (line 132)
-* maximum precision supported by MPFR library: Auto-set.      (line 228)
-* McIlroy, Doug:                         Glossary.            (line 149)
+* mawk utility:                          Escape Sequences.    (line 120)
+* maximum precision supported by MPFR library: Auto-set.      (line 244)
+* McIlroy, Doug:                         Glossary.            (line 258)
 * McPhee, Patrick:                       Contributors.        (line 100)
 * message object files:                  Explaining gettext.  (line  42)
 * message object files, converting from portable object files: I18N Example.
-                                                              (line  63)
+                                                              (line  64)
 * message object files, specifying directory of <1>: Programmer i18n.
-                                                              (line  47)
+                                                              (line  48)
 * message object files, specifying directory of: Explaining gettext.
                                                               (line  54)
 * messages from extensions:              Printing Messages.   (line   6)
 * metacharacters in regular expressions: Regexp Operators.    (line   6)
-* metacharacters, escape sequences for:  Escape Sequences.    (line 138)
-* minimum precision supported by MPFR library: Auto-set.      (line 231)
+* metacharacters, escape sequences for:  Escape Sequences.    (line 139)
+* minimum precision required by MPFR library: Auto-set.       (line 247)
 * mktime:                                Time Functions.      (line  25)
 * modifiers, in format specifiers:       Format Modifiers.    (line   6)
 * monetary information, localization:    Explaining gettext.  (line 104)
 * Moore, Duncan:                         Getline Notes.       (line  40)
-* msgfmt utility:                        I18N Example.        (line  63)
+* msgfmt utility:                        I18N Example.        (line  64)
 * multiple precision:                    Arbitrary Precision Arithmetic.
                                                               (line   6)
 * multiple-line records:                 Multiple Line.       (line   6)
 * n debugger command (alias for next):   Debugger Execution Control.
                                                               (line  43)
-* names, arrays/variables <1>:           Library Names.       (line   6)
-* names, arrays/variables:               Arrays.              (line  18)
+* names, arrays/variables:               Library Names.       (line   6)
 * names, functions <1>:                  Library Names.       (line   6)
 * names, functions:                      Definition Syntax.   (line  23)
-* namespace issues <1>:                  Library Names.       (line   6)
-* namespace issues:                      Arrays.              (line  18)
+* namespace issues:                      Library Names.       (line   6)
 * namespace issues, functions:           Definition Syntax.   (line  23)
-* NetBSD:                                Glossary.            (line 611)
+* NetBSD:                                Glossary.            (line 753)
 * networks, programming:                 TCP/IP Networking.   (line   6)
 * networks, support for:                 Special Network.     (line   6)
-* newlines <1>:                          Boolean Ops.         (line  67)
-* newlines <2>:                          Options.             (line 258)
+* newlines <1>:                          Boolean Ops.         (line  69)
+* newlines <2>:                          Options.             (line 260)
 * newlines:                              Statements/Lines.    (line   6)
 * newlines, as field separators:         Default Field Splitting.
                                                               (line   6)
 * newlines, as record separators:        awk split records.   (line  12)
-* newlines, in dynamic regexps:          Computed Regexps.    (line  59)
-* newlines, in regexp constants:         Computed Regexps.    (line  69)
+* newlines, in dynamic regexps:          Computed Regexps.    (line  60)
+* newlines, in regexp constants:         Computed Regexps.    (line  70)
 * newlines, printing:                    Print Examples.      (line  12)
 * newlines, separating statements in actions <1>: Statements. (line  10)
 * newlines, separating statements in actions: Action Overview.
@@ -33051,21 +33851,21 @@ Index
                                                               (line  43)
 * next file statement:                   Feature History.     (line 169)
 * next statement <1>:                    Next Statement.      (line   6)
-* next statement:                        Boolean Ops.         (line  93)
-* next statement, BEGIN/END patterns and: I/O And BEGIN/END.  (line  36)
+* next statement:                        Boolean Ops.         (line  95)
+* next statement, BEGIN/END patterns and: I/O And BEGIN/END.  (line  37)
 * next statement, BEGINFILE/ENDFILE patterns and: BEGINFILE/ENDFILE.
                                                               (line  49)
 * next statement, user-defined functions and: Next Statement. (line  44)
 * nextfile statement:                    Nextfile Statement.  (line   6)
 * nextfile statement, BEGIN/END patterns and: I/O And BEGIN/END.
-                                                              (line  36)
+                                                              (line  37)
 * nextfile statement, BEGINFILE/ENDFILE patterns and: BEGINFILE/ENDFILE.
                                                               (line  26)
 * nextfile statement, user-defined functions and: Nextfile Statement.
                                                               (line  47)
 * nexti debugger command:                Debugger Execution Control.
                                                               (line  49)
-* NF variable <1>:                       Auto-set.            (line 112)
+* NF variable <1>:                       Auto-set.            (line 124)
 * NF variable:                           Fields.              (line  33)
 * NF variable, decrementing:             Changing Fields.     (line 107)
 * ni debugger command (alias for nexti): Debugger Execution Control.
@@ -33074,23 +33874,23 @@ Index
 * non-existent array elements:           Reference to Elements.
                                                               (line  23)
 * not Boolean-logic operator:            Boolean Ops.         (line   6)
-* NR variable <1>:                       Auto-set.            (line 132)
+* NR variable <1>:                       Auto-set.            (line 144)
 * NR variable:                           Records.             (line   6)
-* NR variable, changing:                 Auto-set.            (line 316)
+* NR variable, changing:                 Auto-set.            (line 341)
 * null strings <1>:                      Basic Data Typing.   (line  26)
 * null strings <2>:                      Truth Values.        (line   6)
 * null strings <3>:                      Regexp Field Splitting.
                                                               (line  43)
-* null strings:                          awk split records.   (line 114)
-* null strings in gawk arguments, quoting and: Quoting.       (line  79)
+* null strings:                          awk split records.   (line 115)
+* null strings in gawk arguments, quoting and: Quoting.       (line  82)
 * null strings, and deleting array elements: Delete.          (line  27)
 * null strings, as array subscripts:     Uninitialized Subscripts.
                                                               (line  43)
 * null strings, converting numbers to strings: Strings And Numbers.
                                                               (line  21)
-* null strings, matching:                Gory Details.        (line 143)
-* number as string of bits:              Bitwise Functions.   (line 109)
-* number of array elements:              String Functions.    (line 197)
+* null strings, matching:                String Functions.    (line 537)
+* number as string of bits:              Bitwise Functions.   (line 110)
+* number of array elements:              String Functions.    (line 201)
 * number sign (#), #! (executable scripts): Executable Scripts.
                                                               (line   6)
 * number sign (#), commenting:           Comments.            (line   6)
@@ -33099,7 +33899,7 @@ Index
 * numbers, as values of characters:      Ordinal Functions.   (line   6)
 * numbers, Cliff random:                 Cliff Random Function.
                                                               (line   6)
-* numbers, converting <1>:               Bitwise Functions.   (line 109)
+* numbers, converting <1>:               Bitwise Functions.   (line 110)
 * numbers, converting:                   Strings And Numbers. (line   6)
 * numbers, converting, to strings:       User-modified.       (line  30)
 * numbers, hexadecimal:                  Nondecimal-numbers.  (line   6)
@@ -33113,15 +33913,15 @@ Index
 * obsolete features:                     Obsolete.            (line   6)
 * octal numbers:                         Nondecimal-numbers.  (line   6)
 * octal values, enabling interpretation of: Options.          (line 211)
-* OFMT variable <1>:                     User-modified.       (line 105)
+* OFMT variable <1>:                     User-modified.       (line 104)
 * OFMT variable <2>:                     Strings And Numbers. (line  57)
 * OFMT variable:                         OFMT.                (line  15)
 * OFMT variable, POSIX awk and:          OFMT.                (line  27)
-* OFS variable <1>:                      User-modified.       (line 114)
+* OFS variable <1>:                      User-modified.       (line 113)
 * OFS variable <2>:                      Output Separators.   (line   6)
 * OFS variable:                          Changing Fields.     (line  64)
-* OpenBSD:                               Glossary.            (line 611)
-* OpenSolaris:                           Other Versions.      (line  96)
+* OpenBSD:                               Glossary.            (line 753)
+* OpenSolaris:                           Other Versions.      (line 100)
 * operating systems, BSD-based:          Manual History.      (line  28)
 * operating systems, PC, gawk on:        PC Using.            (line   6)
 * operating systems, PC, gawk on, installing: PC Installation.
@@ -33147,7 +33947,7 @@ Index
 * operators, precedence:                 Increment Ops.       (line  60)
 * operators, relational, See operators, comparison: Typing and Comparison.
                                                               (line   9)
-* operators, short-circuit:              Boolean Ops.         (line  57)
+* operators, short-circuit:              Boolean Ops.         (line  59)
 * operators, string:                     Concatenation.       (line   8)
 * operators, string-matching:            Regexp Usage.        (line  19)
 * operators, string-matching, for buffers: GNU Regexp Operators.
@@ -33163,18 +33963,18 @@ Index
 * options, long <1>:                     Options.             (line   6)
 * options, long:                         Command Line.        (line  13)
 * options, printing list of:             Options.             (line 154)
-* or:                                    Bitwise Functions.   (line  49)
+* or:                                    Bitwise Functions.   (line  50)
 * OR bitwise operation:                  Bitwise Functions.   (line   6)
 * or Boolean-logic operator:             Boolean Ops.         (line   6)
 * ord() extension function:              Extension Sample Ord.
                                                               (line  12)
 * ord() user-defined function:           Ordinal Functions.   (line  16)
 * order of evaluation, concatenation:    Concatenation.       (line  41)
-* ORS variable <1>:                      User-modified.       (line 119)
-* ORS variable:                          Output Separators.   (line  20)
+* ORS variable <1>:                      User-modified.       (line 118)
+* ORS variable:                          Output Separators.   (line  21)
 * output field separator, See OFS variable: Changing Fields.  (line  64)
 * output record separator, See ORS variable: Output Separators.
-                                                              (line  20)
+                                                              (line  21)
 * output redirection:                    Redirection.         (line   6)
 * output wrapper:                        Output Wrappers.     (line   6)
 * output, buffering:                     I/O Functions.       (line  32)
@@ -33185,16 +33985,16 @@ Index
 * output, formatted:                     Printf.              (line   6)
 * output, pipes:                         Redirection.         (line  57)
 * output, printing, See printing:        Printing.            (line   6)
-* output, records:                       Output Separators.   (line  20)
+* output, records:                       Output Separators.   (line  21)
 * output, standard:                      Special FD.          (line   6)
 * p debugger command (alias for print):  Viewing And Changing Data.
                                                               (line  36)
 * Papadopoulos, Panos:                   Contributors.        (line 128)
-* parent process ID of gawk process:     Auto-set.            (line 196)
+* parent process ID of gawk process:     Auto-set.            (line 212)
 * parentheses (), in a profile:          Profiling.           (line 146)
 * parentheses (), regexp operator:       Regexp Operators.    (line  81)
 * password file:                         Passwd Functions.    (line  16)
-* patsplit:                              String Functions.    (line 294)
+* patsplit:                              String Functions.    (line 297)
 * patterns:                              Patterns and Actions.
                                                               (line   6)
 * patterns, comparison expressions as:   Expression Patterns. (line  14)
@@ -33206,8 +34006,8 @@ Index
 * patterns, regexp constants as:         Expression Patterns. (line  34)
 * patterns, types of:                    Pattern Overview.    (line  15)
 * pawk (profiling version of Brian Kernighan's awk): Other Versions.
-                                                              (line  78)
-* pawk, awk-like facilities for Python:  Other Versions.      (line 125)
+                                                              (line  82)
+* pawk, awk-like facilities for Python:  Other Versions.      (line 129)
 * PC operating systems, gawk on:         PC Using.            (line   6)
 * PC operating systems, gawk on, installing: PC Installation. (line   6)
 * percent sign (%), % operator:          Precedence.          (line  55)
@@ -33232,37 +34032,37 @@ Index
 * plus sign (+), += operator:            Assignment Ops.      (line  82)
 * plus sign (+), regexp operator:        Regexp Operators.    (line 105)
 * pointers to functions:                 Indirect Calls.      (line   6)
-* portability:                           Escape Sequences.    (line 102)
+* portability:                           Escape Sequences.    (line 103)
 * portability, #! (executable scripts):  Executable Scripts.  (line  33)
 * portability, ** operator and:          Arithmetic Ops.      (line  81)
 * portability, **= operator and:         Assignment Ops.      (line 143)
 * portability, ARGV variable:            Executable Scripts.  (line  59)
 * portability, backslash continuation and: Statements/Lines.  (line  30)
 * portability, backslash in escape sequences: Escape Sequences.
-                                                              (line 120)
+                                                              (line 108)
 * portability, close() function and:     Close Files And Pipes.
                                                               (line  81)
 * portability, data files as single record: gawk split records.
                                                               (line  65)
 * portability, deleting array elements:  Delete.              (line  56)
 * portability, example programs:         Library Functions.   (line  42)
-* portability, functions, defining:      Definition Syntax.   (line 109)
+* portability, functions, defining:      Definition Syntax.   (line 114)
 * portability, gawk:                     New Ports.           (line   6)
 * portability, gettext library and:      Explaining gettext.  (line  11)
 * portability, internationalization and: I18N Portability.    (line   6)
-* portability, length() function:        String Functions.    (line 176)
+* portability, length() function:        String Functions.    (line 180)
 * portability, new awk vs. old awk:      Strings And Numbers. (line  57)
 * portability, next statement in user-defined functions: Pass By Value/Reference.
-                                                              (line  91)
+                                                              (line  88)
 * portability, NF variable, decrementing: Changing Fields.    (line 115)
 * portability, operators:                Increment Ops.       (line  60)
 * portability, operators, not in POSIX awk: Precedence.       (line  98)
-* portability, POSIXLY_CORRECT environment variable: Options. (line 356)
-* portability, substr() function:        String Functions.    (line 510)
+* portability, POSIXLY_CORRECT environment variable: Options. (line 359)
+* portability, substr() function:        String Functions.    (line 513)
 * portable object files <1>:             Translator i18n.     (line   6)
 * portable object files:                 Explaining gettext.  (line  37)
 * portable object files, converting to message object files: I18N Example.
-                                                              (line  63)
+                                                              (line  64)
 * portable object files, generating:     Options.             (line 147)
 * portable object template files:        Explaining gettext.  (line  31)
 * porting gawk:                          New Ports.           (line   6)
@@ -33278,7 +34078,7 @@ Index
 * POSIX awk, < operator and:             Getline/File.        (line  26)
 * POSIX awk, arithmetic operators and:   Arithmetic Ops.      (line  30)
 * POSIX awk, backslashes in string constants: Escape Sequences.
-                                                              (line 120)
+                                                              (line 108)
 * POSIX awk, BEGIN/END patterns:         I/O And BEGIN/END.   (line  16)
 * POSIX awk, bracket expressions and:    Bracket Expressions. (line  26)
 * POSIX awk, bracket expressions and, character classes: Bracket Expressions.
@@ -33288,13 +34088,12 @@ Index
 * POSIX awk, continue statement and:     Continue Statement.  (line  44)
 * POSIX awk, CONVFMT variable and:       User-modified.       (line  30)
 * POSIX awk, date utility and:           Time Functions.      (line 254)
-* POSIX awk, field separators and <1>:   Field Splitting Summary.
-                                                              (line  40)
+* POSIX awk, field separators and <1>:   Full Line Fields.    (line  16)
 * POSIX awk, field separators and:       Fields.              (line   6)
 * POSIX awk, FS variable and:            User-modified.       (line  60)
-* POSIX awk, function keyword in:        Definition Syntax.   (line  93)
+* POSIX awk, function keyword in:        Definition Syntax.   (line  98)
 * POSIX awk, functions and, gsub()/sub(): Gory Details.       (line  90)
-* POSIX awk, functions and, length():    String Functions.    (line 176)
+* POSIX awk, functions and, length():    String Functions.    (line 180)
 * POSIX awk, GNU long options and:       Options.             (line  15)
 * POSIX awk, interval expressions in:    Regexp Operators.    (line 135)
 * POSIX awk, next/nextfile statements and: Next Statement.    (line  44)
@@ -33302,19 +34101,23 @@ Index
 * POSIX awk, OFMT variable and <1>:      Strings And Numbers. (line  57)
 * POSIX awk, OFMT variable and:          OFMT.                (line  27)
 * POSIX awk, period (.), using:          Regexp Operators.    (line  51)
-* POSIX awk, printf format strings and:  Format Modifiers.    (line 159)
+* POSIX awk, printf format strings and:  Format Modifiers.    (line 158)
 * POSIX awk, regular expressions and:    Regexp Operators.    (line 161)
 * POSIX awk, timestamps and:             Time Functions.      (line   6)
 * POSIX awk, | I/O operator and:         Getline/Pipe.        (line  55)
-* POSIX mode:                            Options.             (line 252)
+* POSIX mode:                            Options.             (line 254)
 * POSIX, awk and:                        Preface.             (line  21)
 * POSIX, gawk extensions not included in: POSIX/GNU.          (line   6)
 * POSIX, programs, implementing in awk:  Clones.              (line   6)
-* POSIXLY_CORRECT environment variable:  Options.             (line 336)
-* PREC variable:                         User-modified.       (line 124)
+* POSIXLY_CORRECT environment variable:  Options.             (line 339)
+* PREC variable:                         User-modified.       (line 123)
 * precedence <1>:                        Precedence.          (line   6)
 * precedence:                            Increment Ops.       (line  60)
 * precedence, regexp operators:          Regexp Operators.    (line 156)
+* predefined variables:                  Built-in Variables.  (line   6)
+* predefined variables, -v option, setting with: Options.     (line  40)
+* predefined variables, conveying information: Auto-set.      (line   6)
+* predefined variables, user-modifiable: User-modified.       (line   6)
 * print debugger command:                Viewing And Changing Data.
                                                               (line  36)
 * print statement:                       Printing.            (line  16)
@@ -33322,7 +34125,7 @@ Index
 * print statement, commas, omitting:     Print Examples.      (line  31)
 * print statement, I/O operators in:     Precedence.          (line  71)
 * print statement, line continuations and: Print Examples.    (line  76)
-* print statement, OFMT variable and:    User-modified.       (line 114)
+* print statement, OFMT variable and:    User-modified.       (line 113)
 * print statement, See Also redirection, of output: Redirection.
                                                               (line  17)
 * print statement, sprintf() function and: Round Function.    (line   6)
@@ -33353,27 +34156,27 @@ Index
 * printing, unduplicated lines of text:  Uniq Program.        (line   6)
 * printing, user information:            Id Program.          (line   6)
 * private variables:                     Library Names.       (line  11)
-* process group idIDof gawk process:     Auto-set.            (line 190)
-* process ID of gawk process:            Auto-set.            (line 193)
+* process group ID of gawk process:      Auto-set.            (line 206)
+* process ID of gawk process:            Auto-set.            (line 209)
 * processes, two-way communications with: Two-way I/O.        (line   6)
 * processing data:                       Basic High Level.    (line   6)
 * PROCINFO array <1>:                    Passwd Functions.    (line   6)
 * PROCINFO array <2>:                    Time Functions.      (line  47)
-* PROCINFO array:                        Auto-set.            (line 137)
+* PROCINFO array:                        Auto-set.            (line 149)
 * PROCINFO array, and communications via ptys: Two-way I/O.   (line  99)
 * PROCINFO array, and group membership:  Group Functions.     (line   6)
 * PROCINFO array, and user and group ID numbers: Id Program.  (line  15)
 * PROCINFO array, testing the field splitting: Passwd Functions.
-                                                              (line 161)
-* PROCINFO array, uses:                  Auto-set.            (line 249)
+                                                              (line 154)
+* PROCINFO array, uses:                  Auto-set.            (line 265)
 * PROCINFO, values of sorted_in:         Controlling Scanning.
                                                               (line  26)
 * profiling awk programs:                Profiling.           (line   6)
-* profiling awk programs, dynamically:   Profiling.           (line 179)
-* program identifiers:                   Auto-set.            (line 155)
+* profiling awk programs, dynamically:   Profiling.           (line 178)
+* program identifiers:                   Auto-set.            (line 171)
 * program, definition of:                Getting Started.     (line  21)
 * programming conventions, --non-decimal-data option: Nondecimal Data.
-                                                              (line  36)
+                                                              (line  35)
 * programming conventions, ARGC/ARGV variables: Auto-set.     (line  35)
 * programming conventions, exit statement: Exit Statement.    (line  38)
 * programming conventions, function parameters: Return Statement.
@@ -33381,54 +34184,53 @@ Index
 * programming conventions, functions, calling: Calling Built-in.
                                                               (line  10)
 * programming conventions, functions, writing: Definition Syntax.
-                                                              (line  65)
+                                                              (line  70)
 * programming conventions, gawk extensions: Internal File Ops.
                                                               (line  45)
 * programming conventions, private variable names: Library Names.
                                                               (line  23)
 * programming language, recipe for:      History.             (line   6)
-* programming languages, Ada:            Glossary.            (line  19)
+* programming languages, Ada:            Glossary.            (line  11)
 * programming languages, data-driven vs. procedural: Getting Started.
                                                               (line  12)
-* programming languages, Java:           Glossary.            (line 379)
+* programming languages, Java:           Glossary.            (line 473)
 * programming, basic steps:              Basic High Level.    (line  20)
 * programming, concepts:                 Basic Concepts.      (line   6)
 * pwcat program:                         Passwd Functions.    (line  23)
 * q debugger command (alias for quit):   Miscellaneous Debugger Commands.
                                                               (line  99)
-* QSE Awk:                               Other Versions.      (line 131)
+* QSE awk:                               Other Versions.      (line 135)
 * Quanstrom, Erik:                       Alarm Program.       (line   8)
 * question mark (?), ?: operator:        Precedence.          (line  92)
 * question mark (?), regexp operator <1>: GNU Regexp Operators.
                                                               (line  59)
 * question mark (?), regexp operator:    Regexp Operators.    (line 111)
-* QuikTrim Awk:                          Other Versions.      (line 135)
+* QuikTrim Awk:                          Other Versions.      (line 139)
 * quit debugger command:                 Miscellaneous Debugger Commands.
                                                               (line  99)
-* QUIT signal (MS-Windows):              Profiling.           (line 214)
+* QUIT signal (MS-Windows):              Profiling.           (line 213)
 * quoting in gawk command lines:         Long.                (line  26)
-* quoting in gawk command lines, tricks for: Quoting.         (line  88)
+* quoting in gawk command lines, tricks for: Quoting.         (line  91)
 * quoting, for small awk programs:       Comments.            (line  27)
 * r debugger command (alias for run):    Debugger Execution Control.
                                                               (line  62)
 * Rakitzis, Byron:                       History Sorting.     (line  25)
 * Ramey, Chet <1>:                       General Data Types.  (line   6)
 * Ramey, Chet:                           Acknowledgments.     (line  60)
-* rand:                                  Numeric Functions.   (line  50)
+* rand:                                  Numeric Functions.   (line  48)
 * random numbers, Cliff:                 Cliff Random Function.
                                                               (line   6)
 * random numbers, rand()/srand() functions: Numeric Functions.
-                                                              (line  50)
-* random numbers, seed of:               Numeric Functions.   (line  80)
+                                                              (line  48)
+* random numbers, seed of:               Numeric Functions.   (line  78)
 * range expressions (regexps):           Bracket Expressions. (line   6)
 * range patterns:                        Ranges.              (line   6)
 * range patterns, line continuation and: Ranges.              (line  65)
-* Rankin, Pat <1>:                       Bugs.                (line  71)
-* Rankin, Pat <2>:                       Contributors.        (line  37)
-* Rankin, Pat <3>:                       Assignment Ops.      (line 100)
+* Rankin, Pat <1>:                       Contributors.        (line  37)
+* Rankin, Pat <2>:                       Assignment Ops.      (line 100)
 * Rankin, Pat:                           Acknowledgments.     (line  60)
 * reada() extension function:            Extension Sample Read write array.
-                                                              (line  15)
+                                                              (line  18)
 * readable data files, checking:         File Checking.       (line   6)
 * readable.awk program:                  File Checking.       (line  11)
 * readdir extension:                     Extension Sample Readdir.
@@ -33438,36 +34240,36 @@ Index
 * readfile() user-defined function:      Readfile Function.   (line  30)
 * reading input files:                   Reading Files.       (line   6)
 * recipe for a programming language:     History.             (line   6)
-* record separators <1>:                 User-modified.       (line 133)
+* record separators <1>:                 User-modified.       (line 132)
 * record separators:                     awk split records.   (line   6)
 * record separators, changing:           awk split records.   (line  85)
 * record separators, regular expressions as: awk split records.
-                                                              (line 124)
+                                                              (line 125)
 * record separators, with multiline records: Multiple Line.   (line  10)
 * records <1>:                           Basic High Level.    (line  73)
 * records:                               Reading Files.       (line  14)
 * records, multiline:                    Multiple Line.       (line   6)
 * records, printing:                     Print.               (line  22)
 * records, splitting input into:         Records.             (line   6)
-* records, terminating:                  awk split records.   (line 124)
-* records, treating files as:            gawk split records.  (line  92)
-* recursive functions:                   Definition Syntax.   (line  83)
-* redirect gawk output, in debugger:     Debugger Info.       (line  72)
+* records, terminating:                  awk split records.   (line 125)
+* records, treating files as:            gawk split records.  (line  93)
+* recursive functions:                   Definition Syntax.   (line  88)
+* redirect gawk output, in debugger:     Debugger Info.       (line  73)
 * redirection of input:                  Getline/File.        (line   6)
 * redirection of output:                 Redirection.         (line   6)
 * reference counting, sorting arrays:    Array Sorting Functions.
                                                               (line  77)
 * regexp:                                Regexp.              (line   6)
 * regexp constants <1>:                  Comparison Operators.
-                                                              (line 102)
+                                                              (line 103)
 * regexp constants <2>:                  Regexp Constants.    (line   6)
 * regexp constants:                      Regexp Usage.        (line  57)
 * regexp constants, /=.../, /= operator and: Assignment Ops.  (line 148)
 * regexp constants, as patterns:         Expression Patterns. (line  34)
 * regexp constants, in gawk:             Using Constant Regexps.
                                                               (line  28)
-* regexp constants, slashes vs. quotes:  Computed Regexps.    (line  29)
-* regexp constants, vs. string constants: Computed Regexps.   (line  39)
+* regexp constants, slashes vs. quotes:  Computed Regexps.    (line  30)
+* regexp constants, vs. string constants: Computed Regexps.   (line  40)
 * register extension:                    Registration Functions.
                                                               (line   6)
 * regular expressions:                   Regexp.              (line   6)
@@ -33478,7 +34280,7 @@ Index
 * regular expressions, as patterns <1>:  Regexp Patterns.     (line   6)
 * regular expressions, as patterns:      Regexp Usage.        (line   6)
 * regular expressions, as record separators: awk split records.
-                                                              (line 124)
+                                                              (line 125)
 * regular expressions, case sensitivity <1>: User-modified.   (line  76)
 * regular expressions, case sensitivity: Case-sensitivity.    (line   6)
 * regular expressions, computed:         Computed Regexps.    (line   6)
@@ -33486,10 +34288,10 @@ Index
                                                               (line  57)
 * regular expressions, dynamic:          Computed Regexps.    (line   6)
 * regular expressions, dynamic, with embedded newlines: Computed Regexps.
-                                                              (line  59)
+                                                              (line  60)
 * regular expressions, gawk, command-line options: GNU Regexp Operators.
                                                               (line  70)
-* regular expressions, interval expressions and: Options.     (line 277)
+* regular expressions, interval expressions and: Options.     (line 279)
 * regular expressions, leftmost longest match: Leftmost Longest.
                                                               (line   6)
 * regular expressions, operators <1>:    Regexp Operators.    (line   6)
@@ -33505,18 +34307,19 @@ Index
 * regular expressions, searching for:    Egrep Program.       (line   6)
 * relational operators, See comparison operators: Typing and Comparison.
                                                               (line   9)
-* replace in string:                     String Functions.    (line 406)
+* replace in string:                     String Functions.    (line 409)
+* retrying input:                        Retrying Input.      (line   6)
 * return debugger command:               Debugger Execution Control.
                                                               (line  54)
 * return statement, user-defined functions: Return Statement. (line   6)
 * return value, close() function:        Close Files And Pipes.
-                                                              (line 131)
+                                                              (line 133)
 * rev() user-defined function:           Function Example.    (line  54)
 * revoutput extension:                   Extension Sample Revout.
                                                               (line  11)
 * revtwoway extension:                   Extension Sample Rev2way.
                                                               (line  12)
-* rewind() user-defined function:        Rewind Function.     (line  16)
+* rewind() user-defined function:        Rewind Function.     (line  15)
 * right angle bracket (>), > operator <1>: Precedence.        (line  65)
 * right angle bracket (>), > operator:   Comparison Operators.
                                                               (line  11)
@@ -33526,40 +34329,40 @@ Index
                                                               (line  11)
 * right angle bracket (>), >> operator (I/O) <1>: Precedence. (line  65)
 * right angle bracket (>), >> operator (I/O): Redirection.    (line  50)
-* right shift:                           Bitwise Functions.   (line  52)
+* right shift:                           Bitwise Functions.   (line  53)
 * right shift, bitwise:                  Bitwise Functions.   (line  32)
 * Ritchie, Dennis:                       Basic Data Typing.   (line  54)
-* RLENGTH variable:                      Auto-set.            (line 259)
-* RLENGTH variable, match() function and: String Functions.   (line 224)
+* RLENGTH variable:                      Auto-set.            (line 279)
+* RLENGTH variable, match() function and: String Functions.   (line 228)
 * Robbins, Arnold <1>:                   Future Extensions.   (line   6)
-* Robbins, Arnold <2>:                   Bugs.                (line  32)
-* Robbins, Arnold <3>:                   Contributors.        (line 141)
+* Robbins, Arnold <2>:                   Bugs.                (line  71)
+* Robbins, Arnold <3>:                   Contributors.        (line 144)
 * Robbins, Arnold <4>:                   General Data Types.  (line   6)
 * Robbins, Arnold <5>:                   Alarm Program.       (line   6)
 * Robbins, Arnold <6>:                   Passwd Functions.    (line  90)
 * Robbins, Arnold <7>:                   Getline/Pipe.        (line  39)
 * Robbins, Arnold:                       Command Line Field Separator.
-                                                              (line  74)
+                                                              (line  71)
 * Robbins, Bill:                         Getline/Pipe.        (line  39)
-* Robbins, Harry:                        Acknowledgments.     (line  92)
-* Robbins, Jean:                         Acknowledgments.     (line  92)
+* Robbins, Harry:                        Acknowledgments.     (line  94)
+* Robbins, Jean:                         Acknowledgments.     (line  94)
 * Robbins, Miriam <1>:                   Passwd Functions.    (line  90)
 * Robbins, Miriam <2>:                   Getline/Pipe.        (line  39)
-* Robbins, Miriam:                       Acknowledgments.     (line  92)
+* Robbins, Miriam:                       Acknowledgments.     (line  94)
 * Rommel, Kai Uwe:                       Contributors.        (line  42)
-* round to nearest integer:              Numeric Functions.   (line  38)
+* round to nearest integer:              Numeric Functions.   (line  23)
 * round() user-defined function:         Round Function.      (line  16)
 * rounding numbers:                      Round Function.      (line   6)
-* ROUNDMODE variable:                    User-modified.       (line 128)
-* RS variable <1>:                       User-modified.       (line 133)
+* ROUNDMODE variable:                    User-modified.       (line 127)
+* RS variable <1>:                       User-modified.       (line 132)
 * RS variable:                           awk split records.   (line  12)
 * RS variable, multiline records and:    Multiple Line.       (line  17)
-* rshift:                                Bitwise Functions.   (line  52)
-* RSTART variable:                       Auto-set.            (line 265)
-* RSTART variable, match() function and: String Functions.    (line 224)
-* RT variable <1>:                       Auto-set.            (line 272)
+* rshift:                                Bitwise Functions.   (line  53)
+* RSTART variable:                       Auto-set.            (line 285)
+* RSTART variable, match() function and: String Functions.    (line 228)
+* RT variable <1>:                       Auto-set.            (line 292)
 * RT variable <2>:                       Multiple Line.       (line 129)
-* RT variable:                           awk split records.   (line 124)
+* RT variable:                           awk split records.   (line 125)
 * Rubin, Paul <1>:                       Contributors.        (line  15)
 * Rubin, Paul:                           History.             (line  30)
 * rule, definition of:                   Getting Started.     (line  21)
@@ -33570,34 +34373,33 @@ Index
                                                               (line  68)
 * sample debugging session:              Sample Debugging Session.
                                                               (line   6)
-* sandbox mode:                          Options.             (line 284)
-* save debugger options:                 Debugger Info.       (line  84)
+* sandbox mode:                          Options.             (line 286)
+* save debugger options:                 Debugger Info.       (line  85)
 * scalar or array:                       Type Functions.      (line  11)
 * scalar values:                         Basic Data Typing.   (line  13)
 * scanning arrays:                       Scanning an Array.   (line   6)
 * scanning multidimensional arrays:      Multiscanning.       (line  11)
 * Schorr, Andrew <1>:                    Contributors.        (line 133)
-* Schorr, Andrew <2>:                    Auto-set.            (line 299)
+* Schorr, Andrew <2>:                    Auto-set.            (line 324)
 * Schorr, Andrew:                        Acknowledgments.     (line  60)
 * Schreiber, Bert:                       Acknowledgments.     (line  38)
 * Schreiber, Rita:                       Acknowledgments.     (line  38)
-* search and replace in strings:         String Functions.    (line  89)
-* search in string:                      String Functions.    (line 155)
-* search paths <1>:                      VMS Running.         (line  58)
+* search and replace in strings:         String Functions.    (line  90)
+* search in string:                      String Functions.    (line 156)
+* search paths <1>:                      VMS Running.         (line  57)
 * search paths <2>:                      PC Using.            (line  10)
 * search paths:                          Programs Exercises.  (line  70)
 * search paths, for loadable extensions: AWKLIBPATH Variable. (line   6)
-* search paths, for source files <1>:    VMS Running.         (line  58)
+* search paths, for source files <1>:    VMS Running.         (line  57)
 * search paths, for source files <2>:    PC Using.            (line  10)
 * search paths, for source files <3>:    Programs Exercises.  (line  70)
 * search paths, for source files:        AWKPATH Variable.    (line   6)
 * searching, files for regular expressions: Egrep Program.    (line   6)
 * searching, for words:                  Dupword Program.     (line   6)
-* sed utility <1>:                       Glossary.            (line  11)
+* sed utility <1>:                       Glossary.            (line  16)
 * sed utility <2>:                       Simple Sed.          (line   6)
-* sed utility:                           Field Splitting Summary.
-                                                              (line  46)
-* seeding random number generator:       Numeric Functions.   (line  80)
+* sed utility:                           Full Line Fields.    (line  22)
+* seeding random number generator:       Numeric Functions.   (line  78)
 * semicolon (;), AWKPATH variable and:   PC Using.            (line  10)
 * semicolon (;), separating statements in actions <1>: Statements.
                                                               (line  10)
@@ -33609,21 +34411,21 @@ Index
 * separators, field, FIELDWIDTHS variable and: User-modified. (line  37)
 * separators, field, FPAT variable and:  User-modified.       (line  43)
 * separators, field, POSIX and:          Fields.              (line   6)
-* separators, for records <1>:           User-modified.       (line 133)
+* separators, for records <1>:           User-modified.       (line 132)
 * separators, for records:               awk split records.   (line   6)
 * separators, for records, regular expressions as: awk split records.
-                                                              (line 124)
+                                                              (line 125)
 * separators, for statements in actions: Action Overview.     (line  19)
-* separators, subscript:                 User-modified.       (line 146)
+* separators, subscript:                 User-modified.       (line 145)
 * set breakpoint:                        Breakpoint Control.  (line  11)
 * set debugger command:                  Viewing And Changing Data.
                                                               (line  59)
 * set directory of message catalogs:     I18N Functions.      (line  12)
 * set watchpoint:                        Viewing And Changing Data.
                                                               (line  67)
-* shadowing of variable values:          Definition Syntax.   (line  71)
+* shadowing of variable values:          Definition Syntax.   (line  76)
 * shell quoting, rules for:              Quoting.             (line   6)
-* shells, piping commands into:          Redirection.         (line 142)
+* shells, piping commands into:          Redirection.         (line 136)
 * shells, quoting:                       Using Shell Variables.
                                                               (line  12)
 * shells, quoting, rules for:            Quoting.             (line  18)
@@ -33632,7 +34434,7 @@ Index
 * shells, variables:                     Using Shell Variables.
                                                               (line   6)
 * shift, bitwise:                        Bitwise Functions.   (line  32)
-* short-circuit operators:               Boolean Ops.         (line  57)
+* short-circuit operators:               Boolean Ops.         (line  59)
 * show all source files, in debugger:    Debugger Info.       (line  45)
 * show breakpoints:                      Debugger Info.       (line  21)
 * show function arguments, in debugger:  Debugger Info.       (line  18)
@@ -33658,53 +34460,53 @@ Index
 * sidebar, A Constant's Base Does Not Affect Its Value: Nondecimal-numbers.
                                                               (line  64)
 * sidebar, Backslash Before Regular Characters: Escape Sequences.
-                                                              (line 118)
-* sidebar, Changing FS Does Not Affect the Fields: Field Splitting Summary.
-                                                              (line  38)
-* sidebar, Changing NR and FNR:          Auto-set.            (line 314)
+                                                              (line 106)
+* sidebar, Changing FS Does Not Affect the Fields: Full Line Fields.
+                                                              (line  14)
+* sidebar, Changing NR and FNR:          Auto-set.            (line 339)
 * sidebar, Controlling Output Buffering with system(): I/O Functions.
-                                                              (line 138)
+                                                              (line 139)
 * sidebar, Escape Sequences for Metacharacters: Escape Sequences.
-                                                              (line 136)
+                                                              (line 137)
 * sidebar, FS and IGNORECASE:            Field Splitting Summary.
-                                                              (line  64)
+                                                              (line  38)
 * sidebar, Interactive Versus Noninteractive Buffering: I/O Functions.
-                                                              (line 107)
-* sidebar, Matching the Null String:     Gory Details.        (line 141)
+                                                              (line  74)
+* sidebar, Matching the Null String:     String Functions.    (line 535)
 * sidebar, Operator Evaluation Order:    Increment Ops.       (line  58)
-* sidebar, Piping into sh:               Redirection.         (line 140)
-* sidebar, Pre-POSIX awk Used OFMT For String Conversion: Strings And Numbers.
+* sidebar, Piping into sh:               Redirection.         (line 134)
+* sidebar, Pre-POSIX awk Used OFMT for String Conversion: Strings And Numbers.
                                                               (line  55)
-* sidebar, Recipe For A Programming Language: History.        (line   6)
+* sidebar, Recipe for a Programming Language: History.        (line   6)
 * sidebar, RS = "\0" Is Not Portable:    gawk split records.  (line  63)
-* sidebar, So Why Does gawk have BEGINFILE and ENDFILE?: Filetrans Function.
+* sidebar, So Why Does gawk Have BEGINFILE and ENDFILE?: Filetrans Function.
                                                               (line  83)
 * sidebar, Syntactic Ambiguities Between /= and Regular Expressions: Assignment Ops.
                                                               (line 146)
 * sidebar, Understanding #!:             Executable Scripts.  (line  31)
 * sidebar, Understanding $0:             Changing Fields.     (line 134)
 * sidebar, Using \n in Bracket Expressions of Dynamic Regexps: Computed Regexps.
-                                                              (line  57)
+                                                              (line  58)
 * sidebar, Using close()'s Return Value: Close Files And Pipes.
-                                                              (line 129)
-* SIGHUP signal, for dynamic profiling:  Profiling.           (line 211)
-* SIGINT signal (MS-Windows):            Profiling.           (line 214)
-* signals, HUP/SIGHUP, for profiling:    Profiling.           (line 211)
-* signals, INT/SIGINT (MS-Windows):      Profiling.           (line 214)
-* signals, QUIT/SIGQUIT (MS-Windows):    Profiling.           (line 214)
-* signals, USR1/SIGUSR1, for profiling:  Profiling.           (line 188)
+                                                              (line 131)
+* SIGHUP signal, for dynamic profiling:  Profiling.           (line 210)
+* SIGINT signal (MS-Windows):            Profiling.           (line 213)
+* signals, HUP/SIGHUP, for profiling:    Profiling.           (line 210)
+* signals, INT/SIGINT (MS-Windows):      Profiling.           (line 213)
+* signals, QUIT/SIGQUIT (MS-Windows):    Profiling.           (line 213)
+* signals, USR1/SIGUSR1, for profiling:  Profiling.           (line 187)
 * signature program:                     Signature Program.   (line   6)
-* SIGQUIT signal (MS-Windows):           Profiling.           (line 214)
-* SIGUSR1 signal, for dynamic profiling: Profiling.           (line 188)
+* SIGQUIT signal (MS-Windows):           Profiling.           (line 213)
+* SIGUSR1 signal, for dynamic profiling: Profiling.           (line 187)
 * silent debugger command:               Debugger Execution Control.
                                                               (line  10)
-* sin:                                   Numeric Functions.   (line  91)
-* sine:                                  Numeric Functions.   (line  91)
+* sin:                                   Numeric Functions.   (line  89)
+* sine:                                  Numeric Functions.   (line  89)
 * single quote ('):                      One-shot.            (line  15)
-* single quote (') in gawk command lines: Long.               (line  33)
+* single quote (') in gawk command lines: Long.               (line  35)
 * single quote ('), in shell commands:   Quoting.             (line  48)
 * single quote ('), vs. apostrophe:      Comments.            (line  27)
-* single quote ('), with double quotes:  Quoting.             (line  70)
+* single quote ('), with double quotes:  Quoting.             (line  73)
 * single-character fields:               Single Character Fields.
                                                               (line   6)
 * single-step execution, in the debugger: Debugger Execution Control.
@@ -33713,7 +34515,7 @@ Index
 * sleep utility:                         Alarm Program.       (line 110)
 * sleep() extension function:            Extension Sample Time.
                                                               (line  22)
-* Solaris, POSIX-compliant awk:          Other Versions.      (line  96)
+* Solaris, POSIX-compliant awk:          Other Versions.      (line 100)
 * sort array:                            String Functions.    (line  42)
 * sort array indices:                    String Functions.    (line  42)
 * sort function, arrays, sorting:        Array Sorting Functions.
@@ -33722,39 +34524,39 @@ Index
 * sort utility, coprocesses and:         Two-way I/O.         (line  65)
 * sorting characters in different languages: Explaining gettext.
                                                               (line  94)
-* source code, awka:                     Other Versions.      (line  64)
+* source code, awka:                     Other Versions.      (line  68)
 * source code, Brian Kernighan's awk:    Other Versions.      (line  13)
-* source code, Busybox Awk:              Other Versions.      (line  88)
+* source code, BusyBox Awk:              Other Versions.      (line  92)
 * source code, gawk:                     Gawk Distribution.   (line   6)
-* source code, Illumos awk:              Other Versions.      (line 105)
-* source code, jawk:                     Other Versions.      (line 113)
-* source code, libmawk:                  Other Versions.      (line 121)
-* source code, mawk:                     Other Versions.      (line  44)
+* source code, Illumos awk:              Other Versions.      (line 109)
+* source code, jawk:                     Other Versions.      (line 117)
+* source code, libmawk:                  Other Versions.      (line 125)
+* source code, mawk:                     Other Versions.      (line  48)
 * source code, mixing:                   Options.             (line 117)
-* source code, pawk:                     Other Versions.      (line  78)
-* source code, pawk (Python version):    Other Versions.      (line 125)
-* source code, QSE Awk:                  Other Versions.      (line 131)
-* source code, QuikTrim Awk:             Other Versions.      (line 135)
-* source code, Solaris awk:              Other Versions.      (line  96)
+* source code, pawk:                     Other Versions.      (line  82)
+* source code, pawk (Python version):    Other Versions.      (line 129)
+* source code, QSE awk:                  Other Versions.      (line 135)
+* source code, QuikTrim Awk:             Other Versions.      (line 139)
+* source code, Solaris awk:              Other Versions.      (line 100)
 * source files, search path for:         Programs Exercises.  (line  70)
-* sparse arrays:                         Array Intro.         (line  72)
-* Spencer, Henry:                        Glossary.            (line  11)
-* split:                                 String Functions.    (line 313)
-* split string into array:               String Functions.    (line 294)
+* sparse arrays:                         Array Intro.         (line  76)
+* Spencer, Henry:                        Glossary.            (line  16)
+* split:                                 String Functions.    (line 316)
+* split string into array:               String Functions.    (line 297)
 * split utility:                         Split Program.       (line   6)
 * split() function, array elements, deleting: Delete.         (line  61)
 * split.awk program:                     Split Program.       (line  30)
-* sprintf <1>:                           String Functions.    (line 381)
+* sprintf <1>:                           String Functions.    (line 384)
 * sprintf:                               OFMT.                (line  15)
-* sprintf() function, OFMT variable and: User-modified.       (line 114)
+* sprintf() function, OFMT variable and: User-modified.       (line 113)
 * sprintf() function, print/printf statements and: Round Function.
                                                               (line   6)
-* sqrt:                                  Numeric Functions.   (line  94)
+* sqrt:                                  Numeric Functions.   (line  92)
 * square brackets ([]), regexp operator: Regexp Operators.    (line  56)
-* square root:                           Numeric Functions.   (line  94)
-* srand:                                 Numeric Functions.   (line  98)
+* square root:                           Numeric Functions.   (line  92)
+* srand:                                 Numeric Functions.   (line  96)
 * stack frame:                           Debugging Terms.     (line  10)
-* Stallman, Richard <1>:                 Glossary.            (line 296)
+* Stallman, Richard <1>:                 Glossary.            (line 375)
 * Stallman, Richard <2>:                 Contributors.        (line  23)
 * Stallman, Richard <3>:                 Acknowledgments.     (line  18)
 * Stallman, Richard:                     Manual History.      (line   6)
@@ -33775,41 +34577,40 @@ Index
 * stop automatic display, in debugger:   Viewing And Changing Data.
                                                               (line  80)
 * stream editors <1>:                    Simple Sed.          (line   6)
-* stream editors:                        Field Splitting Summary.
-                                                              (line  46)
+* stream editors:                        Full Line Fields.    (line  22)
 * strftime:                              Time Functions.      (line  48)
 * string constants:                      Scalar Constants.    (line  15)
-* string constants, vs. regexp constants: Computed Regexps.   (line  39)
+* string constants, vs. regexp constants: Computed Regexps.   (line  40)
 * string extraction (internationalization): String Extraction.
                                                               (line   6)
-* string length:                         String Functions.    (line 167)
+* string length:                         String Functions.    (line 171)
 * string operators:                      Concatenation.       (line   8)
-* string, regular expression match:      String Functions.    (line 207)
+* string, regular expression match:      String Functions.    (line 211)
 * string-manipulation functions:         String Functions.    (line   6)
 * string-matching operators:             Regexp Usage.        (line  19)
 * string-translation functions:          I18N Functions.      (line   6)
-* strings splitting, example:            String Functions.    (line 333)
-* strings, converting <1>:               Bitwise Functions.   (line 109)
+* strings splitting, example:            String Functions.    (line 335)
+* strings, converting <1>:               Bitwise Functions.   (line 110)
 * strings, converting:                   Strings And Numbers. (line   6)
-* strings, converting letter case:       String Functions.    (line 520)
+* strings, converting letter case:       String Functions.    (line 523)
 * strings, converting, numbers to:       User-modified.       (line  30)
-* strings, empty, See null strings:      awk split records.   (line 114)
+* strings, empty, See null strings:      awk split records.   (line 115)
 * strings, extracting:                   String Extraction.   (line   6)
-* strings, for localization:             Programmer i18n.     (line  14)
+* strings, for localization:             Programmer i18n.     (line  13)
 * strings, length limitations:           Scalar Constants.    (line  20)
 * strings, merging arrays into:          Join Function.       (line   6)
 * strings, null:                         Regexp Field Splitting.
                                                               (line  43)
 * strings, numeric:                      Variable Typing.     (line   6)
-* strtonum:                              String Functions.    (line 388)
+* strtonum:                              String Functions.    (line 391)
 * strtonum() function (gawk), --non-decimal-data option and: Nondecimal Data.
-                                                              (line  36)
-* sub <1>:                               String Functions.    (line 406)
+                                                              (line  35)
+* sub <1>:                               String Functions.    (line 409)
 * sub:                                   Using Constant Regexps.
                                                               (line  43)
-* sub() function, arguments of:          String Functions.    (line 460)
+* sub() function, arguments of:          String Functions.    (line 463)
 * sub() function, escape processing:     Gory Details.        (line   6)
-* subscript separators:                  User-modified.       (line 146)
+* subscript separators:                  User-modified.       (line 145)
 * subscripts in arrays, multidimensional: Multidimensional.   (line  10)
 * subscripts in arrays, multidimensional, scanning: Multiscanning.
                                                               (line  11)
@@ -33817,33 +34618,33 @@ Index
                                                               (line   6)
 * subscripts in arrays, uninitialized variables as: Uninitialized Subscripts.
                                                               (line   6)
-* SUBSEP variable:                       User-modified.       (line 146)
+* SUBSEP variable:                       User-modified.       (line 145)
 * SUBSEP variable, and multidimensional arrays: Multidimensional.
                                                               (line  16)
-* substitute in string:                  String Functions.    (line  89)
-* substr:                                String Functions.    (line 479)
-* substring:                             String Functions.    (line 479)
-* Sumner, Andrew:                        Other Versions.      (line  64)
-* supplementary groups of gawk process:  Auto-set.            (line 244)
+* substitute in string:                  String Functions.    (line  90)
+* substr:                                String Functions.    (line 482)
+* substring:                             String Functions.    (line 482)
+* Sumner, Andrew:                        Other Versions.      (line  68)
+* supplementary groups of gawk process:  Auto-set.            (line 260)
 * switch statement:                      Switch Statement.    (line   6)
-* SYMTAB array:                          Auto-set.            (line 276)
+* SYMTAB array:                          Auto-set.            (line 296)
 * syntactic ambiguity: /= operator vs. /=.../ regexp constant: Assignment Ops.
                                                               (line 148)
-* system:                                I/O Functions.       (line  75)
+* system:                                I/O Functions.       (line 107)
 * systime:                               Time Functions.      (line  66)
 * t debugger command (alias for tbreak): Breakpoint Control.  (line  90)
 * tbreak debugger command:               Breakpoint Control.  (line  90)
-* Tcl:                                   Library Names.       (line  57)
+* Tcl:                                   Library Names.       (line  58)
 * TCP/IP:                                TCP/IP Networking.   (line   6)
 * TCP/IP, support for:                   Special Network.     (line   6)
 * tee utility:                           Tee Program.         (line   6)
 * tee.awk program:                       Tee Program.         (line  26)
 * temporary breakpoint:                  Breakpoint Control.  (line  90)
-* terminating records:                   awk split records.   (line 124)
-* testbits.awk program:                  Bitwise Functions.   (line  70)
+* terminating records:                   awk split records.   (line 125)
+* testbits.awk program:                  Bitwise Functions.   (line  71)
 * testext extension:                     Extension Sample API Tests.
                                                               (line   6)
-* Texinfo <1>:                           Adding Code.         (line 100)
+* Texinfo <1>:                           Adding Code.         (line  99)
 * Texinfo <2>:                           Distribution contents.
                                                               (line  77)
 * Texinfo <3>:                           Extract Program.     (line  12)
@@ -33855,8 +34656,8 @@ Index
                                                               (line   6)
 * text, printing:                        Print.               (line  22)
 * text, printing, unduplicated lines of: Uniq Program.        (line   6)
-* TEXTDOMAIN variable <1>:               Programmer i18n.     (line   9)
-* TEXTDOMAIN variable:                   User-modified.       (line 152)
+* TEXTDOMAIN variable <1>:               Programmer i18n.     (line   8)
+* TEXTDOMAIN variable:                   User-modified.       (line 151)
 * TEXTDOMAIN variable, BEGIN pattern and: Programmer i18n.    (line  60)
 * TEXTDOMAIN variable, portability and:  I18N Portability.    (line  20)
 * textdomain() function (C library):     Explaining gettext.  (line  28)
@@ -33879,26 +34680,26 @@ Index
 * timestamps, converting dates to:       Time Functions.      (line  76)
 * timestamps, formatted:                 Getlocaltime Function.
                                                               (line   6)
-* tolower:                               String Functions.    (line 521)
-* toupper:                               String Functions.    (line 527)
+* tolower:                               String Functions.    (line 524)
+* toupper:                               String Functions.    (line 530)
 * tr utility:                            Translate Program.   (line   6)
 * trace debugger command:                Miscellaneous Debugger Commands.
-                                                              (line 108)
+                                                              (line 107)
 * traceback, display in debugger:        Execution Stack.     (line  13)
 * translate string:                      I18N Functions.      (line  22)
 * translate.awk program:                 Translate Program.   (line  55)
-* treating files, as single records:     gawk split records.  (line  92)
+* treating files, as single records:     gawk split records.  (line  93)
 * troubleshooting, --non-decimal-data option: Options.        (line 211)
 * troubleshooting, == operator:          Comparison Operators.
                                                               (line  37)
 * troubleshooting, awk uses FS not IFS:  Field Separators.    (line  30)
 * troubleshooting, backslash before nonspecial character: Escape Sequences.
-                                                              (line 120)
+                                                              (line 108)
 * troubleshooting, division:             Arithmetic Ops.      (line  44)
 * troubleshooting, fatal errors, field widths, specifying: Constant Size.
-                                                              (line  23)
+                                                              (line  22)
 * troubleshooting, fatal errors, printf format strings: Format Modifiers.
-                                                              (line 159)
+                                                              (line 158)
 * troubleshooting, fflush() function:    I/O Functions.       (line  63)
 * troubleshooting, function call syntax: Function Calls.      (line  30)
 * troubleshooting, gawk:                 Compatibility Mode.  (line   6)
@@ -33906,18 +34707,18 @@ Index
 * troubleshooting, gawk, fatal errors, function arguments: Calling Built-in.
                                                               (line  16)
 * troubleshooting, getline function:     File Checking.       (line  25)
-* troubleshooting, gsub()/sub() functions: String Functions.  (line 470)
-* troubleshooting, match() function:     String Functions.    (line 289)
+* troubleshooting, gsub()/sub() functions: String Functions.  (line 473)
+* troubleshooting, match() function:     String Functions.    (line 292)
 * troubleshooting, print statement, omitting commas: Print Examples.
                                                               (line  31)
-* troubleshooting, printing:             Redirection.         (line 118)
-* troubleshooting, quotes with file names: Special FD.        (line  68)
+* troubleshooting, printing:             Redirection.         (line 112)
+* troubleshooting, quotes with file names: Special FD.        (line  62)
 * troubleshooting, readable data files:  File Checking.       (line   6)
 * troubleshooting, regexp constants vs. string constants: Computed Regexps.
-                                                              (line  39)
+                                                              (line  40)
 * troubleshooting, string concatenation: Concatenation.       (line  26)
-* troubleshooting, substr() function:    String Functions.    (line 497)
-* troubleshooting, system() function:    I/O Functions.       (line  97)
+* troubleshooting, substr() function:    String Functions.    (line 500)
+* troubleshooting, system() function:    I/O Functions.       (line 129)
 * troubleshooting, typographical errors, global variables: Options.
                                                               (line  98)
 * true, logical:                         Truth Values.        (line   6)
@@ -33932,7 +34733,7 @@ Index
 * unassigned array elements:             Reference to Elements.
                                                               (line  18)
 * undefined functions:                   Pass By Value/Reference.
-                                                              (line  71)
+                                                              (line  68)
 * underscore (_), C macro:               Explaining gettext.  (line  71)
 * underscore (_), in names of private variables: Library Names.
                                                               (line  29)
@@ -33940,20 +34741,20 @@ Index
 * undisplay debugger command:            Viewing And Changing Data.
                                                               (line  80)
 * undocumented features:                 Undocumented.        (line   6)
-* Unicode <1>:                           Glossary.            (line 133)
+* Unicode <1>:                           Glossary.            (line 197)
 * Unicode <2>:                           Ranges and Locales.  (line  61)
 * Unicode:                               Ordinal Functions.   (line  45)
 * uninitialized variables, as array subscripts: Uninitialized Subscripts.
                                                               (line   6)
 * uniq utility:                          Uniq Program.        (line   6)
 * uniq.awk program:                      Uniq Program.        (line  65)
-* Unix:                                  Glossary.            (line 611)
+* Unix:                                  Glossary.            (line 753)
 * Unix awk, backslashes in escape sequences: Escape Sequences.
-                                                              (line 132)
+                                                              (line 120)
 * Unix awk, close() function and:        Close Files And Pipes.
-                                                              (line 131)
+                                                              (line 133)
 * Unix awk, password files, field separators and: Command Line Field Separator.
-                                                              (line  65)
+                                                              (line  62)
 * Unix, awk scripts and:                 Executable Scripts.  (line   6)
 * UNIXROOT variable, on OS/2 systems:    PC Using.            (line  16)
 * unsigned integers:                     Computer Arithmetic. (line  41)
@@ -33961,7 +34762,7 @@ Index
                                                               (line  83)
 * unwatch debugger command:              Viewing And Changing Data.
                                                               (line  84)
-* up debugger command:                   Execution Stack.     (line  34)
+* up debugger command:                   Execution Stack.     (line  36)
 * user database, reading:                Passwd Functions.    (line   6)
 * user-defined functions:                User-defined.        (line   6)
 * user-defined, functions, counts, in a profile: Profiling.   (line 137)
@@ -33969,20 +34770,17 @@ Index
 * user-modifiable variables:             User-modified.       (line   6)
 * users, information about, printing:    Id Program.          (line   6)
 * users, information about, retrieving:  Passwd Functions.    (line  16)
-* USR1 signal, for dynamic profiling:    Profiling.           (line 188)
+* USR1 signal, for dynamic profiling:    Profiling.           (line 187)
 * values, numeric:                       Basic Data Typing.   (line  13)
 * values, string:                        Basic Data Typing.   (line  13)
-* variable assignments and input files:  Other Arguments.     (line  23)
+* variable assignments and input files:  Other Arguments.     (line  26)
 * variable typing:                       Typing and Comparison.
                                                               (line   9)
 * variables <1>:                         Basic Data Typing.   (line   6)
 * variables:                             Other Features.      (line   6)
 * variables, assigning on command line:  Assignment Options.  (line   6)
-* variables, built-in <1>:               Built-in Variables.  (line   6)
 * variables, built-in:                   Using Variables.     (line  23)
-* variables, built-in, -v option, setting with: Options.      (line  40)
-* variables, built-in, conveying information: Auto-set.       (line   6)
-* variables, flag:                       Boolean Ops.         (line  67)
+* variables, flag:                       Boolean Ops.         (line  69)
 * variables, getline command into, using <1>: Getline/Variable/Coprocess.
                                                               (line   6)
 * variables, getline command into, using <2>: Getline/Variable/Pipe.
@@ -33994,20 +34792,22 @@ Index
 * variables, global, printing list of:   Options.             (line  93)
 * variables, initializing:               Using Variables.     (line  23)
 * variables, local to a function:        Variable Scope.      (line   6)
-* variables, names of:                   Arrays.              (line  18)
+* variables, predefined:                 Built-in Variables.  (line   6)
+* variables, predefined -v option, setting with: Options.     (line  40)
+* variables, predefined conveying information: Auto-set.      (line   6)
 * variables, private:                    Library Names.       (line  11)
 * variables, setting:                    Options.             (line  32)
-* variables, shadowing:                  Definition Syntax.   (line  71)
+* variables, shadowing:                  Definition Syntax.   (line  76)
 * variables, types of:                   Assignment Ops.      (line  40)
 * variables, types of, comparison expressions and: Typing and Comparison.
                                                               (line   9)
 * variables, uninitialized, as array subscripts: Uninitialized Subscripts.
                                                               (line   6)
 * variables, user-defined:               Variables.           (line   6)
-* version of gawk:                       Auto-set.            (line 214)
-* version of gawk extension API:         Auto-set.            (line 239)
-* version of GNU MP library:             Auto-set.            (line 225)
-* version of GNU MPFR library:           Auto-set.            (line 221)
+* version of gawk:                       Auto-set.            (line 230)
+* version of gawk extension API:         Auto-set.            (line 255)
+* version of GNU MP library:             Auto-set.            (line 241)
+* version of GNU MPFR library:           Auto-set.            (line 237)
 * vertical bar (|):                      Regexp Operators.    (line  70)
 * vertical bar (|), | operator (I/O) <1>: Precedence.         (line  65)
 * vertical bar (|), | operator (I/O):    Getline/Pipe.        (line   9)
@@ -34015,11 +34815,11 @@ Index
 * vertical bar (|), |& operator (I/O) <2>: Precedence.        (line  65)
 * vertical bar (|), |& operator (I/O):   Getline/Coprocess.   (line   6)
 * vertical bar (|), || operator <1>:     Precedence.          (line  89)
-* vertical bar (|), || operator:         Boolean Ops.         (line  57)
+* vertical bar (|), || operator:         Boolean Ops.         (line  59)
 * Vinschen, Corinna:                     Acknowledgments.     (line  60)
 * w debugger command (alias for watch):  Viewing And Changing Data.
                                                               (line  67)
-* w utility:                             Constant Size.       (line  23)
+* w utility:                             Constant Size.       (line  22)
 * wait() extension function:             Extension Sample Fork.
                                                               (line  22)
 * waitpid() extension function:          Extension Sample Fork.
@@ -34036,12 +34836,15 @@ Index
 * wc.awk program:                        Wc Program.          (line  46)
 * Weinberger, Peter <1>:                 Contributors.        (line  11)
 * Weinberger, Peter:                     History.             (line  17)
+* where debugger command:                Execution Stack.     (line  13)
+* where debugger command (alias for backtrace): Execution Stack.
+                                                              (line  13)
 * while statement:                       While Statement.     (line   6)
 * while statement, use of regexps in:    Regexp Usage.        (line  19)
 * whitespace, as field separators:       Default Field Splitting.
                                                               (line   6)
 * whitespace, functions, calling:        Calling Built-in.    (line  10)
-* whitespace, newlines as:               Options.             (line 258)
+* whitespace, newlines as:               Options.             (line 260)
 * Williams, Kent:                        Contributors.        (line  34)
 * Woehlke, Matthew:                      Contributors.        (line  79)
 * Woods, John:                           Contributors.        (line  27)
@@ -34056,9 +34859,9 @@ Index
 * words, duplicate, searching for:       Dupword Program.     (line   6)
 * words, usage counts, generating:       Word Sorting.        (line   6)
 * writea() extension function:           Extension Sample Read write array.
-                                                              (line   9)
+                                                              (line  12)
 * xgettext utility:                      String Extraction.   (line  13)
-* xor:                                   Bitwise Functions.   (line  55)
+* xor:                                   Bitwise Functions.   (line  56)
 * XOR bitwise operation:                 Bitwise Functions.   (line   6)
 * Yawitz, Efraim:                        Contributors.        (line 131)
 * Zaretskii, Eli <1>:                    Bugs.                (line  71)
@@ -34075,12 +34878,12 @@ Index
 * | (vertical bar), | operator (I/O):    Getline/Pipe.        (line   9)
 * | (vertical bar), |& operator (I/O) <1>: Two-way I/O.       (line  25)
 * | (vertical bar), |& operator (I/O) <2>: Precedence.        (line  65)
-* | (vertical bar), |& operator (I/O) <3>: Redirection.       (line 102)
+* | (vertical bar), |& operator (I/O) <3>: Redirection.       (line  96)
 * | (vertical bar), |& operator (I/O):   Getline/Coprocess.   (line   6)
 * | (vertical bar), |& operator (I/O), pipes, closing: Close Files And Pipes.
-                                                              (line 119)
+                                                              (line 121)
 * | (vertical bar), || operator <1>:     Precedence.          (line  89)
-* | (vertical bar), || operator:         Boolean Ops.         (line  57)
+* | (vertical bar), || operator:         Boolean Ops.         (line  59)
 * ~ (tilde), ~ operator <1>:             Expression Patterns. (line  24)
 * ~ (tilde), ~ operator <2>:             Precedence.          (line  80)
 * ~ (tilde), ~ operator <3>:             Comparison Operators.
@@ -34094,553 +34897,563 @@ Index
 
 Tag Table:
 Node: Top1204
-Node: Foreword41858
-Node: Preface46203
-Ref: Preface-Footnote-149226
-Ref: Preface-Footnote-249333
-Node: History49565
-Node: Names51939
-Ref: Names-Footnote-153033
-Node: This Manual53179
-Ref: This Manual-Footnote-158958
-Node: Conventions59058
-Node: Manual History61403
-Ref: Manual History-Footnote-164479
-Ref: Manual History-Footnote-264520
-Node: How To Contribute64594
-Node: Acknowledgments65833
-Node: Getting Started70581
-Node: Running gawk73015
-Node: One-shot74205
-Node: Read Terminal75430
-Node: Long77455
-Node: Executable Scripts78849
-Ref: Executable Scripts-Footnote-181650
-Node: Comments81752
-Node: Quoting84225
-Node: DOS Quoting89538
-Node: Sample Data Files90213
-Node: Very Simple92820
-Node: Two Rules97705
-Node: More Complex99599
-Ref: More Complex-Footnote-1102513
-Node: Statements/Lines102598
-Ref: Statements/Lines-Footnote-1107054
-Node: Other Features107319
-Node: When108250
-Ref: When-Footnote-1110006
-Node: Intro Summary110071
-Node: Invoking Gawk110954
-Node: Command Line112469
-Node: Options113260
-Ref: Options-Footnote-1128907
-Node: Other Arguments128932
-Node: Naming Standard Input131760
-Node: Environment Variables132853
-Node: AWKPATH Variable133411
-Ref: AWKPATH Variable-Footnote-1136277
-Ref: AWKPATH Variable-Footnote-2136322
-Node: AWKLIBPATH Variable136582
-Node: Other Environment Variables137341
-Node: Exit Status140793
-Node: Include Files141468
-Node: Loading Shared Libraries145046
-Node: Obsolete146430
-Node: Undocumented147127
-Node: Invoking Summary147394
-Node: Regexp148994
-Node: Regexp Usage150453
-Node: Escape Sequences152486
-Node: Regexp Operators158557
-Ref: Regexp Operators-Footnote-1165988
-Ref: Regexp Operators-Footnote-2166135
-Node: Bracket Expressions166233
-Ref: table-char-classes168251
-Node: Leftmost Longest171191
-Node: Computed Regexps172395
-Node: GNU Regexp Operators175773
-Node: Case-sensitivity179479
-Ref: Case-sensitivity-Footnote-1182369
-Ref: Case-sensitivity-Footnote-2182604
-Node: Regexp Summary182712
-Node: Reading Files184181
-Node: Records186273
-Node: awk split records186995
-Node: gawk split records191853
-Ref: gawk split records-Footnote-1196374
-Node: Fields196411
-Ref: Fields-Footnote-1199375
-Node: Nonconstant Fields199461
-Ref: Nonconstant Fields-Footnote-1201691
-Node: Changing Fields201893
-Node: Field Separators207847
-Node: Default Field Splitting210549
-Node: Regexp Field Splitting211666
-Node: Single Character Fields214993
-Node: Command Line Field Separator216052
-Node: Full Line Fields219478
-Ref: Full Line Fields-Footnote-1219986
-Node: Field Splitting Summary220032
-Ref: Field Splitting Summary-Footnote-1223164
-Node: Constant Size223265
-Node: Splitting By Content227871
-Ref: Splitting By Content-Footnote-1231944
-Node: Multiple Line231984
-Ref: Multiple Line-Footnote-1237840
-Node: Getline238019
-Node: Plain Getline240230
-Node: Getline/Variable242936
-Node: Getline/File244083
-Node: Getline/Variable/File245467
-Ref: Getline/Variable/File-Footnote-1247066
-Node: Getline/Pipe247153
-Node: Getline/Variable/Pipe249839
-Node: Getline/Coprocess250946
-Node: Getline/Variable/Coprocess252198
-Node: Getline Notes252935
-Node: Getline Summary255739
-Ref: table-getline-variants256147
-Node: Read Timeout257059
-Ref: Read Timeout-Footnote-1260886
-Node: Command-line directories260944
-Node: Input Summary261848
-Node: Input Exercises264985
-Node: Printing265713
-Node: Print267435
-Node: Print Examples268928
-Node: Output Separators271707
-Node: OFMT273723
-Node: Printf275081
-Node: Basic Printf275987
-Node: Control Letters277526
-Node: Format Modifiers281517
-Node: Printf Examples287544
-Node: Redirection290008
-Node: Special Files296980
-Node: Special FD297513
-Ref: Special FD-Footnote-1301110
-Node: Special Network301184
-Node: Special Caveats302034
-Node: Close Files And Pipes302830
-Ref: Close Files And Pipes-Footnote-1309991
-Ref: Close Files And Pipes-Footnote-2310139
-Node: Output Summary310289
-Node: Output Exercises311286
-Node: Expressions311966
-Node: Values313151
-Node: Constants313827
-Node: Scalar Constants314507
-Ref: Scalar Constants-Footnote-1315366
-Node: Nondecimal-numbers315616
-Node: Regexp Constants318616
-Node: Using Constant Regexps319141
-Node: Variables322213
-Node: Using Variables322868
-Node: Assignment Options324774
-Node: Conversion326649
-Node: Strings And Numbers327173
-Ref: Strings And Numbers-Footnote-1330235
-Node: Locale influences conversions330344
-Ref: table-locale-affects333061
-Node: All Operators333649
-Node: Arithmetic Ops334279
-Node: Concatenation336784
-Ref: Concatenation-Footnote-1339603
-Node: Assignment Ops339709
-Ref: table-assign-ops344692
-Node: Increment Ops345995
-Node: Truth Values and Conditions349433
-Node: Truth Values350516
-Node: Typing and Comparison351565
-Node: Variable Typing352358
-Node: Comparison Operators356010
-Ref: table-relational-ops356420
-Node: POSIX String Comparison359970
-Ref: POSIX String Comparison-Footnote-1361054
-Node: Boolean Ops361192
-Ref: Boolean Ops-Footnote-1365531
-Node: Conditional Exp365622
-Node: Function Calls367349
-Node: Precedence371229
-Node: Locales374898
-Node: Expressions Summary376529
-Node: Patterns and Actions379070
-Node: Pattern Overview380186
-Node: Regexp Patterns381863
-Node: Expression Patterns382406
-Node: Ranges386186
-Node: BEGIN/END389292
-Node: Using BEGIN/END390054
-Ref: Using BEGIN/END-Footnote-1392790
-Node: I/O And BEGIN/END392896
-Node: BEGINFILE/ENDFILE395167
-Node: Empty398098
-Node: Using Shell Variables398415
-Node: Action Overview400698
-Node: Statements403025
-Node: If Statement404873
-Node: While Statement406371
-Node: Do Statement408415
-Node: For Statement409571
-Node: Switch Statement412723
-Node: Break Statement415111
-Node: Continue Statement417152
-Node: Next Statement418977
-Node: Nextfile Statement421347
-Node: Exit Statement424004
-Node: Built-in Variables426408
-Node: User-modified427535
-Ref: User-modified-Footnote-1435224
-Node: Auto-set435286
-Ref: Auto-set-Footnote-1448475
-Ref: Auto-set-Footnote-2448680
-Node: ARGC and ARGV448736
-Node: Pattern Action Summary452640
-Node: Arrays454863
-Node: Array Basics456412
-Node: Array Intro457238
-Ref: figure-array-elements459211
-Ref: Array Intro-Footnote-1461735
-Node: Reference to Elements461863
-Node: Assigning Elements464313
-Node: Array Example464804
-Node: Scanning an Array466536
-Node: Controlling Scanning469537
-Ref: Controlling Scanning-Footnote-1474710
-Node: Delete475026
-Ref: Delete-Footnote-1477777
-Node: Numeric Array Subscripts477834
-Node: Uninitialized Subscripts480017
-Node: Multidimensional481644
-Node: Multiscanning484757
-Node: Arrays of Arrays486346
-Node: Arrays Summary491009
-Node: Functions493114
-Node: Built-in493987
-Node: Calling Built-in495065
-Node: Numeric Functions497053
-Ref: Numeric Functions-Footnote-1501889
-Ref: Numeric Functions-Footnote-2502246
-Ref: Numeric Functions-Footnote-3502294
-Node: String Functions502563
-Ref: String Functions-Footnote-1525560
-Ref: String Functions-Footnote-2525689
-Ref: String Functions-Footnote-3525937
-Node: Gory Details526024
-Ref: table-sub-escapes527797
-Ref: table-sub-proposed529317
-Ref: table-posix-sub530681
-Ref: table-gensub-escapes532221
-Ref: Gory Details-Footnote-1533397
-Node: I/O Functions533548
-Ref: I/O Functions-Footnote-1540658
-Node: Time Functions540805
-Ref: Time Functions-Footnote-1551269
-Ref: Time Functions-Footnote-2551337
-Ref: Time Functions-Footnote-3551495
-Ref: Time Functions-Footnote-4551606
-Ref: Time Functions-Footnote-5551718
-Ref: Time Functions-Footnote-6551945
-Node: Bitwise Functions552211
-Ref: table-bitwise-ops552773
-Ref: Bitwise Functions-Footnote-1557018
-Node: Type Functions557202
-Node: I18N Functions558344
-Node: User-defined559989
-Node: Definition Syntax560793
-Ref: Definition Syntax-Footnote-1566197
-Node: Function Example566266
-Ref: Function Example-Footnote-1568906
-Node: Function Caveats568928
-Node: Calling A Function569446
-Node: Variable Scope570401
-Node: Pass By Value/Reference573389
-Node: Return Statement576899
-Node: Dynamic Typing579883
-Node: Indirect Calls580812
-Ref: Indirect Calls-Footnote-1590528
-Node: Functions Summary590656
-Node: Library Functions593306
-Ref: Library Functions-Footnote-1596924
-Ref: Library Functions-Footnote-2597067
-Node: Library Names597238
-Ref: Library Names-Footnote-1600711
-Ref: Library Names-Footnote-2600931
-Node: General Functions601017
-Node: Strtonum Function602045
-Node: Assert Function604947
-Node: Round Function608273
-Node: Cliff Random Function609814
-Node: Ordinal Functions610830
-Ref: Ordinal Functions-Footnote-1613895
-Ref: Ordinal Functions-Footnote-2614147
-Node: Join Function614358
-Ref: Join Function-Footnote-1616129
-Node: Getlocaltime Function616329
-Node: Readfile Function620065
-Node: Data File Management621904
-Node: Filetrans Function622536
-Node: Rewind Function626605
-Node: File Checking628163
-Ref: File Checking-Footnote-1629295
-Node: Empty Files629496
-Node: Ignoring Assigns631475
-Node: Getopt Function633029
-Ref: Getopt Function-Footnote-1644293
-Node: Passwd Functions644496
-Ref: Passwd Functions-Footnote-1653475
-Node: Group Functions653563
-Ref: Group Functions-Footnote-1661494
-Node: Walking Arrays661707
-Node: Library Functions Summary663310
-Node: Library Exercises664698
-Node: Sample Programs665978
-Node: Running Examples666748
-Node: Clones667476
-Node: Cut Program668700
-Node: Egrep Program678558
-Ref: Egrep Program-Footnote-1686145
-Node: Id Program686255
-Node: Split Program689909
-Ref: Split Program-Footnote-1693447
-Node: Tee Program693575
-Node: Uniq Program696362
-Node: Wc Program703785
-Ref: Wc Program-Footnote-1708050
-Node: Miscellaneous Programs708142
-Node: Dupword Program709355
-Node: Alarm Program711386
-Node: Translate Program716190
-Ref: Translate Program-Footnote-1720763
-Ref: Translate Program-Footnote-2721033
-Node: Labels Program721172
-Ref: Labels Program-Footnote-1724533
-Node: Word Sorting724617
-Node: History Sorting728660
-Node: Extract Program730496
-Node: Simple Sed738032
-Node: Igawk Program741094
-Ref: Igawk Program-Footnote-1755398
-Ref: Igawk Program-Footnote-2755599
-Node: Anagram Program755737
-Node: Signature Program758805
-Node: Programs Summary760052
-Node: Programs Exercises761267
-Ref: Programs Exercises-Footnote-1765398
-Node: Advanced Features765489
-Node: Nondecimal Data767437
-Node: Array Sorting769014
-Node: Controlling Array Traversal769711
-Node: Array Sorting Functions777991
-Ref: Array Sorting Functions-Footnote-1781898
-Node: Two-way I/O782092
-Ref: Two-way I/O-Footnote-1787036
-Ref: Two-way I/O-Footnote-2787215
-Node: TCP/IP Networking787297
-Node: Profiling790139
-Node: Advanced Features Summary797690
-Node: Internationalization799554
-Node: I18N and L10N801034
-Node: Explaining gettext801720
-Ref: Explaining gettext-Footnote-1806746
-Ref: Explaining gettext-Footnote-2806930
-Node: Programmer i18n807095
-Ref: Programmer i18n-Footnote-1811889
-Node: Translator i18n811938
-Node: String Extraction812732
-Ref: String Extraction-Footnote-1813865
-Node: Printf Ordering813951
-Ref: Printf Ordering-Footnote-1816733
-Node: I18N Portability816797
-Ref: I18N Portability-Footnote-1819246
-Node: I18N Example819309
-Ref: I18N Example-Footnote-1822015
-Node: Gawk I18N822087
-Node: I18N Summary822725
-Node: Debugger824064
-Node: Debugging825086
-Node: Debugging Concepts825527
-Node: Debugging Terms827383
-Node: Awk Debugging829980
-Node: Sample Debugging Session830872
-Node: Debugger Invocation831392
-Node: Finding The Bug832728
-Node: List of Debugger Commands839207
-Node: Breakpoint Control840539
-Node: Debugger Execution Control844203
-Node: Viewing And Changing Data847563
-Node: Execution Stack850921
-Node: Debugger Info852434
-Node: Miscellaneous Debugger Commands856428
-Node: Readline Support861612
-Node: Limitations862504
-Node: Debugging Summary864777
-Node: Arbitrary Precision Arithmetic865945
-Node: Computer Arithmetic867432
-Ref: Computer Arithmetic-Footnote-1871819
-Node: Math Definitions871876
-Ref: table-ieee-formats875165
-Ref: Math Definitions-Footnote-1875705
-Node: MPFR features875808
-Node: FP Math Caution877425
-Ref: FP Math Caution-Footnote-1878475
-Node: Inexactness of computations878844
-Node: Inexact representation879792
-Node: Comparing FP Values881147
-Node: Errors accumulate882111
-Node: Getting Accuracy883544
-Node: Try To Round886203
-Node: Setting precision887102
-Ref: table-predefined-precision-strings887784
-Node: Setting the rounding mode889577
-Ref: table-gawk-rounding-modes889941
-Ref: Setting the rounding mode-Footnote-1893395
-Node: Arbitrary Precision Integers893574
-Ref: Arbitrary Precision Integers-Footnote-1897347
-Node: POSIX Floating Point Problems897496
-Ref: POSIX Floating Point Problems-Footnote-1901372
-Node: Floating point summary901410
-Node: Dynamic Extensions903614
-Node: Extension Intro905166
-Node: Plugin License906431
-Node: Extension Mechanism Outline907116
-Ref: figure-load-extension907540
-Ref: figure-load-new-function909025
-Ref: figure-call-new-function910027
-Node: Extension API Description912011
-Node: Extension API Functions Introduction913461
-Node: General Data Types918328
-Ref: General Data Types-Footnote-1924021
-Node: Requesting Values924320
-Ref: table-value-types-returned925057
-Node: Memory Allocation Functions926015
-Ref: Memory Allocation Functions-Footnote-1928762
-Node: Constructor Functions928858
-Node: Registration Functions930616
-Node: Extension Functions931301
-Node: Exit Callback Functions933603
-Node: Extension Version String934851
-Node: Input Parsers935501
-Node: Output Wrappers945315
-Node: Two-way processors949831
-Node: Printing Messages952035
-Ref: Printing Messages-Footnote-1953112
-Node: Updating `ERRNO'953264
-Node: Accessing Parameters954003
-Node: Symbol Table Access955233
-Node: Symbol table by name955747
-Node: Symbol table by cookie957723
-Ref: Symbol table by cookie-Footnote-1961856
-Node: Cached values961919
-Ref: Cached values-Footnote-1965423
-Node: Array Manipulation965514
-Ref: Array Manipulation-Footnote-1966612
-Node: Array Data Types966651
-Ref: Array Data Types-Footnote-1969354
-Node: Array Functions969446
-Node: Flattening Arrays973320
-Node: Creating Arrays980172
-Node: Extension API Variables984903
-Node: Extension Versioning985539
-Node: Extension API Informational Variables987440
-Node: Extension API Boilerplate988526
-Node: Finding Extensions992330
-Node: Extension Example992890
-Node: Internal File Description993620
-Node: Internal File Ops997711
-Ref: Internal File Ops-Footnote-11009143
-Node: Using Internal File Ops1009283
-Ref: Using Internal File Ops-Footnote-11011630
-Node: Extension Samples1011898
-Node: Extension Sample File Functions1013422
-Node: Extension Sample Fnmatch1020990
-Node: Extension Sample Fork1022472
-Node: Extension Sample Inplace1023685
-Node: Extension Sample Ord1025360
-Node: Extension Sample Readdir1026196
-Ref: table-readdir-file-types1027052
-Node: Extension Sample Revout1027851
-Node: Extension Sample Rev2way1028442
-Node: Extension Sample Read write array1029183
-Node: Extension Sample Readfile1031062
-Node: Extension Sample API Tests1032162
-Node: Extension Sample Time1032687
-Node: gawkextlib1034002
-Node: Extension summary1036815
-Node: Extension Exercises1040508
-Node: Language History1041230
-Node: V7/SVR3.11042873
-Node: SVR41045193
-Node: POSIX1046635
-Node: BTL1048021
-Node: POSIX/GNU1048755
-Node: Feature History1054531
-Node: Common Extensions1067622
-Node: Ranges and Locales1068934
-Ref: Ranges and Locales-Footnote-11073551
-Ref: Ranges and Locales-Footnote-21073578
-Ref: Ranges and Locales-Footnote-31073812
-Node: Contributors1074033
-Node: History summary1079458
-Node: Installation1080827
-Node: Gawk Distribution1081778
-Node: Getting1082262
-Node: Extracting1083086
-Node: Distribution contents1084728
-Node: Unix Installation1090498
-Node: Quick Installation1091115
-Node: Additional Configuration Options1093557
-Node: Configuration Philosophy1095295
-Node: Non-Unix Installation1097646
-Node: PC Installation1098104
-Node: PC Binary Installation1099415
-Node: PC Compiling1101263
-Ref: PC Compiling-Footnote-11104262
-Node: PC Testing1104367
-Node: PC Using1105543
-Node: Cygwin1109695
-Node: MSYS1110504
-Node: VMS Installation1111018
-Node: VMS Compilation1111814
-Ref: VMS Compilation-Footnote-11113036
-Node: VMS Dynamic Extensions1113094
-Node: VMS Installation Details1114467
-Node: VMS Running1116719
-Node: VMS GNV1119553
-Node: VMS Old Gawk1120276
-Node: Bugs1120746
-Node: Other Versions1124750
-Node: Installation summary1130974
-Node: Notes1132030
-Node: Compatibility Mode1132895
-Node: Additions1133677
-Node: Accessing The Source1134602
-Node: Adding Code1136038
-Node: New Ports1142216
-Node: Derived Files1146697
-Ref: Derived Files-Footnote-11152172
-Ref: Derived Files-Footnote-21152206
-Ref: Derived Files-Footnote-31152802
-Node: Future Extensions1152916
-Node: Implementation Limitations1153522
-Node: Extension Design1154770
-Node: Old Extension Problems1155924
-Ref: Old Extension Problems-Footnote-11157441
-Node: Extension New Mechanism Goals1157498
-Ref: Extension New Mechanism Goals-Footnote-11160858
-Node: Extension Other Design Decisions1161047
-Node: Extension Future Growth1163153
-Node: Old Extension Mechanism1163989
-Node: Notes summary1165751
-Node: Basic Concepts1166937
-Node: Basic High Level1167618
-Ref: figure-general-flow1167890
-Ref: figure-process-flow1168489
-Ref: Basic High Level-Footnote-11171718
-Node: Basic Data Typing1171903
-Node: Glossary1175231
-Node: Copying1200383
-Node: GNU Free Documentation License1237939
-Node: Index1263075
+Node: Foreword342451
+Node: Foreword446895
+Node: Preface48426
+Ref: Preface-Footnote-151297
+Ref: Preface-Footnote-251404
+Ref: Preface-Footnote-351637
+Node: History51779
+Node: Names54130
+Ref: Names-Footnote-155224
+Node: This Manual55370
+Ref: This Manual-Footnote-161870
+Node: Conventions61970
+Node: Manual History64307
+Ref: Manual History-Footnote-167300
+Ref: Manual History-Footnote-267341
+Node: How To Contribute67415
+Node: Acknowledgments68544
+Node: Getting Started73410
+Node: Running gawk75849
+Node: One-shot77039
+Node: Read Terminal78303
+Node: Long80334
+Node: Executable Scripts81847
+Ref: Executable Scripts-Footnote-184636
+Node: Comments84739
+Node: Quoting87221
+Node: DOS Quoting92739
+Node: Sample Data Files93414
+Node: Very Simple96009
+Node: Two Rules100908
+Node: More Complex102794
+Node: Statements/Lines105656
+Ref: Statements/Lines-Footnote-1110111
+Node: Other Features110376
+Node: When111312
+Ref: When-Footnote-1113066
+Node: Intro Summary113131
+Node: Invoking Gawk114015
+Node: Command Line115529
+Node: Options116327
+Ref: Options-Footnote-1132122
+Ref: Options-Footnote-2132351
+Node: Other Arguments132376
+Node: Naming Standard Input135324
+Node: Environment Variables136417
+Node: AWKPATH Variable136975
+Ref: AWKPATH Variable-Footnote-1140382
+Ref: AWKPATH Variable-Footnote-2140427
+Node: AWKLIBPATH Variable140687
+Node: Other Environment Variables141943
+Node: Exit Status145574
+Node: Include Files146250
+Node: Loading Shared Libraries149839
+Node: Obsolete151266
+Node: Undocumented151958
+Node: Invoking Summary152225
+Node: Regexp153888
+Node: Regexp Usage155342
+Node: Escape Sequences157379
+Node: Regexp Operators163608
+Ref: Regexp Operators-Footnote-1171018
+Ref: Regexp Operators-Footnote-2171165
+Node: Bracket Expressions171263
+Ref: table-char-classes173278
+Node: Leftmost Longest176220
+Node: Computed Regexps177522
+Node: GNU Regexp Operators180951
+Node: Case-sensitivity184623
+Ref: Case-sensitivity-Footnote-1187508
+Ref: Case-sensitivity-Footnote-2187743
+Node: Regexp Summary187851
+Node: Reading Files189318
+Node: Records191480
+Node: awk split records192213
+Node: gawk split records197142
+Ref: gawk split records-Footnote-1201681
+Node: Fields201718
+Ref: Fields-Footnote-1204496
+Node: Nonconstant Fields204582
+Ref: Nonconstant Fields-Footnote-1206820
+Node: Changing Fields207023
+Node: Field Separators212954
+Node: Default Field Splitting215658
+Node: Regexp Field Splitting216775
+Node: Single Character Fields220125
+Node: Command Line Field Separator221184
+Node: Full Line Fields224401
+Ref: Full Line Fields-Footnote-1225922
+Ref: Full Line Fields-Footnote-2225968
+Node: Field Splitting Summary226069
+Node: Constant Size228143
+Node: Splitting By Content232722
+Ref: Splitting By Content-Footnote-1236687
+Node: Multiple Line236850
+Ref: Multiple Line-Footnote-1242731
+Node: Getline242910
+Node: Plain Getline245380
+Node: Getline/Variable248020
+Node: Getline/File249169
+Node: Getline/Variable/File250554
+Ref: Getline/Variable/File-Footnote-1252157
+Node: Getline/Pipe252244
+Node: Getline/Variable/Pipe254922
+Node: Getline/Coprocess256053
+Node: Getline/Variable/Coprocess257317
+Node: Getline Notes258056
+Node: Getline Summary260850
+Ref: table-getline-variants261262
+Node: Read Timeout262091
+Ref: Read Timeout-Footnote-1265994
+Node: Retrying Input266052
+Node: Command-line directories267251
+Node: Input Summary268158
+Node: Input Exercises271543
+Node: Printing272271
+Node: Print274106
+Node: Print Examples275563
+Node: Output Separators278342
+Node: OFMT280360
+Node: Printf281715
+Node: Basic Printf282500
+Node: Control Letters284072
+Node: Format Modifiers288057
+Node: Printf Examples294063
+Node: Redirection296549
+Node: Special FD303387
+Ref: Special FD-Footnote-1306553
+Node: Special Files306627
+Node: Other Inherited Files307244
+Node: Special Network308244
+Node: Special Caveats309106
+Node: Close Files And Pipes310055
+Ref: Close Files And Pipes-Footnote-1317240
+Ref: Close Files And Pipes-Footnote-2317388
+Node: Nonfatal317538
+Node: Output Summary319863
+Node: Output Exercises321084
+Node: Expressions321764
+Node: Values322953
+Node: Constants323630
+Node: Scalar Constants324321
+Ref: Scalar Constants-Footnote-1325183
+Node: Nondecimal-numbers325433
+Node: Regexp Constants328443
+Node: Using Constant Regexps328969
+Node: Variables332132
+Node: Using Variables332789
+Node: Assignment Options334700
+Node: Conversion336575
+Node: Strings And Numbers337099
+Ref: Strings And Numbers-Footnote-1340164
+Node: Locale influences conversions340273
+Ref: table-locale-affects343019
+Node: All Operators343611
+Node: Arithmetic Ops344240
+Node: Concatenation346745
+Ref: Concatenation-Footnote-1349564
+Node: Assignment Ops349671
+Ref: table-assign-ops354650
+Node: Increment Ops355960
+Node: Truth Values and Conditions359391
+Node: Truth Values360474
+Node: Typing and Comparison361523
+Node: Variable Typing362339
+Node: Comparison Operators366006
+Ref: table-relational-ops366416
+Node: POSIX String Comparison369911
+Ref: POSIX String Comparison-Footnote-1370983
+Node: Boolean Ops371122
+Ref: Boolean Ops-Footnote-1375600
+Node: Conditional Exp375691
+Node: Function Calls377429
+Node: Precedence381309
+Node: Locales384969
+Node: Expressions Summary386601
+Node: Patterns and Actions389172
+Node: Pattern Overview390292
+Node: Regexp Patterns391971
+Node: Expression Patterns392514
+Node: Ranges396294
+Node: BEGIN/END399401
+Node: Using BEGIN/END400162
+Ref: Using BEGIN/END-Footnote-1402898
+Node: I/O And BEGIN/END403004
+Node: BEGINFILE/ENDFILE405319
+Node: Empty408216
+Node: Using Shell Variables408533
+Node: Action Overview410806
+Node: Statements413132
+Node: If Statement414980
+Node: While Statement416475
+Node: Do Statement418503
+Node: For Statement419651
+Node: Switch Statement422809
+Node: Break Statement425191
+Node: Continue Statement427284
+Node: Next Statement429111
+Node: Nextfile Statement431492
+Node: Exit Statement434120
+Node: Built-in Variables436531
+Node: User-modified437664
+Ref: User-modified-Footnote-1445298
+Node: Auto-set445360
+Ref: Auto-set-Footnote-1459593
+Ref: Auto-set-Footnote-2459798
+Node: ARGC and ARGV459854
+Node: Pattern Action Summary464072
+Node: Arrays466505
+Node: Array Basics467834
+Node: Array Intro468678
+Ref: figure-array-elements470615
+Ref: Array Intro-Footnote-1473238
+Node: Reference to Elements473366
+Node: Assigning Elements475828
+Node: Array Example476319
+Node: Scanning an Array478078
+Node: Controlling Scanning481101
+Ref: Controlling Scanning-Footnote-1486495
+Node: Numeric Array Subscripts486811
+Node: Uninitialized Subscripts488996
+Node: Delete490613
+Ref: Delete-Footnote-1493362
+Node: Multidimensional493419
+Node: Multiscanning496516
+Node: Arrays of Arrays498105
+Node: Arrays Summary502859
+Node: Functions504950
+Node: Built-in505989
+Node: Calling Built-in507067
+Node: Numeric Functions509062
+Ref: Numeric Functions-Footnote-1513895
+Ref: Numeric Functions-Footnote-2514252
+Ref: Numeric Functions-Footnote-3514300
+Node: String Functions514572
+Ref: String Functions-Footnote-1538073
+Ref: String Functions-Footnote-2538202
+Ref: String Functions-Footnote-3538450
+Node: Gory Details538537
+Ref: table-sub-escapes540318
+Ref: table-sub-proposed541833
+Ref: table-posix-sub543195
+Ref: table-gensub-escapes544732
+Ref: Gory Details-Footnote-1545565
+Node: I/O Functions545716
+Ref: I/O Functions-Footnote-1552952
+Node: Time Functions553099
+Ref: Time Functions-Footnote-1563608
+Ref: Time Functions-Footnote-2563676
+Ref: Time Functions-Footnote-3563834
+Ref: Time Functions-Footnote-4563945
+Ref: Time Functions-Footnote-5564057
+Ref: Time Functions-Footnote-6564284
+Node: Bitwise Functions564550
+Ref: table-bitwise-ops565112
+Ref: Bitwise Functions-Footnote-1569440
+Node: Type Functions569612
+Node: I18N Functions570764
+Node: User-defined572411
+Node: Definition Syntax573216
+Ref: Definition Syntax-Footnote-1578875
+Node: Function Example578946
+Ref: Function Example-Footnote-1581867
+Node: Function Caveats581889
+Node: Calling A Function582407
+Node: Variable Scope583365
+Node: Pass By Value/Reference586358
+Node: Return Statement589855
+Node: Dynamic Typing592834
+Node: Indirect Calls593763
+Ref: Indirect Calls-Footnote-1604006
+Node: Functions Summary604134
+Node: Library Functions606836
+Ref: Library Functions-Footnote-1610444
+Ref: Library Functions-Footnote-2610587
+Node: Library Names610758
+Ref: Library Names-Footnote-1614216
+Ref: Library Names-Footnote-2614439
+Node: General Functions614525
+Node: Strtonum Function615628
+Node: Assert Function618650
+Node: Round Function621974
+Node: Cliff Random Function623515
+Node: Ordinal Functions624531
+Ref: Ordinal Functions-Footnote-1627594
+Ref: Ordinal Functions-Footnote-2627846
+Node: Join Function628057
+Ref: Join Function-Footnote-1629827
+Node: Getlocaltime Function630027
+Node: Readfile Function633771
+Node: Shell Quoting635743
+Node: Data File Management637144
+Node: Filetrans Function637776
+Node: Rewind Function641872
+Node: File Checking643258
+Ref: File Checking-Footnote-1644591
+Node: Empty Files644792
+Node: Ignoring Assigns646771
+Node: Getopt Function648321
+Ref: Getopt Function-Footnote-1659785
+Node: Passwd Functions659985
+Ref: Passwd Functions-Footnote-1668825
+Node: Group Functions668913
+Ref: Group Functions-Footnote-1676810
+Node: Walking Arrays677015
+Node: Library Functions Summary680021
+Node: Library Exercises681423
+Node: Sample Programs682703
+Node: Running Examples683473
+Node: Clones684201
+Node: Cut Program685425
+Node: Egrep Program695145
+Ref: Egrep Program-Footnote-1702648
+Node: Id Program702758
+Node: Split Program706434
+Ref: Split Program-Footnote-1709888
+Node: Tee Program710016
+Node: Uniq Program712805
+Node: Wc Program720224
+Ref: Wc Program-Footnote-1724474
+Node: Miscellaneous Programs724568
+Node: Dupword Program725781
+Node: Alarm Program727812
+Node: Translate Program732617
+Ref: Translate Program-Footnote-1737180
+Node: Labels Program737450
+Ref: Labels Program-Footnote-1740801
+Node: Word Sorting740885
+Node: History Sorting744955
+Node: Extract Program746790
+Node: Simple Sed754314
+Node: Igawk Program757384
+Ref: Igawk Program-Footnote-1771710
+Ref: Igawk Program-Footnote-2771911
+Ref: Igawk Program-Footnote-3772033
+Node: Anagram Program772148
+Node: Signature Program775209
+Node: Programs Summary776456
+Node: Programs Exercises777677
+Ref: Programs Exercises-Footnote-1781808
+Node: Advanced Features781899
+Node: Nondecimal Data783881
+Node: Array Sorting785471
+Node: Controlling Array Traversal786171
+Ref: Controlling Array Traversal-Footnote-1794537
+Node: Array Sorting Functions794655
+Ref: Array Sorting Functions-Footnote-1798541
+Node: Two-way I/O798737
+Ref: Two-way I/O-Footnote-1803682
+Ref: Two-way I/O-Footnote-2803868
+Node: TCP/IP Networking803950
+Node: Profiling806822
+Node: Advanced Features Summary815093
+Node: Internationalization817026
+Node: I18N and L10N818506
+Node: Explaining gettext819192
+Ref: Explaining gettext-Footnote-1824217
+Ref: Explaining gettext-Footnote-2824401
+Node: Programmer i18n824566
+Ref: Programmer i18n-Footnote-1829442
+Node: Translator i18n829491
+Node: String Extraction830285
+Ref: String Extraction-Footnote-1831416
+Node: Printf Ordering831502
+Ref: Printf Ordering-Footnote-1834288
+Node: I18N Portability834352
+Ref: I18N Portability-Footnote-1836808
+Node: I18N Example836871
+Ref: I18N Example-Footnote-1839674
+Node: Gawk I18N839746
+Node: I18N Summary840390
+Node: Debugger841730
+Node: Debugging842752
+Node: Debugging Concepts843193
+Node: Debugging Terms845003
+Node: Awk Debugging847575
+Node: Sample Debugging Session848481
+Node: Debugger Invocation849015
+Node: Finding The Bug850400
+Node: List of Debugger Commands856879
+Node: Breakpoint Control858211
+Node: Debugger Execution Control861888
+Node: Viewing And Changing Data865247
+Node: Execution Stack868623
+Node: Debugger Info870258
+Node: Miscellaneous Debugger Commands874303
+Node: Readline Support879304
+Node: Limitations880198
+Node: Debugging Summary882313
+Node: Arbitrary Precision Arithmetic883487
+Node: Computer Arithmetic884903
+Ref: table-numeric-ranges888480
+Ref: Computer Arithmetic-Footnote-1889004
+Node: Math Definitions889061
+Ref: table-ieee-formats892356
+Ref: Math Definitions-Footnote-1892960
+Node: MPFR features893065
+Node: FP Math Caution894736
+Ref: FP Math Caution-Footnote-1895786
+Node: Inexactness of computations896155
+Node: Inexact representation897114
+Node: Comparing FP Values898472
+Node: Errors accumulate899554
+Node: Getting Accuracy900986
+Node: Try To Round903690
+Node: Setting precision904589
+Ref: table-predefined-precision-strings905273
+Node: Setting the rounding mode907102
+Ref: table-gawk-rounding-modes907466
+Ref: Setting the rounding mode-Footnote-1910918
+Node: Arbitrary Precision Integers911097
+Ref: Arbitrary Precision Integers-Footnote-1916013
+Node: POSIX Floating Point Problems916162
+Ref: POSIX Floating Point Problems-Footnote-1920041
+Node: Floating point summary920079
+Node: Dynamic Extensions922266
+Node: Extension Intro923818
+Node: Plugin License925083
+Node: Extension Mechanism Outline925880
+Ref: figure-load-extension926308
+Ref: figure-register-new-function927788
+Ref: figure-call-new-function928792
+Node: Extension API Description930779
+Node: Extension API Functions Introduction932313
+Node: General Data Types937182
+Ref: General Data Types-Footnote-1943082
+Node: Memory Allocation Functions943381
+Ref: Memory Allocation Functions-Footnote-1946220
+Node: Constructor Functions946319
+Node: Registration Functions948058
+Node: Extension Functions948743
+Node: Exit Callback Functions951040
+Node: Extension Version String952288
+Node: Input Parsers952951
+Node: Output Wrappers962826
+Node: Two-way processors967339
+Node: Printing Messages969602
+Ref: Printing Messages-Footnote-1970678
+Node: Updating `ERRNO'970830
+Node: Requesting Values971570
+Ref: table-value-types-returned972297
+Node: Accessing Parameters973254
+Node: Symbol Table Access974488
+Node: Symbol table by name975002
+Node: Symbol table by cookie977022
+Ref: Symbol table by cookie-Footnote-1981167
+Node: Cached values981230
+Ref: Cached values-Footnote-1984726
+Node: Array Manipulation984817
+Ref: Array Manipulation-Footnote-1985907
+Node: Array Data Types985944
+Ref: Array Data Types-Footnote-1988599
+Node: Array Functions988691
+Node: Flattening Arrays992550
+Node: Creating Arrays999452
+Node: Redirection API1004223
+Node: Extension API Variables1007048
+Node: Extension Versioning1007681
+Node: Extension API Informational Variables1009572
+Node: Extension API Boilerplate1010637
+Node: Finding Extensions1014446
+Node: Extension Example1015006
+Node: Internal File Description1015778
+Node: Internal File Ops1019845
+Ref: Internal File Ops-Footnote-11031596
+Node: Using Internal File Ops1031736
+Ref: Using Internal File Ops-Footnote-11034119
+Node: Extension Samples1034392
+Node: Extension Sample File Functions1035920
+Node: Extension Sample Fnmatch1043601
+Node: Extension Sample Fork1045089
+Node: Extension Sample Inplace1046304
+Node: Extension Sample Ord1048390
+Node: Extension Sample Readdir1049226
+Ref: table-readdir-file-types1050103
+Node: Extension Sample Revout1050914
+Node: Extension Sample Rev2way1051503
+Node: Extension Sample Read write array1052243
+Node: Extension Sample Readfile1054183
+Node: Extension Sample Time1055278
+Node: Extension Sample API Tests1056626
+Node: gawkextlib1057117
+Node: Extension summary1059818
+Node: Extension Exercises1063507
+Node: Language History1065003
+Node: V7/SVR3.11066659
+Node: SVR41068812
+Node: POSIX1070246
+Node: BTL1071627
+Node: POSIX/GNU1072358
+Node: Feature History1078197
+Node: Common Extensions1091994
+Node: Ranges and Locales1093366
+Ref: Ranges and Locales-Footnote-11097985
+Ref: Ranges and Locales-Footnote-21098012
+Ref: Ranges and Locales-Footnote-31098247
+Node: Contributors1098468
+Node: History summary1104008
+Node: Installation1105387
+Node: Gawk Distribution1106333
+Node: Getting1106817
+Node: Extracting1107640
+Node: Distribution contents1109277
+Node: Unix Installation1115379
+Node: Quick Installation1116062
+Node: Shell Startup Files1118473
+Node: Additional Configuration Options1119552
+Node: Configuration Philosophy1121356
+Node: Non-Unix Installation1123725
+Node: PC Installation1124183
+Node: PC Binary Installation1125503
+Node: PC Compiling1127351
+Ref: PC Compiling-Footnote-11130372
+Node: PC Testing1130481
+Node: PC Using1131657
+Node: Cygwin1135772
+Node: MSYS1136542
+Node: VMS Installation1137043
+Node: VMS Compilation1137835
+Ref: VMS Compilation-Footnote-11139064
+Node: VMS Dynamic Extensions1139122
+Node: VMS Installation Details1140806
+Node: VMS Running1143057
+Node: VMS GNV1145897
+Node: VMS Old Gawk1146632
+Node: Bugs1147102
+Node: Other Versions1150991
+Node: Installation summary1157425
+Node: Notes1158484
+Node: Compatibility Mode1159349
+Node: Additions1160131
+Node: Accessing The Source1161056
+Node: Adding Code1162491
+Node: New Ports1168648
+Node: Derived Files1173130
+Ref: Derived Files-Footnote-11178605
+Ref: Derived Files-Footnote-21178639
+Ref: Derived Files-Footnote-31179235
+Node: Future Extensions1179349
+Node: Implementation Limitations1179955
+Node: Extension Design1181203
+Node: Old Extension Problems1182357
+Ref: Old Extension Problems-Footnote-11183874
+Node: Extension New Mechanism Goals1183931
+Ref: Extension New Mechanism Goals-Footnote-11187291
+Node: Extension Other Design Decisions1187480
+Node: Extension Future Growth1189588
+Node: Old Extension Mechanism1190424
+Node: Notes summary1192186
+Node: Basic Concepts1193372
+Node: Basic High Level1194053
+Ref: figure-general-flow1194325
+Ref: figure-process-flow1194924
+Ref: Basic High Level-Footnote-11198153
+Node: Basic Data Typing1198338
+Node: Glossary1201666
+Node: Copying1233595
+Node: GNU Free Documentation License1271151
+Node: Index1296287
 
 End Tag Table
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 17972c7a..ca378cca 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -37,13 +37,11 @@
 @ifnotdocbook
 @set BULLET @bullet{}
 @set MINUS @minus{}
-@set NUL @sc{nul}
 @end ifnotdocbook
 
 @ifdocbook
 @set BULLET
 @set MINUS
-@set NUL NUL
 @end ifdocbook
 
 @set xref-automatic-section-title
@@ -53,11 +51,17 @@
 @c applies to and all the info about who's publishing this edition
 
 @c These apply across the board.
-@set UPDATE-MONTH August, 2014
+@set UPDATE-MONTH February, 2015
 @set VERSION 4.1
-@set PATCHLEVEL 1
+@set PATCHLEVEL 2
 
+@set GAWKINETTITLE TCP/IP Internetworking with @command{gawk}
+@ifset FOR_PRINT
+@set TITLE Effective awk Programming
+@end ifset
+@ifclear FOR_PRINT
 @set TITLE GAWK: Effective AWK Programming
+@end ifclear
 @set SUBTITLE A User's Guide for GNU Awk
 @set EDITION 4.1
 
@@ -172,19 +176,31 @@
 @macro DBREF{text}
 @ref{\text\}
 @end macro
+@macro DBXREF{text}
+@xref{\text\}
+@end macro
+@macro DBPXREF{text}
+@pxref{\text\}
+@end macro
 @end ifdocbook
 
 @ifnotdocbook
 @macro DBREF{text}
 @ref{\text\},
 @end macro
+@macro DBXREF{text}
+@xref{\text\},
+@end macro
+@macro DBPXREF{text}
+@pxref{\text\},
+@end macro
 @end ifnotdocbook
 
 @ifclear FOR_PRINT
 @set FN file name
-@set FFN File Name
+@set FFN File name
 @set DF data file
-@set DDF Data File
+@set DDF Data file
 @set PVERSION version
 @end ifclear
 @ifset FOR_PRINT
@@ -192,7 +208,7 @@
 @set FFN Filename
 @set DF datafile
 @set DDF Datafile
-@set PVERSION Version
+@set PVERSION version
 @end ifset
 
 @c For HTML, spell out email addresses, to avoid problems with
@@ -283,13 +299,13 @@ Fax: +1-617-542-2652
 Email: <email>gnu@@gnu.org</email>
 URL: <ulink url="http://www.gnu.org">http://www.gnu.org/</ulink></literallayout>
 
-<literallayout class="normal">Copyright &copy; 1989, 1991, 1992, 1993, 1996&ndash;2005, 2007, 2009&ndash;2014
+<literallayout class="normal">Copyright &copy; 1989, 1991, 1992, 1993, 1996&ndash;2005, 2007, 2009&ndash;2015
 Free Software Foundation, Inc.
 All Rights Reserved.</literallayout>
 @end docbook
 
 @ifnotdocbook
-Copyright @copyright{} 1989, 1991, 1992, 1993, 1996--2005, 2007, 2009--2014 @*
+Copyright @copyright{} 1989, 1991, 1992, 1993, 1996--2005, 2007, 2009--2015 @*
 Free Software Foundation, Inc.
 @end ifnotdocbook
 @sp 2
@@ -312,7 +328,7 @@ A copy of the license is included in the section entitled
 A copy of the license
 may be found on the Internet at
 @uref{http://www.gnu.org/software/gawk/manual/html_node/GNU-Free-Documentation-License.html,
-the GNU Project's web site}.
+the GNU Project's website}.
 @end ifset
 
 @enumerate a
@@ -380,10 +396,10 @@ ISBN 1-882114-28-0 @*
 @sp 9
 @center @i{To my parents, for their love, and for the wonderful example they set for me.}
 @sp 1
-@center @i{To my wife Miriam, for making me complete.
+@center @i{To my wife, Miriam, for making me complete.
 Thank you for building your life together with me.}
 @sp 1
-@center @i{To our children Chana, Rivka, Nachum and Malka, for enrichening our lives in innumerable ways.}
+@center @i{To our children, Chana, Rivka, Nachum, and Malka, for enrichening our lives in innumerable ways.}
 @sp 1
 @w{ }
 @page
@@ -428,8 +444,9 @@ particular records in a file and perform operations upon them.
 @end ifnottex
 
 @menu
-* Foreword::                       Some nice words about this
+* Foreword3::                      Some nice words about this
                                    @value{DOCUMENT}.
+* Foreword4::                      More nice words.
 * Preface::                        What this @value{DOCUMENT} is about; brief
                                    history and acknowledgments.
 * Getting Started::                A basic introduction to using
@@ -456,7 +473,7 @@ particular records in a file and perform operations upon them.
                                    @command{gawk}.
 * Internationalization::           Getting @command{gawk} to speak your
                                    language.
-* Debugger::                       The @code{gawk} debugger.
+* Debugger::                       The @command{gawk} debugger.
 * Arbitrary Precision Arithmetic:: Arbitrary precision arithmetic with
                                    @command{gawk}.
 * Dynamic Extensions::             Adding new built-in functions to
@@ -560,8 +577,8 @@ particular records in a file and perform operations upon them.
 * Regexp Field Splitting::              Using regexps as the field separator.
 * Single Character Fields::             Making each character a separate
                                         field.
-* Command Line Field Separator::        Setting @code{FS} from the
-                                        command line.
+* Command Line Field Separator::        Setting @code{FS} from the command
+                                        line.
 * Full Line Fields::                    Making the full line be a single
                                         field.
 * Field Splitting Summary::             Some final points and a summary table.
@@ -587,6 +604,7 @@ particular records in a file and perform operations upon them.
                                         @code{getline}.
 * Getline Summary::                     Summary of @code{getline} Variants.
 * Read Timeout::                        Reading input with a timeout.
+* Retrying Input::                      Retrying input after certain errors.
 * Command-line directories::            What happens if you put a directory on
                                         the command line.
 * Input Summary::                       Input summary.
@@ -605,15 +623,18 @@ particular records in a file and perform operations upon them.
 * Printf Examples::                     Several examples.
 * Redirection::                         How to redirect output to multiple
                                         files and pipes.
+* Special FD::                          Special files for I/O.
 * Special Files::                       File name interpretation in
                                         @command{gawk}. @command{gawk} allows
                                         access to inherited file descriptors.
-* Special FD::                          Special files for I/O.
+* Other Inherited Files::               Accessing other open files with
+                                        @command{gawk}.
 * Special Network::                     Special files for network
                                         communications.
 * Special Caveats::                     Things to watch out for.
 * Close Files And Pipes::               Closing Input and Output Files and
                                         Pipes.
+* Nonfatal::                            Enabling Nonfatal Output.
 * Output Summary::                      Output summary.
 * Output Exercises::                    Exercises.
 * Values::                              Constants, Variables, and Regular
@@ -701,7 +722,7 @@ particular records in a file and perform operations upon them.
                                         record.
 * Nextfile Statement::                  Stop processing the current file.
 * Exit Statement::                      Stop execution of @command{awk}.
-* Built-in Variables::                  Summarizes the built-in variables.
+* Built-in Variables::                  Summarizes the predefined variables.
 * User-modified::                       Built-in variables that you change to
                                         control @command{awk}.
 * Auto-set::                            Built-in variables where @command{awk}
@@ -721,12 +742,12 @@ particular records in a file and perform operations upon them.
                                         elements.
 * Controlling Scanning::                Controlling the order in which arrays
                                         are scanned.
-* Delete::                              The @code{delete} statement removes an
-                                        element from an array.
 * Numeric Array Subscripts::            How to use numbers as subscripts in
                                         @command{awk}.
 * Uninitialized Subscripts::            Using Uninitialized variables as
                                         subscripts.
+* Delete::                              The @code{delete} statement removes an
+                                        element from an array.
 * Multidimensional::                    Emulating multidimensional arrays in
                                         @command{awk}.
 * Multiscanning::                       Scanning multidimensional arrays.
@@ -785,6 +806,8 @@ particular records in a file and perform operations upon them.
 * Getlocaltime Function::               A function to get formatted times.
 * Readfile Function::                   A function to read an entire file at
                                         once.
+* Shell Quoting::                       A function to quote strings for the
+                                        shell.
 * Data File Management::                Functions for managing command-line
                                         data files.
 * Filetrans Function::                  A function for handling data file
@@ -899,7 +922,6 @@ particular records in a file and perform operations upon them.
 * Extension API Description::           A full description of the API.
 * Extension API Functions Introduction:: Introduction to the API functions.
 * General Data Types::                  The data types.
-* Requesting Values::                   How to get a value.
 * Memory Allocation Functions::         Functions for allocating memory.
 * Constructor Functions::               Functions for creating values.
 * Registration Functions::              Functions to register things with
@@ -912,6 +934,7 @@ particular records in a file and perform operations upon them.
 * Two-way processors::                  Registering a two-way processor.
 * Printing Messages::                   Functions for printing messages.
 * Updating @code{ERRNO}::               Functions for updating @code{ERRNO}.
+* Requesting Values::                   How to get a value.
 * Accessing Parameters::                Functions for accessing parameters.
 * Symbol Table Access::                 Functions for accessing global
                                         variables.
@@ -923,6 +946,7 @@ particular records in a file and perform operations upon them.
 * Array Functions::                     Functions for working with arrays.
 * Flattening Arrays::                   How to flatten arrays.
 * Creating Arrays::                     How to create and populate arrays.
+* Redirection API::                     How to access and manipulate redirections.
 * Extension API Variables::             Variables provided by the API.
 * Extension Versioning::                API Version information.
 * Extension API Informational Variables:: Variables providing information about
@@ -935,7 +959,7 @@ particular records in a file and perform operations upon them.
 * Internal File Ops::                   The code for internal file operations.
 * Using Internal File Ops::             How to use an external extension.
 * Extension Samples::                   The sample extensions that ship with
-                                        @code{gawk}.
+                                        @command{gawk}.
 * Extension Sample File Functions::     The file functions sample.
 * Extension Sample Fnmatch::            An interface to @code{fnmatch()}.
 * Extension Sample Fork::               An interface to @code{fork()} and
@@ -950,9 +974,9 @@ particular records in a file and perform operations upon them.
                                         processor.
 * Extension Sample Read write array::   Serializing an array to a file.
 * Extension Sample Readfile::           Reading an entire file into a string.
-* Extension Sample API Tests::          Tests for the API.
 * Extension Sample Time::               An interface to @code{gettimeofday()}
                                         and @code{sleep()}.
+* Extension Sample API Tests::          Tests for the API.
 * gawkextlib::                          The @code{gawkextlib} project.
 * Extension summary::                   Extension summary.
 * Extension Exercises::                 Exercises.
@@ -981,6 +1005,7 @@ particular records in a file and perform operations upon them.
 * Unix Installation::                   Installing @command{gawk} under
                                         various versions of Unix.
 * Quick Installation::                  Compiling @command{gawk} under Unix.
+* Shell Startup Files::                 Shell convenience functions.
 * Additional Configuration Options::    Other compile-time options.
 * Configuration Philosophy::            How it's all supposed to work.
 * Non-Unix Installation::               Installation on Other Operating
@@ -1053,8 +1078,8 @@ for enrichening our lives in innumerable ways.
 @summarycontents
 @contents
 
-@node Foreword
-@unnumbered Foreword
+@node Foreword3
+@unnumbered Foreword to the Third Edition
 
 @c This bit is post-processed by a script which turns the chapter
 @c tag into a preface tag, and moves this stuff to before the title.
@@ -1067,7 +1092,7 @@ for enrichening our lives in innumerable ways.
       <!-- can't put mawk into command tags. sigh. -->
       <affiliation><jobtitle>Author of mawk</jobtitle></affiliation>
     </author>
-    <date>March, 2001</date>
+    <date>March 2001</date>
    </prefaceinfo>
 @end docbook
 
@@ -1079,21 +1104,23 @@ The circumstances started a couple of years
 earlier. I was working at a new job and noticed an unplugged
 Unix computer sitting in the corner.  No one knew how to use it,
 and neither did I.  However,
-a couple of days later it was running, and
+a couple of days later, it was running, and
 I was @code{root} and the one-and-only user.
 That day, I began the transition from statistician to Unix programmer.
 
 On one of many trips to the library or bookstore in search of
-books on Unix, I found the gray AWK book, a.k.a.@: Aho, Kernighan and
-Weinberger, @cite{The AWK Programming Language}, Addison-Wesley,
-1988.  AWK's simple programming paradigm---find a pattern in the
+books on Unix, I found the gray AWK book, a.k.a.@:
+Alfred V.@: Aho, Brian W.@: Kernighan, and
+Peter J.@: Weinberger's @cite{The AWK Programming Language} (Addison-Wesley,
+1988).  @command{awk}'s simple programming paradigm---find a pattern in the
 input and then perform an action---often reduced complex or tedious
-data manipulations to few lines of code.  I was excited to try my
+data manipulations to a few lines of code.  I was excited to try my
 hand at programming in AWK.
 
 Alas,  the @command{awk} on my computer was a limited version of the
-language described in the AWK book.  I discovered that my computer
-had ``old @command{awk}'' and the AWK book described ``new @command{awk}.''
+language described in the gray book.  I discovered that my computer
+had ``old @command{awk}'' and the book described
+``new @command{awk}.''
 I learned that this was typical; the old version refused to step
 aside or relinquish its name.  If a system had a new @command{awk}, it was
 invariably called @command{nawk}, and few systems had it.
@@ -1111,7 +1138,7 @@ My Unix system started out unplugged from the wall; it certainly was not
 plugged into a network.  So, oblivious to the existence of @command{gawk}
 and the Unix community in general, and desiring a new @command{awk}, I wrote
 my own, called @command{mawk}.
-Before I was finished I knew about @command{gawk},
+Before I was finished, I knew about @command{gawk},
 but it was too late to stop, so I eventually posted
 to a @code{comp.sources} newsgroup.
 
@@ -1120,7 +1147,7 @@ from Arnold introducing
 himself.   He suggested we share design and algorithms and
 attached a draft of the POSIX standard so
 that I could update @command{mawk} to support language extensions added
-after publication of the AWK book.
+after publication of @cite{The AWK Programming Language}.
 
 Frankly, if our roles had
 been reversed, I would not have been so open and we probably would
@@ -1139,7 +1166,7 @@ standard.
 On the other hand, the novice AWK programmer can study
 a wealth of practical programs that emphasize
 the power of AWK's basic idioms:
-data driven control-flow, pattern matching with regular expressions,
+data-driven control flow, pattern matching with regular expressions,
 and associative arrays.
 Those looking for something new can try out @command{gawk}'s
 interface to network protocols via special @file{/inet} files.
@@ -1147,7 +1174,7 @@ interface to network protocols via special @file{/inet} files.
 The programs in this book make clear that an AWK program is
 typically much smaller and faster to develop than
 a counterpart written in C.
-Consequently, there is often a payoff to prototype an
+Consequently, there is often a payoff to prototyping an
 algorithm or design in AWK to get it running quickly and expose
 problems early. Often, the interpreted performance is adequate
 and the AWK prototype becomes the product.
@@ -1200,7 +1227,62 @@ AWK or want to learn how, then read this book.
 @display
 Michael Brennan
 Author of @command{mawk}
-March, 2001
+March 2001
+@end display
+@end ifnotdocbook
+
+@node Foreword4
+@unnumbered Foreword to the Fourth Edition
+
+@c This bit is post-processed by a script which turns the chapter
+@c tag into a preface tag, and moves this stuff to before the title.
+@c Bleah.
+@docbook
+  <prefaceinfo>
+    <author>
+      <firstname>Michael</firstname>
+      <surname>Brennan</surname>
+      <!-- can't put mawk into command tags. sigh. -->
+      <affiliation><jobtitle>Author of mawk</jobtitle></affiliation>
+    </author>
+    <date>October 2014</date>
+   </prefaceinfo>
+@end docbook
+
+Some things don't change.  Thirteen years ago I wrote:
+``If you use AWK or want to learn how, then read this book.''
+True then, and still true today.
+
+Learning to use a programming language is about more than mastering the
+syntax.  One needs to acquire an understanding of how to use the
+features of the language to solve practical programming problems.
+A focus of this book is many examples that show how to use AWK.
+
+Some things do change. Our computers are much faster and have more memory.
+Consequently, speed and storage inefficiencies of a high-level language
+matter less.  Prototyping in AWK and then rewriting in C for performance
+reasons happens less, because more often the prototype is fast enough.
+
+Of course, there are computing operations that are best done in C or C++.
+With @command{gawk} 4.1 and later, you do not have to choose between writing
+your program in AWK or in C/C++.  You can write most of your
+program in AWK and the aspects that require C/C++ capabilities can be written
+in C/C++, and then the pieces glued together when the @command{gawk} module loads
+the C/C++ module as a dynamic plug-in.
+@c Chapter 16
+@ref{Dynamic Extensions},
+has all the
+details, and, as expected, many examples to help you learn the ins and outs.
+
+I enjoy programming in AWK and had fun (re)reading this book.
+I think you will too.
+
+@ifnotdocbook
+@cindex Brennan, Michael
+@display
+Michael Brennan
+Author of @command{mawk}
+October 2014
 @end display
 @end ifnotdocbook
 
@@ -1220,9 +1302,9 @@ March, 2001
       <firstname>Arnold</firstname>
       <surname>Robbins</surname>
       <affiliation><jobtitle>Nof Ayalon</jobtitle></affiliation>
-      <affiliation><jobtitle>ISRAEL</jobtitle></affiliation>
+      <affiliation><jobtitle>Israel</jobtitle></affiliation>
     </author>
-    <date>June, 2014</date>
+    <date>February 2015</date>
    </prefaceinfo>
 @end docbook
 
@@ -1234,9 +1316,8 @@ The @command{awk} utility interprets a special-purpose programming
 language that makes it easy to handle simple data-reformatting jobs.
 
 The GNU implementation of @command{awk} is called @command{gawk}; if you
-invoke it with the proper options or environment variables
-(@pxref{Options}), it is fully
-compatible with
+invoke it with the proper options or environment variables,
+it is fully compatible with
 the POSIX@footnote{The 2008 POSIX standard is accessible online at
 @w{@url{http://www.opengroup.org/onlinepubs/9699919799/}.}}
 specification of the @command{awk} language
@@ -1244,7 +1325,7 @@ and with the Unix version of @command{awk} maintained
 by Brian Kernighan.
 This means that all
 properly written @command{awk} programs should work with @command{gawk}.
-Thus, we usually don't distinguish between @command{gawk} and other
+So most of the time, we don't distinguish between @command{gawk} and other
 @command{awk} implementations.
 
 @cindex @command{awk}, POSIX and, See Also POSIX @command{awk}
@@ -1253,7 +1334,7 @@ Thus, we usually don't distinguish between @command{gawk} and other
 @cindex @command{gawk}, @command{awk} and
 @cindex @command{awk}, @command{gawk} and
 @cindex @command{awk}, uses for
-Using @command{awk} allows you to:
+Using @command{awk} you can:
 
 @itemize @value{BULLET}
 @item
@@ -1266,7 +1347,7 @@ Generate reports
 Validate data
 
 @item
-Produce indexes and perform other document preparation tasks
+Produce indexes and perform other document-preparation tasks
 
 @item
 Experiment with algorithms that you can adapt later to other computer
@@ -1291,15 +1372,15 @@ Sort data
 Perform simple network communications
 
 @item
-Profile and debug @command{awk} programs.
+Profile and debug @command{awk} programs
 
 @item
-Extend the language with functions written in C or C++.
+Extend the language with functions written in C or C++
 @end itemize
 
 This @value{DOCUMENT} teaches you about the @command{awk} language and
 how you can use it effectively.  You should already be familiar with basic
-system commands, such as @command{cat} and @command{ls},@footnote{These commands
+system commands, such as @command{cat} and @command{ls},@footnote{These utilities
 are available on POSIX-compliant systems, as well as on traditional
 Unix-based systems. If you are using some other operating system, you still need to
 be familiar with the ideas of I/O redirection and pipes.} as well as basic shell
@@ -1321,10 +1402,9 @@ Microsoft Windows
 @ifclear FOR_PRINT
 (all versions) and OS/2 PCs,
 @end ifclear
-and OpenVMS.
-(Some other, obsolete systems to which @command{gawk} was once ported
-are no longer supported and the code for those systems
-has been removed.)
+and OpenVMS.@footnote{Some other, obsolete systems to which @command{gawk}
+was once ported are no longer supported and the code for those systems
+has been removed.}
 
 @menu
 * History::                     The history of @command{gawk} and
@@ -1343,10 +1423,10 @@ has been removed.)
 @unnumberedsec History of @command{awk} and @command{gawk}
 @cindex recipe for a programming language
 @cindex programming language, recipe for
-@cindex sidebar, Recipe For A Programming Language
+@cindex sidebar, Recipe for a Programming Language
 @ifdocbook
 @docbook
-<sidebar><title>Recipe For A Programming Language</title>
+<sidebar><title>Recipe for a Programming Language</title>
 @end docbook
 
 
@@ -1368,7 +1448,7 @@ more parts C.  Document very well and release.
 
 @ifnotdocbook
 @cartouche
-@center @b{Recipe For A Programming Language}
+@center @b{Recipe for a Programming Language}
 
 
 
@@ -1390,7 +1470,7 @@ more parts C.  Document very well and release.
 @cindex Kernighan, Brian
 @cindex @command{awk}, history of
 The name @command{awk} comes from the initials of its designers: Alfred V.@:
-Aho, Peter J.@: Weinberger and Brian W.@: Kernighan.  The original version of
+Aho, Peter J.@: Weinberger, and Brian W.@: Kernighan.  The original version of
 @command{awk} was written in 1977 at AT&T Bell Laboratories.
 In 1985, a new version made the programming
 language more powerful, introducing user-defined functions, multiple input
@@ -1401,36 +1481,36 @@ The version in System V Release 4 (1989) added some new features and cleaned
 up the behavior in some of the ``dark corners'' of the language.
 The specification for @command{awk} in the POSIX Command Language
 and Utilities standard further clarified the language.
-Both the @command{gawk} designers and the original Bell Laboratories @command{awk}
-designers provided feedback for the POSIX specification.
+Both the @command{gawk} designers and the original @command{awk} designers at Bell Laboratories
+provided feedback for the POSIX specification.
 
 @cindex Rubin, Paul
 @cindex Fenlason, Jay
 @cindex Trueman, David
-Paul Rubin wrote the GNU implementation, @command{gawk}, in 1986.
+Paul Rubin wrote @command{gawk} in 1986.
 Jay Fenlason completed it, with advice from Richard Stallman.  John Woods
 contributed parts of the code as well.  In 1988 and 1989, David Trueman, with
 help from me, thoroughly reworked @command{gawk} for compatibility
 with the newer @command{awk}.
 Circa 1994, I became the primary maintainer.
 Current development focuses on bug fixes,
-performance improvements, standards compliance and, occasionally, new features.
+performance improvements, standards compliance, and, occasionally, new features.
 
-In May of 1997, J@"urgen Kahrs felt the need for network access
+In May 1997, J@"urgen Kahrs felt the need for network access
 from @command{awk}, and with a little help from me, set about adding
 features to do this for @command{gawk}.  At that time, he also
 wrote the bulk of
-@cite{TCP/IP Internetworking with @command{gawk}}
+@cite{@value{GAWKINETTITLE}}
 (a separate document, available as part of the @command{gawk} distribution).
 His code finally became part of the main @command{gawk} distribution
 with @command{gawk} @value{PVERSION} 3.1.
 
 John Haque rewrote the @command{gawk} internals, in the process providing
 an @command{awk}-level debugger. This version became available as
-@command{gawk} @value{PVERSION} 4.0, in 2011.
+@command{gawk} @value{PVERSION} 4.0 in 2011.
 
-@xref{Contributors},
-for a complete list of those who made important contributions to @command{gawk}.
+@DBXREF{Contributors}
+for a full list of those who have made important contributions to @command{gawk}.
 
 @node Names
 @unnumberedsec A Rose by Any Other Name
@@ -1439,11 +1519,11 @@ for a complete list of those who made important contributions to @command{gawk}.
 The @command{awk} language has evolved over the years. Full details are
 provided in @ref{Language History}.
 The language described in this @value{DOCUMENT}
-is often referred to as ``new @command{awk}''.
+is often referred to as ``new @command{awk}.''
 By analogy, the original version of @command{awk} is
 referred to as ``old @command{awk}.''
 
-Today, on most systems, when you run the @command{awk} utility,
+On most current systems, when you run the @command{awk} utility
 you get some version of new @command{awk}.@footnote{Only
 Solaris systems still use an old @command{awk} for the
 default @command{awk} utility. A more modern @command{awk} lives in
@@ -1496,14 +1576,16 @@ entry ``differences in @command{awk} and @command{gawk}.''}
 @ifset FOR_PRINT
 implementations.
 @end ifset
-Finally, any @command{gawk} features that are not in
-the POSIX standard for @command{awk} are noted.
+Finally, it notes any @command{gawk} features that are not in
+the POSIX standard for @command{awk}.
 
 @ifnotinfo
 This @value{DOCUMENT} has the difficult task of being both a tutorial and a reference.
 If you are a novice, feel free to skip over details that seem too complex.
 You should also ignore the many cross-references; they are for the
-expert user and for the online Info and HTML versions of the @value{DOCUMENT}.
+expert user and for the Info and
+@uref{http://www.gnu.org/software/gawk/manual/, HTML}
+versions of the @value{DOCUMENT}.
 @end ifnotinfo
 
 There are sidebars
@@ -1516,14 +1598,17 @@ All appear in the index, under the heading ``sidebar.''
 
 Most of the time, the examples use complete @command{awk} programs.
 Some of the more advanced sections show only the part of the @command{awk}
-program that illustrates the concept currently being described.
+program that illustrates the concept being described.
 
-While this @value{DOCUMENT} is aimed principally at people who have not been
+Although this @value{DOCUMENT} is aimed principally at people who have not been
 exposed
 to @command{awk}, there is a lot of information here that even the @command{awk}
 expert should find useful.  In particular, the description of POSIX
 @command{awk} and the example programs in
-@ref{Library Functions}, and in
+@ref{Library Functions}, and
+@ifnotdocbook
+in
+@end ifnotdocbook
 @ref{Sample Programs},
 should be of interest.
 
@@ -1531,22 +1616,30 @@ This @value{DOCUMENT} is split into several parts, as follows:
 
 @c FULLXREF ON
 
-Part I describes the @command{awk} language and @command{gawk} program in detail.
+@itemize @value{BULLET}
+@item
+Part I describes the @command{awk} language and the @command{gawk} program in detail.
 It starts with the basics, and continues through all of the features of @command{awk}.
 It contains the following chapters:
 
+@c nested
+@itemize @value{MINUS}
+@item
 @ref{Getting Started},
 provides the essentials you need to know to begin using @command{awk}.
 
+@item
 @ref{Invoking Gawk},
 describes how to run @command{gawk}, the meaning of its
 command-line options, and how it finds @command{awk}
 program source files.
 
+@item
 @ref{Regexp},
 introduces regular expressions in general, and in particular the flavors
 supported by POSIX @command{awk} and @command{gawk}.
 
+@item
 @ref{Reading Files},
 describes how @command{awk} reads your data.
 It introduces the concepts of records and fields, as well
@@ -1554,66 +1647,88 @@ as the @code{getline} command.
 I/O redirection is first described here.
 Network I/O is also briefly introduced here.
 
+@item
 @ref{Printing},
 describes how @command{awk} programs can produce output with
 @code{print} and @code{printf}.
 
+@item
 @ref{Expressions},
 describes expressions, which are the basic building blocks
 for getting most things done in a program.
 
+@item
 @ref{Patterns and Actions},
 describes how to write patterns for matching records, actions for
-doing something when a record is matched, and the built-in variables
+doing something when a record is matched, and the predefined variables
 @command{awk} and @command{gawk} use.
 
+@item
 @ref{Arrays},
-covers @command{awk}'s one-and-only data structure: associative arrays.
-Deleting array elements and whole arrays is also described, as well as
-sorting arrays in @command{gawk}.  It also describes how @command{gawk}
-provides arrays of arrays.
+covers @command{awk}'s one-and-only data structure: the associative array.
+Deleting array elements and whole arrays is described, as well as
+sorting arrays in @command{gawk}.  The @value{CHAPTER} also describes how
+@command{gawk} provides arrays of arrays.
 
+@item
 @ref{Functions},
-describes the built-in functions @command{awk} and
-@command{gawk} provide, as well as how to define
-your own functions.
+describes the built-in functions @command{awk} and @command{gawk} provide,
+as well as how to define your own functions.  It also discusses how
+@command{gawk} lets you call functions indirectly.
+@end itemize
 
+@item
 Part II shows how to use @command{awk} and @command{gawk} for problem solving.
 There is lots of code here for you to read and learn from.
-It contains the following chapters:
+This part contains the following chapters:
 
-@ref{Library Functions}, which provides a number of functions meant to
+@c nested
+@itemize @value{MINUS}
+@item
+@ref{Library Functions}, provides a number of functions meant to
 be used from main @command{awk} programs.
 
+@item
 @ref{Sample Programs},
-which provides many sample @command{awk} programs.
+provides many sample @command{awk} programs.
+@end itemize
 
 Reading these two chapters allows you to see @command{awk}
 solving real problems.
 
+@item
 Part III focuses on features specific to @command{gawk}.
 It contains the following chapters:
 
+@c nested
+@itemize @value{MINUS}
+@item
 @ref{Advanced Features},
-describes a number of @command{gawk}-specific advanced features.
+describes a number of advanced features.
 Of particular note
-are the abilities to have two-way communications with another process,
+are the abilities to control the order of array traversal,
+have two-way communications with another process,
 perform TCP/IP networking, and
 profile your @command{awk} programs.
 
+@item
 @ref{Internationalization},
-describes special features in @command{gawk} for translating program
+describes special features for translating program
 messages into different languages at runtime.
 
-@ref{Debugger}, describes the @command{awk} debugger.
+@item
+@ref{Debugger}, describes the @command{gawk} debugger.
 
+@item
 @ref{Arbitrary Precision Arithmetic},
-describes advanced arithmetic facilities provided by
-@command{gawk}.
+describes advanced arithmetic facilities.
 
+@item
 @ref{Dynamic Extensions}, describes how to add new variables and
 functions to @command{gawk} by writing extensions in C or C++.
+@end itemize
 
+@item
 @ifclear FOR_PRINT
 Part IV provides the appendices, the Glossary, and two licenses that cover
 the @command{gawk} source code and this @value{DOCUMENT}, respectively.
@@ -1624,11 +1739,14 @@ Part IV provides the following appendices,
 including the GNU General Public License:
 @end ifset
 
+@itemize @value{MINUS}
+@item
 @ref{Language History},
 describes how the @command{awk} language has evolved since
-its first release to present.  It also describes how @command{gawk}
+its first release to the present.  It also describes how @command{gawk}
 has acquired features over time.
 
+@item
 @ref{Installation},
 describes how to get @command{gawk}, how to compile it
 on POSIX-compatible systems,
@@ -1638,60 +1756,74 @@ in @command{gawk} and where to get other freely
 available @command{awk} implementations.
 
 @ifset FOR_PRINT
-
+@item
 @ref{Copying},
 presents the license that covers the @command{gawk} source code.
+@end ifset
+
+@ifclear FOR_PRINT
+@item
+@ref{Notes},
+describes how to disable @command{gawk}'s extensions, as
+well as how to contribute new code to @command{gawk},
+and some possible future directions for @command{gawk} development.
+
+@item
+@ref{Basic Concepts},
+provides some very cursory background material for those who
+are completely unfamiliar with computer programming.
+
+The @ref{Glossary}, defines most, if not all, of the significant terms used
+throughout the @value{DOCUMENT}.  If you find terms that you aren't familiar with,
+try looking them up here.
+
+@item
+@ref{Copying}, and
+@ref{GNU Free Documentation License},
+present the licenses that cover the @command{gawk} source code
+and this @value{DOCUMENT}, respectively.
+@end ifclear
+@end itemize
+@end itemize
 
+@ifset FOR_PRINT
 The version of this @value{DOCUMENT} distributed with @command{gawk}
 contains additional appendices and other end material.
 To save space, we have omitted them from the
 printed edition. You may find them online, as follows:
 
+@itemize @value{BULLET}
+@item
 @uref{http://www.gnu.org/software/gawk/manual/html_node/Notes.html,
 The appendix on implementation notes}
-describes how to disable @command{gawk}'s extensions, as
-well as how to contribute new code to @command{gawk},
-and some possible future directions for @command{gawk} development.
+describes how to disable @command{gawk}'s extensions, how to contribute
+new code to @command{gawk}, where to find information on some possible
+future directions for @command{gawk} development, and the design decisions
+behind the extension API.
 
+@item
 @uref{http://www.gnu.org/software/gawk/manual/html_node/Basic-Concepts.html,
 The appendix on basic concepts}
 provides some very cursory background material for those who
 are completely unfamiliar with computer programming.
 
+@item
 @uref{http://www.gnu.org/software/gawk/manual/html_node/Glossary.html,
 The Glossary}
-defines most, if not all, the significant terms used
+defines most, if not all, of the significant terms used
 throughout the @value{DOCUMENT}.  If you find terms that you aren't familiar with,
 try looking them up here.
 
+@item
 @uref{http://www.gnu.org/software/gawk/manual/html_node/GNU-Free-Documentation-License.html,
 The GNU FDL}
 is the license that covers this @value{DOCUMENT}.
+@end itemize
 
 Some of the chapters have exercise sections; these have also been
-omitted from the print edition.
+omitted from the print edition but are available online.
 @end ifset
 
-@ifclear FOR_PRINT
-@ref{Notes},
-describes how to disable @command{gawk}'s extensions, as
-well as how to contribute new code to @command{gawk},
-and some possible future directions for @command{gawk} development.
-
-@ref{Basic Concepts},
-provides some very cursory background material for those who
-are completely unfamiliar with computer programming.
-
-The @ref{Glossary}, defines most, if not all, the significant terms used
-throughout the @value{DOCUMENT}.  If you find terms that you aren't familiar with,
-try looking them up here.
-
-@ref{Copying}, and
-@ref{GNU Free Documentation License},
-present the licenses that cover the @command{gawk} source code
-and this @value{DOCUMENT}, respectively.
-@end ifclear
-
 @c FULLXREF OFF
 
 @node Conventions
@@ -1722,7 +1854,7 @@ This typically represents the command's standard output.
 Output from the command, usually its standard output, appears
 @code{like this}.
 @end ifset
-Error messages, and other output on the command's standard error, are preceded
+Error messages and other output on the command's standard error are preceded
 by the glyph ``@error{}''.  For example:
 
 @example
@@ -1733,15 +1865,23 @@ $ @kbd{echo hello on stderr 1>&2}
 @end example
 
 @ifnotinfo
-In the text, command names appear in @code{this font}, while code segments
+In the text, almost anything related to programming, such as
+command names,
+variable and function names, and string, numeric and regexp constants
+appear in @code{this font}. Code fragments
 appear in the same font and quoted, @samp{like this}.
+Things that are replaced by the user or programmer
+appear in @var{this font}.
 Options look like this: @option{-f}.
+@value{FFN}s are indicated like this: @file{/path/to/ourfile}.
+@ifclear FOR_PRINT
 Some things are
 emphasized @emph{like this}, and if a point needs to be made
-strongly, it is done @strong{like this}.  The first occurrence of
+strongly, it is done @strong{like this}.
+@end ifclear
+The first occurrence of
 a new term is usually its @dfn{definition} and appears in the same
 font as the previous occurrence of ``definition'' in this sentence.
-Finally, @value{FN}s are indicated like this: @file{/path/to/ourfile}.
 @end ifnotinfo
 
 Characters that you type at the keyboard look @kbd{like this}.  In particular,
@@ -1749,11 +1889,11 @@ there are special characters called ``control characters.''  These are
 characters that you type by holding down both the @kbd{CONTROL} key and
 another key, at the same time.  For example, a @kbd{Ctrl-d} is typed
 by first pressing and holding the @kbd{CONTROL} key, next
-pressing the @kbd{d} key and finally releasing both keys.
+pressing the @kbd{d} key, and finally releasing both keys.
 
 For the sake of brevity, throughout this @value{DOCUMENT}, we refer to
 Brian Kernighan's version of @command{awk} as ``BWK @command{awk}.''
-(@xref{Other Versions}, for information on his and other versions.)
+(@DBXREF{Other Versions} for information on his and other versions.)
 
 @ifset FOR_PRINT
 @quotation NOTE
@@ -1769,7 +1909,7 @@ Cautionary or warning notes look like this.
 @unnumberedsubsec Dark Corners
 @cindex Kernighan, Brian
 @quotation
-@i{Dark corners are basically fractal --- no matter how much
+@i{Dark corners are basically fractal---no matter how much
 you illuminate, there's always a smaller but darker one.}
 @author Brian Kernighan
 @end quotation
@@ -1785,14 +1925,14 @@ the picture of a flashlight in the margin, as shown here.
 @value{DARKCORNER}
 @end iftex
 @ifnottex
-``(d.c.)''.
+``(d.c.).''
 @end ifnottex
 @ifclear FOR_PRINT
 They also appear in the index under the heading ``dark corner.''
 @end ifclear
 
-As noted by the opening quote, though, any coverage of dark corners is,
-by definition, incomplete.
+But, as noted by the opening quote, any coverage of dark
+corners is by definition incomplete.
 
 @cindex c.e., See common extensions
 Extensions to the standard @command{awk} language that are supported by
@@ -1820,12 +1960,12 @@ Emacs editor.  GNU Emacs is the most widely used version of Emacs today.
 @cindex GPL (General Public License)
 @cindex General Public License, See GPL
 @cindex documentation, online
-The GNU@footnote{GNU stands for ``GNU's not Unix.''}
+The GNU@footnote{GNU stands for ``GNU's Not Unix.''}
 Project is an ongoing effort on the part of the Free Software
 Foundation to create a complete, freely distributable, POSIX-compliant
 computing environment.
-The FSF uses the ``GNU General Public License'' (GPL) to ensure that
-their software's
+The FSF uses the GNU General Public License (GPL) to ensure that
+its software's
 source code is always available to the end user.
 @ifclear FOR_PRINT
 A copy of the GPL is included
@@ -1839,7 +1979,7 @@ The GPL applies to the C language source code for @command{gawk}.
 To find out more about the FSF and the GNU Project online,
 see @uref{http://www.gnu.org, the GNU Project's home page}.
 This @value{DOCUMENT} may also be read from
-@uref{http://www.gnu.org/software/gawk/manual/, their web site}.
+@uref{http://www.gnu.org/software/gawk/manual/, GNU's website}.
 
 @ifclear FOR_PRINT
 A shell, an editor (Emacs), highly portable optimizing C, C++, and
@@ -1866,9 +2006,7 @@ available for download from the Internet.
 @ifnotinfo
 The @value{DOCUMENT} you are reading is actually free---at least, the
 information in it is free to anyone.  The machine-readable
-source code for the @value{DOCUMENT} comes with @command{gawk}; anyone
-may take this @value{DOCUMENT} to a copying machine and make as many
-copies as they like.
+source code for the @value{DOCUMENT} comes with @command{gawk}.
 @ifclear FOR_PRINT
 (Take a moment to check the Free Documentation
 License in @ref{GNU Free Documentation License}.)
@@ -1876,31 +2014,30 @@ License in @ref{GNU Free Documentation License}.)
 @end ifnotinfo
 
 @cindex Close, Diane
-The @value{DOCUMENT} itself has gone through a number of previous editions.
+The @value{DOCUMENT} itself has gone through multiple previous editions.
 Paul Rubin wrote the very first draft of @cite{The GAWK Manual};
-it was around 40 pages in size.
+it was around 40 pages long.
 Diane Close and Richard Stallman improved it, yielding a
 version that was
-around 90 pages long and barely described the original, ``old''
+around 90 pages and barely described the original, ``old''
 version of @command{awk}.
 
 I started working with that version in the fall of 1988.
 As work on it progressed,
 the FSF published several preliminary versions (numbered 0.@var{x}).
-In 1996, Edition 1.0 was released with @command{gawk} 3.0.0.
+In 1996, edition 1.0 was released with @command{gawk} 3.0.0.
 The FSF published the first two editions under
 the title @cite{The GNU Awk User's Guide}.
 @ifset FOR_PRINT
 SSC published two editions of the @value{DOCUMENT} under the
-title @cite{Effective awk Programming}, and in O'Reilly published
+title @cite{Effective awk Programming}, and O'Reilly published
 the third edition in 2001.
 @end ifset
 
 This edition maintains the basic structure of the previous editions.
-For FSF edition 4.0, the content has been thoroughly reviewed
-and updated. All references to @command{gawk} versions prior to 4.0 have been
-removed.
-Of significant note for this edition was @ref{Debugger}.
+For FSF edition 4.0, the content was thoroughly reviewed and updated. All
+references to @command{gawk} versions prior to 4.0 were removed.
+Of significant note for that edition was the addition of @ref{Debugger}.
 
 For FSF edition
 @ifclear FOR_PRINT
@@ -1914,19 +2051,18 @@ the content has been reorganized into parts,
 and the major new additions are @ref{Arbitrary Precision Arithmetic},
 and @ref{Dynamic Extensions}.
 
-This @value{DOCUMENT} will undoubtedly continue to evolve.  An electronic
-version comes with the @command{gawk} distribution from the FSF.  If you
-find an error in this @value{DOCUMENT}, please report it!  @xref{Bugs},
+This @value{DOCUMENT} will undoubtedly continue to evolve.  If you
+find an error in the @value{DOCUMENT}, please report it!  @DBXREF{Bugs}
 for information on submitting problem reports electronically.
 
 @ifset FOR_PRINT
 @c fakenode --- for prepinfo
 @unnumberedsec How to Stay Current
 
-It may be you have a version of @command{gawk} which is newer than the
-one described in this @value{DOCUMENT}.  To find out what has changed,
+You may have a newer version of @command{gawk} than the
+one described here.  To find out what has changed,
 you should first look at the @file{NEWS} file in the @command{gawk}
-distribution, which provides a high level summary of what changed in
+distribution, which provides a high-level summary of the changes in
 each release.
 
 You can then look at the @uref{http://www.gnu.org/software/gawk/manual/,
@@ -1951,16 +2087,18 @@ contributed code: the archive did not grow and the domain went unused
 for several years.
 
 Late in 2008, a volunteer took on the task of setting up
-an @command{awk}-related web site---@uref{http://awk.info}---and did a very
+an @command{awk}-related website---@uref{http://awk.info}---and did a very
 nice job.
 
 If you have written an interesting @command{awk} program, or have written
 a @command{gawk} extension that you would like to share with the rest
 of the world, please see @uref{http://awk.info/?contribute} for how to
-contribute it to the web site.
+contribute it to the website.
 
+@ignore
 As of this writing, this website is in search of a maintainer; please
 contact me if you are interested.
+@end ignore
 
 @ignore
 Other links:
@@ -1978,7 +2116,7 @@ The initial draft of @cite{The GAWK Manual} had the following acknowledgments:
 Many people need to be thanked for their assistance in producing this
 manual.  Jay Fenlason contributed many ideas and sample programs.  Richard
 Mlynarik and Robert Chassell gave helpful comments on drafts of this
-manual.  The paper @cite{A Supplemental Document for @command{awk}} by John W.@:
+manual.  The paper @cite{A Supplemental Document for AWK} by John W.@:
 Pierce of the Chemistry Department at UC San Diego, pinpointed several
 issues relevant both to @command{awk} implementation and to this manual, that
 would otherwise have escaped us.
@@ -1989,12 +2127,18 @@ I would like to acknowledge Richard M.@: Stallman, for his vision of a
 better world and for his courage in founding the FSF and starting the
 GNU Project.
 
+@ifclear FOR_PRINT
 Earlier editions of this @value{DOCUMENT} had the following acknowledgements:
+@end ifclear
+@ifset FOR_PRINT
+The previous edition of this @value{DOCUMENT} had
+the following acknowledgements:
+@end ifset
 
 @quotation
 The following people (in alphabetical order)
 provided helpful comments on various
-versions of this book,
+versions of this book:
 Rick Adams,
 Dr.@: Nelson H.F. Beebe,
 Karl Berry,
@@ -2022,7 +2166,7 @@ Robert J.@: Chassell provided much valuable advice on
 the use of Texinfo.
 He also deserves special thanks for
 convincing me @emph{not} to title this @value{DOCUMENT}
-@cite{How To Gawk Politely}.
+@cite{How to Gawk Politely}.
 Karl Berry helped significantly with the @TeX{} part of Texinfo.
 
 @cindex Hartholz, Marshall
@@ -2096,35 +2240,45 @@ Andrew Schorr,
 Corinna Vinschen,
 and Eli Zaretskii
 (in alphabetical order)
-make up the current
-@command{gawk} ``crack portability team.''  Without their hard work and
-help, @command{gawk} would not be nearly the fine program it is today.  It
-has been and continues to be a pleasure working with this team of fine
-people.
+make up the current @command{gawk} ``crack portability team.''  Without
+their hard work and help, @command{gawk} would not be nearly the robust,
+portable program it is today.  It has been and continues to be a pleasure
+working with this team of fine people.
 
 Notable code and documentation contributions were made by
-a number of people. @xref{Contributors}, for the full list.
+a number of people. @DBXREF{Contributors} for the full list.
 
+@ifset FOR_PRINT
+@cindex Oram, Andy
+Thanks to Andy Oram of O'Reilly Media for initiating
+the fourth edition and for his support during the work.
+Thanks to Jasmine Kwityn for her copyediting work.
+@end ifset
+
+Thanks to Michael Brennan for the Forewords.
+
+@cindex Duman, Patrice
+@cindex Berry, Karl
 Thanks to Patrice Dumas for the new @command{makeinfo} program.
-Thanks to Karl Berry who continues to work to keep
+Thanks to Karl Berry, who continues to work to keep
 the Texinfo markup language sane.
 
 @cindex Kernighan, Brian
 @cindex Brennan, Michael
 @cindex Day, Robert P.J.@:
-Robert P.J.@: Day, Michael Brennan and Brian Kernighan kindly acted as
+Robert P.J.@: Day, Michael Brennan, and Brian Kernighan kindly acted as
 reviewers for the 2015 edition of this @value{DOCUMENT}. Their feedback
 helped improve the final work.
 
-I would like to thank Brian Kernighan for invaluable assistance during the
-testing and debugging of @command{gawk}, and for ongoing
+I would also like to thank Brian Kernighan for his invaluable assistance during the
+testing and debugging of @command{gawk}, and for his ongoing
 help and advice in clarifying numerous points about the language.
 We could not have done nearly as good a job on either @command{gawk}
 or its documentation without his help.
 
 Brian is in a class by himself as a programmer and technical
 author.  I have to thank him (yet again) for his ongoing friendship
-and the role model he has been for me for close to 30 years!
+and for being a role model to me for close to 30 years!
 Having him as a reviewer is an exciting privilege. It has also
 been extremely humbling@enddots{}
 
@@ -2140,14 +2294,14 @@ which they raised and educated me.
 Finally, I also must acknowledge my gratitude to G-d, for the many opportunities
 He has sent my way, as well as for the gifts He has given me with which to
 take advantage of those opportunities.
-@iftex
+@ifnotdocbook
 @sp 2
 @noindent
 Arnold Robbins @*
 Nof Ayalon @*
-ISRAEL @*
-May, 2014
-@end iftex
+Israel @*
+February 2015
+@end ifnotdocbook
 
 @ifnotinfo
 @part @value{PART1}The @command{awk} Language
@@ -2163,31 +2317,31 @@ following chapters:
 
 @itemize @value{BULLET}
 @item
-@ref{Getting Started}.
+@ref{Getting Started}
 
 @item
-@ref{Invoking Gawk}.
+@ref{Invoking Gawk}
 
 @item
-@ref{Regexp}.
+@ref{Regexp}
 
 @item
-@ref{Reading Files}.
+@ref{Reading Files}
 
 @item
-@ref{Printing}.
+@ref{Printing}
 
 @item
-@ref{Expressions}.
+@ref{Expressions}
 
 @item
-@ref{Patterns and Actions}.
+@ref{Patterns and Actions}
 
 @item
-@ref{Arrays}.
+@ref{Arrays}
 
 @item
-@ref{Functions}.
+@ref{Functions}
 @end itemize
 @end ifdocbook
 
@@ -2202,17 +2356,17 @@ following chapters:
 The basic function of @command{awk} is to search files for lines (or other
 units of text) that contain certain patterns.  When a line matches one
 of the patterns, @command{awk} performs specified actions on that line.
-@command{awk} keeps processing input lines in this way until it reaches
+@command{awk} continues to process input lines in this way until it reaches
 the end of the input files.
 
 @cindex @command{awk}, uses for
 @cindex programming languages@comma{} data-driven vs.@: procedural
 @cindex @command{awk} programs
 Programs in @command{awk} are different from programs in most other languages,
-because @command{awk} programs are @dfn{data-driven}; that is, you describe
-the data you want to work with and then what to do when you find it.
+because @command{awk} programs are @dfn{data driven} (i.e., you describe
+the data you want to work with and then what to do when you find it).
 Most other languages are @dfn{procedural}; you have to describe, in great
-detail, every step the program is to take.  When working with procedural
+detail, every step the program should take.  When working with procedural
 languages, it is usually much
 harder to clearly describe the data your program will process.
 For this reason, @command{awk} programs are often refreshingly easy to
@@ -2222,15 +2376,15 @@ read and write.
 @cindex rule, definition of
 When you run @command{awk}, you specify an @command{awk} @dfn{program} that
 tells @command{awk} what to do.  The program consists of a series of
-@dfn{rules}.  (It may also contain @dfn{function definitions},
-an advanced feature that we will ignore for now.
-@xref{User-defined}.)  Each rule specifies one
+@dfn{rules} (it may also contain @dfn{function definitions},
+an advanced feature that we will ignore for now;
+@pxref{User-defined}).  Each rule specifies one
 pattern to search for and one action to perform
 upon finding the pattern.
 
-Syntactically, a rule consists of a pattern followed by an action.  The
-action is enclosed in braces to separate it from the pattern.
-Newlines usually separate rules.  Therefore, an @command{awk}
+Syntactically, a rule consists of a @dfn{pattern} followed by an
+@dfn{action}.  The action is enclosed in braces to separate it from the
+pattern.  Newlines usually separate rules.  Therefore, an @command{awk}
 program looks like this:
 
 @example
@@ -2304,8 +2458,8 @@ awk '@var{program}' @var{input-file1} @var{input-file2} @dots{}
 @end example
 
 @noindent
-where @var{program} consists of a series of @var{patterns} and
-@var{actions}, as described earlier.
+where @var{program} consists of a series of patterns and
+actions, as described earlier.
 
 @cindex single quote (@code{'})
 @cindex @code{'} (single quote)
@@ -2324,11 +2478,12 @@ programs from shell scripts, because it avoids the need for a separate
 file for the @command{awk} program.  A self-contained shell script is more
 reliable because there are no other files to misplace.
 
+Later in this chapter, in
+@ifdocbook
+the section
+@end ifdocbook
 @ref{Very Simple},
-@ifnotinfo
-later in this @value{CHAPTER},
-@end ifnotinfo
-presents several short,
+we'll see examples of several short,
 self-contained programs.
 
 @node Read Terminal
@@ -2349,10 +2504,10 @@ awk '@var{program}'
 which usually means whatever you type on the keyboard.  This continues
 until you indicate end-of-file by typing @kbd{Ctrl-d}.
 @ifset FOR_PRINT
-(On other operating systems, the end-of-file character may be different.)
+(On non-POSIX operating systems, the end-of-file character may be different.)
 @end ifset
 @ifclear FOR_PRINT
-(On other operating systems, the end-of-file character may be different.
+(On non-POSIX operating systems, the end-of-file character may be different.
 For example, on OS/2, it is @kbd{Ctrl-z}.)
 @end ifclear
 
@@ -2365,7 +2520,7 @@ to keep you from worrying about the complexities of computer
 programming:
 
 @example
-$ @kbd{awk "BEGIN @{ print "Don\47t Panic!" @}"}
+$ @kbd{awk 'BEGIN @{ print "Don\47t Panic!" @}'}
 @print{} Don't Panic!
 @end example
 
@@ -2373,11 +2528,11 @@ $ @kbd{awk "BEGIN @{ print "Don\47t Panic!" @}"}
 reading any input.  If there are no other statements in your program,
 as is the case here, @command{awk} just stops, instead of trying to read
 input it doesn't know how to process.
-The @samp{\47} is a magic way of getting a single quote into
+The @samp{\47} is a magic way (explained later) of getting a single quote into
 the program, without having to engage in ugly shell quoting tricks.
 
 @quotation NOTE
-As a side note, if you use Bash as your shell, you should execute the
+If you use Bash as your shell, you should execute the
 command @samp{set +H} before running this program interactively, to
 disable the C shell-style command history, which treats @samp{!} as a
 special character. We recommend putting this command into your personal
@@ -2386,7 +2541,7 @@ startup file.
 
 This next simple @command{awk} program
 emulates the @command{cat} utility; it copies whatever you type on the
-keyboard to its standard output (why this works is explained shortly).
+keyboard to its standard output (why this works is explained shortly):
 
 @example
 $ @kbd{awk '@{ print @}'}
@@ -2407,7 +2562,7 @@ $ @kbd{awk '@{ print @}'}
 @cindex @command{awk} programs, running
 @cindex @command{awk} programs, lengthy
 @cindex files, @command{awk} programs in
-Sometimes your @command{awk} programs can be very long.  In this case, it is
+Sometimes @command{awk} programs are very long.  In these cases, it is
 more convenient to put the program into a separate file.  In order to tell
 @command{awk} to use that file for its program, you type:
 
@@ -2437,7 +2592,7 @@ awk -f advice
 does the same thing as this one:
 
 @example
-awk "BEGIN @{ print \"Don't Panic!\" @}"
+awk 'BEGIN @{ print "Don\47t Panic!" @}'
 @end example
 
 @cindex quoting in @command{gawk} command lines
@@ -2449,12 +2604,12 @@ specify with @option{-f}, because most @value{FN}s don't contain any of the shel
 special characters.  Notice that in @file{advice}, the @command{awk}
 program did not have single quotes around it.  The quotes are only needed
 for programs that are provided on the @command{awk} command line.
+(Also, placing the program in a file allows us to use a literal single quote in the program
+text, instead of the magic @samp{\47}.)
 
-@c STARTOFRANGE sq1x
 @cindex single quote (@code{'}) in @command{gawk} command lines
-@c STARTOFRANGE qs2x
 @cindex @code{'} (single quote) in @command{gawk} command lines
-If you want to clearly identify your @command{awk} program files as such,
+If you want to clearly identify an @command{awk} program file as such,
 you can add the extension @file{.awk} to the @value{FN}.  This doesn't
 affect the execution of the @command{awk} program but it does make
 ``housekeeping'' easier.
@@ -2469,7 +2624,7 @@ affect the execution of the @command{awk} program but it does make
 Once you have learned @command{awk}, you may want to write self-contained
 @command{awk} scripts, using the @samp{#!} script mechanism.  You can do
 this on many systems.@footnote{The @samp{#!} mechanism works on
-GNU/Linux systems, BSD-based systems and commercial Unix systems.}
+GNU/Linux systems, BSD-based systems, and commercial Unix systems.}
 For example, you could update the file @file{advice} to look like this:
 
 @example
@@ -2512,8 +2667,8 @@ written in @command{awk}.
 according to the instructions in your program. (This is different
 from a @dfn{compiled} language such as C, where your program is first
 compiled into machine code that is executed directly by your system's
-hardware.)  The @command{awk} utility is thus termed an @dfn{interpreter}.
-Many modern languages are interperted.
+processor.)  The @command{awk} utility is thus termed an @dfn{interpreter}.
+Many modern languages are interpreted.
 
 The line beginning with @samp{#!} lists the full @value{FN} of an
 interpreter to run and a single optional initial command-line argument
@@ -2521,9 +2676,9 @@ to pass to that interpreter.  The operating system then runs the
 interpreter with the given argument and the full argument list of the
 executed program.  The first argument in the list is the full @value{FN}
 of the @command{awk} program.  The rest of the argument list contains
-either options to @command{awk}, or @value{DF}s, or both. Note that on
+either options to @command{awk}, or @value{DF}s, or both. (Note that on
 many systems @command{awk} may be found in @file{/usr/bin} instead of
-in @file{/bin}. Caveat Emptor.
+in @file{/bin}.)
 
 Some systems limit the length of the interpreter name to 32 characters.
 Often, this can be dealt with by using a symbolic link.
@@ -2562,8 +2717,8 @@ to provide your script name.
 according to the instructions in your program. (This is different
 from a @dfn{compiled} language such as C, where your program is first
 compiled into machine code that is executed directly by your system's
-hardware.)  The @command{awk} utility is thus termed an @dfn{interpreter}.
-Many modern languages are interperted.
+processor.)  The @command{awk} utility is thus termed an @dfn{interpreter}.
+Many modern languages are interpreted.
 
 The line beginning with @samp{#!} lists the full @value{FN} of an
 interpreter to run and a single optional initial command-line argument
@@ -2571,9 +2726,9 @@ to pass to that interpreter.  The operating system then runs the
 interpreter with the given argument and the full argument list of the
 executed program.  The first argument in the list is the full @value{FN}
 of the @command{awk} program.  The rest of the argument list contains
-either options to @command{awk}, or @value{DF}s, or both. Note that on
+either options to @command{awk}, or @value{DF}s, or both. (Note that on
 many systems @command{awk} may be found in @file{/usr/bin} instead of
-in @file{/bin}. Caveat Emptor.
+in @file{/bin}.)
 
 Some systems limit the length of the interpreter name to 32 characters.
 Often, this can be dealt with by using a symbolic link.
@@ -2610,14 +2765,14 @@ can explain what the program does and how it works.  Nearly all
 programming languages have provisions for comments, as programs are
 typically hard to understand without them.
 
-In the @command{awk} language, a comment starts with the sharp sign
+In the @command{awk} language, a comment starts with the number sign
 character (@samp{#}) and continues to the end of the line.
 The @samp{#} does not have to be the first character on the line. The
-@command{awk} language ignores the rest of a line following a sharp sign.
+@command{awk} language ignores the rest of a line following a number sign.
 For example, we could have put the following into @file{advice}:
 
 @example
-# This program prints a nice friendly message.  It helps
+# This program prints a nice, friendly message.  It helps
 # keep novice users from being afraid of the computer.
 BEGIN    @{ print "Don't Panic!" @}
 @end example
@@ -2633,7 +2788,8 @@ when reading it at a later time.
 @quotation CAUTION
 As mentioned in
 @ref{One-shot},
-you can enclose small to medium programs in single quotes, in order to keep
+you can enclose short to medium-sized programs in single quotes,
+in order to keep
 your shell scripts self-contained.  When doing so, @emph{don't} put
 an apostrophe (i.e., a single quote) into a comment (or anywhere else
 in your program). The shell interprets the quote as the closing
@@ -2662,19 +2818,19 @@ $ @kbd{awk '@{ print "hello" @} # let's be cute'}
 @cindex @code{\} (backslash)
 @cindex backslash (@code{\})
 Putting a backslash before the single quote in @samp{let's} wouldn't help,
-since backslashes are not special inside single quotes.
+because backslashes are not special inside single quotes.
 The next @value{SUBSECTION} describes the shell's quoting rules.
 @end quotation
 
 @node Quoting
-@subsection Shell-Quoting Issues
+@subsection Shell Quoting Issues
 @cindex shell quoting, rules for
 
 @menu
 * DOS Quoting::                 Quoting in Windows Batch Files.
 @end menu
 
-For short to medium length @command{awk} programs, it is most convenient
+For short to medium-length @command{awk} programs, it is most convenient
 to enter the program on the @command{awk} command line.
 This is best done by enclosing the entire program in single quotes.
 This is true whether you are entering the program interactively at
@@ -2698,8 +2854,8 @@ or empty, string.
 The null string is character data that has no value.
 In other words, it is empty.  It is written in @command{awk} programs
 like this: @code{""}. In the shell, it can be written using single
-or double quotes: @code{""} or @code{''}. While the null string has
-no characters in it, it does exist. Consider this command:
+or double quotes: @code{""} or @code{''}. Although the null string has
+no characters in it, it does exist. For example, consider this command:
 
 @example
 $ @kbd{echo ""}
@@ -2709,8 +2865,7 @@ $ @kbd{echo ""}
 Here, the @command{echo} utility receives a single argument, even
 though that argument has no characters in it. In the rest of this
 @value{DOCUMENT}, we use the terms @dfn{null string} and @dfn{empty string}
-interchangeably.  Now, on to the quoting rules.
-
+interchangeably.  Now, on to the quoting rules:
 
 @itemize @value{BULLET}
 @item
@@ -2733,7 +2888,7 @@ The shell does no interpretation of the quoted text, passing it on verbatim
 to the command.
 It is @emph{impossible} to embed a single quote inside single-quoted text.
 Refer back to
-@ref{Comments},
+@DBREF{Comments}
 for an example of what happens if you try.
 
 @item
@@ -2743,7 +2898,7 @@ Double quotes protect most things between the opening and closing quotes.
 The shell does at least variable and command substitution on the quoted text.
 Different shells may do additional kinds of processing on double-quoted text.
 
-Since certain characters within double-quoted text are processed by the shell,
+Because certain characters within double-quoted text are processed by the shell,
 they must be @dfn{escaped} within the text.  Of note are the characters
 @samp{$}, @samp{`}, @samp{\}, and @samp{"}, all of which must be preceded by
 a backslash within double-quoted text if they are to be passed on literally
@@ -2752,8 +2907,14 @@ Thus, the example seen
 @ifnotinfo
 previously
 @end ifnotinfo
-in @ref{Read Terminal},
-is applicable:
+in @ref{Read Terminal}:
+
+@example
+awk 'BEGIN @{ print "Don\47t Panic!" @}'
+@end example
+
+@noindent
+could instead be written this way:
 
 @example
 $ @kbd{awk "BEGIN @{ print \"Don't Panic!\" @}"}
@@ -2783,7 +2944,7 @@ awk -F"" '@var{program}' @var{files}  # wrong!
 @end example
 
 @noindent
-In the second case, @command{awk} will attempt to use the text of the program
+In the second case, @command{awk} attempts to use the text of the program
 as the value of @code{FS}, and the first @value{FN} as the text of the program!
 This results in syntax errors at best, and confusing behavior at worst.
 @end itemize
@@ -2799,7 +2960,7 @@ $ @kbd{awk 'BEGIN @{ print "Here is a single quote <'"'"'>" @}'}
 
 @noindent
 This program consists of three concatenated quoted strings.  The first and the
-third are single-quoted, the second is double-quoted.
+third are single-quoted, and the second is double-quoted.
 
 This can be ``simplified'' to:
 
@@ -2820,8 +2981,6 @@ $ @kbd{awk "BEGIN @{ print \"Here is a single quote <'>\" @}"}
 @end example
 
 @noindent
-@c ENDOFRANGE sq1x
-@c ENDOFRANGE qs2x
 This option is also painful, because double quotes, backslashes, and dollar signs
 are very common in more advanced @command{awk} programs.
 
@@ -2838,19 +2997,22 @@ $ @kbd{awk 'BEGIN @{ print "Here is a double quote <\42>" @}'}
 @end example
 
 @noindent
-This works nicely, except that you should comment clearly what the
+This works nicely, but you should comment clearly what the
 escapes mean.
 
 A fourth option is to use command-line variable assignment, like this:
 
 @example
-$ awk -v sq="'" 'BEGIN @{ print "Here is a single quote <" sq ">" @}'
+$ @kbd{awk -v sq="'" 'BEGIN @{ print "Here is a single quote <" sq ">" @}'}
 @print{} Here is a single quote <'>
 @end example
 
+(Here, the two string constants and the value of @code{sq} are concatenated
+into a single string that is printed by @code{print}.)
+
 If you really need both single and double quotes in your @command{awk}
 program, it is probably best to move it into a separate file, where
-the shell won't be part of the picture, and you can say what you mean.
+the shell won't be part of the picture and you can say what you mean.
 
 @node DOS Quoting
 @subsubsection Quoting in MS-Windows Batch Files
@@ -2911,8 +3073,8 @@ The second @value{DF}, called @file{inventory-shipped}, contains
 information about monthly shipments.  In both files,
 each line is considered to be one @dfn{record}.
 
-In the @value{DF} @file{mail-list}, each record contains the name of a person,
-his/her phone number, his/her email-address, and a code for their relationship
+In @file{mail-list}, each record contains the name of a person,
+his/her phone number, his/her email address, and a code for his/her relationship
 with the author of the list.
 The columns are aligned using spaces.
 An @samp{A} in the last column
@@ -2949,7 +3111,7 @@ of green crates shipped, the number of red boxes shipped, the number of
 orange bags shipped, and the number of blue packages shipped,
 respectively.  There are 16 entries, covering the 12 months of last year
 and the first four months of the current year.
-An empty line separates the data for the two years.
+An empty line separates the data for the two years:
 
 @example
 @c file eg/data/inventory-shipped
@@ -2983,7 +3145,7 @@ The following command runs a simple @command{awk} program that searches the
 input file @file{mail-list} for the character string @samp{li} (a
 grouping of characters is usually called a @dfn{string};
 the term @dfn{string} is based on similar usage in English, such
-as ``a string of pearls,'' or ``a string of cars in a train''):
+as ``a string of pearls'' or ``a string of cars in a train''):
 
 @example
 awk '/li/ @{ print $0 @}' mail-list
@@ -3030,11 +3192,11 @@ omitting the @code{print} statement but retaining the braces makes an
 empty action that does nothing (i.e., no lines are printed).
 
 @cindex @command{awk} programs, one-line examples
-Many practical @command{awk} programs are just a line or two.  Following is a
+Many practical @command{awk} programs are just a line or two long.  Following is a
 collection of useful, short programs to get you started.  Some of these
 programs contain constructs that haven't been covered yet. (The description
-of the program will give you a good idea of what is going on, but please
-read the rest of the @value{DOCUMENT} to become an @command{awk} expert!)
+of the program will give you a good idea of what is going on, but you'll
+need to read the rest of the @value{DOCUMENT} to become an @command{awk} expert!)
 Most of the examples use a @value{DF} named @file{data}.  This is just a
 placeholder; if you use these programs yourself, substitute
 your own @value{FN}s for @file{data}.
@@ -3051,7 +3213,7 @@ Print every line that is longer than 80 characters:
 awk 'length($0) > 80' data
 @end example
 
-The sole rule has a relational expression as its pattern and it has no
+The sole rule has a relational expression as its pattern and has no
 action---so it uses the default action, printing the record.
 
 @item
@@ -3071,11 +3233,11 @@ Print the length of the longest line in @file{data}:
 
 @example
 expand data | awk '@{ if (x < length($0)) x = length($0) @}
-              END @{ print "maximum line length is " x @}'
+                   END @{ print "maximum line length is " x @}'
 @end example
 
 This example differs slightly from the previous one:
-The input is processed by the @command{expand} utility to change TABs
+the input is processed by the @command{expand} utility to change TABs
 into spaces, so the widths compared are actually the right-margin columns,
 as opposed to the number of input characters on each line.
 
@@ -3103,7 +3265,7 @@ Print the total number of bytes used by @var{files}:
 
 @example
 ls -l @var{files} | awk '@{ x += $5 @}
-                  END @{ print "total bytes: " x @}'
+                   END @{ print "total bytes: " x @}'
 @end example
 
 @item
@@ -3138,7 +3300,7 @@ Print the even-numbered lines in the @value{DF}:
 awk 'NR % 2 == 0' data
 @end example
 
-If you use the expression @samp{NR % 2 == 1} instead,
+If you used the expression @samp{NR % 2 == 1} instead,
 the program would print the odd-numbered lines.
 @end itemize
 
@@ -3147,15 +3309,20 @@ the program would print the odd-numbered lines.
 @cindex @command{awk} programs
 
 The @command{awk} utility reads the input files one line at a
-time.  For each line, @command{awk} tries the patterns of each of the rules.
+time.  For each line, @command{awk} tries the patterns of each rule.
 If several patterns match, then several actions execute in the order in
 which they appear in the @command{awk} program.  If no patterns match, then
 no actions run.
 
 After processing all the rules that match the line (and perhaps there are none),
 @command{awk} reads the next line.  (However,
-@pxref{Next Statement},
-and also @pxref{Nextfile Statement}).
+@DBPXREF{Next Statement}
+@ifdocbook
+and @DBREF{Nextfile Statement}.)
+@end ifdocbook
+@ifnotdocbook
+and also @pxref{Nextfile Statement}.)
+@end ifnotdocbook
 This continues until the program reaches the end of the file.
 For example, the following @command{awk} program contains two rules:
 
@@ -3229,13 +3396,12 @@ the file was last modified. Its output looks like this:
 @noindent
 @cindex line continuations, with C shell
 The first field contains read-write permissions, the second field contains
-the number of links to the file, and the third field identifies the owner of
-the file. The fourth field identifies the group of the file.
-The fifth field contains the size of the file in bytes.  The
+the number of links to the file, and the third field identifies the file's owner.
+The fourth field identifies the file's group.
+The fifth field contains the file's size in bytes.  The
 sixth, seventh, and eighth fields contain the month, day, and time,
 respectively, that the file was last modified.  Finally, the ninth field
-contains the @value{FN}.@footnote{The @samp{LC_ALL=C} is
-needed to produce this traditional-style output from @command{ls}.}
+contains the @value{FN}.
 
 @c @cindex automatic initialization
 @cindex initialization, automatic
@@ -3330,7 +3496,7 @@ lines in the middle of a regular expression or a string.
 with the C shell.}  It works for @command{awk} programs in files and
 for one-shot programs, @emph{provided} you are using a POSIX-compliant
 shell, such as the Unix Bourne shell or Bash.  But the C shell behaves
-differently!  There, you must use two backslashes in a row, followed by
+differently!  There you must use two backslashes in a row, followed by
 a newline.  Note also that when using the C shell, @emph{every} newline
 in your @command{awk} program must be escaped with a backslash. To illustrate:
 
@@ -3371,9 +3537,9 @@ starts a comment, it ignores @emph{everything} on the rest of the
 line. For example:
 
 @example
-$ gawk 'BEGIN @{ print "dont panic" # a friendly \
->                                    BEGIN rule
-> @}'
+$ @kbd{gawk 'BEGIN @{ print "dont panic" # a friendly \}
+> @kbd{                                   BEGIN rule}
+> @kbd{@}'}
 @error{} gawk: cmd. line:2:                BEGIN rule
 @error{} gawk: cmd. line:2:                ^ syntax error
 @end example
@@ -3421,9 +3587,9 @@ performing bit manipulation, for runtime string translation (internationalizatio
 determining the type of a variable,
 and array sorting.
 
-As we develop our presentation of the @command{awk} language, we introduce
+As we develop our presentation of the @command{awk} language, we will introduce
 most of the variables and many of the functions. They are described
-systematically in @ref{Built-in Variables}, and in
+systematically in @DBREF{Built-in Variables} and in
 @ref{Built-in}.
 
 @node When
@@ -3457,8 +3623,8 @@ eight-bit microprocessors,
 @end ifset
 and a microcode assembler for a special-purpose Prolog
 computer.
-While the original @command{awk}'s capabilities were strained by tasks
-of such complexity, modern versions are more capable.
+The original @command{awk}'s capabilities were strained by tasks
+of such complexity, but modern versions are more capable.
 
 @cindex @command{awk} programs, complex
 If you find yourself writing @command{awk} scripts of more than, say,
@@ -3475,7 +3641,7 @@ and Perl.}
 @c FIXME: Review this chapter for summary of builtin functions called.
 @itemize @value{BULLET}
 @item
-Programs in @command{awk} consist of @var{pattern}-@var{action} pairs.
+Programs in @command{awk} consist of @var{pattern}--@var{action} pairs.
 
 @item
 An @var{action} without a @var{pattern} always runs.  The default
@@ -3504,7 +3670,7 @@ part of a larger shell script (or MS-Windows batch file).
 You may use backslash continuation to continue a source line.
 Lines are automatically continued after
 a comma, open brace, question mark, colon,
-@samp{||}, @samp{&&}, @code{do} and @code{else}.
+@samp{||}, @samp{&&}, @code{do}, and @code{else}.
 @end itemize
 
 @node Invoking Gawk
@@ -3513,7 +3679,7 @@ a comma, open brace, question mark, colon,
 This @value{CHAPTER} covers how to run @command{awk}, both POSIX-standard
 and @command{gawk}-specific command-line options, and what
 @command{awk} and
-@command{gawk} do with non-option arguments.
+@command{gawk} do with nonoption arguments.
 It then proceeds to cover how @command{gawk} searches for source files,
 reading standard input along with other files, @command{gawk}'s
 environment variables, @command{gawk}'s exit status, using include files,
@@ -3557,7 +3723,7 @@ enclosed in [@dots{}] in these templates are optional:
 @cindex GNU long options
 @cindex long options
 @cindex options, long
-Besides traditional one-letter POSIX-style options, @command{gawk} also
+In addition to traditional one-letter POSIX-style options, @command{gawk} also
 supports GNU long options.
 
 @cindex dark corner, invoking @command{awk}
@@ -3579,20 +3745,16 @@ warning that the program is empty.
 
 @node Options
 @section Command-Line Options
-@c STARTOFRANGE ocl
 @cindex options, command-line
-@c STARTOFRANGE clo
 @cindex command line, options
-@c STARTOFRANGE gnulo
 @cindex GNU long options
-@c STARTOFRANGE longo
 @cindex options, long
 
 Options begin with a dash and consist of a single character.
 GNU-style long options consist of two dashes and a keyword.
 The keyword can be abbreviated, as long as the abbreviation allows the option
-to be uniquely identified.  If the option takes an argument, then the
-keyword is either immediately followed by an equals sign (@samp{=}) and the
+to be uniquely identified.  If the option takes an argument, either the
+keyword is immediately followed by an equals sign (@samp{=}) and the
 argument's value, or the keyword and the argument's value are separated
 by whitespace.
 If a particular option with a value is given more than once, it is the
@@ -3619,8 +3781,8 @@ Set the @code{FS} variable to @var{fs}
 @cindex @option{-f} option
 @cindex @option{--file} option
 @cindex @command{awk} programs, location of
-Read @command{awk} program source from @var{source-file}
-instead of in the first non-option argument.
+Read the @command{awk} program source from @var{source-file}
+instead of in the first nonoption argument.
 This option may be given multiple times; the @command{awk}
 program consists of the concatenation of the contents of
 each specified @var{source-file}.
@@ -3639,13 +3801,13 @@ The @option{-v} option can only set one variable, but it can be used
 more than once, setting another variable each time, like this:
 @samp{awk @w{-v foo=1} @w{-v bar=2} @dots{}}.
 
-@cindex built-in variables, @code{-v} option@comma{} setting with
-@cindex variables, built-in, @code{-v} option@comma{} setting with
+@cindex predefined variables, @code{-v} option@comma{} setting with
+@cindex variables, predefined @code{-v} option@comma{} setting with
 @quotation CAUTION
 Using @option{-v} to set the values of the built-in
 variables may lead to surprising results.  @command{awk} will reset the
 values of those variables as it needs to, possibly ignoring any
-predefined value you may have given.
+initial value you may have given.
 @end quotation
 
 @item -W @var{gawk-opt}
@@ -3674,8 +3836,6 @@ by the user that could start with @samp{-}.
 It is also useful for passing options on to the @command{awk}
 program; see @ref{Getopt Function}.
 @end table
-@c ENDOFRANGE gnulo
-@c ENDOFRANGE longo
 
 The following list describes @command{gawk}-specific options:
 
@@ -3687,14 +3847,14 @@ The following list describes @command{gawk}-specific options:
 @cindex @option{--characters-as-bytes} option
 Cause @command{gawk} to treat all input data as single-byte characters.
 In addition, all output written with @code{print} or @code{printf}
-are treated as single-byte characters.
+is treated as single-byte characters.
 
 Normally, @command{gawk} follows the POSIX standard and attempts to process
 its input data according to the current locale (@pxref{Locales}). This can often involve
 converting multibyte characters into wide characters (internally), and
 can lead to problems or confusion if the input data does not contain valid
-multibyte characters. This option is an easy way to tell @command{gawk}:
-``hands off my data!''.
+multibyte characters. This option is an easy way to tell @command{gawk},
+``Hands off my data!''
 
 @item @option{-c}
 @itemx @option{--traditional}
@@ -3728,7 +3888,7 @@ Print the short version of the General Public License and then exit.
 @cindex variables, global, printing list of
 Print a sorted list of global variables, their types, and final values
 to @var{file}.  If no @var{file} is provided, print this
-list to the file named @file{awkvars.out} in the current directory.
+list to a file named @file{awkvars.out} in the current directory.
 No space is allowed between the @option{-d} and @var{file}, if
 @var{file} is supplied.
 
@@ -3748,9 +3908,10 @@ names like @code{i}, @code{j}, etc.)
 @cindex @command{awk} debugging, enabling
 Enable debugging of @command{awk} programs
 (@pxref{Debugging}).
-By default, the debugger reads commands interactively from the keyboard.
+By default, the debugger reads commands interactively from the keyboard
+(standard input).
 The optional @var{file} argument allows you to specify a file with a list
-of commands for the debugger to execute non-interactively.
+of commands for the debugger to execute noninteractively.
 No space is allowed between the @option{-D} and @var{file}, if
 @var{file} is supplied.
 
@@ -3788,7 +3949,13 @@ Command-line variable assignments of the form
 This option is particularly necessary for World Wide Web CGI applications
 that pass arguments through the URL; using this option prevents a malicious
 (or other) user from passing in options, assignments, or @command{awk} source
-code (via @option{-e}) to the CGI application.  This option should be used
+code (via @option{-e}) to the CGI application.@footnote{For more detail,
+please see Section 4.4 of @uref{http://www.ietf.org/rfc/rfc3875,
+RFC 3875}. Also see the
+@uref{http://lists.gnu.org/archive/html/bug-gawk/2014-11/msg00022.html,
+explanatory note sent to the @command{gawk} bug
+mailing list}.}
+This option should be used
 with @samp{#!} scripts (@pxref{Executable Scripts}), like so:
 
 @example
@@ -3804,7 +3971,7 @@ with @samp{#!} scripts (@pxref{Executable Scripts}), like so:
 @cindex portable object files, generating
 @cindex files, portable object, generating
 Analyze the source program and
-generate a GNU @command{gettext} Portable Object Template file on standard
+generate a GNU @command{gettext} portable object template file on standard
 output for all string constants that have been marked for translation.
 @xref{Internationalization},
 for information about this option.
@@ -3816,7 +3983,7 @@ for information about this option.
 @cindex GNU long options, printing list of
 @cindex options, printing list of
 @cindex printing, list of options
-Print a ``usage'' message summarizing the short and long style options
+Print a ``usage'' message summarizing the short- and long-style options
 that @command{gawk} accepts and then exit.
 
 @item @option{-i} @var{source-file}
@@ -3824,9 +3991,9 @@ that @command{gawk} accepts and then exit.
 @cindex @option{-i} option
 @cindex @option{--include} option
 @cindex @command{awk} programs, location of
-Read @command{awk} source library from @var{source-file}.  This option
+Read an @command{awk} source library from @var{source-file}.  This option
 is completely equivalent to using the @code{@@include} directive inside
-your program.  This option is very similar to the @option{-f} option,
+your program.  It is very similar to the @option{-f} option,
 but there are two important differences.  First, when @option{-i} is
 used, the program source is not loaded if it has been previously
 loaded, whereas with @option{-f}, @command{gawk} always loads the file.
@@ -3848,7 +4015,7 @@ environment variable.  The correct library suffix for your platform will be
 supplied by default, so it need not be specified in the extension name.
 The extension initialization routine should be named @code{dl_load()}.
 An alternative is to use the @code{@@load} keyword inside the program to load
-a shared library.  This feature is described in detail in @ref{Dynamic Extensions}.
+a shared library.  This advanced feature is described in detail in @ref{Dynamic Extensions}.
 
 @item @option{-L}[@var{value}]
 @itemx @option{--lint}[@code{=}@var{value}]
@@ -3879,7 +4046,7 @@ care to search for all occurrences of each inappropriate construct. As
 @itemx @option{--bignum}
 @cindex @option{-M} option
 @cindex @option{--bignum} option
-Force arbitrary precision arithmetic on numbers. This option has no effect
+Force arbitrary-precision arithmetic on numbers. This option has no effect
 if @command{gawk} is not compiled to use the GNU MPFR and MP libraries
 (@pxref{Arbitrary Precision Arithmetic}).
 
@@ -3895,8 +4062,8 @@ values in input data
 (@pxref{Nondecimal Data}).
 
 @quotation CAUTION
-This option can severely break old programs.
-Use with care.
+This option can severely break old programs.  Use with care.  Also note
+that this option may disappear in a future version of @command{gawk}.
 @end quotation
 
 @item @option{-N}
@@ -3911,7 +4078,7 @@ when parsing numeric input data (@pxref{Locales}).
 @cindex @option{-o} option
 @cindex @option{--pretty-print} option
 Enable pretty-printing of @command{awk} programs.
-By default, output program is created in a file named @file{awkprof.out}
+By default, the output program is created in a file named @file{awkprof.out}
 (@pxref{Profiling}).
 The optional @var{file} argument allows you to specify a different
 @value{FN} for the output.
@@ -3928,7 +4095,7 @@ This is no longer the case.
 @cindex @option{--optimize} option
 @cindex @option{-O} option
 Enable some optimizations on the internal representation of the program.
-At the moment this includes just simple constant folding.
+At the moment, this includes just simple constant folding.
 
 @item @option{-p}[@var{file}]
 @itemx @option{--profile}[@code{=}@var{file}]
@@ -3955,7 +4122,7 @@ in the left margin, and function call counts for each function.
 Operate in strict POSIX mode.  This disables all @command{gawk}
 extensions (just like @option{--traditional}) and
 disables all extensions not allowed by POSIX.
-@xref{Common Extensions}, for a summary of the extensions
+@DBXREF{Common Extensions} for a summary of the extensions
 in @command{gawk} that are disabled by this option.
 Also,
 the following additional
@@ -4005,8 +4172,8 @@ Allow interval expressions
 (@pxref{Regexp Operators})
 in regexps.
 This is now @command{gawk}'s default behavior.
-Nevertheless, this option remains both for backward compatibility,
-and for use in combination with @option{--traditional}.
+Nevertheless, this option remains (both for backward compatibility
+and for use in combination with @option{--traditional}).
 
 @item @option{-S}
 @itemx @option{--sandbox}
@@ -4059,7 +4226,8 @@ If it is, @command{awk} reads its program source from all of the named files, as
 if they had been concatenated together into one big file.  This is
 useful for creating libraries of @command{awk} functions.  These functions
 can be written once and then retrieved from a standard place, instead
-of having to be included into each individual program.
+of having to be included in each individual program.
+The @option{-i} option is similar in this regard.
 (As mentioned in
 @ref{Definition Syntax},
 function names must be unique.)
@@ -4069,20 +4237,20 @@ if the program is entered at the keyboard,
 by specifying @samp{-f /dev/tty}.  After typing your program,
 type @kbd{Ctrl-d} (the end-of-file character) to terminate it.
 (You may also use @samp{-f -} to read program source from the standard
-input but then you will not be able to also use the standard input as a
+input, but then you will not be able to also use the standard input as a
 source of data.)
 
 Because it is clumsy using the standard @command{awk} mechanisms to mix
 source file and command-line @command{awk} programs, @command{gawk}
 provides the @option{-e} option.  This does not require you to
-pre-empt the standard input for your source code; it allows you to easily
+preempt the standard input for your source code; it allows you to easily
 mix command-line and library source code (@pxref{AWKPATH Variable}).
 As with @option{-f}, the @option{-e} and @option{-i}
 options may also be used multiple times on the command line.
 
 @cindex @option{-e} option
 If no @option{-f} or @option{-e} option is specified, then @command{gawk}
-uses the first non-option command-line argument as the text of the
+uses the first nonoption command-line argument as the text of the
 program source code.
 
 @cindex @env{POSIXLY_CORRECT} environment variable
@@ -4121,8 +4289,6 @@ setenv POSIXLY_CORRECT true
 Having @env{POSIXLY_CORRECT} set is not recommended for daily use,
 but it is good for testing the portability of your programs to other
 environments.
-@c ENDOFRANGE ocl
-@c ENDOFRANGE clo
 
 @node Other Arguments
 @section Other Command-Line Arguments
@@ -4133,20 +4299,23 @@ Any additional arguments on the command line are normally treated as
 input files to be processed in the order specified.   However, an
 argument that has the form @code{@var{var}=@var{value}}, assigns
 the value @var{value} to the variable @var{var}---it does not specify a
-file at all.
-(See
-@ref{Assignment Options}.)
+file at all.  (See @ref{Assignment Options}.) In the following example,
+@var{count=1} is a variable assignment, not a @value{FN}:
+
+@example
+awk -f program.awk file1 count=1 file2
+@end example
 
 @cindex @command{gawk}, @code{ARGIND} variable in
 @cindex @code{ARGIND} variable, command-line arguments
 @cindex @code{ARGV} array, indexing into
 @cindex @code{ARGC}/@code{ARGV} variables, command-line arguments
-All these arguments are made available to your @command{awk} program in the
+All the command-line arguments are made available to your @command{awk} program in the
 @code{ARGV} array (@pxref{Built-in Variables}).  Command-line options
 and the program text (if present) are omitted from @code{ARGV}.
 All other arguments, including variable assignments, are
 included.   As each element of @code{ARGV} is processed, @command{gawk}
-sets the variable @code{ARGIND} to the index in @code{ARGV} of the
+sets @code{ARGIND} to the index in @code{ARGV} of the
 current element.
 
 @c FIXME: One day, move the ARGC and ARGV node closer to here.
@@ -4251,74 +4420,82 @@ behaves.
 @cindex @env{AWKPATH} environment variable
 @cindex directories, searching for source files
 @cindex search paths, for source files
-@cindex differences in @command{awk} and @command{gawk}, @code{AWKPATH} environment variable
+@cindex differences in @command{awk} and @command{gawk}, @env{AWKPATH} environment variable
 @ifinfo
 The previous @value{SECTION} described how @command{awk} program files can be named
 on the command line with the @option{-f} option.
 @end ifinfo
 In most @command{awk}
-implementations, you must supply a precise path name for each program
+implementations, you must supply a precise pathname for each program
 file, unless the file is in the current directory.
-But in @command{gawk}, if the @value{FN} supplied to the @option{-f}
+But with @command{gawk}, if the @value{FN} supplied to the @option{-f}
 or @option{-i} options
 does not contain a directory separator @samp{/}, then @command{gawk} searches a list of
-directories (called the @dfn{search path}), one by one, looking for a
+directories (called the @dfn{search path}) one by one, looking for a
 file with the specified name.
 
 The search path is a string consisting of directory names
-separated by colons@footnote{Semicolons on MS-Windows and MS-DOS.}.  @command{gawk} gets its search path from the
+separated by colons.@footnote{Semicolons on MS-Windows and MS-DOS.}
+@command{gawk} gets its search path from the
 @env{AWKPATH} environment variable.  If that variable does not exist,
-@command{gawk} uses a default path,
-@samp{.:/usr/local/share/awk}.@footnote{Your version of @command{gawk}
-may use a different directory; it
-will depend upon how @command{gawk} was built and installed. The actual
-directory is the value of @samp{$(datadir)} generated when
-@command{gawk} was configured.  You probably don't need to worry about this,
-though.}
+or if it has an empty value,
+@command{gawk} uses a default path (described shortly).
 
 The search path feature is particularly helpful for building libraries
 of useful @command{awk} functions.  The library files can be placed in a
 standard directory in the default path and then specified on
-the command line with a short @value{FN}.  Otherwise, the full @value{FN}
-would have to be typed for each file.
+the command line with a short @value{FN}.  Otherwise, you would have to
+type the full @value{FN} for each file.
 
-By using the @option{-i} option, or the @option{-e} and @option{-f} options, your command-line
+By using the @option{-i} or @option{-f} options, your command-line
 @command{awk} programs can use facilities in @command{awk} library files
 (@pxref{Library Functions}).
 Path searching is not done if @command{gawk} is in compatibility mode.
 This is true for both @option{--traditional} and @option{--posix}.
 @xref{Options}.
 
-If the source code is not found after the initial search, the path is searched
-again after adding the default @samp{.awk} suffix to the @value{FN}.
+If the source code file is not found after the initial search, the path is searched
+again after adding the suffix @samp{.awk} to the @value{FN}.
 
-@quotation NOTE
-@c 4/2014:
-@c using @samp{.} to get quotes, since @file{} no longer supplies them.
-To include
-the current directory in the path, either place
-@samp{.} explicitly in the path or write a null entry in the
-path.  (A null entry is indicated by starting or ending the path with a
-colon or by placing two colons next to each other [@samp{::}].)
-This path search mechanism is similar
+@command{gawk}'s path search mechanism is similar
 to the shell's.
 (See @uref{http://www.gnu.org/software/bash/manual/,
-@cite{The Bourne-Again SHell manual}.})
+@cite{The Bourne-Again SHell manual}}.)
+It treats a null entry in the path as indicating the current
+directory.
+(A null entry is indicated by starting or ending the path with a
+colon or by placing two colons next to each other [@samp{::}].)
 
-However, @command{gawk} always looks in the current directory @emph{before}
-searching @env{AWKPATH}, so there is no real reason to include
-the current directory in the search path.
-@c Prior to 4.0, gawk searched the current directory after the
-@c path search, but it's not worth documenting it.
+@quotation NOTE
+To include the current directory in the path, either place @file{.}
+as an entry in the path or write a null entry in the path.
+
+Different past versions of @command{gawk} would also look explicitly in
+the current directory, either before or after the path search.  As of
+@value{PVERSION} 4.1.2, this no longer happens; if you wish to look
+in the current directory, you must include @file{.} either as a separate
+entry or as a null entry in the search path.
 @end quotation
 
-If @env{AWKPATH} is not defined in the
-environment, @command{gawk} places its default search path into
-@code{ENVIRON["AWKPATH"]}. This makes it easy to determine
-the actual search path that @command{gawk} used
-from within an @command{awk} program.
+The default value for @env{AWKPATH} is
+@samp{.:/usr/local/share/awk}.@footnote{Your version of @command{gawk}
+may use a different directory; it
+will depend upon how @command{gawk} was built and installed. The actual
+directory is the value of @code{$(datadir)} generated when
+@command{gawk} was configured.  You probably don't need to worry about this,
+though.}  Since @file{.} is included at the beginning, @command{gawk}
+searches first in the current directory and then in @file{/usr/local/share/awk}.
+In practice, this means that you will rarely need to change the
+value of @env{AWKPATH}.
+
+@xref{Shell Startup Files}, for information on functions that help to
+manipulate the @env{AWKPATH} variable.
+
+@command{gawk} places the value of the search path that it used into
+@code{ENVIRON["AWKPATH"]}. This provides access to the actual search
+path value from within an @command{awk} program.
 
-While you can change @code{ENVIRON["AWKPATH"]} within your @command{awk}
+Although you can change @code{ENVIRON["AWKPATH"]} within your @command{awk}
 program, this has no effect on the running program's behavior.  This makes
 sense: the @env{AWKPATH} environment variable is used to find the program
 source files.  Once your program is running, all the files have been
@@ -4340,24 +4517,26 @@ the platform.  For example, on GNU/Linux systems, the suffix @samp{.so}
 is used.  The search path specified is also used for extensions loaded
 via the @code{@@load} keyword (@pxref{Loading Shared Libraries}).
 
+If @env{AWKLIBPATH} does not exist in the environment, or if it has
+an empty value, @command{gawk} uses a default path; this
+is typically @samp{/usr/local/lib/gawk}, although it can vary depending
+upon how @command{gawk} was built.
+
+@xref{Shell Startup Files}, for information on functions that help to
+manipulate the @env{AWKLIBPATH} variable.
+
+@command{gawk} places the value of the search path that it used into
+@code{ENVIRON["AWKLIBPATH"]}. This provides access to the actual search
+path value from within an @command{awk} program.
+
 @node Other Environment Variables
 @subsection Other Environment Variables
 
 A number of other environment variables affect @command{gawk}'s
 behavior, but they are more specialized. Those in the following
-list are meant to be used by regular users.
+list are meant to be used by regular users:
 
 @table @env
-@item POSIXLY_CORRECT
-Causes @command{gawk} to switch to POSIX compatibility
-mode, disabling all traditional and GNU extensions.
-@xref{Options}.
-
-@item GAWK_SOCK_RETRIES
-Controls the number of times @command{gawk} attempts to
-retry a two-way TCP/IP (socket) connection before giving up.
-@xref{TCP/IP Networking}.
-
 @item GAWK_MSEC_SLEEP
 Specifies the interval between connection retries,
 in milliseconds. On systems that do not support
@@ -4368,6 +4547,18 @@ the value is rounded up to an integral number of seconds.
 Specifies the time, in milliseconds, for @command{gawk} to
 wait for input before returning with an error.
 @xref{Read Timeout}.
+
+@item GAWK_SOCK_RETRIES
+Controls the number of times @command{gawk} attempts to
+retry a two-way TCP/IP (socket) connection before giving up.
+@xref{TCP/IP Networking}.
+Note that when nonfatal I/O is enabled (@pxref{Nonfatal}),
+@command{gawk} only tries to open a TCP/IP socket once.
+
+@item POSIXLY_CORRECT
+Causes @command{gawk} to switch to POSIX-compatibility
+mode, disabling all traditional and GNU extensions.
+@xref{Options}.
 @end table
 
 The environment variables in the following list are meant
@@ -4382,7 +4573,7 @@ file as the size of the memory buffer to allocate for I/O. Otherwise,
 the value should be a number, and @command{gawk} uses that number as
 the size of the buffer to allocate.  (When this variable is not set,
 @command{gawk} uses the smaller of the file's size and the ``default''
-blocksize, which is usually the filesystems I/O blocksize.)
+blocksize, which is usually the filesystem's I/O blocksize.)
 
 @item AWK_HASH
 If this variable exists with a value of @samp{gst}, @command{gawk}
@@ -4397,10 +4588,11 @@ for debugging problems on filesystems on non-POSIX operating systems
 where I/O is performed in records, not in blocks.
 
 @item GAWK_MSG_SRC
-If this variable exists, @command{gawk} includes the source file
-name and line number from which warning and/or fatal messages
+If this variable exists, @command{gawk} includes the @value{FN}
+and line number within the @command{gawk} source code
+from which warning and/or fatal messages
 are generated.  Its purpose is to help isolate the source of a
-message, since there can be multiple places which produce the
+message, as there are multiple places that produce the
 same warning or error message.
 
 @item GAWK_NO_DFA
@@ -4416,16 +4608,16 @@ This specifies the amount by which @command{gawk} should grow its
 internal evaluation stack, when needed.
 
 @item INT_CHAIN_MAX
-The average number of items @command{gawk} will maintain on a
+This specifies intended maximum number of items @command{gawk} will maintain on a
 hash chain for managing arrays indexed by integers.
 
 @item STR_CHAIN_MAX
-The average number of items @command{gawk} will maintain on a
+This specifies intended maximum number of items @command{gawk} will maintain on a
 hash chain for managing arrays indexed by strings.
 
 @item TIDYMEM
 If this variable exists, @command{gawk} uses the @code{mtrace()} library
-calls from GNU LIBC to help track down possible memory leaks.
+calls from the GNU C library to help track down possible memory leaks.
 @end table
 
 @node Exit Status
@@ -4444,11 +4636,11 @@ If an error occurs, @command{gawk} exits with the value of
 the C constant @code{EXIT_FAILURE}.  This is usually one.
 
 If @command{gawk} exits because of a fatal error, the exit
-status is 2.  On non-POSIX systems, this value may be mapped
+status is two.  On non-POSIX systems, this value may be mapped
 to @code{EXIT_FAILURE}.
 
 @node Include Files
-@section Including Other Files Into Your Program
+@section Including Other Files into Your Program
 
 @c Panos Papadopoulos <panos1962@gmail.com> contributed the original
 @c text for this section.
@@ -4462,7 +4654,7 @@ The @code{@@include} keyword can be used to read external @command{awk} source
 files.  This gives you the ability to split large @command{awk} source files
 into smaller, more manageable pieces, and also lets you reuse common @command{awk}
 code from various @command{awk} scripts.  In other words, you can group
-together @command{awk} functions, used to carry out specific tasks,
+together @command{awk} functions used to carry out specific tasks
 into external files. These files can be used just like function libraries,
 using the @code{@@include} keyword in conjunction with the @env{AWKPATH}
 environment variable.  Note that source files may also be included
@@ -4493,13 +4685,13 @@ produces the following result:
 
 @example
 $ @kbd{gawk -f test2}
-@print{} This is file test1.
-@print{} This is file test2.
+@print{} This is script test1.
+@print{} This is script test2.
 @end example
 
-@code{gawk} runs the @file{test2} script which includes @file{test1}
+@command{gawk} runs the @file{test2} script, which includes @file{test1}
 using the @code{@@include}
-keyword.  So, to include external @command{awk} source files you just
+keyword.  So, to include external @command{awk} source files, you just
 use @code{@@include} followed by the name of the file to be included,
 enclosed in double quotes.
 
@@ -4524,9 +4716,9 @@ following results:
 
 @example
 $ @kbd{gawk -f test3}
-@print{} This is file test1.
-@print{} This is file test2.
-@print{} This is file test3.
+@print{} This is script test1.
+@print{} This is script test2.
+@print{} This is script test3.
 @end example
 
 The @value{FN} can, of course, be a pathname. For example:
@@ -4536,27 +4728,28 @@ The @value{FN} can, of course, be a pathname. For example:
 @end example
 
 @noindent
-or:
+and:
 
 @example
 @@include "/usr/awklib/network"
 @end example
 
 @noindent
-are valid. The @code{AWKPATH} environment variable can be of great
+are both valid. The @env{AWKPATH} environment variable can be of great
 value when using @code{@@include}. The same rules for the use
-of the @code{AWKPATH} variable in command-line file searches
+of the @env{AWKPATH} variable in command-line file searches
 (@pxref{AWKPATH Variable}) apply to
 @code{@@include} also.
 
 This is very helpful in constructing @command{gawk} function libraries.
-If you have a large script with useful, general purpose @command{awk}
+If you have a large script with useful, general-purpose @command{awk}
 functions, you can break it down into library files and put those files
-in a special directory.  You can then include those ``libraries,'' using
-either the full pathnames of the files, or by setting the @code{AWKPATH}
+in a special directory.  You can then include those ``libraries,''
+either by using the full pathnames of the files, or by setting the @env{AWKPATH}
 environment variable accordingly and then using @code{@@include} with
-just the file part of the full pathname. Of course you can have more
-than one directory to keep library files; the more complex the working
+just the file part of the full pathname. Of course,
+you can keep library files in more than one directory;
+the more complex the working
 environment is, the more directories you may need to organize the files
 to be included.
 
@@ -4569,11 +4762,11 @@ In particular, @code{@@include} is very useful for writing CGI scripts
 to be run from web pages.
 
 As mentioned in @ref{AWKPATH Variable}, the current directory is always
-searched first for source files, before searching in @env{AWKPATH},
-and this also applies to files named with @code{@@include}.
+searched first for source files, before searching in @env{AWKPATH};
+this also applies to files named with @code{@@include}.
 
 @node Loading Shared Libraries
-@section Loading Dynamic Extensions Into Your Program
+@section Loading Dynamic Extensions into Your Program
 
 This @value{SECTION} describes a feature that is specific to @command{gawk}.
 
@@ -4583,7 +4776,7 @@ This @value{SECTION} describes a feature that is specific to @command{gawk}.
 The @code{@@load} keyword can be used to read external @command{awk} extensions
 (stored as system shared libraries).
 This allows you to link in compiled code that may offer superior
-performance and/or give you access to extended capabilities not supported 
+performance and/or give you access to extended capabilities not supported
 by the @command{awk} language.  The @env{AWKLIBPATH} variable is used to
 search for the extension.  Using @code{@@load} is completely equivalent
 to using the @option{-l} command-line option.
@@ -4591,7 +4784,7 @@ to using the @option{-l} command-line option.
 If the extension is not initially found in @env{AWKLIBPATH}, another
 search is conducted after appending the platform's default shared library
 suffix to the @value{FN}.  For example, on GNU/Linux systems, the suffix
-@samp{.so} is used.
+@samp{.so} is used:
 
 @example
 $ @kbd{gawk '@@load "ordchr"; BEGIN @{print chr(65)@}'}
@@ -4613,6 +4806,7 @@ that requires access to an extension.
 
 @ref{Dynamic Extensions}, describes how to write extensions (in C or C++)
 that can be loaded with either @code{@@load} or the @option{-l} option.
+It also describes the @code{ordchr} extension.
 
 @node Obsolete
 @section Obsolete Options and/or Features
@@ -4623,8 +4817,8 @@ that can be loaded with either @code{@@load} or the @option{-l} option.
 @cindex features, deprecated
 @cindex obsolete features
 This @value{SECTION} describes features and/or command-line options from
-previous releases of @command{gawk} that are either not available in the
-current version or that are still supported but deprecated (meaning that
+previous releases of @command{gawk} that either are not available in the
+current version or are still supported but deprecated (meaning that
 they will @emph{not} be in the next release).
 
 The process-related special files @file{/dev/pid}, @file{/dev/ppid},
@@ -4681,15 +4875,15 @@ awk '@{ sum += $1 @} END @{ print sum @}'
 @end example
 
 @command{gawk} actually supports this but it is purposely undocumented
-because it is considered bad style.  The correct way to write such a program
-is either
+because it is bad style.  The correct way to write such a program
+is either:
 
 @example
 awk '@{ sum += $1 @} ; END @{ print sum @}'
 @end example
 
 @noindent
-or
+or:
 
 @example
 awk '@{ sum += $1 @}
@@ -4697,15 +4891,14 @@ awk '@{ sum += $1 @}
 @end example
 
 @noindent
-@xref{Statements/Lines}, for a fuller
-explanation.
+@xref{Statements/Lines}, for a fuller explanation.
 
 You can insert newlines after the @samp{;} in @code{for} loops.
 This seems to have been a long-undocumented feature in Unix @command{awk}.
 
 Similarly, you may use @code{print} or @code{printf} statements in the
 @var{init} and @var{increment} parts of a @code{for} loop.  This is another
-long-undocumented ``feature'' of Unix @code{awk}.
+long-undocumented ``feature'' of Unix @command{awk}.
 
 @end ignore
 
@@ -4722,23 +4915,24 @@ to run @command{awk}.
 
 @item
 The three standard options for all versions of @command{awk} are
-@option{-f}, @option{-F} and @option{-v}.  @command{gawk} supplies these
+@option{-f}, @option{-F}, and @option{-v}.  @command{gawk} supplies these
 and many others, as well as corresponding GNU-style long options.
 
 @item
-Non-option command-line arguments are usually treated as @value{FN}s,
+Nonoption command-line arguments are usually treated as @value{FN}s,
 unless they have the form @samp{@var{var}=@var{value}}, in which case
 they are taken as variable assignments to be performed at that point
 in processing the input.
 
 @item
-All non-option command-line arguments, excluding the program text,
+All nonoption command-line arguments, excluding the program text,
 are placed in the @code{ARGV} array.  Adjusting @code{ARGC} and @code{ARGV}
 affects how @command{awk} processes input.
 
 @item
 You can use a single minus sign (@samp{-}) to refer to standard input
-on the command line.
+on the command line. @command{gawk} also lets you use the special
+@value{FN} @file{/dev/stdin}.
 
 @item
 @command{gawk} pays attention to a number of environment variables.
@@ -4758,13 +4952,12 @@ and @option{-f} command-line options.
 @item
 @command{gawk} allows you to load additional functions written in C
 or C++ using the @code{@@load} statement and/or the @option{-l} option.
-(This advanced feature is described later on in @ref{Dynamic Extensions}.)
+(This advanced feature is described later, in @ref{Dynamic Extensions}.)
 @end itemize
 
 @node Regexp
 @chapter Regular Expressions
 @cindex regexp
-@c STARTOFRANGE regexp
 @cindex regular expressions
 
 A @dfn{regular expression}, or @dfn{regexp}, is a way of describing a
@@ -4780,7 +4973,7 @@ belongs to that set.
 The simplest regular expression is a sequence of letters, numbers, or
 both.  Such a regexp matches any string that contains that sequence.
 Thus, the regexp @samp{foo} matches any string containing @samp{foo}.
-Therefore, the pattern @code{/foo/} matches any input record containing
+Thus, the pattern @code{/foo/} matches any input record containing
 the three adjacent characters @samp{foo} @emph{anywhere} in the record.  Other
 kinds of regexps let you specify more complicated classes of strings.
 
@@ -4843,17 +5036,16 @@ and @samp{!~} perform regular expression comparisons.  Expressions
 using these operators can be used as patterns, or in @code{if},
 @code{while}, @code{for}, and @code{do} statements.
 (@xref{Statements}.)
-For example:
+For example, the following is true if the expression @var{exp} (taken
+as a string) matches @var{regexp}:
 
 @example
 @var{exp} ~ /@var{regexp}/
 @end example
 
 @noindent
-is true if the expression @var{exp} (taken as a string)
-matches @var{regexp}.  The following example matches, or selects,
-all input records with the uppercase letter @samp{J} somewhere in the
-first field:
+This example matches, or selects, all input records with the uppercase
+letter @samp{J} somewhere in the first field:
 
 @example
 $ @kbd{awk '$1 ~ /J/' inventory-shipped}
@@ -4923,11 +5115,11 @@ string or regexp.  Thus, the string whose contents are the two characters
 @samp{"} and @samp{\} must be written @code{"\"\\"}.
 
 Other escape sequences represent unprintable characters
-such as TAB or newline.  While there is nothing to stop you from entering most
+such as TAB or newline.  There is nothing to stop you from entering most
 unprintable characters directly in a string constant or regexp constant,
-they may look ugly.
+but they may look ugly.
 
-The following table lists
+The following list presents
 all the escape sequences used in @command{awk} and
 what they represent. Unless noted otherwise, all these escape
 sequences apply to both string constants and regexp constants:
@@ -4972,7 +5164,7 @@ Horizontal TAB, @kbd{Ctrl-i}, ASCII code 9 (HT).
 @cindex @code{\} (backslash), @code{\v} escape sequence
 @cindex backslash (@code{\}), @code{\v} escape sequence
 @item \v
-Vertical tab, @kbd{Ctrl-k}, ASCII code 11 (VT).
+Vertical TAB, @kbd{Ctrl-k}, ASCII code 11 (VT).
 
 @cindex @code{\} (backslash), @code{\}@var{nnn} escape sequence
 @cindex backslash (@code{\}), @code{\}@var{nnn} escape sequence
@@ -4993,15 +5185,18 @@ of hexadecimal digits (@samp{0}--@samp{9}, and either @samp{A}--@samp{F}
 or @samp{a}--@samp{f}).  A maximum of two digts are allowed after
 the @samp{\x}. Any further hexadecimal digits are treated as simple
 letters or numbers.  @value{COMMONEXT}
+(The @samp{\x} escape sequence is not allowed in POSIX awk.)
 
 @quotation CAUTION
 In ISO C, the escape sequence continues until the first nonhexadecimal
 digit is seen.
-@c FIXME: Add exact version here.
 For many years, @command{gawk} would continue incorporating
 hexadecimal digits into the value until a non-hexadecimal digit
 or the end of the string was encountered.
-However, using more than two hexadecimal digits produces
+However, using more than two hexadecimal digits produced
+undefined results.
+As of @value{PVERSION} 4.2, only two digits
+are processed.
 @end quotation
 
 @cindex @code{\} (backslash), @code{\/} escape sequence
@@ -5011,7 +5206,7 @@ A literal slash (necessary for regexp constants only).
 This sequence is used when you want to write a regexp
 constant that contains a slash
 (such as @code{/.*:\/home\/[[:alnum:]]+:.*/}; the @samp{[[:alnum:]]}
-notation is discussed shortly, in @ref{Bracket Expressions}).
+notation is discussed in @ref{Bracket Expressions}).
 Because the regexp is delimited by
 slashes, you need to escape any slash that is part of the pattern,
 in order to tell @command{awk} to keep processing the rest of the regexp.
@@ -5034,7 +5229,7 @@ with a backslash have special meaning in regexps.
 
 In a regexp, a backslash before any character that is not in the previous list
 and not listed in
-@ref{GNU Regexp Operators},
+@DBREF{GNU Regexp Operators}
 means that the next character should be taken literally, even if it would
 normally be a regexp operator.  For example, @code{/a\+b/} matches the three
 characters @samp{a+b}.
@@ -5043,27 +5238,9 @@ characters @samp{a+b}.
 @cindex @code{\} (backslash), in escape sequences
 @cindex portability
 For complete portability, do not use a backslash before any character not
-shown in the previous list.
-
-To summarize:
-
-@itemize @value{BULLET}
-@item
-The escape sequences in the table above are always processed first,
-for both string constants and regexp constants. This happens very early,
-as soon as @command{awk} reads your program.
-
-@item
-@command{gawk} processes both regexp constants and dynamic regexps
-(@pxref{Computed Regexps}),
-for the special operators listed in
-@ref{GNU Regexp Operators}.
-
-@item
-A backslash before any other character means to treat that character
-literally.
-@end itemize
+shown in the previous list or that is not an operator.
 
+@c 11/2014: Moved so as to not stack sidebars
 @cindex sidebar, Backslash Before Regular Characters
 @ifdocbook
 @docbook
@@ -5148,6 +5325,25 @@ In such implementations, typing @code{"a\qc"} is the same as typing
 @end cartouche
 @end ifnotdocbook
 
+To summarize:
+
+@itemize @value{BULLET}
+@item
+The escape sequences in the preceding list are always processed first,
+for both string constants and regexp constants. This happens very early,
+as soon as @command{awk} reads your program.
+
+@item
+@command{gawk} processes both regexp constants and dynamic regexps
+(@pxref{Computed Regexps}),
+for the special operators listed in
+@ref{GNU Regexp Operators}.
+
+@item
+A backslash before any other character means to treat that character
+literally.
+@end itemize
+
 @cindex sidebar, Escape Sequences for Metacharacters
 @ifdocbook
 @docbook
@@ -5204,7 +5400,6 @@ escape sequences literally when used in regexp constants. Thus,
 
 @node Regexp Operators
 @section Regular Expression Operators
-@c STARTOFRANGE regexpo
 @cindex regular expressions, operators
 @cindex metacharacters in regular expressions
 
@@ -5222,14 +5417,14 @@ are recognized and converted into corresponding real characters as
 the very first step in processing regexps.
 
 Here is a list of metacharacters.  All characters that are not escape
-sequences and that are not listed in the table stand for themselves:
+sequences and that are not listed here stand for themselves:
 
 @c Use @asis so the docbook comes out ok. Sigh.
 @table @asis
 @cindex backslash (@code{\}), regexp operator
 @cindex @code{\} (backslash), regexp operator
 @item @code{\}
-This is used to suppress the special meaning of a character when
+This suppresses the special meaning of a character when
 matching.  For example, @samp{\$}
 matches the character @samp{$}.
 
@@ -5238,8 +5433,9 @@ matches the character @samp{$}.
 @cindex @code{^} (caret), regexp operator
 @cindex caret (@code{^}), regexp operator
 @item @code{^}
-This matches the beginning of a string.  For example, @samp{^@@chapter}
-matches @samp{@@chapter} at the beginning of a string and can be used
+This matches the beginning of a string.  @samp{^@@chapter}
+matches @samp{@@chapter} at the beginning of a string,
+for example, and can be used
 to identify chapter beginnings in Texinfo source files.
 The @samp{^} is known as an @dfn{anchor}, because it anchors the pattern to
 match only at the beginning of the string.
@@ -5279,10 +5475,10 @@ with @samp{A}.
 
 @cindex POSIX @command{awk}, period (@code{.})@comma{} using
 In strict POSIX mode (@pxref{Options}),
-@samp{.} does not match the @value{NUL}
+@samp{.} does not match the @sc{nul}
 character, which is a character with all bits equal to zero.
-Otherwise, @value{NUL} is just another character. Other versions of @command{awk}
-may not be able to match the @value{NUL} character.
+Otherwise, @sc{nul} is just another character. Other versions of @command{awk}
+may not be able to match the @sc{nul} character.
 
 @cindex @code{[]} (square brackets), regexp operator
 @cindex square brackets (@code{[]}), regexp operator
@@ -5344,10 +5540,10 @@ just @samp{p} if no @samp{h}s are present.
 There are two subtle points to understand about how @samp{*} works.
 First, the @samp{*} applies only to the single preceding regular expression
 component (e.g., in @samp{ph*}, it applies just to the @samp{h}).
-To cause @samp{*} to apply to a larger sub-expression, use parentheses:
-@samp{(ph)*} matches @samp{ph}, @samp{phph}, @samp{phphph} and so on.
+To cause @samp{*} to apply to a larger subexpression, use parentheses:
+@samp{(ph)*} matches @samp{ph}, @samp{phph}, @samp{phphph}, and so on.
 
-Second, @samp{*} finds as many repetititons as possible. If the text
+Second, @samp{*} finds as many repetitions as possible. If the text
 to be matched is @samp{phhhhhhhhhhhhhhooey}, @samp{ph*} matches all of
 the @samp{h}s.
 
@@ -5383,10 +5579,10 @@ is repeated at least @var{n} times:
 Matches @samp{whhhy}, but not @samp{why} or @samp{whhhhy}.
 
 @item wh@{3,5@}y
-Matches @samp{whhhy}, @samp{whhhhy}, or @samp{whhhhhy}, only.
+Matches @samp{whhhy}, @samp{whhhhy}, or @samp{whhhhhy} only.
 
 @item wh@{2,@}y
-Matches @samp{whhy} or @samp{whhhy}, and so on.
+Matches @samp{whhy}, @samp{whhhy}, and so on.
 @end table
 
 @cindex POSIX @command{awk}, interval expressions in
@@ -5435,17 +5631,15 @@ usage as a syntax error.
 
 If @command{gawk} is in compatibility mode (@pxref{Options}), interval
 expressions are not available in regular expressions.
-@c ENDOFRANGE regexpo
 
 @node Bracket Expressions
 @section Using Bracket Expressions
-@c STARTOFRANGE charlist
 @cindex bracket expressions
 @cindex bracket expressions, range expressions
 @cindex range expressions (regexps)
 @cindex character lists in regular expression
 
-As mentioned earlier, a bracket expression matches any character amongst
+As mentioned earlier, a bracket expression matches any character among
 those listed between the opening and closing square brackets.
 
 Within a bracket expression, a @dfn{range expression} consists of two
@@ -5479,7 +5673,7 @@ characters to be matched.
 @cindex Extended Regular Expressions (EREs)
 @cindex EREs (Extended Regular Expressions)
 @cindex @command{egrep} utility
-This treatment of @samp{\} in bracket expressions
+The treatment of @samp{\} in bracket expressions
 is compatible with other @command{awk}
 implementations and is also mandated by POSIX.
 The regular expressions in @command{awk} are a superset
@@ -5503,23 +5697,23 @@ a keyword denoting the class, and @samp{:]}.
 POSIX standard.
 
 @float Table,table-char-classes
-@caption{POSIX Character Classes}
+@caption{POSIX character classes}
 @multitable @columnfractions .15 .85
 @headitem Class @tab Meaning
-@item @code{[:alnum:]} @tab Alphanumeric characters.
-@item @code{[:alpha:]} @tab Alphabetic characters.
-@item @code{[:blank:]} @tab Space and TAB characters.
-@item @code{[:cntrl:]} @tab Control characters.
-@item @code{[:digit:]} @tab Numeric characters.
-@item @code{[:graph:]} @tab Characters that are both printable and visible.
-(A space is printable but not visible, whereas an @samp{a} is both.)
-@item @code{[:lower:]} @tab Lowercase alphabetic characters.
-@item @code{[:print:]} @tab Printable characters (characters that are not control characters).
+@item @code{[:alnum:]} @tab Alphanumeric characters
+@item @code{[:alpha:]} @tab Alphabetic characters
+@item @code{[:blank:]} @tab Space and TAB characters
+@item @code{[:cntrl:]} @tab Control characters
+@item @code{[:digit:]} @tab Numeric characters
+@item @code{[:graph:]} @tab Characters that are both printable and visible
+(a space is printable but not visible, whereas an @samp{a} is both)
+@item @code{[:lower:]} @tab Lowercase alphabetic characters
+@item @code{[:print:]} @tab Printable characters (characters that are not control characters)
 @item @code{[:punct:]} @tab Punctuation characters (characters that are not letters, digits,
-control characters, or space characters).
-@item @code{[:space:]} @tab Space characters (such as space, TAB, and formfeed, to name a few).
-@item @code{[:upper:]} @tab Uppercase alphabetic characters.
-@item @code{[:xdigit:]} @tab Characters that are hexadecimal digits.
+control characters, or space characters)
+@item @code{[:space:]} @tab Space characters (such as space, TAB, and formfeed, to name a few)
+@item @code{[:upper:]} @tab Uppercase alphabetic characters
+@item @code{[:xdigit:]} @tab Characters that are hexadecimal digits
 @end multitable
 @end float
 
@@ -5534,12 +5728,12 @@ and numeric characters in your character set.
 @c Thanks to
 @c Date: Tue, 01 Jul 2014 07:39:51 +0200
 @c From: Hermann Peifer <peifer@gmx.eu>
-Some utilities that match regular expressions provide a non-standard
-@code{[:ascii:]} character class; @command{awk} does not. However, you
-can simulate such a construct using @code{[\x00-\x7F]}.  This matches
+Some utilities that match regular expressions provide a nonstandard
+@samp{[:ascii:]} character class; @command{awk} does not. However, you
+can simulate such a construct using @samp{[\x00-\x7F]}.  This matches
 all values numerically between zero and 127, which is the defined
 range of the ASCII character set.  Use a complemented character list
-(@code{[^\x00-\x7F]}) to match any single-byte characters that are not
+(@samp{[^\x00-\x7F]}) to match any single-byte characters that are not
 in the ASCII range.
 
 @cindex bracket expressions, collating elements
@@ -5568,8 +5762,8 @@ Locale-specific names for a list of
 characters that are equal. The name is enclosed between
 @samp{[=} and @samp{=]}.
 For example, the name @samp{e} might be used to represent all of
-``e,'' ``@`e,'' and ``@'e.'' In this case, @samp{[[=e=]]} is a regexp
-that matches any of @samp{e}, @samp{@'e}, or @samp{@`e}.
+``e,'' ``@^e,'' ``@`e,'' and ``@'e.'' In this case, @samp{[[=e=]]} is a regexp
+that matches any of @samp{e}, @samp{@^e}, @samp{@'e}, or @samp{@`e}.
 @end table
 
 These features are very valuable in non-English-speaking locales.
@@ -5583,7 +5777,6 @@ expression matching currently recognize only POSIX character classes;
 they do not recognize collating symbols or equivalence classes.
 @end quotation
 @c maybe one day ...
-@c ENDOFRANGE charlist
 
 @node Leftmost Longest
 @section How Much Text Matches?
@@ -5596,11 +5789,11 @@ Consider the following:
 echo aaaabcd | awk '@{ sub(/a+/, "<A>"); print @}'
 @end example
 
-This example uses the @code{sub()} function (which we haven't discussed yet;
-@pxref{String Functions})
-to make a change to the input record. Here, the regexp @code{/a+/}
-indicates ``one or more @samp{a} characters,'' and the replacement
-text is @samp{<A>}.
+This example uses the @code{sub()} function to make a change to the input
+record.  (@code{sub()} replaces the first instance of any text matched
+by the first argument with the string provided as the second argument;
+@pxref{String Functions}.)  Here, the regexp @code{/a+/} indicates ``one
+or more @samp{a} characters,'' and the replacement text is @samp{<A>}.
 
 The input contains four @samp{a} characters.
 @command{awk} (and POSIX) regular expressions always match
@@ -5627,9 +5820,7 @@ and also @pxref{Field Separators}).
 @node Computed Regexps
 @section Using Dynamic Regexps
 
-@c STARTOFRANGE dregexp
 @cindex regular expressions, computed
-@c STARTOFRANGE regexpd
 @cindex regular expressions, dynamic
 @cindex @code{~} (tilde), @code{~} operator
 @cindex tilde (@code{~}), @code{~} operator
@@ -5655,14 +5846,14 @@ and tests whether the input record matches this regexp.
 
 @quotation NOTE
 When using the @samp{~} and @samp{!~}
-operators, there is a difference between a regexp constant
+operators, be aware that there is a difference between a regexp constant
 enclosed in slashes and a string constant enclosed in double quotes.
 If you are going to use a string constant, you have to understand that
 the string is, in essence, scanned @emph{twice}: the first time when
 @command{awk} reads your program, and the second time when it goes to
 match the string on the lefthand side of the operator with the pattern
 on the right.  This is true of any string-valued expression (such as
-@code{digits_regexp}, shown previously), not just string constants.
+@code{digits_regexp}, shown in the previous example), not just string constants.
 @end quotation
 
 @cindex regexp constants, slashes vs.@: quotes
@@ -5716,7 +5907,7 @@ intend a regexp match.
 @cindex regular expressions, dynamic, with embedded newlines
 @cindex newlines, in dynamic regexps
 
-Some versions of @command{awk} do not allow the newline
+Some older versions of @command{awk} do not allow the newline
 character to be used inside a bracket expression for a dynamic regexp:
 
 @example
@@ -5725,7 +5916,7 @@ $ @kbd{awk '$0 ~ "[ \t\n]"'}
 @error{} ]...
 @error{}  source line number 1
 @error{}  context is
-@error{}          >>>  <<<
+@error{}        $0 ~ "[ >>>  \t\n]" <<<
 @end example
 
 @cindex newlines, in regexp constants
@@ -5754,7 +5945,7 @@ occur often in practice, but it's worth noting for future reference.
 @cindex regular expressions, dynamic, with embedded newlines
 @cindex newlines, in dynamic regexps
 
-Some versions of @command{awk} do not allow the newline
+Some older versions of @command{awk} do not allow the newline
 character to be used inside a bracket expression for a dynamic regexp:
 
 @example
@@ -5763,7 +5954,7 @@ $ @kbd{awk '$0 ~ "[ \t\n]"'}
 @error{} ]...
 @error{}  source line number 1
 @error{}  context is
-@error{}          >>>  <<<
+@error{}        $0 ~ "[ >>>  \t\n]" <<<
 @end example
 
 @cindex newlines, in regexp constants
@@ -5780,17 +5971,13 @@ $ @kbd{awk '$0 ~ /[ \t\n]/'}
 occur often in practice, but it's worth noting for future reference.
 @end cartouche
 @end ifnotdocbook
-@c ENDOFRANGE dregexp
-@c ENDOFRANGE regexpd
 
 @node GNU Regexp Operators
 @section @command{gawk}-Specific Regexp Operators
 
 @c This section adapted (long ago) from the regex-0.12 manual
 
-@c STARTOFRANGE regexpg
 @cindex regular expressions, operators, @command{gawk}
-@c STARTOFRANGE gregexp
 @cindex @command{gawk}, regular expressions, operators
 @cindex operators, GNU-specific
 @cindex regular expressions, operators, for words
@@ -5866,7 +6053,7 @@ matches either @samp{ball} or @samp{balls}, as a separate word.
 @item \B
 Matches the empty string that occurs between two
 word-constituent characters. For example,
-@code{/\Brat\B/} matches @samp{crate} but it does not match @samp{dirty rat}.
+@code{/\Brat\B/} matches @samp{crate}, but it does not match @samp{dirty rat}.
 @samp{\B} is essentially the opposite of @samp{\y}.
 @end table
 
@@ -5874,9 +6061,9 @@ word-constituent characters. For example,
 @cindex regular expressions, operators, for buffers
 @cindex operators, string-matching, for buffers
 There are two other operators that work on buffers.  In Emacs, a
-@dfn{buffer} is, naturally, an Emacs buffer.  For other programs,
-@command{gawk}'s regexp library routines consider the entire
-string to match as the buffer.
+@dfn{buffer} is, naturally, an Emacs buffer.
+Other GNU programs, including @command{gawk},
+consider the entire string to match as the buffer.
 The operators are:
 
 @table @code
@@ -5885,14 +6072,14 @@ The operators are:
 @cindex backslash (@code{\}), @code{\`} operator (@command{gawk})
 @cindex @code{\} (backslash), @code{\`} operator (@command{gawk})
 Matches the empty string at the
-beginning of a buffer (string).
+beginning of a buffer (string)
 
 @c @cindex operators, @code{\'} (@command{gawk})
 @cindex backslash (@code{\}), @code{\'} operator (@command{gawk})
 @cindex @code{\} (backslash), @code{\'} operator (@command{gawk})
 @item \'
 Matches the empty string at the
-end of a buffer (string).
+end of a buffer (string)
 @end table
 
 @cindex @code{^} (caret), regexp operator
@@ -5937,16 +6124,16 @@ in @ref{Regexp Operators}.
 @end ifnottex
 
 @item @code{--posix}
-Only POSIX regexps are supported; the GNU operators are not special
+Match only POSIX regexps; the GNU operators are not special
 (e.g., @samp{\w} matches a literal @samp{w}).  Interval expressions
 are allowed.
 
 @cindex Brian Kernighan's @command{awk}
 @item @code{--traditional}
-Traditional Unix @command{awk} regexps are matched. The GNU operators
+Match traditional Unix @command{awk} regexps. The GNU operators
 are not special, and interval expressions are not available.
-The POSIX character classes (@samp{[[:alnum:]]}, etc.) are supported,
-as BWK @command{awk} does support them.
+Because BWK @command{awk} supports them,
+the POSIX character classes (@samp{[[:alnum:]]}, etc.) are available.
 Characters described by octal and hexadecimal escape sequences are
 treated literally, even if they represent regexp metacharacters.
 
@@ -5955,15 +6142,11 @@ Allow interval expressions in regexps, if @option{--traditional}
 has been provided.
 Otherwise, interval expressions are available by default.
 @end table
-@c ENDOFRANGE gregexp
-@c ENDOFRANGE regexpg
 
 @node Case-sensitivity
 @section Case Sensitivity in Matching
 
-@c STARTOFRANGE regexpcs
 @cindex regular expressions, case sensitivity
-@c STARTOFRANGE csregexp
 @cindex case sensitivity, regexps and
 Case is normally significant in regular expressions, both when matching
 ordinary characters (i.e., not metacharacters) and inside bracket
@@ -6006,7 +6189,7 @@ When @code{IGNORECASE} is not zero, @emph{all} regexp and string
 operations ignore case.
 
 Changing the value of @code{IGNORECASE} dynamically controls the
-case-sensitivity of the program as it runs.  Case is significant by
+case sensitivity of the program as it runs.  Case is significant by
 default because @code{IGNORECASE} (like most variables) is initialized
 to zero:
 
@@ -6019,7 +6202,7 @@ if (x ~ /ab/) @dots{}   # now it will succeed
 @end example
 
 In general, you cannot use @code{IGNORECASE} to make certain rules
-case-insensitive and other rules case-sensitive, because there is no
+case insensitive and other rules case sensitive, as there is no
 straightforward way
 to set @code{IGNORECASE} just for the pattern of
 a particular rule.@footnote{Experienced C and C++ programmers will note
@@ -6030,13 +6213,13 @@ and
 However, this is somewhat obscure and we don't recommend it.}
 To do this, use either bracket expressions or @code{tolower()}.  However, one
 thing you can do with @code{IGNORECASE} only is dynamically turn
-case-sensitivity on or off for all the rules at once.
+case sensitivity on or off for all the rules at once.
 
 @code{IGNORECASE} can be set on the command line or in a @code{BEGIN} rule
 (@pxref{Other Arguments}; also
 @pxref{Using BEGIN/END}).
 Setting @code{IGNORECASE} from the command line is a way to make
-a program case-insensitive without having to edit it.
+a program case insensitive without having to edit it.
 
 @c @cindex ISO 8859-1
 @c @cindex ISO Latin-1
@@ -6055,8 +6238,6 @@ the right thing.}
 The value of @code{IGNORECASE} has no effect if @command{gawk} is in
 compatibility mode (@pxref{Options}).
 Case is always significant in compatibility mode.
-@c ENDOFRANGE csregexp
-@c ENDOFRANGE regexpcs
 
 @node Regexp Summary
 @section Summary
@@ -6073,12 +6254,12 @@ in conditional expressions, or as part of matching expressions
 using the @samp{~} and @samp{!~} operators.
 
 @item
-Escape sequences let you represent non-printable characters and
+Escape sequences let you represent nonprintable characters and
 also let you represent regexp metacharacters as literal characters
 to be matched.
 
 @item
-Regexp operators provide grouping, alternation and repetition.
+Regexp operators provide grouping, alternation, and repetition.
 
 @item
 Bracket expressions give you a shorthand for specifying sets
@@ -6087,28 +6268,26 @@ Within bracket expressions, POSIX character classes let you specify
 certain groups of characters in a locale-independent fashion.
 
 @item
-@command{gawk}'s @code{IGNORECASE} variable lets you control the
-case sensitivity of regexp matching.  In other @command{awk}
-versions, use @code{tolower()} or @code{toupper()}.
-
-@item
 Regular expressions match the leftmost longest text in the string being
 matched.  This matters for cases where you need to know the extent of
 the match, such as for text substitution and when the record separator
 is a regexp.
 
 @item
-Matching expressions may use dynamic regexps, that is, string values
-treated as regular expressions.
+Matching expressions may use dynamic regexps (i.e., string values
+treated as regular expressions).
+
+@item
+@command{gawk}'s @code{IGNORECASE} variable lets you control the
+case sensitivity of regexp matching.  In other @command{awk}
+versions, use @code{tolower()} or @code{toupper()}.
 
 @end itemize
 
-@c ENDOFRANGE regexp
 
 @node Reading Files
 @chapter Reading Input Files
 
-@c STARTOFRANGE infir
 @cindex reading input files
 @cindex input files, reading
 @cindex input files
@@ -6119,7 +6298,7 @@ standard input (by default, this is the keyboard, but often it is a pipe from an
 command) or from files whose names you specify on the @command{awk}
 command line.  If you specify input files, @command{awk} reads them
 in order, processing all the data from one before going on to the next.
-The name of the current input file can be found in the built-in variable
+The name of the current input file can be found in the predefined variable
 @code{FILENAME}
 (@pxref{Built-in Variables}).
 
@@ -6133,7 +6312,7 @@ This makes it more convenient for programs to work on the parts of a record.
 
 @cindex @code{getline} command
 On rare occasions, you may need to use the @code{getline} command.
-The  @code{getline} command is valuable, both because it
+The  @code{getline} command is valuable both because it
 can do explicit input from any number of files, and because the files
 used with it do not have to be named on the @command{awk} command line
 (@pxref{Getline}).
@@ -6150,6 +6329,7 @@ used with it do not have to be named on the @command{awk} command line
 * Getline::                     Reading files under explicit program control
                                 using the @code{getline} function.
 * Read Timeout::                Reading input with a timeout.
+* Retrying Input::              Retrying input after certain errors.
 * Command-line directories::    What happens if you put a directory on the
                                 command line.
 * Input Summary::               Input summary.
@@ -6159,17 +6339,15 @@ used with it do not have to be named on the @command{awk} command line
 @node Records
 @section How Input Is Split into Records
 
-@c STARTOFRANGE inspl
 @cindex input, splitting into records
-@c STARTOFRANGE recspl
 @cindex records, splitting input into
 @cindex @code{NR} variable
 @cindex @code{FNR} variable
 @command{awk} divides the input for your program into records and fields.
 It keeps track of the number of records that have been read so far from
-the current input file.  This value is stored in a built-in variable
-called @code{FNR} which is reset to zero when a new file is started.
-Another built-in variable, @code{NR}, records the total number of input
+the current input file.  This value is stored in a predefined variable
+called @code{FNR}, which is reset to zero every time a new file is started.
+Another predefined variable, @code{NR}, records the total number of input
 records read so far from all @value{DF}s.  It starts at zero, but is
 never automatically reset to zero.
 
@@ -6179,15 +6357,15 @@ never automatically reset to zero.
 @end menu
 
 @node awk split records
-@subsection Record Splitting With Standard @command{awk}
+@subsection Record Splitting with Standard @command{awk}
 
 @cindex separators, for records
 @cindex record separators
 Records are separated by a character called the @dfn{record separator}.
 By default, the record separator is the newline character.
 This is why records are, by default, single lines.
-A different character can be used for the record separator by
-assigning the character to the built-in variable @code{RS}.
+To use a different character for the record separator,
+simply assign that character to the predefined variable @code{RS}.
 
 @cindex newlines, as record separators
 @cindex @code{RS} variable
@@ -6196,7 +6374,7 @@ the value of @code{RS} can be changed in the @command{awk} program
 with the assignment operator, @samp{=}
 (@pxref{Assignment Ops}).
 The new record-separator character should be enclosed in quotation marks,
-which indicate a string constant.  Often the right time to do this is
+which indicate a string constant.  Often, the right time to do this is
 at the beginning of execution, before any input is processed,
 so that the very first record is read with the proper separator.
 To do this, use the special @code{BEGIN} pattern
@@ -6210,8 +6388,8 @@ awk 'BEGIN @{ RS = "u" @}
 
 @noindent
 changes the value of @code{RS} to @samp{u}, before reading any input.
-This is a string whose first character is the letter ``u;'' as a result, records
-are separated by the letter ``u.''  Then the input file is read, and the second
+The new value is a string whose first character is the letter ``u''; as a result, records
+are separated by the letter ``u''.  Then the input file is read, and the second
 rule in the @command{awk} program (the action with no pattern) prints each
 record.  Because each @code{print} statement adds a newline at the end of
 its output, this @command{awk} program copies the input
@@ -6258,7 +6436,7 @@ $ @kbd{awk 'BEGIN @{ RS = "u" @}}
 @print{} m@@ny
 @print{} .ed
 @print{}      R
-@print{} 
+@print{}
 @end example
 
 @noindent
@@ -6272,8 +6450,8 @@ Bill         555-1675     bill.drowning@@hotmail.com       A
 @end example
 
 @noindent
-It contains no @samp{u} so there is no reason to split the record,
-unlike the others which have one or more occurrences of the @samp{u}.
+It contains no @samp{u}, so there is no reason to split the record,
+unlike the others, which each have one or more occurrences of the @samp{u}.
 In fact, this record is treated as part of the previous record;
 the newline separating them in the output
 is the original newline in the @value{DF}, not the one added by
@@ -6298,12 +6476,13 @@ Using an unusual character such as @samp{/} is more likely to
 produce correct behavior in the majority of cases, but there
 are no guarantees. The moral is: Know Your Data.
 
-There is one unusual case, that occurs when @command{gawk} is
+When using regular characters as the record separator,
+there is one unusual case that occurs when @command{gawk} is
 being fully POSIX-compliant (@pxref{Options}).
 Then, the following (extreme) pipeline prints a surprising @samp{1}:
 
 @example
-$ echo | gawk --posix 'BEGIN @{ RS = "a" @} ; @{ print NF @}'
+$ @kbd{echo | gawk --posix 'BEGIN @{ RS = "a" @} ; @{ print NF @}'}
 @print{} 1
 @end example
 
@@ -6325,7 +6504,7 @@ The empty string @code{""} (a string without any characters)
 has a special meaning
 as the value of @code{RS}. It means that records are separated
 by one or more blank lines and nothing else.
-@xref{Multiple Line}, for more details.
+@DBXREF{Multiple Line} for more details.
 
 If you change the value of @code{RS} in the middle of an @command{awk} run,
 the new value is used to delimit subsequent records, but the record
@@ -6345,7 +6524,7 @@ sets the variable @code{RT} to the text in the input that matched
 @code{RS}.
 
 @node gawk split records
-@subsection Record Splitting With @command{gawk}
+@subsection Record Splitting with @command{gawk}
 
 @cindex common extensions, @code{RS} as a regexp
 @cindex extensions, common@comma{} @code{RS} as a regexp
@@ -6367,7 +6546,7 @@ contains the same single character. However, when @code{RS} is a
 regular expression, @code{RT} contains
 the actual input text that matched the regular expression.
 
-If the input file ended without any text that matches @code{RS},
+If the input file ends without any text matching @code{RS},
 @command{gawk} sets @code{RT} to the null string.
 
 The following example illustrates both of these features.
@@ -6387,13 +6566,13 @@ $ @kbd{echo record 1 AAAA record 2 BBBB record 3 |}
 
 @noindent
 The square brackets delineate the contents of @code{RT}, letting you
-see the leading and trailing whitespace. The final value of @code{RT}
+see the leading and trailing whitespace. The final value of
 @code{RT} is a newline.
-@xref{Simple Sed}, for a more useful example
+@DBXREF{Simple Sed} for a more useful example
 of @code{RS} as a regexp and @code{RT}.
 
 If you set @code{RS} to a regular expression that allows optional
-trailing text, such as @samp{RS = "abc(XYZ)?"} it is possible, due
+trailing text, such as @samp{RS = "abc(XYZ)?"}, it is possible, due
 to implementation constraints, that @command{gawk} may match the leading
 part of the regular expression, but not the trailing part, particularly
 if the input text that could match the trailing part is fairly long.
@@ -6406,8 +6585,8 @@ metacharacters match the beginning and end of a @emph{string}, and not
 the beginning and end of a @emph{line}.  As a result, something like
 @samp{RS = "^[[:upper:]]"} can only match at the beginning of a file.
 This is because @command{gawk} views the input file as one long string
-that happens to contain newline characters in it.
-It is thus best to avoid anchor characters in the value of @code{RS}.
+that happens to contain newline characters.
+It is thus best to avoid anchor metacharacters in the value of @code{RS}.
 @end quotation
 
 @cindex differences in @command{awk} and @command{gawk}, @code{RS}/@code{RT} variables
@@ -6416,7 +6595,7 @@ variable are @command{gawk} extensions; they are not available in
 compatibility mode
 (@pxref{Options}).
 In compatibility mode, only the first character of the value of
-@code{RS} is used to determine the end of the record.
+@code{RS} determines the end of the record.
 
 @cindex sidebar, @code{RS = "\0"} Is Not Portable
 @ifdocbook
@@ -6431,7 +6610,7 @@ a value that you know doesn't occur in the input file.  This is hard
 to do in a general way, such that a program always works for arbitrary
 input files.
 
-You might think that for text files, the @value{NUL} character, which
+You might think that for text files, the @sc{nul} character, which
 consists of a character with all bits equal to zero, is a good
 value to use for @code{RS} in this case:
 
@@ -6440,29 +6619,30 @@ BEGIN @{ RS = "\0" @}  # whole file becomes one record?
 @end example
 
 @cindex differences in @command{awk} and @command{gawk}, strings, storing
-@command{gawk} in fact accepts this, and uses the @value{NUL}
+@command{gawk} in fact accepts this, and uses the @sc{nul}
 character for the record separator.
 This works for certain special files, such as @file{/proc/environ} on
-GNU/Linux systems, where the @value{NUL} character is in fact the record separator.
+GNU/Linux systems, where the @sc{nul} character is in fact the record separator.
 However, this usage is @emph{not} portable
 to most other @command{awk} implementations.
 
 @cindex dark corner, strings, storing
 Almost all other @command{awk} implementations@footnote{At least that we know
 about.} store strings internally as C-style strings.  C strings use the
-@value{NUL} character as the string terminator.  In effect, this means that
+@sc{nul} character as the string terminator.  In effect, this means that
 @samp{RS = "\0"} is the same as @samp{RS = ""}.
 @value{DARKCORNER}
 
-It happens that recent versions of @command{mawk} can use the @value{NUL}
+It happens that recent versions of @command{mawk} can use the @sc{nul}
 character as a record separator. However, this is a special case:
-@command{mawk} does not allow embedded @value{NUL} characters in strings.
+@command{mawk} does not allow embedded @sc{nul} characters in strings.
+(This may change in a future version of @command{mawk}.)
 
 @cindex records, treating files as
 @cindex treating files, as single records
-@xref{Readfile Function}, for an interesting, portable way to read
-whole files.  If you are using @command{gawk}, see @ref{Extension Sample
-Readfile}, for another option.
+@DBXREF{Readfile Function} for an interesting way to read
+whole files.  If you are using @command{gawk}, see @DBREF{Extension Sample
+Readfile} for another option.
 
 @docbook
 </sidebar>
@@ -6481,7 +6661,7 @@ a value that you know doesn't occur in the input file.  This is hard
 to do in a general way, such that a program always works for arbitrary
 input files.
 
-You might think that for text files, the @value{NUL} character, which
+You might think that for text files, the @sc{nul} character, which
 consists of a character with all bits equal to zero, is a good
 value to use for @code{RS} in this case:
 
@@ -6490,33 +6670,32 @@ BEGIN @{ RS = "\0" @}  # whole file becomes one record?
 @end example
 
 @cindex differences in @command{awk} and @command{gawk}, strings, storing
-@command{gawk} in fact accepts this, and uses the @value{NUL}
+@command{gawk} in fact accepts this, and uses the @sc{nul}
 character for the record separator.
 This works for certain special files, such as @file{/proc/environ} on
-GNU/Linux systems, where the @value{NUL} character is in fact the record separator.
+GNU/Linux systems, where the @sc{nul} character is in fact the record separator.
 However, this usage is @emph{not} portable
 to most other @command{awk} implementations.
 
 @cindex dark corner, strings, storing
 Almost all other @command{awk} implementations@footnote{At least that we know
 about.} store strings internally as C-style strings.  C strings use the
-@value{NUL} character as the string terminator.  In effect, this means that
+@sc{nul} character as the string terminator.  In effect, this means that
 @samp{RS = "\0"} is the same as @samp{RS = ""}.
 @value{DARKCORNER}
 
-It happens that recent versions of @command{mawk} can use the @value{NUL}
+It happens that recent versions of @command{mawk} can use the @sc{nul}
 character as a record separator. However, this is a special case:
-@command{mawk} does not allow embedded @value{NUL} characters in strings.
+@command{mawk} does not allow embedded @sc{nul} characters in strings.
+(This may change in a future version of @command{mawk}.)
 
 @cindex records, treating files as
 @cindex treating files, as single records
-@xref{Readfile Function}, for an interesting, portable way to read
-whole files.  If you are using @command{gawk}, see @ref{Extension Sample
-Readfile}, for another option.
+@DBXREF{Readfile Function} for an interesting way to read
+whole files.  If you are using @command{gawk}, see @DBREF{Extension Sample
+Readfile} for another option.
 @end cartouche
 @end ifnotdocbook
-@c ENDOFRANGE inspl
-@c ENDOFRANGE recspl
 
 @node Fields
 @section Examining Fields
@@ -6524,7 +6703,6 @@ Readfile}, for another option.
 @cindex examining fields
 @cindex fields
 @cindex accessing fields
-@c STARTOFRANGE fiex
 @cindex fields, examining
 @cindex POSIX @command{awk}, field separators and
 @cindex field separators, POSIX and
@@ -6535,9 +6713,9 @@ called @dfn{fields}.  By default, fields are separated by @dfn{whitespace},
 like words in a line.
 Whitespace in @command{awk} means any string of one or more spaces,
 TABs, or newlines;@footnote{In POSIX @command{awk}, newlines are not
-considered whitespace for separating fields.} other characters, such as
-formfeed, vertical tab, etc., that are
-considered whitespace by other languages, are @emph{not} considered
+considered whitespace for separating fields.} other characters
+that are considered whitespace by other languages
+(such as formfeed, vertical tab, etc.) are @emph{not} considered
 whitespace by @command{awk}.
 
 The purpose of fields is to make it more convenient for you to refer to
@@ -6549,12 +6727,12 @@ simple @command{awk} programs so powerful.
 @cindex @code{$} (dollar sign), @code{$} field operator
 @cindex dollar sign (@code{$}), @code{$} field operator
 @cindex field operators@comma{} dollar sign as
-You use a dollar-sign (@samp{$})
+You use a dollar sign (@samp{$})
 to refer to a field in an @command{awk} program,
 followed by the number of the field you want.  Thus, @code{$1}
 refers to the first field, @code{$2} to the second, and so on.
-(Unlike the Unix shells, the field numbers are not limited to single digits.
-@code{$127} is the one hundred twenty-seventh field in the record.)
+(Unlike in the Unix shells, the field numbers are not limited to single digits.
+@code{$127} is the 127th field in the record.)
 For example, suppose the following is a line of input:
 
 @example
@@ -6570,7 +6748,7 @@ field.
 
 @cindex @code{NF} variable
 @cindex fields, number of
-@code{NF} is a built-in variable whose value is the number of fields
+@code{NF} is a predefined variable whose value is the number of fields
 in the current record.  @command{awk} automatically updates the value
 of @code{NF} each time it reads a record.  No matter how many fields
 there are, the last field in a record can be represented by @code{$NF}.
@@ -6579,7 +6757,7 @@ If you try to reference a field beyond the last
 one (such as @code{$8} when the record has only seven fields), you get
 the empty string.  (If used in a numeric operation, you get zero.)
 
-The use of @code{$0}, which looks like a reference to the ``zero-th'' field, is
+The use of @code{$0}, which looks like a reference to the ``zeroth'' field, is
 a special case: it represents the whole input record. Use it
 when you are not interested in specific fields.
 Here are some more examples:
@@ -6592,15 +6770,11 @@ $ @kbd{awk '$1 ~ /li/ @{ print $0 @}' mail-list}
 
 @noindent
 This example prints each record in the file @file{mail-list} whose first
-field contains the string @samp{li}.  The operator @samp{~} is called a
-@dfn{matching operator}
-(@pxref{Regexp Usage});
-it tests whether a string (here, the field @code{$1}) matches a given regular
-expression.
+field contains the string @samp{li}.
 
-By contrast, the following example
-looks for @samp{li} in @emph{the entire record} and prints the first
-field and the last field for each matching input record:
+By contrast, the following example looks for @samp{li} in @emph{the
+entire record} and prints the first and last fields for each matching
+input record:
 
 @example
 $ @kbd{awk '/li/ @{ print $1, $NF @}' mail-list}
@@ -6609,7 +6783,6 @@ $ @kbd{awk '/li/ @{ print $1, $NF @}' mail-list}
 @print{} Julie F
 @print{} Samuel A
 @end example
-@c ENDOFRANGE fiex
 
 @node Nonconstant Fields
 @section Nonconstant Field Numbers
@@ -6628,7 +6801,7 @@ awk '@{ print $NR @}'
 
 @noindent
 Recall that @code{NR} is the number of records read so far: one in the
-first record, two in the second, etc.  So this example prints the first
+first record, two in the second, and so on.  So this example prints the first
 field of the first record, the second field of the second record, and so
 on.  For the twentieth record, field number 20 is printed; most likely,
 the record has fewer than 20 fields, so this prints a blank line.
@@ -6639,13 +6812,13 @@ awk '@{ print $(2*2) @}' mail-list
 @end example
 
 @command{awk} evaluates the expression @samp{(2*2)} and uses
-its value as the number of the field to print.  The @samp{*} sign
+its value as the number of the field to print.  The @samp{*}
 represents multiplication, so the expression @samp{2*2} evaluates to four.
 The parentheses are used so that the multiplication is done before the
 @samp{$} operation; they are necessary whenever there is a binary
 operator@footnote{A @dfn{binary operator}, such as @samp{*} for
 multiplication, is one that takes two operands. The distinction
-is required, since @command{awk} also has unary (one-operand)
+is required because @command{awk} also has unary (one-operand)
 and ternary (three-operand) operators.}
 in the field-number expression.  This example, then, prints the
 type of relationship (the fourth field) for every line of the file
@@ -6663,14 +6836,13 @@ implementations may behave differently.)
 
 As mentioned in @ref{Fields},
 @command{awk} stores the current record's number of fields in the built-in
-variable @code{NF} (also @pxref{Built-in Variables}).  The expression
+variable @code{NF} (also @pxref{Built-in Variables}).  Thus, the expression
 @code{$NF} is not a special feature---it is the direct consequence of
 evaluating @code{NF} and using its value as a field number.
 
 @node Changing Fields
 @section Changing the Contents of a Field
 
-@c STARTOFRANGE ficon
 @cindex fields, changing contents of
 The contents of a field, as seen by @command{awk}, can be changed within an
 @command{awk} program; this changes what @command{awk} perceives as the
@@ -6719,12 +6891,12 @@ $ @kbd{awk '@{ $2 = $2 - 10; print $0 @}' inventory-shipped}
 @dots{}
 @end example
 
-It is also possible to also assign contents to fields that are out
+It is also possible to assign contents to fields that are out
 of range.  For example:
 
 @example
-$ awk '@{ $6 = ($5 + $4 + $3 + $2)
->        print $6 @}' inventory-shipped
+$ @kbd{awk '@{ $6 = ($5 + $4 + $3 + $2)}
+> @kbd{       print $6 @}' inventory-shipped}
 @print{} 168
 @print{} 297
 @print{} 301
@@ -6770,9 +6942,9 @@ else
 
 @noindent
 should print @samp{everything is normal}, because @code{NF+1} is certain
-to be out of range.  (@xref{If Statement},
+to be out of range.  (@DBXREF{If Statement}
 for more information about @command{awk}'s @code{if-else} statements.
-@xref{Typing and Comparison},
+@DBXREF{Typing and Comparison}
 for more information about the @samp{!=} operator.)
 
 It is important to note that making an assignment to an existing field
@@ -6812,8 +6984,8 @@ after the new value of @code{NF} and recomputes @code{$0}.
 Here is an example:
 
 @example
-$ echo a b c d e f | awk '@{ print "NF =", NF;
->                            NF = 3; print $0 @}'
+$ @kbd{echo a b c d e f | awk '@{ print "NF =", NF;}
+> @kbd{                          NF = 3; print $0 @}'}
 @print{} NF = 6
 @print{} a b c
 @end example
@@ -6821,12 +6993,12 @@ $ echo a b c d e f | awk '@{ print "NF =", NF;
 @cindex portability, @code{NF} variable@comma{} decrementing
 @quotation CAUTION
 Some versions of @command{awk} don't
-rebuild @code{$0} when @code{NF} is decremented. Caveat emptor.
+rebuild @code{$0} when @code{NF} is decremented.
 @end quotation
 
 Finally, there are times when it is convenient to force
 @command{awk} to rebuild the entire record, using the current
-value of the fields and @code{OFS}.  To do this, use the
+values of the fields and @code{OFS}.  To do this, use the
 seemingly innocuous assignment:
 
 @example
@@ -6855,14 +7027,14 @@ such as @code{sub()} and @code{gsub()}
 It is important to remember that @code{$0} is the @emph{full}
 record, exactly as it was read from the input.  This includes
 any leading or trailing whitespace, and the exact whitespace (or other
-characters) that separate the fields.
+characters) that separates the fields.
 
-It is a not-uncommon error to try to change the field separators
+It is a common error to try to change the field separators
 in a record simply by setting @code{FS} and @code{OFS}, and then
 expecting a plain @samp{print} or @samp{print $0} to print the
 modified record.
 
-But this does not work, since nothing was done to change the record
+But this does not work, because nothing was done to change the record
 itself.  Instead, you must force the record to be rebuilt, typically
 with a statement such as @samp{$1 = $1}, as described earlier.
 
@@ -6880,20 +7052,19 @@ with a statement such as @samp{$1 = $1}, as described earlier.
 It is important to remember that @code{$0} is the @emph{full}
 record, exactly as it was read from the input.  This includes
 any leading or trailing whitespace, and the exact whitespace (or other
-characters) that separate the fields.
+characters) that separates the fields.
 
-It is a not-uncommon error to try to change the field separators
+It is a common error to try to change the field separators
 in a record simply by setting @code{FS} and @code{OFS}, and then
 expecting a plain @samp{print} or @samp{print $0} to print the
 modified record.
 
-But this does not work, since nothing was done to change the record
+But this does not work, because nothing was done to change the record
 itself.  Instead, you must force the record to be rebuilt, typically
 with a statement such as @samp{$1 = $1}, as described earlier.
 @end cartouche
 @end ifnotdocbook
 
-@c ENDOFRANGE ficon
 
 @node Field Separators
 @section Specifying How Fields Are Separated
@@ -6909,9 +7080,7 @@ with a statement such as @samp{$1 = $1}, as described earlier.
 
 @cindex @code{FS} variable
 @cindex fields, separating
-@c STARTOFRANGE fisepr
 @cindex field separators
-@c STARTOFRANGE fisepg
 @cindex fields, separating
 The @dfn{field separator}, which is either a single character or a regular
 expression, controls the way @command{awk} splits an input record into fields.
@@ -6932,7 +7101,7 @@ is split into three fields: @samp{m}, @samp{@bullet{}g}, and
 Note the leading spaces in the values of the second and third fields.
 
 @cindex troubleshooting, @command{awk} uses @code{FS} not @code{IFS}
-The field separator is represented by the built-in variable @code{FS}.
+The field separator is represented by the predefined variable @code{FS}.
 Shell programmers take note:  @command{awk} does @emph{not} use the
 name @code{IFS} that is used by the POSIX-compliant shells (such as
 the Unix Bourne shell, @command{sh}, or Bash).
@@ -6940,7 +7109,7 @@ the Unix Bourne shell, @command{sh}, or Bash).
 @cindex @code{FS} variable, changing value of
 The value of @code{FS} can be changed in the @command{awk} program with the
 assignment operator, @samp{=} (@pxref{Assignment Ops}).
-Often the right time to do this is at the beginning of execution
+Often, the right time to do this is at the beginning of execution
 before any input has been processed, so that the very first record
 is read with the proper separator.  To do this, use the special
 @code{BEGIN} pattern
@@ -6977,7 +7146,7 @@ John Q. Smith, LXIX, 29 Oak St., Walamazoo, MI 42139
 @end example
 
 @noindent
-The same program would extract @samp{@bullet{}LXIX}, instead of
+The same program would extract @samp{@bullet{}LXIX} instead of
 @samp{@bullet{}29@bullet{}Oak@bullet{}St.}.
 If you were expecting the program to print the
 address, you would be surprised.  The moral is to choose your data layout and
@@ -7011,9 +7180,7 @@ rules.
 @node Regexp Field Splitting
 @subsection Using Regular Expressions to Separate Fields
 
-@c STARTOFRANGE regexpfs
 @cindex regular expressions, as field separators
-@c STARTOFRANGE fsregexp
 @cindex field separators, regular expressions as
 The previous @value{SUBSECTION}
 discussed the use of single characters or simple strings as the
@@ -7086,16 +7253,17 @@ $ @kbd{echo '   a b c d' | awk '@{ print; $2 = $2; print @}'}
 The first @code{print} statement prints the record as it was read,
 with leading whitespace intact.  The assignment to @code{$2} rebuilds
 @code{$0} by concatenating @code{$1} through @code{$NF} together,
-separated by the value of @code{OFS}.  Because the leading whitespace
-was ignored when finding @code{$1}, it is not part of the new @code{$0}.
-Finally, the last @code{print} statement prints the new @code{$0}.
+separated by the value of @code{OFS} (which is a space by default).
+Because the leading whitespace was ignored when finding @code{$1},
+it is not part of the new @code{$0}.  Finally, the last @code{print}
+statement prints the new @code{$0}.
 
 @cindex @code{FS}, containing @code{^}
 @cindex @code{^} (caret), in @code{FS}
 @cindex dark corner, @code{^}, in @code{FS}
 There is an additional subtlety to be aware of when using regular expressions
 for field splitting.
-It is not well-specified in the POSIX standard, or anywhere else, what @samp{^}
+It is not well specified in the POSIX standard, or anywhere else, what @samp{^}
 means when splitting fields.  Does the @samp{^}  match only at the beginning of
 the entire record? Or is each field separator a new string?  It turns out that
 different @command{awk} versions answer this question differently, and you
@@ -7110,14 +7278,12 @@ also works this way. For example:
 @example
 $ @kbd{echo 'xxAA  xxBxx  C' |}
 > @kbd{gawk -F '(^x+)|( +)' '@{ for (i = 1; i <= NF; i++)}
->                                   @kbd{printf "-->%s<--\n", $i @}'}
+> @kbd{                            printf "-->%s<--\n", $i @}'}
 @print{} --><--
 @print{} -->AA<--
 @print{} -->xxBxx<--
 @print{} -->C<--
 @end example
-@c ENDOFRANGE regexpfs
-@c ENDOFRANGE fsregexp
 
 @node Single Character Fields
 @subsection Making Each Character a Separate Field
@@ -7173,15 +7339,10 @@ awk -F, '@var{program}' @var{input-files}
 @noindent
 sets @code{FS} to the @samp{,} character.  Notice that the option uses
 an uppercase @samp{F} instead of a lowercase @samp{f}. The latter
-option (@option{-f}) specifies a file
-containing an @command{awk} program.  Case is significant in command-line
-options:
-the @option{-F} and @option{-f} options have nothing to do with each other.
-You can use both options at the same time to set the @code{FS} variable
-@emph{and} get an @command{awk} program from a file.
+option (@option{-f}) specifies a file containing an @command{awk} program.
 
 The value used for the argument to @option{-F} is processed in exactly the
-same way as assignments to the built-in variable @code{FS}.
+same way as assignments to the predefined variable @code{FS}.
 Any special characters in the field separator must be escaped
 appropriately.  For example, to use a @samp{\} as the field separator
 on the command line, you would have to type:
@@ -7246,7 +7407,7 @@ choosing your field and record separators.
 @cindex Unix @command{awk}, password files@comma{} field separators and
 Perhaps the most common use of a single character as the field separator
 occurs when processing the Unix system password file.  On many Unix
-systems, each user has a separate entry in the system password file, one
+systems, each user has a separate entry in the system password file, with one
 line per user.  The information in these lines is separated by colons.
 The first field is the user's login name and the second is the user's
 encrypted or shadow password.  (A shadow password is indicated by the
@@ -7266,11 +7427,11 @@ awk -F: '$5 == ""' /etc/passwd
 @end example
 
 @node Full Line Fields
-@subsection Making The Full Line Be A Single Field
+@subsection Making the Full Line Be a Single Field
 
 Occasionally, it's useful to treat the whole input line as a
 single field.  This can be done easily and portably simply by
-setting @code{FS} to @code{"\n"} (a newline).@footnote{Thanks to
+setting @code{FS} to @code{"\n"} (a newline):@footnote{Thanks to
 Andrew Schorr for this tip.}
 
 @example
@@ -7280,43 +7441,6 @@ awk -F'\n' '@var{program}' @var{files @dots{}}
 @noindent
 When you do this, @code{$1} is the same as @code{$0}.
 
-@node Field Splitting Summary
-@subsection Field-Splitting Summary
-
-It is important to remember that when you assign a string constant
-as the value of @code{FS}, it undergoes normal @command{awk} string
-processing.  For example, with Unix @command{awk} and @command{gawk},
-the assignment @samp{FS = "\.."} assigns the character string @code{".."}
-to @code{FS} (the backslash is stripped).  This creates a regexp meaning
-``fields are separated by occurrences of any two characters.''
-If instead you want fields to be separated by a literal period followed
-by any single character, use @samp{FS = "\\.."}.
-
-The following table summarizes how fields are split, based on the value
-of @code{FS} (@samp{==} means ``is equal to''):
-
-@table @code
-@item FS == " "
-Fields are separated by runs of whitespace.  Leading and trailing
-whitespace are ignored.  This is the default.
-
-@item FS == @var{any other single character}
-Fields are separated by each occurrence of the character.  Multiple
-successive occurrences delimit empty fields, as do leading and
-trailing occurrences.
-The character can even be a regexp metacharacter; it does not need
-to be escaped.
-
-@item FS == @var{regexp}
-Fields are separated by occurrences of characters that match @var{regexp}.
-Leading and trailing matches of @var{regexp} delimit empty fields.
-
-@item FS == ""
-Each individual character in the record becomes a separate field.
-(This is a @command{gawk} extension; it is not specified by the
-POSIX standard.)
-@end table
-
 @cindex sidebar, Changing @code{FS} Does Not Affect the Fields
 @ifdocbook
 @docbook
@@ -7329,7 +7453,7 @@ POSIX standard.)
 According to the POSIX standard, @command{awk} is supposed to behave
 as if each record is split into fields at the time it is read.
 In particular, this means that if you change the value of @code{FS}
-after a record is read, the value of the fields (i.e., how they were split)
+after a record is read, the values of the fields (i.e., how they were split)
 should reflect the old value of @code{FS}, not the new one.
 
 @cindex dark corner, field separators
@@ -7342,10 +7466,7 @@ using the @emph{current} value of @code{FS}!
 @value{DARKCORNER}
 This behavior can be difficult
 to diagnose. The following example illustrates the difference
-between the two methods.
-(The @command{sed}@footnote{The @command{sed} utility is a ``stream editor.''
-Its behavior is also defined by the POSIX standard.}
-command prints just the first line of @file{/etc/passwd}.)
+between the two methods:
 
 @example
 sed 1q /etc/passwd | awk '@{ FS = ":" ; print $1 @}'
@@ -7363,9 +7484,13 @@ on an incorrect implementation of @command{awk}, while @command{gawk}
 prints the full first line of the file, something like:
 
 @example
-root:nSijPlPhZZwgE:0:0:Root:/:
+root:x:0:0:Root:/:
 @end example
 
+(The @command{sed}@footnote{The @command{sed} utility is a ``stream editor.''
+Its behavior is also defined by the POSIX standard.}
+command prints just the first line of @file{/etc/passwd}.)
+
 @docbook
 </sidebar>
 @end docbook
@@ -7382,7 +7507,7 @@ root:nSijPlPhZZwgE:0:0:Root:/:
 According to the POSIX standard, @command{awk} is supposed to behave
 as if each record is split into fields at the time it is read.
 In particular, this means that if you change the value of @code{FS}
-after a record is read, the value of the fields (i.e., how they were split)
+after a record is read, the values of the fields (i.e., how they were split)
 should reflect the old value of @code{FS}, not the new one.
 
 @cindex dark corner, field separators
@@ -7395,10 +7520,7 @@ using the @emph{current} value of @code{FS}!
 @value{DARKCORNER}
 This behavior can be difficult
 to diagnose. The following example illustrates the difference
-between the two methods.
-(The @command{sed}@footnote{The @command{sed} utility is a ``stream editor.''
-Its behavior is also defined by the POSIX standard.}
-command prints just the first line of @file{/etc/passwd}.)
+between the two methods:
 
 @example
 sed 1q /etc/passwd | awk '@{ FS = ":" ; print $1 @}'
@@ -7416,11 +7538,51 @@ on an incorrect implementation of @command{awk}, while @command{gawk}
 prints the full first line of the file, something like:
 
 @example
-root:nSijPlPhZZwgE:0:0:Root:/:
+root:x:0:0:Root:/:
 @end example
+
+(The @command{sed}@footnote{The @command{sed} utility is a ``stream editor.''
+Its behavior is also defined by the POSIX standard.}
+command prints just the first line of @file{/etc/passwd}.)
 @end cartouche
 @end ifnotdocbook
 
+@node Field Splitting Summary
+@subsection Field-Splitting Summary
+
+It is important to remember that when you assign a string constant
+as the value of @code{FS}, it undergoes normal @command{awk} string
+processing.  For example, with Unix @command{awk} and @command{gawk},
+the assignment @samp{FS = "\.."} assigns the character string @code{".."}
+to @code{FS} (the backslash is stripped).  This creates a regexp meaning
+``fields are separated by occurrences of any two characters.''
+If instead you want fields to be separated by a literal period followed
+by any single character, use @samp{FS = "\\.."}.
+
+The following list summarizes how fields are split, based on the value
+of @code{FS} (@samp{==} means ``is equal to''):
+
+@table @code
+@item FS == " "
+Fields are separated by runs of whitespace.  Leading and trailing
+whitespace are ignored.  This is the default.
+
+@item FS == @var{any other single character}
+Fields are separated by each occurrence of the character.  Multiple
+successive occurrences delimit empty fields, as do leading and
+trailing occurrences.
+The character can even be a regexp metacharacter; it does not need
+to be escaped.
+
+@item FS == @var{regexp}
+Fields are separated by occurrences of characters that match @var{regexp}.
+Leading and trailing matches of @var{regexp} delimit empty fields.
+
+@item FS == ""
+Each individual character in the record becomes a separate field.
+(This is a common extension; it is not specified by the POSIX standard.)
+@end table
+
 @cindex sidebar, @code{FS} and @code{IGNORECASE}
 @ifdocbook
 @docbook
@@ -7444,7 +7606,7 @@ print $1
 @noindent
 The output is @samp{aCa}.  If you really want to split fields on an
 alphabetic character while ignoring case, use a regexp that will
-do it for you.  E.g., @samp{FS = "[c]"}.  In this case, @code{IGNORECASE}
+do it for you (e.g., @samp{FS = "[c]"}).  In this case, @code{IGNORECASE}
 will take effect.
 
 @docbook
@@ -7474,31 +7636,29 @@ print $1
 @noindent
 The output is @samp{aCa}.  If you really want to split fields on an
 alphabetic character while ignoring case, use a regexp that will
-do it for you.  E.g., @samp{FS = "[c]"}.  In this case, @code{IGNORECASE}
+do it for you (e.g., @samp{FS = "[c]"}).  In this case, @code{IGNORECASE}
 will take effect.
 @end cartouche
 @end ifnotdocbook
 
-@c ENDOFRANGE fisepr
-@c ENDOFRANGE fisepg
 
 @node Constant Size
 @section Reading Fixed-Width Data
 
-@quotation NOTE
+@cindex data, fixed-width
+@cindex fixed-width data
+@cindex advanced features, fixed-width data
+
+@c O'Reilly doesn't like it as a note the first thing in the section.
 This @value{SECTION} discusses an advanced
 feature of @command{gawk}.  If you are a novice @command{awk} user,
 you might want to skip it on the first reading.
-@end quotation
 
-@cindex data, fixed-width
-@cindex fixed-width data
-@cindex advanced features, fixed-width data
-@command{gawk} provides a facility for dealing with
-fixed-width fields with no distinctive field separator.  For example,
-data of this nature arises in the input for old Fortran programs where
-numbers are run together, or in the output of programs that did not
-anticipate the use of their output as input for other programs.
+@command{gawk} provides a facility for dealing with fixed-width fields
+with no distinctive field separator.  For example, data of this nature
+arises in the input for old Fortran programs where numbers are run
+together, or in the output of programs that did not anticipate the use
+of their output as input for other programs.
 
 An example of the latter is a table where all the columns are lined up by
 the use of a variable number of spaces and @emph{empty fields are just
@@ -7518,7 +7678,7 @@ variable @code{FIELDWIDTHS}.  Each number specifies the width of the field,
 @emph{including} columns between fields.  If you want to ignore the columns
 between fields, you can specify the width as a separate field that is
 subsequently ignored.
-It is a fatal error to supply a field width that is not a positive number.
+It is a fatal error to supply a field width that has a negative value.
 The following data is the output of the Unix @command{w} utility.  It is useful
 to illustrate the use of @code{FIELDWIDTHS}:
 
@@ -7537,15 +7697,10 @@ dave     ttyq4    26Jun9115days     46     46  wnewmail
 @end group
 @end example
 
-The following program takes the above input, converts the idle time to
+The following program takes this input, converts the idle time to
 number of seconds, and prints out the first two fields and the calculated
 idle time:
 
-@quotation NOTE
-This program uses a number of @command{awk} features that
-haven't been introduced yet.
-@end quotation
-
 @example
 BEGIN  @{ FIELDWIDTHS = "9 6 10 6 7 7 35" @}
 NR > 2 @{
@@ -7564,6 +7719,11 @@ NR > 2 @{
 @}
 @end example
 
+@quotation NOTE
+The preceding program uses a number of @command{awk} features that
+haven't been introduced yet.
+@end quotation
+
 Running the program on the data produces the following results:
 
 @example
@@ -7595,7 +7755,7 @@ In order to tell which kind of field splitting is in effect,
 use @code{PROCINFO["FS"]}
 (@pxref{Auto-set}).
 The value is @code{"FS"} if regular field splitting is being used,
-or it is @code{"FIELDWIDTHS"} if fixed-width field splitting is being used:
+or @code{"FIELDWIDTHS"} if fixed-width field splitting is being used:
 
 @example
 if (PROCINFO["FS"] == "FS")
@@ -7609,17 +7769,16 @@ else
 This information is useful when writing a function
 that needs to temporarily change @code{FS} or @code{FIELDWIDTHS},
 read some records, and then restore the original settings
-(@pxref{Passwd Functions},
+(@DBPXREF{Passwd Functions}
 for an example of such a function).
 
 @node Splitting By Content
-@section Defining Fields By Content
+@section Defining Fields by Content
 
-@quotation NOTE
+@c O'Reilly doesn't like it as a note the first thing in the section.
 This @value{SECTION} discusses an advanced
 feature of @command{gawk}.  If you are a novice @command{awk} user,
 you might want to skip it on the first reading.
-@end quotation
 
 @cindex advanced features, specifying field content
 Normally, when using @code{FS}, @command{gawk} defines the fields as the
@@ -7630,14 +7789,16 @@ However, there are times when you really want to define the fields by
 what they are, and not by what they are not.
 
 The most notorious such case
-is so-called @dfn{comma separated value} (CSV) data. Many spreadsheet programs,
+is so-called @dfn{comma-separated values} (CSV) data. Many spreadsheet programs,
 for example, can export their data into text files, where each record is
-terminated with a newline, and fields are separated by commas. If only
-commas separated the data, there wouldn't be an issue. The problem comes when
-one of the fields contains an @emph{embedded} comma. While there is no
-formal standard specification for CSV data@footnote{At least, we don't know of one.},
-in such cases, most programs embed the field in double quotes. So we might
-have data like this:
+terminated with a newline, and fields are separated by commas. If
+commas only separated the data, there wouldn't be an issue. The problem comes when
+one of the fields contains an @emph{embedded} comma.
+In such cases, most programs embed the field in double quotes.@footnote{The
+CSV format lacked a formal standard definition for many years.
+@uref{http://www.ietf.org/rfc/rfc4180.txt, RFC 4180}
+standardizes the most common practices.}
+So, we might have data like this:
 
 @example
 @c file eg/misc/addresses.csv
@@ -7651,7 +7812,7 @@ The @code{FPAT} variable offers a solution for cases like this.
 The value of @code{FPAT} should be a string that provides a regular expression.
 This regular expression describes the contents of each field.
 
-In the case of CSV data as presented above, each field is either ``anything that
+In the case of CSV data as presented here, each field is either ``anything that
 is not a comma,'' or ``a double quote, anything that is not a double quote, and a
 closing double quote.''  If written as a regular expression constant
 (@pxref{Regexp}),
@@ -7716,15 +7877,15 @@ will be @code{"FPAT"} if content-based field splitting is being used.
 @quotation NOTE
 Some programs export CSV data that contains embedded newlines between
 the double quotes.  @command{gawk} provides no way to deal with this.
-Since there is no formal specification for CSV data, there isn't much
+Even though a formal specification for CSV data exists, there isn't much
 more to be done;
 the @code{FPAT} mechanism provides an elegant solution for the majority
-of cases, and the @command{gawk} developers are satisfied with that. 
+of cases, and the @command{gawk} developers are satisfied with that.
 @end quotation
 
 As written, the regexp used for @code{FPAT} requires that each field
-have a least one character.  A straightforward modification
-(changing changed the first @samp{+} to @samp{*}) allows fields to be empty:
+contain at least one character.  A straightforward modification
+(changing the first @samp{+} to @samp{*}) allows fields to be empty:
 
 @example
 FPAT = "([^,]*)|(\"[^\"]+\")"
@@ -7734,20 +7895,17 @@ Finally, the @code{patsplit()} function makes the same functionality
 available for splitting regular strings (@pxref{String Functions}).
 
 To recap, @command{gawk} provides three independent methods
-to split input records into fields. @command{gawk} uses whichever
-mechanism was last chosen based on which of the three
-variables---@code{FS}, @code{FIELDWIDTHS}, and @code{FPAT}---was
+to split input records into fields.
+The mechanism used is based on which of the three
+variables---@code{FS}, @code{FIELDWIDTHS}, or @code{FPAT}---was
 last assigned to.
 
 @node Multiple Line
 @section Multiple-Line Records
 
 @cindex multiple-line records
-@c STARTOFRANGE recm
 @cindex records, multiline
-@c STARTOFRANGE imr
 @cindex input, multiline records
-@c STARTOFRANGE frm
 @cindex files, reading, multiline records
 @cindex input, files, See input files
 In some databases, a single line cannot conveniently hold all the
@@ -7782,7 +7940,7 @@ at the end of the record and one or more blank lines after the record.
 In addition, a regular expression always matches the longest possible
 sequence when there is a choice
 (@pxref{Leftmost Longest}).
-So the next record doesn't start until
+So, the next record doesn't start until
 the first nonblank line that follows---no matter how many blank lines
 appear in a row, they are considered one record separator.
 
@@ -7797,10 +7955,10 @@ In the second case, this special processing is not done.
 @cindex field separator, in multiline records
 @cindex @code{FS}, in multiline records
 Now that the input is separated into records, the second step is to
-separate the fields in the record.  One way to do this is to divide each
+separate the fields in the records.  One way to do this is to divide each
 of the lines into fields in the normal manner.  This happens by default
 as the result of a special feature.  When @code{RS} is set to the empty
-string, @emph{and} @code{FS} is set to a single character,
+string @emph{and} @code{FS} is set to a single character,
 the newline character @emph{always} acts as a field separator.
 This is in addition to whatever field separations result from
 @code{FS}.@footnote{When @code{FS} is the null string (@code{""})
@@ -7815,7 +7973,7 @@ want the newline character to separate fields, because there is no way to
 prevent it.  However, you can work around this by using the @code{split()}
 function to break up the record manually
 (@pxref{String Functions}).
-If you have a single character field separator, you can work around
+If you have a single-character field separator, you can work around
 the special feature in a different way, by making @code{FS} into a
 regexp for that single character.  For example, if the field
 separator is a percent character, instead of
@@ -7823,10 +7981,10 @@ separator is a percent character, instead of
 
 Another way to separate fields is to
 put each field on a separate line: to do this, just set the
-variable @code{FS} to the string @code{"\n"}.  (This single
-character separator matches a single newline.)
+variable @code{FS} to the string @code{"\n"}.
+(This single-character separator matches a single newline.)
 A practical example of a @value{DF} organized this way might be a mailing
-list, where each entry is separated by blank lines.  Consider a mailing
+list, where blank lines separate the entries.  Consider a mailing
 list in a file named @file{addresses}, which looks like this:
 
 @example
@@ -7861,7 +8019,7 @@ BEGIN @{ RS = "" ; FS = "\n" @}
 Running the program produces the following output:
 
 @example
-$ awk -f addrs.awk addresses
+$ @kbd{awk -f addrs.awk addresses}
 @print{} Name is: Jane Doe
 @print{} Address is: 123 Main Street
 @print{} City and State are: Anywhere, SE 12345-6789
@@ -7873,12 +8031,9 @@ $ awk -f addrs.awk addresses
 @dots{}
 @end example
 
-@xref{Labels Program}, for a more realistic
-program that deals with address lists.
-The following
-table
-summarizes how records are split, based on the
-value of
+@DBXREF{Labels Program} for a more realistic program dealing with
+address lists.  The following list summarizes how records are split,
+based on the value of
 @ifinfo
 @code{RS}.
 (@samp{==} means ``is equal to.'')
@@ -7913,24 +8068,19 @@ POSIX standard.)
 
 @cindex @command{gawk}, @code{RT} variable in
 @cindex @code{RT} variable
-In all cases, @command{gawk} sets @code{RT} to the input text that matched the
-value specified by @code{RS}.
+If not in compatibility mode (@pxref{Options}), @command{gawk} sets
+@code{RT} to the input text that matched the value specified by @code{RS}.
 But if the input file ended without any text that matches @code{RS},
 then @command{gawk} sets @code{RT} to the null string.
-@c ENDOFRANGE recm
-@c ENDOFRANGE imr
-@c ENDOFRANGE frm
 
 @node Getline
 @section Explicit Input with @code{getline}
 
-@c STARTOFRANGE getl
 @cindex @code{getline} command, explicit input with
-@c STARTOFRANGE inex
 @cindex input, explicit
 So far we have been getting our input data from @command{awk}'s main
 input stream---either the standard input (usually your keyboard, sometimes
-the output from another program) or from the
+the output from another program) or the
 files specified on the command line.  The @command{awk} language has a
 special built-in command called @code{getline} that
 can be used to read input under your explicit control.
@@ -7966,12 +8116,19 @@ a record, such as a file that cannot be opened, then @code{getline}
 returns @minus{}1.  In this case, @command{gawk} sets the variable
 @code{ERRNO} to a string describing the error that occurred.
 
+If @code{ERRNO} indicates that the I/O operation may be
+retried, and @code{PROCINFO["@var{input}", "RETRY"]} is set,
+then @code{getline} returns @minus{}2
+instead of @minus{}1, and further calls to @code{getline}
+may be attemped.  @DBXREF{Retrying Input} for further information about
+this feature.
+
 In the following examples, @var{command} stands for a string value that
 represents a shell command.
 
 @quotation NOTE
 When @option{--sandbox} is specified (@pxref{Options}),
-reading lines from files, pipes and coprocesses is disabled.
+reading lines from files, pipes, and coprocesses is disabled.
 @end quotation
 
 @menu
@@ -8012,9 +8169,7 @@ processing on the next record @emph{right now}.  For example:
             while (j == 0) @{
                 # get more text
                 if (getline <= 0) @{
-                    m = "unexpected EOF or error"
-                    m = (m ": " ERRNO)
-                    print m > "/dev/stderr"
+                    print("unexpected EOF or error:", ERRNO) > "/dev/stderr"
                     exit
                 @}
                 # build up the line using string concatenation
@@ -8116,7 +8271,7 @@ free
 @end example
 
 The @code{getline} command used in this way sets only the variables
-@code{NR}, @code{FNR} and @code{RT} (and of course, @var{var}).
+@code{NR}, @code{FNR}, and @code{RT} (and, of course, @var{var}).
 The record is not
 split into fields, so the values of the fields (including @code{$0}) and
 the value of @code{NF} do not change.
@@ -8131,7 +8286,7 @@ the value of @code{NF} do not change.
 @cindex left angle bracket (@code{<}), @code{<} operator (I/O)
 @cindex operators, input/output
 Use @samp{getline < @var{file}} to read the next record from @var{file}.
-Here @var{file} is a string-valued expression that
+Here, @var{file} is a string-valued expression that
 specifies the @value{FN}.  @samp{< @var{file}} is called a @dfn{redirection}
 because it directs input to come from a different place.
 For example, the following
@@ -8170,10 +8325,10 @@ you want your program to be portable to all @command{awk} implementations.
 
 Use @samp{getline @var{var} < @var{file}} to read input
 from the file
-@var{file}, and put it in the variable @var{var}.  As above, @var{file}
+@var{file}, and put it in the variable @var{var}.  As earlier, @var{file}
 is a string-valued expression that specifies the file from which to read.
 
-In this version of @code{getline}, none of the built-in variables are
+In this version of @code{getline}, none of the predefined variables are
 changed and the record is not split into fields.  The only variable
 changed is @var{var}.@footnote{This is not quite true. @code{RT} could
 be changed if @code{RS} is a regular expression.}
@@ -8206,7 +8361,7 @@ One deficiency of this program is that it does not process nested
 @code{@@include} statements
 (i.e., @code{@@include} statements in included files)
 the way a true macro preprocessor would.
-@xref{Igawk Program}, for a program
+@DBXREF{Igawk Program} for a program
 that does handle nested @code{@@include} statements.
 
 @node Getline/Pipe
@@ -8283,7 +8438,7 @@ bletch
 @end example
 
 @noindent
-Notice that this program ran the command @command{who} and printed the previous result.
+Notice that this program ran the command @command{who} and printed the result.
 (If you try this program yourself, you will of course get different results,
 depending upon who is logged in on your system.)
 
@@ -8308,8 +8463,8 @@ Unfortunately, @command{gawk} has not been consistent in its treatment
 of a construct like @samp{@w{"echo "} "date" | getline}.
 Most versions, including the current version, treat it at as
 @samp{@w{("echo "} "date") | getline}.
-(This how BWK @command{awk} behaves.)
-Some versions changed and treated it as
+(This is also how BWK @command{awk} behaves.)
+Some versions instead treat it as
 @samp{@w{"echo "} ("date" | getline)}.
 (This is how @command{mawk} behaves.)
 In short, @emph{always} use explicit parentheses, and then you won't
@@ -8335,8 +8490,8 @@ BEGIN @{
 @}
 @end example
 
-In this version of @code{getline}, none of the built-in variables are
-changed and the record is not split into fields.
+In this version of @code{getline}, none of the predefined variables are
+changed and the record is not split into fields. However, @code{RT} is set.
 
 @ifinfo
 @c Thanks to Paul Eggert for initial wording here
@@ -8357,7 +8512,7 @@ program to be portable to other @command{awk} implementations.
 @cindex operators, input/output
 @cindex differences in @command{awk} and @command{gawk}, input/output operators
 
-Input into @code{getline} from a pipe is a one-way operation.
+Reading input into @code{getline} from a pipe is a one-way operation.
 The command that is started with @samp{@var{command} | getline} only
 sends data @emph{to} your @command{awk} program.
 
@@ -8367,7 +8522,7 @@ for processing and then read the results back.
 communications are possible.  This is done with the @samp{|&}
 operator.
 Typically, you write data to the coprocess first and then
-read results back, as shown in the following:
+read the results back, as shown in the following:
 
 @example
 print "@var{some query}" |& "db_server"
@@ -8397,7 +8552,7 @@ When you use @samp{@var{command} |& getline @var{var}}, the output from
 the coprocess @var{command} is sent through a two-way pipe to @code{getline}
 and into the variable @var{var}.
 
-In this version of @code{getline}, none of the built-in variables are
+In this version of @code{getline}, none of the predefined variables are
 changed and the record is not split into fields.  The only variable
 changed is @var{var}.
 However, @code{RT} is set.
@@ -8444,23 +8599,29 @@ causes @command{awk} to set the value of @code{FILENAME}. Normally,
 @code{FILENAME} does not have a value inside @code{BEGIN} rules, because you
 have not yet started to process the command-line @value{DF}s.
 @value{DARKCORNER}
-(@xref{BEGIN/END},
+(See @ref{BEGIN/END};
 also @pxref{Auto-set}.)
 
 @item
 Using @code{FILENAME} with @code{getline}
 (@samp{getline < FILENAME})
-is likely to be a source for
+is likely to be a source of
 confusion.  @command{awk} opens a separate input stream from the
 current input file.  However, by not using a variable, @code{$0}
-and @code{NR} are still updated.  If you're doing this, it's
+and @code{NF} are still updated.  If you're doing this, it's
 probably by accident, and you should reconsider what it is you're
 trying to accomplish.
 
 @item
-@DBREF{Getline Summary} presents a table summarizing the
+@ifdocbook
+The next section
+@end ifdocbook
+@ifnotdocbook
+@ref{Getline Summary},
+@end ifnotdocbook
+presents a table summarizing the
 @code{getline} variants and which variables they can affect.
-It is worth noting that those variants which do not use redirection
+It is worth noting that those variants that do not use redirection
 can cause @code{FILENAME} to be updated if they cause
 @command{awk} to start reading a new input file.
 
@@ -8469,7 +8630,7 @@ can cause @code{FILENAME} to be updated if they cause
 If the variable being assigned is an expression with side effects,
 different versions of @command{awk} behave differently upon encountering
 end-of-file.  Some versions don't evaluate the expression; many versions
-(including @command{gawk}) do.  Here is an example, due to Duncan Moore:
+(including @command{gawk}) do.  Here is an example, courtesy of Duncan Moore:
 
 @ignore
 Date: Sun, 01 Apr 2012 11:49:33 +0100
@@ -8486,12 +8647,12 @@ BEGIN @{
 
 @noindent
 Here, the side effect is the @samp{++c}.  Is @code{c} incremented if
-end of file is encountered, before the element in @code{a} is assigned?
+end-of-file is encountered before the element in @code{a} is assigned?
 
 @command{gawk} treats @code{getline} like a function call, and evaluates
 the expression @samp{a[++c]} before attempting to read from @file{f}.
 However, some versions of @command{awk} only evaluate the expression once they
-know that there is a string value to be assigned.  Caveat Emptor.
+know that there is a string value to be assigned.
 @end itemize
 
 @node Getline Summary
@@ -8500,30 +8661,27 @@ know that there is a string value to be assigned.  Caveat Emptor.
 
 @ref{table-getline-variants}
 summarizes the eight variants of @code{getline},
-listing which built-in variables are set by each one,
+listing which predefined variables are set by each one,
 and whether the variant is standard or a @command{gawk} extension.
-Note: for each variant, @command{gawk} sets the @code{RT} built-in variable.
+Note: for each variant, @command{gawk} sets the @code{RT} predefined variable.
 
 @float Table,table-getline-variants
-@caption{@code{getline} Variants and What They Set}
+@caption{@code{getline} variants and what they set}
 @multitable @columnfractions .33 .38 .27
-@headitem Variant @tab Effect @tab Standard / Extension
-@item @code{getline} @tab Sets @code{$0}, @code{NF}, @code{FNR}, @code{NR}, and @code{RT} @tab Standard
-@item @code{getline} @var{var} @tab Sets @var{var}, @code{FNR}, @code{NR}, and @code{RT} @tab Standard
-@item @code{getline <} @var{file} @tab Sets @code{$0}, @code{NF}, and @code{RT} @tab Standard
-@item @code{getline @var{var} < @var{file}} @tab Sets @var{var} and @code{RT} @tab Standard
-@item @var{command} @code{| getline} @tab Sets @code{$0}, @code{NF}, and @code{RT} @tab Standard
-@item @var{command} @code{| getline} @var{var} @tab Sets @var{var} and @code{RT} @tab Standard
-@item @var{command} @code{|& getline} @tab Sets @code{$0}, @code{NF}, and @code{RT} @tab Extension
-@item @var{command} @code{|& getline} @var{var} @tab Sets @var{var} and @code{RT} @tab Extension
+@headitem Variant @tab Effect @tab @command{awk} / @command{gawk}
+@item @code{getline} @tab Sets @code{$0}, @code{NF}, @code{FNR}, @code{NR}, and @code{RT} @tab @command{awk}
+@item @code{getline} @var{var} @tab Sets @var{var}, @code{FNR}, @code{NR}, and @code{RT} @tab @command{awk}
+@item @code{getline <} @var{file} @tab Sets @code{$0}, @code{NF}, and @code{RT} @tab @command{awk}
+@item @code{getline @var{var} < @var{file}} @tab Sets @var{var} and @code{RT} @tab @command{awk}
+@item @var{command} @code{| getline} @tab Sets @code{$0}, @code{NF}, and @code{RT} @tab @command{awk}
+@item @var{command} @code{| getline} @var{var} @tab Sets @var{var} and @code{RT} @tab @command{awk}
+@item @var{command} @code{|& getline} @tab Sets @code{$0}, @code{NF}, and @code{RT} @tab @command{gawk}
+@item @var{command} @code{|& getline} @var{var} @tab Sets @var{var} and @code{RT} @tab @command{gawk}
 @end multitable
 @end float
-@c ENDOFRANGE getl
-@c ENDOFRANGE inex
-@c ENDOFRANGE infir
 
 @node Read Timeout
-@section Reading Input With A Timeout
+@section Reading Input with a Timeout
 @cindex timeout, reading input
 
 @cindex differences in @command{awk} and @command{gawk}, read timeouts
@@ -8531,8 +8689,8 @@ This @value{SECTION} describes a feature that is specific to @command{gawk}.
 
 You may specify a timeout in milliseconds for reading input from the keyboard,
 a pipe, or two-way communication, including TCP/IP sockets. This can be done
-on a per input, command or connection basis, by setting a special element
-in the @code{PROCINFO} (@pxref{Auto-set}) array:
+on a per-input, per-command, or per-connection basis, by setting a special
+element in the @code{PROCINFO} array (@pxref{Auto-set}):
 
 @example
 PROCINFO["input_name", "READ_TIMEOUT"] = @var{timeout in milliseconds}
@@ -8563,8 +8721,8 @@ while ((getline < "/dev/stdin") > 0)
 @end example
 
 @command{gawk} terminates the read operation if input does not
-arrive after waiting for the timeout period, returns failure
-and sets the @code{ERRNO} variable to an appropriate string value.
+arrive after waiting for the timeout period, returns failure,
+and sets @code{ERRNO} to an appropriate string value.
 A negative or zero value for the timeout is the same as specifying
 no timeout at all.
 
@@ -8573,7 +8731,7 @@ loop that reads input records and matches them against patterns,
 like so:
 
 @example
-$ @kbd{ gawk 'BEGIN @{ PROCINFO["-", "READ_TIMEOUT"] = 5000 @}}
+$ @kbd{gawk 'BEGIN @{ PROCINFO["-", "READ_TIMEOUT"] = 5000 @}}
 > @kbd{@{ print "You entered: " $0 @}'}
 @kbd{gawk}
 @print{} You entered: gawk
@@ -8596,7 +8754,7 @@ for the input to arrive:
 PROCINFO[Service, "READ_TIMEOUT"] = 1000
 while ((Service |& getline) > 0) @{
     print $0
-    PROCINFO[S, "READ_TIMEOUT"] -= 100
+    PROCINFO[Service, "READ_TIMEOUT"] -= 100
 @}
 @end example
 
@@ -8605,21 +8763,22 @@ You should not assume that the read operation will block
 exactly after the tenth record has been printed. It is possible that
 @command{gawk} will read and buffer more than one record's
 worth of data the first time. Because of this, changing the value
-of timeout like in the above example is not very useful.
+of timeout like in the preceding example is not very useful.
 @end quotation
 
-If the @code{PROCINFO} element is not present and the environment
-variable @env{GAWK_READ_TIMEOUT} exists,
+If the @code{PROCINFO} element is not present and the
+@env{GAWK_READ_TIMEOUT} environment variable exists,
 @command{gawk} uses its value to initialize the timeout value.
 The exclusive use of the environment variable to specify timeout
 has the disadvantage of not being able to control it
-on a per command or connection basis.
+on a per-command or per-connection basis.
 
 @command{gawk} considers a timeout event to be an error even though
 the attempt to read from the underlying device may
 succeed in a later attempt. This is a limitation, and it also
 means that you cannot use this to multiplex input from
-two or more sources.
+two or more sources.  @DBXREF{Retrying Input} for a way to enable 
+later I/O attempts to succeed.
 
 Assigning a timeout value prevents read operations from
 blocking indefinitely. But bear in mind that there are other ways
@@ -8629,8 +8788,38 @@ a connection before it can start reading any data,
 or the attempt to open a FIFO special file for reading can block
 indefinitely until some other process opens it for writing.
 
+@node Retrying Input
+@section Retrying Reads After Certain Input Errors
+@cindex retrying input
+
+@cindex differences in @command{awk} and @command{gawk}, retrying input
+This @value{SECTION} describes a feature that is specific to @command{gawk}.
+
+When @command{gawk} encounters an error while reading input, by
+default @code{getline} returns @minus{}1, and subsequent attempts to
+read from that file result in an end-of-file indication.  However, you
+may optionally instruct @command{gawk} to allow I/O to be retried when
+certain errors are encountered by setting a special element in
+the @code{PROCINFO} array (@pxref{Auto-set}):
+
+@example
+PROCINFO["@var{input_name}", "RETRY"] = 1
+@end example
+
+When this element exists, @command{gawk} checks the value of the system
+(C language)
+@code{errno} variable when an I/O error occurs.  If @code{errno} indicates
+a subsequent I/O attempt may succeed, @code{getline} instead returns
+@minus{}2 and
+further calls to @code{getline} may succeed.  This applies to the @code{errno}
+values @code{EAGAIN}, @code{EWOULDBLOCK}, @code{EINTR}, or @code{ETIMEDOUT}.
+
+This feature is useful in conjunction with
+@code{PROCINFO["@var{input_name}", "READ_TIMEOUT"]} or situations where a file
+descriptor has been configured to behave in a non-blocking fashion.
+
 @node Command-line directories
-@section Directories On The Command Line
+@section Directories on the Command Line
 @cindex differences in @command{awk} and @command{gawk}, command-line directories
 @cindex directories, command-line
 @cindex command line, directories on
@@ -8645,14 +8834,14 @@ command line, but otherwise ignores it.  This makes it easier to use
 shell wildcards with your @command{awk} program:
 
 @example
-$ @kbd{gawk -f whizprog.awk *}        @ii{Directories could kill this progam}
+$ @kbd{gawk -f whizprog.awk *}        @ii{Directories could kill this program}
 @end example
 
 If either of the @option{--posix}
 or @option{--traditional} options is given, then @command{gawk} reverts
 to treating a directory on the command line as a fatal error.
 
-@xref{Extension Sample Readdir}, for a way to treat directories
+@DBXREF{Extension Sample Readdir} for a way to treat directories
 as usable data from an @command{awk} program.
 
 @node Input Summary
@@ -8664,24 +8853,28 @@ Input is split into records based on the value of @code{RS}.
 The possibilities are as follows:
 
 @multitable @columnfractions .25 .35 .40
-@headitem Value of @code{RS} @tab Records are split on @tab @command{awk} / @command{gawk}
+@headitem Value of @code{RS} @tab Records are split on @dots{} @tab @command{awk} / @command{gawk}
 @item Any single character @tab That character @tab @command{awk}
 @item The empty string (@code{""}) @tab Runs of two or more newlines @tab @command{awk}
 @item A regexp @tab Text that matches the regexp @tab @command{gawk}
 @end multitable
 
 @item
+@code{FNR} indicates how many records have been read from the current input file;
+@code{NR} indicates how many records have been read in total.
+
+@item
 @command{gawk} sets @code{RT} to the text matched by @code{RS}.
 
 @item
 After splitting the input into records, @command{awk} further splits
-the record into individual fields, named @code{$1}, @code{$2} and so
+the records into individual fields, named @code{$1}, @code{$2}, and so
 on. @code{$0} is the whole record, and @code{NF} indicates how many
 fields there are.  The default way to split fields is between whitespace
 characters.
 
 @item
-Fields may be referenced using a variable, as in @samp{$NF}.  Fields
+Fields may be referenced using a variable, as in @code{$NF}.  Fields
 may also be assigned values, which causes the value of @code{$0} to be
 recomputed when it is later referenced. Assigning to a field with a number
 greater than @code{NF} creates the field and rebuilds the record, using
@@ -8689,18 +8882,19 @@ greater than @code{NF} creates the field and rebuilds the record, using
 thing. Decrementing @code{NF} throws away fields and rebuilds the record.
 
 @item
-Field splitting is more complicated than record splitting.
+Field splitting is more complicated than record splitting:
 
 @multitable @columnfractions .40 .40 .20
 @headitem Field separator value @tab Fields are split @dots{} @tab @command{awk} / @command{gawk}
 @item @code{FS == " "} @tab On runs of whitespace @tab @command{awk}
 @item @code{FS == @var{any single character}} @tab On that character @tab @command{awk}
 @item @code{FS == @var{regexp}} @tab On text matching the regexp @tab @command{awk}
-@item @code{FS == ""}  @tab Each individual character is a separate field @tab @command{gawk}
+@item @code{FS == ""}  @tab Such that each individual character is a separate field @tab @command{gawk}
 @item @code{FIELDWIDTHS == @var{list of columns}} @tab Based on character position @tab @command{gawk}
-@item @code{FPAT == @var{regexp}} @tab On text around text matching the regexp @tab @command{gawk}
+@item @code{FPAT == @var{regexp}} @tab On the text surrounding text matching the regexp @tab @command{gawk}
 @end multitable
 
+@item
 Using @samp{FS = "\n"} causes the entire record to be a single field
 (assuming that newlines separate records).
 
@@ -8709,14 +8903,14 @@ Using @samp{FS = "\n"} causes the entire record to be a single field
 This can also be done using command-line variable assignment.
 
 @item
-@code{PROCINFO["FS"]} can be used to see how fields are being split.
+Use @code{PROCINFO["FS"]} to see how fields are being split.
 
 @item
-Use @code{getline} in its various forms to read additional records,
-from the default input stream, from a file, or from a pipe or co-process.
+Use @code{getline} in its various forms to read additional records
+from the default input stream, from a file, or from a pipe or coprocess.
 
 @item
-Use @code{PROCINFO[@var{file}, "READ_TIMEOUT"]} to cause reads to timeout
+Use @code{PROCINFO[@var{file}, "READ_TIMEOUT"]} to cause reads to time out
 for @var{file}.
 
 @item
@@ -8750,7 +8944,6 @@ That can be fixed by making one simple change. What is it?
 @node Printing
 @chapter Printing Output
 
-@c STARTOFRANGE prnt
 @cindex printing
 @cindex output, printing, See printing
 One of the most common programming actions is to @dfn{print}, or output,
@@ -8761,12 +8954,11 @@ The @code{print} statement is not limited when
 computing @emph{which} values to print. However, with two exceptions,
 you cannot specify @emph{how} to print them---how many
 columns, whether to use exponential notation or not, and so on.
-(For the exceptions, @pxref{Output Separators}, and
+(For the exceptions, @DBPXREF{Output Separators} and
 @ref{OFMT}.)
 For printing with specifications, you need the @code{printf} statement
 (@pxref{Printf}).
 
-@c STARTOFRANGE prnts
 @cindex @code{print} statement
 @cindex @code{printf} statement
 Besides basic and formatted printing, this @value{CHAPTER}
@@ -8782,10 +8974,12 @@ and discusses the @code{close()} built-in function.
 * Printf::                      The @code{printf} statement.
 * Redirection::                 How to redirect output to multiple files and
                                 pipes.
+* Special FD::                  Special files for I/O.
 * Special Files::               File name interpretation in @command{gawk}.
                                 @command{gawk} allows access to inherited file
                                 descriptors.
 * Close Files And Pipes::       Closing Input and Output Files and Pipes.
+* Nonfatal::                    Enabling Nonfatal Output.
 * Output Summary::              Output summary.
 * Output Exercises::            Exercises.
 @end menu
@@ -8793,7 +8987,7 @@ and discusses the @code{close()} built-in function.
 @node Print
 @section The @code{print} Statement
 
-The @code{print} statement is used for producing output with simple, standardized
+Use the @code{print} statement to produce output with simple, standardized
 formatting.  You specify only the strings or numbers to print, in a
 list separated by commas.  They are output, separated by single spaces,
 followed by a newline.  The statement looks like this:
@@ -8817,7 +9011,7 @@ expression.  Numeric values are converted to strings and then printed.
 @cindex text, printing
 The simple statement @samp{print} with no items is equivalent to
 @samp{print $0}: it prints the entire current record.  To print a blank
-line, use @samp{print ""}, where @code{""} is the empty string.
+line, use @samp{print ""}.
 To print a fixed piece of text, use a string constant, such as
 @w{@code{"Don't Panic"}}, as one item.  If you forget to use the
 double-quote characters, your text is taken as an @command{awk}
@@ -8825,8 +9019,8 @@ expression, and you will probably get an error.  Keep in mind that a
 space is printed between any two items.
 
 Note that the @code{print} statement is a statement and not an
-expression---you can't use it the pattern part of a pattern-action
-statement, for example.
+expression---you can't use it in the pattern part of a
+pattern--action statement, for example.
 
 @node Print Examples
 @section @code{print} Statement Examples
@@ -8837,9 +9031,22 @@ newline, the newline is output along with the rest of the string.  A
 single @code{print} statement can make any number of lines this way.
 
 @cindex newlines, printing
-The following is an example of printing a string that contains embedded newlines
+The following is an example of printing a string that contains embedded
+@ifinfo
+newlines
 (the @samp{\n} is an escape sequence, used to represent the newline
 character; @pxref{Escape Sequences}):
+@end ifinfo
+@ifhtml
+newlines
+(the @samp{\n} is an escape sequence, used to represent the newline
+character; @pxref{Escape Sequences}):
+@end ifhtml
+@ifnotinfo
+@ifnothtml
+newlines:
+@end ifnothtml
+@end ifnotinfo
 
 @example
 $ @kbd{awk 'BEGIN @{ print "line one\nline two\nline three" @}'}
@@ -8932,7 +9139,6 @@ You can continue either a @code{print} or
 @code{printf} statement simply by putting a newline after any comma
 (@pxref{Statements/Lines}).
 @end quotation
-@c ENDOFRANGE prnts
 
 @node Output Separators
 @section Output Separators
@@ -8943,15 +9149,15 @@ of items separated by commas.  In the output, the items are normally
 separated by single spaces.  However, this doesn't need to be the case;
 a single space is simply the default.  Any string of
 characters may be used as the @dfn{output field separator} by setting the
-built-in variable @code{OFS}.  The initial value of this variable
-is the string @w{@code{" "}}---that is, a single space.
+predefined variable @code{OFS}.  The initial value of this variable
+is the string @w{@code{" "}} (i.e., a single space).
 
-The output from an entire @code{print} statement is called an
-@dfn{output record}.  Each @code{print} statement outputs one output
-record, and then outputs a string called the @dfn{output record separator}
-(or @code{ORS}).  The initial
-value of @code{ORS} is the string @code{"\n"}; i.e., a newline
-character.  Thus, each @code{print} statement normally makes a separate line.
+The output from an entire @code{print} statement is called an @dfn{output
+record}.  Each @code{print} statement outputs one output record, and
+then outputs a string called the @dfn{output record separator} (or
+@code{ORS}).  The initial value of @code{ORS} is the string @code{"\n"}
+(i.e., a newline character).  Thus, each @code{print} statement normally
+makes a separate line.
 
 @cindex output, records
 @cindex output record separator, See @code{ORS} variable
@@ -8974,27 +9180,27 @@ newline:
 $ @kbd{awk 'BEGIN @{ OFS = ";"; ORS = "\n\n" @}}
 >            @kbd{@{ print $1, $2 @}' mail-list}
 @print{} Amelia;555-5553
-@print{} 
+@print{}
 @print{} Anthony;555-3412
-@print{} 
+@print{}
 @print{} Becky;555-7685
-@print{} 
+@print{}
 @print{} Bill;555-1675
-@print{} 
+@print{}
 @print{} Broderick;555-0542
-@print{} 
+@print{}
 @print{} Camilla;555-2912
-@print{} 
+@print{}
 @print{} Fabius;555-1234
-@print{} 
+@print{}
 @print{} Julie;555-6699
-@print{} 
+@print{}
 @print{} Martin;555-6480
-@print{} 
+@print{}
 @print{} Samuel;555-3430
-@print{} 
+@print{}
 @print{} Jean-Paul;555-2127
-@print{} 
+@print{}
 @end example
 
 If the value of @code{ORS} does not contain a newline, the program's output
@@ -9005,7 +9211,7 @@ runs together on a single line.
 @cindex numeric, output format
 @cindex formats@comma{} numeric output
 When printing numeric values with the @code{print} statement,
-@command{awk} internally converts the number to a string of characters
+@command{awk} internally converts each number to a string of characters
 and prints that string.  @command{awk} uses the @code{sprintf()} function
 to do this conversion
 (@pxref{String Functions}).
@@ -9019,13 +9225,13 @@ more fully in
 @cindexawkfunc{sprintf}
 @cindex @code{OFMT} variable
 @cindex output, format specifier@comma{} @code{OFMT}
-The built-in variable @code{OFMT} contains the default format specification
+The predefined variable @code{OFMT} contains the format specification
 that @code{print} uses with @code{sprintf()} when it wants to convert a
 number to a string for printing.
 The default value of @code{OFMT} is @code{"%.6g"}.
 The way @code{print} prints numbers can be changed
-by supplying different format specifications
-as the value of @code{OFMT}, as shown in the following example:
+by supplying a different format specification
+for the value of @code{OFMT}, as shown in the following example:
 
 @example
 $ @kbd{awk 'BEGIN @{}
@@ -9045,7 +9251,6 @@ if @code{OFMT} contains anything but a floating-point conversion specification.
 @node Printf
 @section Using @code{printf} Statements for Fancier Printing
 
-@c STARTOFRANGE printfs
 @cindex @code{printf} statement
 @cindex output, formatted
 @cindex formatting output
@@ -9055,9 +9260,7 @@ With @code{printf} you can
 specify the width to use for each item, as well as various
 formatting choices for numbers (such as what output base to use, whether to
 print an exponent, whether to print a sign, and how many digits to print
-after the decimal point).  You do this by supplying a string, called
-the @dfn{format string}, that controls how and where to print the other
-arguments.
+after the decimal point).
 
 @menu
 * Basic Printf::                Syntax of the @code{printf} statement.
@@ -9077,10 +9280,10 @@ printf @var{format}, @var{item1}, @var{item2}, @dots{}
 @end example
 
 @noindent
-The entire list of arguments may optionally be enclosed in parentheses.  The
-parentheses are necessary if any of the item expressions use the @samp{>}
-relational operator; otherwise, it can be confused with an output redirection
-(@pxref{Redirection}).
+As for @code{print}, the entire list of arguments may optionally be
+enclosed in parentheses. Here too, the parentheses are necessary if any
+of the item expressions uses the @samp{>} relational operator; otherwise,
+it can be confused with an output redirection (@pxref{Redirection}).
 
 @cindex format specifiers
 The difference between @code{printf} and @code{print} is the @var{format}
@@ -9103,14 +9306,14 @@ on @code{printf} statements. For example:
 @example
 $ @kbd{awk 'BEGIN @{}
 >    @kbd{ORS = "\nOUCH!\n"; OFS = "+"}
->    @kbd{msg = "Dont Panic!"}
+>    @kbd{msg = "Don\47t Panic!"}
 >    @kbd{printf "%s\n", msg}
 > @kbd{@}'}
-@print{} Dont Panic!
+@print{} Don't Panic!
 @end example
 
 @noindent
-Here, neither the @samp{+} nor the @samp{OUCH} appear in
+Here, neither the @samp{+} nor the @samp{OUCH!} appears in
 the output message.
 
 @node Control Letters
@@ -9128,7 +9331,7 @@ the field width.  Here is a list of the format-control letters:
 @c @asis for docbook to come out right
 @table @asis
 @item @code{%c}
-Print a number as an ASCII character; thus, @samp{printf "%c",
+Print a number as a character; thus, @samp{printf "%c",
 65} outputs the letter @samp{A}. The output for a string value is
 the first character of the string.
 
@@ -9157,8 +9360,8 @@ The two control letters are equivalent.
 (The @samp{%i} specification is for compatibility with ISO C.)
 
 @item @code{%e}, @code{%E}
-Print a number in scientific (exponential) notation;
-for example:
+Print a number in scientific (exponential) notation.
+For example:
 
 @example
 printf "%4.3e\n", 1950
@@ -9185,17 +9388,17 @@ which follow the decimal point.
 (The @samp{4.3} represents two modifiers,
 discussed in the next @value{SUBSECTION}.)
 
-On systems supporting IEEE 754 floating point format, values
+On systems supporting IEEE 754 floating-point format, values
 representing negative
 infinity are formatted as
 @samp{-inf} or @samp{-infinity},
 and positive infinity as
-@samp{inf} and @samp{infinity}.
+@samp{inf} or @samp{infinity}.
 The special ``not a number'' value formats as @samp{-nan} or @samp{nan}
 (@pxref{Math Definitions}).
 
 @item @code{%F}
-Like @samp{%f} but the infinity and ``not a number'' values are spelled
+Like @samp{%f}, but the infinity and ``not a number'' values are spelled
 using uppercase letters.
 
 The @samp{%F} format is a POSIX extension to ISO C; not all systems
@@ -9216,7 +9419,7 @@ Print a string.
 @item @code{%u}
 Print an unsigned decimal integer.
 (This format is of marginal use, because all numbers in @command{awk}
-are floating-point; it is provided primarily for compatibility with C.)
+are floating point; it is provided primarily for compatibility with C.)
 
 @item @code{%x}, @code{%X}
 Print an unsigned hexadecimal integer;
@@ -9245,23 +9448,22 @@ values or do something else entirely.
 @node Format Modifiers
 @subsection Modifiers for @code{printf} Formats
 
-@c STARTOFRANGE pfm
 @cindex @code{printf} statement, modifiers
 @cindex modifiers@comma{} in format specifiers
 A format specification can also include @dfn{modifiers} that can control
 how much of the item's value is printed, as well as how much space it gets.
 The modifiers come between the @samp{%} and the format-control letter.
-We will use the bullet symbol ``@bullet{}'' in the following examples to
+We use the bullet symbol ``@bullet{}'' in the following examples to
 represent
 spaces in the output. Here are the possible modifiers, in the order in
 which they may appear:
 
-@table @code
+@table @asis
 @cindex differences in @command{awk} and @command{gawk}, @code{print}/@code{printf} statements
 @cindex @code{printf} statement, positional specifiers
 @c the code{} does NOT start a secondary
 @cindex positional specifiers, @code{printf} statement
-@item @var{N}$
+@item @code{@var{N}$}
 An integer constant followed by a @samp{$} is a @dfn{positional specifier}.
 Normally, format specifications are applied to arguments in the order
 given in the format string.  With a positional specifier, the format
@@ -9282,9 +9484,9 @@ It is in fact a @command{gawk} extension, intended for use in translating
 messages at runtime.
 @xref{Printf Ordering},
 which describes how and why to use positional specifiers.
-For now, we will not use them.
+For now, we ignore them.
 
-@item -
+@item @code{-} (Minus)
 The minus sign, used before the width modifier (see later on in
 this list),
 says to left-justify
@@ -9302,14 +9504,14 @@ prints @samp{foo@bullet{}}.
 For numeric conversions, prefix positive values with a space and
 negative values with a minus sign.
 
-@item +
+@item @code{+}
 The plus sign, used before the width modifier (see later on in
 this list),
 says to always supply a sign for numeric conversions, even if the data
 to format is positive. The @samp{+} overrides the space modifier.
 
-@item #
-Use an ``alternate form'' for certain control letters.
+@item @code{#}
+Use an ``alternative form'' for certain control letters.
 For @samp{%o}, supply a leading zero.
 For @samp{%x} and @samp{%X}, supply a leading @samp{0x} or @samp{0X} for
 a nonzero result.
@@ -9317,16 +9519,16 @@ For @samp{%e}, @samp{%E}, @samp{%f}, and @samp{%F}, the result always
 contains a decimal point.
 For @samp{%g} and @samp{%G}, trailing zeros are not removed from the result.
 
-@item 0
-A leading @samp{0} (zero) acts as a flag that indicates that output should be
+@item @code{0}
+A leading @samp{0} (zero) acts as a flag indicating that output should be
 padded with zeros instead of spaces.
 This applies only to the numeric output formats.
 This flag only has an effect when the field width is wider than the
 value to print.
 
-@item '
+@item @code{'}
 A single quote or apostrophe character is a POSIX extension to ISO C.
-It indicates that the integer part of a floating point value, or the
+It indicates that the integer part of a floating-point value, or the
 entire part of an integer decimal value, should have a thousands-separator
 character in it.  This only works in locales that support such characters.
 For example:
@@ -9377,7 +9579,7 @@ prints @samp{foobar}.
 Preceding the @var{width} with a minus sign causes the output to be
 padded with spaces on the right, instead of on the left.
 
-@item .@var{prec}
+@item @code{.@var{prec}}
 A period followed by an integer constant
 specifies the precision to use when printing.
 The meaning of the precision varies by control letter:
@@ -9407,7 +9609,7 @@ prints @samp{foob}.
 @end table
 
 The C library @code{printf}'s dynamic @var{width} and @var{prec}
-capability (for example, @code{"%*.*s"}) is supported.  Instead of
+capability (e.g., @code{"%*.*s"}) is supported.  Instead of
 supplying explicit @var{width} and/or @var{prec} values in the format
 string, they are passed in the argument list.  For example:
 
@@ -9440,7 +9642,7 @@ printf "%" w "." p "s\n", s
 @end example
 
 @noindent
-This is not particularly easy to read but it does work.
+This is not particularly easy to read, but it does work.
 
 @c @cindex lint checks
 @cindex troubleshooting, fatal errors, @code{printf} format strings
@@ -9451,7 +9653,6 @@ format strings. These are not valid in @command{awk}.  Most @command{awk}
 implementations silently ignore them.  If @option{--lint} is provided
 on the command line (@pxref{Options}), @command{gawk} warns about their
 use. If @option{--posix} is supplied, their use is a fatal error.
-@c ENDOFRANGE pfm
 
 @node Printf Examples
 @subsection Examples Using @code{printf}
@@ -9487,7 +9688,7 @@ $ @kbd{awk '@{ printf "%-10s %s\n", $1, $2 @}' mail-list}
 @end example
 
 In this case, the phone numbers had to be printed as strings because
-the numbers are separated by a dash.  Printing the phone numbers as
+the numbers are separated by dashes.  Printing the phone numbers as
 numbers would have produced just the first three digits: @samp{555}.
 This would have been pretty confusing.
 
@@ -9504,17 +9705,17 @@ the @command{awk} program:
 @example
 awk 'BEGIN @{ print "Name      Number"
              print "----      ------" @}
-     @{ printf "%-10s %s\n", $1, $2 @}' mail-list
+           @{ printf "%-10s %s\n", $1, $2 @}' mail-list
 @end example
 
-The above example mixes @code{print} and @code{printf} statements in
+The preceding example mixes @code{print} and @code{printf} statements in
 the same program.  Using just @code{printf} statements can produce the
 same results:
 
 @example
 awk 'BEGIN @{ printf "%-10s %s\n", "Name", "Number"
              printf "%-10s %s\n", "----", "------" @}
-     @{ printf "%-10s %s\n", $1, $2 @}' mail-list
+           @{ printf "%-10s %s\n", $1, $2 @}' mail-list
 @end example
 
 @noindent
@@ -9529,17 +9730,14 @@ emphasized by storing it in a variable, like this:
 awk 'BEGIN @{ format = "%-10s %s\n"
              printf format, "Name", "Number"
              printf format, "----", "------" @}
-     @{ printf format, $1, $2 @}' mail-list
+           @{ printf format, $1, $2 @}' mail-list
 @end example
 
-@c ENDOFRANGE printfs
 
 @node Redirection
 @section Redirecting Output of @code{print} and @code{printf}
 
-@c STARTOFRANGE outre
 @cindex output redirection
-@c STARTOFRANGE reout
 @cindex redirection of output
 @cindex @option{--sandbox} option, output redirection with @code{print}, @code{printf}
 So far, the output from @code{print} and @code{printf} has gone
@@ -9550,7 +9748,7 @@ This is called @dfn{redirection}.
 
 @quotation NOTE
 When @option{--sandbox} is specified (@pxref{Options}),
-redirecting output to files and pipes is disabled.
+redirecting output to files, pipes, and coprocesses is disabled.
 @end quotation
 
 A redirection appears after the @code{print} or @code{printf} statement.
@@ -9603,7 +9801,7 @@ Each output file contains one name or number per line.
 @cindex @code{>} (right angle bracket), @code{>>} operator (I/O)
 @cindex right angle bracket (@code{>}), @code{>>} operator (I/O)
 @item print @var{items} >> @var{output-file}
-This redirection prints the items into the pre-existing output file
+This redirection prints the items into the preexisting output file
 named @var{output-file}.  The difference between this and the
 single-@samp{>} redirection is that the old contents (if any) of
 @var{output-file} are not erased.  Instead, the @command{awk} output is
@@ -9642,25 +9840,19 @@ The unsorted list is written with an ordinary redirection, while
 the sorted list is written by piping through the @command{sort} utility.
 
 The next example uses redirection to mail a message to the mailing
-list @samp{bug-system}.  This might be useful when trouble is encountered
+list @code{bug-system}.  This might be useful when trouble is encountered
 in an @command{awk} script run periodically for system maintenance:
 
 @example
 report = "mail bug-system"
-print "Awk script failed:", $0 | report
-m = ("at record number " FNR " of " FILENAME)
-print m | report
+print("Awk script failed:", $0) | report
+print("at record number", FNR, "of", FILENAME) | report
 close(report)
 @end example
 
-The message is built using string concatenation and saved in the variable
-@code{m}.  It's then sent down the pipeline to the @command{mail} program.
-(The parentheses group the items to concatenate---see
-@ref{Concatenation}.)
-
 The @code{close()} function is called here because it's a good idea to close
 the pipe as soon as all the intended output has been sent to it.
-@xref{Close Files And Pipes},
+@DBXREF{Close Files And Pipes}
 for more information.
 
 This example also illustrates the use of a variable to represent
@@ -9679,15 +9871,23 @@ This redirection prints the items to the input of @var{command}.
 The difference between this and the
 single-@samp{|} redirection is that the output from @var{command}
 can be read with @code{getline}.
-Thus @var{command} is a @dfn{coprocess}, which works together with,
-but subsidiary to, the @command{awk} program.
+Thus, @var{command} is a @dfn{coprocess}, which works together with
+but is subsidiary to the @command{awk} program.
 
 This feature is a @command{gawk} extension, and is not available in
 POSIX @command{awk}.
+@ifnotdocbook
 @xref{Getline/Coprocess},
 for a brief discussion.
 @xref{Two-way I/O},
 for a more complete discussion.
+@end ifnotdocbook
+@ifdocbook
+@DBXREF{Getline/Coprocess}
+for a brief discussion and
+@DBREF{Two-way I/O}
+for a more complete discussion.
+@end ifdocbook
 @end table
 
 Redirecting output using @samp{>}, @samp{>>}, @samp{|}, or @samp{|&}
@@ -9710,9 +9910,9 @@ print "Avoid improbability generators" >> "guide.txt"
 @noindent
 This is indeed how redirections must be used from the shell.  But in
 @command{awk}, it isn't necessary.  In this kind of case, a program should
-use @samp{>} for all the @code{print} statements, since the output file
+use @samp{>} for all the @code{print} statements, because the output file
 is only opened once. (It happens that if you mix @samp{>} and @samp{>>}
-that output is produced in the expected order. However, mixing the operators
+output is produced in the expected order. However, mixing the operators
 for the same file is definitely poor style, and is confusing to readers
 of your program.)
 
@@ -9764,6 +9964,9 @@ The program builds up a list of command lines,
 using the @command{mv} utility to rename the files.
 It then sends the list to the shell for execution.
 
+@DBXREF{Shell Quoting} for a function that can help in generating
+command lines to be fed to the shell.
+
 @docbook
 </sidebar>
 @end docbook
@@ -9795,28 +9998,14 @@ uppercase characters converted to lowercase
 The program builds up a list of command lines,
 using the @command{mv} utility to rename the files.
 It then sends the list to the shell for execution.
+
+@DBXREF{Shell Quoting} for a function that can help in generating
+command lines to be fed to the shell.
 @end cartouche
 @end ifnotdocbook
-@c ENDOFRANGE outre
-@c ENDOFRANGE reout
-
-@node Special Files
-@section Special @value{FFN}s in @command{gawk}
-@c STARTOFRANGE gfn
-@cindex @command{gawk}, file names in
-
-@command{gawk} provides a number of special @value{FN}s that it interprets
-internally.  These @value{FN}s provide access to standard file descriptors
-and TCP/IP networking.
-
-@menu
-* Special FD::                  Special files for I/O.
-* Special Network::             Special files for network communications.
-* Special Caveats::             Things to watch out for.
-@end menu
 
 @node Special FD
-@subsection Special Files for Standard Descriptors
+@section Special Files for Standard Preopened Data Streams
 @cindex standard input
 @cindex input, standard
 @cindex standard output
@@ -9827,9 +10016,12 @@ and TCP/IP networking.
 @cindex files, descriptors, See file descriptors
 
 Running programs conventionally have three input and output streams
-already available to them for reading and writing.  These are known as
-the @dfn{standard input}, @dfn{standard output}, and @dfn{standard error
-output}.  These streams are, by default, connected to your keyboard and screen, but
+already available to them for reading and writing.  These are known
+as the @dfn{standard input}, @dfn{standard output}, and @dfn{standard
+error output}.  These open streams (and any other open files or pipes)
+are often referred to by the technical term @dfn{file descriptors}.
+
+These streams are, by default, connected to your keyboard and screen, but
 they are often redirected with the shell, via the @samp{<}, @samp{<<},
 @samp{>}, @samp{>>}, @samp{>&}, and @samp{|} operators.  Standard error
 is typically used for writing error messages; the reason there are two separate
@@ -9838,7 +10030,7 @@ redirected separately.
 
 @cindex differences in @command{awk} and @command{gawk}, error messages
 @cindex error handling
-In other implementations of @command{awk}, the only way to write an error
+In traditional implementations of @command{awk}, the only way to write an error
 message to standard error in an @command{awk} program is as follows:
 
 @example
@@ -9864,19 +10056,19 @@ that is connected to your keyboard and screen. It represents the
 ``terminal,''@footnote{The ``tty'' in @file{/dev/tty} stands for
 ``Teletype,'' a serial terminal.} which on modern systems is a keyboard
 and screen, not a serial console.)
-This usually has the same effect but not always: although the
+This generally has the same effect, but not always: although the
 standard error stream is usually the screen, it can be redirected; when
 that happens, writing to the screen is not correct.  In fact, if
 @command{awk} is run from a background job, it may not have a
 terminal at all.
 Then opening @file{/dev/tty} fails.
 
-@command{gawk} provides special @value{FN}s for accessing the three standard
-streams. @value{COMMONEXT} It also provides syntax for accessing
-any other inherited open files.  If the @value{FN} matches
-one of these special names when @command{gawk} redirects input or output,
-then it directly uses the stream that the @value{FN} stands for.
-These special @value{FN}s work for all operating systems that @command{gawk}
+@command{gawk}, BWK @command{awk}, and @command{mawk} provide
+special @value{FN}s for accessing the three standard streams.
+If the @value{FN} matches one of these special names when @command{gawk}
+(or one of the others) redirects input or output, then it directly uses
+the descriptor that the @value{FN} stands for.  These special
+@value{FN}s work for all operating systems that @command{gawk}
 has been ported to, not just those that are POSIX-compliant:
 
 @cindex common extensions, @code{/dev/stdin} special file
@@ -9898,19 +10090,10 @@ The standard output (file descriptor 1).
 
 @item /dev/stderr
 The standard error output (file descriptor 2).
-
-@item /dev/fd/@var{N}
-The file associated with file descriptor @var{N}.  Such a file must
-be opened by the program initiating the @command{awk} execution (typically
-the shell).  Unless special pains are taken in the shell from which
-@command{gawk} is invoked, only descriptors 0, 1, and 2 are available.
 @end table
 
-The @value{FN}s @file{/dev/stdin}, @file{/dev/stdout}, and @file{/dev/stderr}
-are aliases for @file{/dev/fd/0}, @file{/dev/fd/1}, and @file{/dev/fd/2},
-respectively. However, they are more self-explanatory.
-The proper way to write an error message in a @command{gawk} program
-is to use @file{/dev/stderr}, like this:
+With these facilities,
+the proper way to write an error message then becomes:
 
 @example
 print "Serious error detected!" > "/dev/stderr"
@@ -9918,18 +10101,54 @@ print "Serious error detected!" > "/dev/stderr"
 
 @cindex troubleshooting, quotes with file names
 Note the use of quotes around the @value{FN}.
-Like any other redirection, the value must be a string.
+Like with any other redirection, the value must be a string.
 It is a common error to omit the quotes, which leads
 to confusing results.
 
-Finally, using the @code{close()} function on a @value{FN} of the
+@command{gawk} does not treat these @value{FN}s as special when
+in POSIX-compatibility mode. However, because BWK @command{awk}
+supports them, @command{gawk} does support them even when
+invoked with the @option{--traditional} option (@pxref{Options}).
+
+@node Special Files
+@section Special @value{FFN}s in @command{gawk}
+@cindex @command{gawk}, file names in
+
+Besides access to standard input, standard output, and standard error,
+@command{gawk} provides access to any open file descriptor.
+Additionally, there are special @value{FN}s reserved for
+TCP/IP networking.
+
+@menu
+* Other Inherited Files::       Accessing other open files with
+                                @command{gawk}.
+* Special Network::             Special files for network communications.
+* Special Caveats::             Things to watch out for.
+@end menu
+
+@node Other Inherited Files
+@subsection Accessing Other Open Files with @command{gawk}
+
+Besides the @code{/dev/stdin}, @code{/dev/stdout}, and @code{/dev/stderr}
+special @value{FN}s mentioned earlier, @command{gawk} provides syntax
+for accessing any other inherited open file:
+
+@table @file
+@item /dev/fd/@var{N}
+The file associated with file descriptor @var{N}.  Such a file must
+be opened by the program initiating the @command{awk} execution (typically
+the shell).  Unless special pains are taken in the shell from which
+@command{gawk} is invoked, only descriptors 0, 1, and 2 are available.
+@end table
+
+The @value{FN}s @file{/dev/stdin}, @file{/dev/stdout}, and @file{/dev/stderr}
+are essentially aliases for @file{/dev/fd/0}, @file{/dev/fd/1}, and
+@file{/dev/fd/2}, respectively. However, those names are more self-explanatory.
+
+Note that using @code{close()} on a @value{FN} of the
 form @code{"/dev/fd/@var{N}"}, for file descriptor numbers
 above two, does actually close the given file descriptor.
 
-The @file{/dev/stdin}, @file{/dev/stdout}, and @file{/dev/stderr}
-special files are also recognized internally by several other
-versions of @command{awk}.
-
 @node Special Network
 @subsection Special Files for Network Communications
 @cindex networks, support for
@@ -9944,7 +10163,7 @@ This is done using a special @value{FN} of the form:
 @file{/@var{net-type}/@var{protocol}/@var{local-port}/@var{remote-host}/@var{remote-port}}
 @end example
 
-The @var{net-type} is one of @samp{inet}, @samp{inet4} or @samp{inet6}.
+The @var{net-type} is one of @samp{inet}, @samp{inet4}, or @samp{inet6}.
 The @var{protocol} is one of @samp{tcp} or @samp{udp},
 and the other fields represent the other essential pieces of information
 for making a networking connection.
@@ -9958,38 +10177,38 @@ Full discussion is delayed until
 @node Special Caveats
 @subsection Special @value{FFN} Caveats
 
-Here is a list of things to bear in mind when using the
+Here are some things to bear in mind when using the
 special @value{FN}s that @command{gawk} provides:
 
 @itemize @value{BULLET}
 @cindex compatibility mode (@command{gawk}), file names
 @cindex file names, in compatibility mode
 @item
-Recognition of these special @value{FN}s is disabled if @command{gawk} is in
-compatibility mode (@pxref{Options}).
+Recognition of the @value{FN}s for the three standard preopened
+files is disabled only in POSIX mode.
+
+@item
+Recognition of the other special @value{FN}s is disabled if @command{gawk} is in
+compatibility mode (either @option{--traditional} or @option{--posix};
+@pxref{Options}).
 
 @item
 @command{gawk} @emph{always}
 interprets these special @value{FN}s.
 For example, using @samp{/dev/fd/4}
 for output actually writes on file descriptor 4, and not on a new
-file descriptor that is @code{dup()}'ed from file descriptor 4.  Most of
+file descriptor that is @code{dup()}ed from file descriptor 4.  Most of
 the time this does not matter; however, it is important to @emph{not}
 close any of the files related to file descriptors 0, 1, and 2.
 Doing so results in unpredictable behavior.
 @end itemize
-@c ENDOFRANGE gfn
 
 @node Close Files And Pipes
 @section Closing Input and Output Redirections
 @cindex files, output, See output files
-@c STARTOFRANGE ifc
 @cindex input files, closing
-@c STARTOFRANGE ofc
 @cindex output, files@comma{} closing
-@c STARTOFRANGE pc
 @cindex pipe, closing
-@c STARTOFRANGE cc
 @cindex coprocesses, closing
 @cindex @code{getline} command, coprocesses@comma{} using from
 
@@ -10128,7 +10347,7 @@ is not closed and released until @code{close()} is called or
 @command{awk} exits.
 
 @code{close()} silently does nothing if given an argument that
-does not represent a file, pipe or coprocess that was opened with
+does not represent a file, pipe, or coprocess that was opened with
 a redirection.  In such a case, it returns a negative value,
 indicating an error. In addition, @command{gawk} sets @code{ERRNO}
 to a string indicating the error.
@@ -10136,7 +10355,8 @@ to a string indicating the error.
 Note also that @samp{close(FILENAME)} has no ``magic'' effects on the
 implicit loop that reads through the files named on the command line.
 It is, more likely, a close of a file that was never opened with a
-redirection, so @command{awk} silently does nothing.
+redirection, so @command{awk} silently does nothing, except return
+a negative value.
 
 @cindex @code{|} (vertical bar), @code{|&} operator (I/O), pipes@comma{} closing
 When using the @samp{|&} operator to communicate with a coprocess,
@@ -10148,10 +10368,10 @@ the first argument is the name of the command or special file used
 to start the coprocess.
 The second argument should be a string, with either of the values
 @code{"to"} or @code{"from"}.  Case does not matter.
-As this is an advanced feature, a more complete discussion is
+As this is an advanced feature, discussion is
 delayed until
 @ref{Two-way I/O},
-which discusses it in more detail and gives an example.
+which describes it in more detail and gives an example.
 
 @cindex sidebar, Using @code{close()}'s Return Value
 @ifdocbook
@@ -10166,9 +10386,10 @@ which discusses it in more detail and gives an example.
 @cindex Unix @command{awk}, @code{close()} function and
 
 In many older versions of Unix @command{awk}, the @code{close()} function
-is actually a statement.  It is a syntax error to try and use the return
-value from @code{close()}:
+is actually a statement.
 @value{DARKCORNER}
+It is a syntax error to try and use the return
+value from @code{close()}:
 
 @example
 command = "@dots{}"
@@ -10182,7 +10403,7 @@ retval = close(command)  # syntax error in many Unix awks
 The return value is @minus{}1 if the argument names something
 that was never opened with a redirection, or if there is
 a system problem closing the file or process.
-In these cases, @command{gawk} sets the built-in variable
+In these cases, @command{gawk} sets the predefined variable
 @code{ERRNO} to a string describing the problem.
 
 In @command{gawk},
@@ -10198,9 +10419,9 @@ This value is zero if the close succeeds, or @minus{}1 if
 it fails.
 
 The POSIX standard is very vague; it says that @code{close()}
-returns zero on success and nonzero otherwise.  In general,
+returns zero on success and a nonzero value otherwise.  In general,
 different implementations vary in what they report when closing
-pipes; thus the return value cannot be used portably.
+pipes; thus, the return value cannot be used portably.
 @value{DARKCORNER}
 In POSIX mode (@pxref{Options}), @command{gawk} just returns zero
 when closing a pipe.
@@ -10222,9 +10443,10 @@ when closing a pipe.
 @cindex Unix @command{awk}, @code{close()} function and
 
 In many older versions of Unix @command{awk}, the @code{close()} function
-is actually a statement.  It is a syntax error to try and use the return
-value from @code{close()}:
+is actually a statement.
 @value{DARKCORNER}
+It is a syntax error to try and use the return
+value from @code{close()}:
 
 @example
 command = "@dots{}"
@@ -10238,7 +10460,7 @@ retval = close(command)  # syntax error in many Unix awks
 The return value is @minus{}1 if the argument names something
 that was never opened with a redirection, or if there is
 a system problem closing the file or process.
-In these cases, @command{gawk} sets the built-in variable
+In these cases, @command{gawk} sets the predefined variable
 @code{ERRNO} to a string describing the problem.
 
 In @command{gawk},
@@ -10254,19 +10476,80 @@ This value is zero if the close succeeds, or @minus{}1 if
 it fails.
 
 The POSIX standard is very vague; it says that @code{close()}
-returns zero on success and nonzero otherwise.  In general,
+returns zero on success and a nonzero value otherwise.  In general,
 different implementations vary in what they report when closing
-pipes; thus the return value cannot be used portably.
+pipes; thus, the return value cannot be used portably.
 @value{DARKCORNER}
 In POSIX mode (@pxref{Options}), @command{gawk} just returns zero
 when closing a pipe.
 @end cartouche
 @end ifnotdocbook
 
-@c ENDOFRANGE ifc
-@c ENDOFRANGE ofc
-@c ENDOFRANGE pc
-@c ENDOFRANGE cc
+
+@node Nonfatal
+@section Enabling Nonfatal Output
+
+This @value{SECTION} describes a @command{gawk}-specific feature.
+
+In standard @command{awk}, output with @code{print} or @code{printf}
+to a nonexistent file, or some other I/O error (such as filling up the
+disk) is a fatal error.
+
+@example
+$ @kbd{gawk 'BEGIN @{ print "hi" > "/no/such/file" @}'}
+@error{} gawk: cmd. line:1: fatal: can't redirect to `/no/such/file' (No such file or directory)
+@end example
+
+@command{gawk} makes it possible to detect that an error has
+occurred, allowing you to possibly recover from the error, or
+at least print an error message of your choosing before exiting.
+You can do this in one of two ways:
+
+@itemize @bullet
+@item
+For all output files, by assigning any value to @code{PROCINFO["NONFATAL"]}.
+
+@item
+On a per-file basis, by assigning any value to
+@code{PROCINFO[@var{filename}, "NONFATAL"]}.
+Here, @var{filename} is the name of the file to which
+you wish output to be nonfatal.
+@end itemize
+
+Once you have enabled nonfatal output, you must check @code{ERRNO}
+after every relevant @code{print} or @code{printf} statement to
+see if something went wrong.  It is also a good idea to initialize
+@code{ERRNO} to zero before attempting the output. For example:
+
+@example
+$ @kbd{gawk '}
+> @kbd{BEGIN @{}
+> @kbd{    PROCINFO["NONFATAL"] = 1}
+> @kbd{    ERRNO = 0}
+> @kbd{    print "hi" > "/no/such/file"}
+> @kbd{    if (ERRNO) @{}
+> @kbd{        print("Output failed:", ERRNO) > "/dev/stderr"}
+> @kbd{        exit 1}
+> @kbd{    @}}
+> @kbd{@}'}
+@error{} Output failed: No such file or directory
+@end example
+
+Here, @command{gawk} did not produce a fatal error; instead
+it let the @command{awk} program code detect the problem and handle it.
+
+This mechanism works also for standard output and standard error.
+For standard output, you may use @code{PROCINFO["-", "NONFATAL"]}
+or @code{PROCINFO["/dev/stdout", "NONFATAL"]}.  For standard error, use
+@code{PROCINFO["/dev/stderr", "NONFATAL"]}.
+
+When attempting to open a TCP/IP socket (@pxref{TCP/IP Networking}),
+@command{gawk} tries multiple times. The @env{GAWK_SOCK_RETRIES}
+environment variable (@pxref{Other Environment Variables}) allows you to
+override @command{gawk}'s builtin default number of attempts.  However,
+once nonfatal I/O is enabled for a given socket, @command{gawk} only
+retries once, relying on @command{awk}-level code to notice that there
+was a problem.
 
 @node Output Summary
 @section Summary
@@ -10280,22 +10563,28 @@ for numeric values for the @code{print} statement.
 
 @item
 The @code{printf} statement provides finer-grained control over output,
-with format control letters for different data types and various flags
-that modify the behavior of the format control letters.
+with format-control letters for different data types and various flags
+that modify the behavior of the format-control letters.
 
 @item
 Output from both @code{print} and @code{printf} may be redirected to
-files, pipes, and co-processes.
+files, pipes, and coprocesses.
 
 @item
-@command{gawk} provides special file names for access to standard input,
-output and error, and for network communications.
+@command{gawk} provides special @value{FN}s for access to standard input,
+output, and error, and for network communications.
 
 @item
-Use @code{close()} to close open file, pipe and co-process redirections.
-For co-processes, it is possible to close only one direction of the
+Use @code{close()} to close open file, pipe, and coprocess redirections.
+For coprocesses, it is possible to close only one direction of the
 communications.
 
+@item
+Normally errors with @code{print} or @code{printf} are fatal.
+@command{gawk} lets you make output errors be nonfatal either for
+all files or on a per-file basis. You must then check for errors
+after every relevant output statement.
+
 @end itemize
 
 @c EXCLUDE START
@@ -10330,11 +10619,9 @@ BEGIN @{ print "Serious error detected!" > /dev/stderr @}
 @end enumerate
 @c EXCLUDE END
 
-@c ENDOFRANGE prnt
 
 @node Expressions
 @chapter Expressions
-@c STARTOFRANGE exps
 @cindex expressions
 
 Expressions are the basic building blocks of @command{awk} patterns
@@ -10345,7 +10632,7 @@ can assign a new value to a variable or a field by using an assignment operator.
 An expression can serve as a pattern or action statement on its own.
 Most other kinds of
 statements contain one or more expressions that specify the data on which to
-operate.  As in other languages, expressions in @command{awk} include
+operate.  As in other languages, expressions in @command{awk} can include
 variables, array references, constants, and function calls, as well as
 combinations of these with various operators.
 
@@ -10360,11 +10647,11 @@ combinations of these with various operators.
 @end menu
 
 @node Values
-@section Constants, Variables and Conversions
+@section Constants, Variables, and Conversions
 
 Expressions are built up from values and the operations performed
 upon them. This @value{SECTION} describes the elementary objects
-which provide the values used in expressions.
+that provide the values used in expressions.
 
 @menu
 * Constants::                   String, numeric and regexp constants.
@@ -10377,7 +10664,6 @@ which provide the values used in expressions.
 @node Constants
 @subsection Constant Expressions
 
-@c STARTOFRANGE cnst
 @cindex constants, types of
 
 The simplest type of expression is the @dfn{constant}, which always has
@@ -10386,7 +10672,7 @@ string, and regular expression.
 
 Each is used in the appropriate context when you need a data
 value that isn't going to change.  Numeric constants can
-have different forms, but are stored identically internally.
+have different forms, but are internally stored in an identical manner.
 
 @menu
 * Scalar Constants::            Numeric and string constants.
@@ -10402,7 +10688,7 @@ have different forms, but are stored identically internally.
 A @dfn{numeric constant} stands for a number.  This number can be an
 integer, a decimal fraction, or a number in scientific (exponential)
 notation.@footnote{The internal representation of all numbers,
-including integers, uses double precision floating-point numbers.
+including integers, uses double-precision floating-point numbers.
 On most modern systems, these are in IEEE 754 standard format.
 @xref{Arbitrary Precision Arithmetic}, for much more information.}
 Here are some examples of numeric constants that all
@@ -10415,8 +10701,8 @@ have the same value:
 @end example
 
 @cindex string constants
-A string constant consists of a sequence of characters enclosed in
-double-quotation marks.  For example:
+A @dfn{string constant} consists of a sequence of characters enclosed in
+double quotation marks.  For example:
 
 @example
 "parrot"
@@ -10427,7 +10713,7 @@ double-quotation marks.  For example:
 @cindex strings, length limitations
 represents the string whose contents are @samp{parrot}.  Strings in
 @command{gawk} can be of any length, and they can contain any of the possible
-eight-bit ASCII characters including ASCII @value{NUL} (character code zero).
+eight-bit ASCII characters, including ASCII @sc{nul} (character code zero).
 Other @command{awk}
 implementations may have difficulty with some character codes.
 
@@ -10438,19 +10724,19 @@ implementations may have difficulty with some character codes.
 @cindex numbers, octal
 @cindex numbers, hexadecimal
 
-In @command{awk}, all numbers are in decimal; i.e., base 10.  Many other
+In @command{awk}, all numbers are in decimal (i.e., base 10).  Many other
 programming languages allow you to specify numbers in other bases, often
 octal (base 8) and hexadecimal (base 16).
-In octal, the numbers go 0, 1, 2, 3, 4, 5, 6, 7, 10, 11, 12, etc.
-Just as @samp{11}, in decimal, is 1 times 10 plus 1, so
-@samp{11}, in octal, is 1 times 8, plus 1. This equals 9 in decimal.
-In hexadecimal, there are 16 digits. Since the everyday decimal
+In octal, the numbers go 0, 1, 2, 3, 4, 5, 6, 7, 10, 11, 12, and so on.
+Just as @samp{11} in decimal is 1 times 10 plus 1, so
+@samp{11} in octal is 1 times 8 plus 1. This equals 9 in decimal.
+In hexadecimal, there are 16 digits. Because the everyday decimal
 number system only has ten digits (@samp{0}--@samp{9}), the letters
 @samp{a} through @samp{f} are used to represent the rest.
 (Case in the letters is usually irrelevant; hexadecimal @samp{a} and @samp{A}
 have the same value.)
-Thus, @samp{11}, in
-hexadecimal, is 1 times 16 plus 1, which equals 17 in decimal.
+Thus, @samp{11} in
+hexadecimal is 1 times 16 plus 1, which equals 17 in decimal.
 
 Just by looking at plain @samp{11}, you can't tell what base it's in.
 So, in C, C++, and other languages derived from C,
@@ -10461,13 +10747,13 @@ and hexadecimal numbers start with a leading @samp{0x} or @samp{0X}:
 
 @table @code
 @item 11
-Decimal value 11.
+Decimal value 11
 
 @item 011
-Octal 11, decimal value 9.
+Octal 11, decimal value 9
 
 @item 0x11
-Hexadecimal 11, decimal value 17.
+Hexadecimal 11, decimal value 17
 @end table
 
 This example shows the difference:
@@ -10495,12 +10781,13 @@ you can use the @code{strtonum()} function
 (@pxref{String Functions})
 to convert the data into a number.
 Most of the time, you will want to use octal or hexadecimal constants
-when working with the built-in bit manipulation functions;
-see @ref{Bitwise Functions},
+when working with the built-in bit-manipulation functions;
+see @DBREF{Bitwise Functions}
 for more information.
 
-Unlike some early C implementations, @samp{8} and @samp{9} are not valid
-in octal constants; e.g., @command{gawk} treats @samp{018} as decimal 18:
+Unlike in some early C implementations, @samp{8} and @samp{9} are not
+valid in octal constants.  For example, @command{gawk} treats @samp{018}
+as decimal 18:
 
 @example
 $ @kbd{gawk 'BEGIN @{ print "021 is", 021 ; print 018 @}'}
@@ -10562,19 +10849,17 @@ $ @kbd{gawk 'BEGIN @{ printf "0x11 is <%s>\n", 0x11 @}'}
 @node Regexp Constants
 @subsubsection Regular Expression Constants
 
-@c STARTOFRANGE rec
 @cindex regexp constants
 @cindex @code{~} (tilde), @code{~} operator
 @cindex tilde (@code{~}), @code{~} operator
 @cindex @code{!} (exclamation point), @code{!~} operator
 @cindex exclamation point (@code{!}), @code{!~} operator
-A regexp constant is a regular expression description enclosed in
+A @dfn{regexp constant} is a regular expression description enclosed in
 slashes, such as @code{@w{/^beginning and end$/}}.  Most regexps used in
 @command{awk} programs are constant, but the @samp{~} and @samp{!~}
 matching operators can also match computed or dynamic regexps
 (which are typically just ordinary strings or variables that contain a regexp,
-but could be a more complex expression).
-@c ENDOFRANGE cnst
+but could be more complex expressions).
 
 @node Using Constant Regexps
 @subsection Using Regular Expression Constants
@@ -10586,7 +10871,7 @@ matched.
 However, regexp constants (such as @code{/foo/}) may be used like simple expressions.
 When a
 regexp constant appears by itself, it has the same meaning as if it appeared
-in a pattern, i.e., @samp{($0 ~ /foo/)}
+in a pattern (i.e., @samp{($0 ~ /foo/)}).
 @value{DARKCORNER}
 @xref{Expression Patterns}.
 This means that the following two code segments:
@@ -10607,7 +10892,7 @@ if (/barfly/ || /camelot/)
 @noindent
 are exactly equivalent.
 One rather bizarre consequence of this rule is that the following
-Boolean expression is valid, but does not do what the user probably
+Boolean expression is valid, but does not do what its author probably
 intended:
 
 @example
@@ -10653,10 +10938,9 @@ Modern implementations of @command{awk}, including @command{gawk}, allow
 the third argument of @code{split()} to be a regexp constant, but some
 older implementations do not.
 @value{DARKCORNER}
-This can lead to confusion when attempting to use regexp constants
-as arguments to user-defined functions
-(@pxref{User-defined}).
-For example:
+Because some built-in functions accept regexp constants as arguments,
+confusion can arise when attempting to use regexp constants as arguments
+to user-defined functions (@pxref{User-defined}).  For example:
 
 @example
 function mysub(pat, repl, str, global)
@@ -10681,19 +10965,18 @@ function mysub(pat, repl, str, global)
 In this example, the programmer wants to pass a regexp constant to the
 user-defined function @code{mysub()}, which in turn passes it on to
 either @code{sub()} or @code{gsub()}.  However, what really happens is that
-the @code{pat} parameter is either one or zero, depending upon whether
+the @code{pat} parameter is assigned a value of either one or zero, depending upon whether
 or not @code{$0} matches @code{/hi/}.
 @command{gawk} issues a warning when it sees a regexp constant used as
-a parameter to a user-defined function, since passing a truth value in
+a parameter to a user-defined function, because passing a truth value in
 this way is probably not what was intended.
-@c ENDOFRANGE rec
 
 @node Variables
 @subsection Variables
 
 @cindex variables, user-defined
 @cindex user-defined, variables
-Variables are ways of storing values at one point in your program for
+@dfn{Variables} are ways of storing values at one point in your program for
 use later in another part of your program.  They can be manipulated
 entirely within the program text, and they can also be assigned values
 on the @command{awk} command line.
@@ -10721,27 +11004,27 @@ are distinct variables.
 A variable name is a valid expression by itself; it represents the
 variable's current value.  Variables are given new values with
 @dfn{assignment operators}, @dfn{increment operators}, and
-@dfn{decrement operators}.
-@xref{Assignment Ops}.
+@dfn{decrement operators}
+(@pxref{Assignment Ops}).
 In addition, the @code{sub()} and @code{gsub()} functions can
-change a variable's value, and the @code{match()}, @code{patsplit()}
-and @code{split()} functions can change the contents of their
-array parameters. @xref{String Functions}.
+change a variable's value, and the @code{match()}, @code{split()},
+and @code{patsplit()} functions can change the contents of their
+array parameters (@pxref{String Functions}).
 
 @cindex variables, built-in
 @cindex variables, initializing
 A few variables have special built-in meanings, such as @code{FS} (the
-field separator), and @code{NF} (the number of fields in the current input
-record).  @xref{Built-in Variables}, for a list of the built-in variables.
-These built-in variables can be used and assigned just like all other
+field separator) and @code{NF} (the number of fields in the current input
+record).  @DBXREF{Built-in Variables} for a list of the predefined variables.
+These predefined variables can be used and assigned just like all other
 variables, but their values are also used or changed automatically by
-@command{awk}.  All built-in variables' names are entirely uppercase.
+@command{awk}.  All predefined variables' names are entirely uppercase.
 
 Variables in @command{awk} can be assigned either numeric or string values.
 The kind of value a variable holds can change over the life of a program.
 By default, variables are initialized to the empty string, which
 is zero if converted to a number.  There is no need to explicitly
-``initialize'' a variable in @command{awk},
+initialize a variable in @command{awk},
 which is what you would do in C and in most other traditional languages.
 
 @node Assignment Options
@@ -10773,7 +11056,7 @@ as in the following:
 the variable is set at the very beginning, even before the
 @code{BEGIN} rules execute.  The @option{-v} option and its assignment
 must precede all the @value{FN} arguments, as well as the program text.
-(@xref{Options}, for more information about
+(@DBXREF{Options} for more information about
 the @option{-v} option.)
 Otherwise, the variable assignment is performed at a time determined by
 its position among the input file arguments---after the processing of the
@@ -10813,7 +11096,7 @@ sequences
 @node Conversion
 @subsection Conversion of Strings and Numbers
 
-Number to string and string to number conversion are generally
+Number-to-string and string-to-number conversion are generally
 straightforward.  There can be subtleties to be aware of;
 this @value{SECTION} discusses this important facet of @command{awk}.
 
@@ -10824,7 +11107,7 @@ this @value{SECTION} discusses this important facet of @command{awk}.
 @end menu
 
 @node Strings And Numbers
-@subsubsection How @command{awk} Converts Between Strings And Numbers
+@subsubsection How @command{awk} Converts Between Strings and Numbers
 
 @cindex converting, strings to numbers
 @cindex strings, converting
@@ -10855,13 +11138,13 @@ string, concatenate that number with the empty string, @code{""}.
 To force a string to be converted to a number, add zero to that string.
 A string is converted to a number by interpreting any numeric prefix
 of the string as numerals:
-@code{"2.5"} converts to 2.5, @code{"1e3"} converts to 1000, and @code{"25fix"}
+@code{"2.5"} converts to 2.5, @code{"1e3"} converts to 1,000, and @code{"25fix"}
 has a numeric value of 25.
 Strings that can't be interpreted as valid numbers convert to zero.
 
 @cindex @code{CONVFMT} variable
 The exact manner in which numbers are converted into strings is controlled
-by the @command{awk} built-in variable @code{CONVFMT} (@pxref{Built-in Variables}).
+by the @command{awk} predefined variable @code{CONVFMT} (@pxref{Built-in Variables}).
 Numbers are converted using the @code{sprintf()} function
 with @code{CONVFMT} as the format
 specifier
@@ -10895,10 +11178,10 @@ b = a ""
 @code{b} has the value @code{"12"}, not @code{"12.00"}.
 @value{DARKCORNER}
 
-@cindex sidebar, Pre-POSIX @command{awk} Used @code{OFMT} For String Conversion
+@cindex sidebar, Pre-POSIX @command{awk} Used @code{OFMT} for String Conversion
 @ifdocbook
 @docbook
-<sidebar><title>Pre-POSIX @command{awk} Used @code{OFMT} For String Conversion</title>
+<sidebar><title>Pre-POSIX @command{awk} Used @code{OFMT} for String Conversion</title>
 @end docbook
 
 @cindex POSIX @command{awk}, @code{OFMT} variable and
@@ -10912,7 +11195,7 @@ specifies the output format to use when printing numbers with @code{print}.
 conversion from the semantics of printing.  Both @code{CONVFMT} and
 @code{OFMT} have the same default value: @code{"%.6g"}.  In the vast majority
 of cases, old @command{awk} programs do not change their behavior.
-@xref{Print}, for more information on the @code{print} statement.
+@DBXREF{Print} for more information on the @code{print} statement.
 
 @docbook
 </sidebar>
@@ -10921,7 +11204,7 @@ of cases, old @command{awk} programs do not change their behavior.
 
 @ifnotdocbook
 @cartouche
-@center @b{Pre-POSIX @command{awk} Used @code{OFMT} For String Conversion}
+@center @b{Pre-POSIX @command{awk} Used @code{OFMT} for String Conversion}
 
 
 @cindex POSIX @command{awk}, @code{OFMT} variable and
@@ -10935,7 +11218,7 @@ specifies the output format to use when printing numbers with @code{print}.
 conversion from the semantics of printing.  Both @code{CONVFMT} and
 @code{OFMT} have the same default value: @code{"%.6g"}.  In the vast majority
 of cases, old @command{awk} programs do not change their behavior.
-@xref{Print}, for more information on the @code{print} statement.
+@DBXREF{Print} for more information on the @code{print} statement.
 @end cartouche
 @end ifnotdocbook
 
@@ -10958,7 +11241,7 @@ The POSIX standard says that @command{awk} always uses the period as the decimal
 point when reading the @command{awk} program source code, and for
 command-line variable assignments (@pxref{Other Arguments}).  However,
 when interpreting input data, for @code{print} and @code{printf} output,
-and for number to string conversion, the local decimal point character
+and for number-to-string conversion, the local decimal point character
 is used.  @value{DARKCORNER} In all cases, numbers in source code and
 in input data cannot have a thousands separator.  Here are some examples
 indicating the difference in behavior, on a GNU/Linux system:
@@ -10978,17 +11261,17 @@ $ @kbd{echo 4,321 | LC_ALL=en_DK.utf-8 gawk '@{ print $1 + 1 @}'}
 @noindent
 The @code{en_DK.utf-8} locale is for English in Denmark, where the comma acts as
 the decimal point separator.  In the normal @code{"C"} locale, @command{gawk}
-treats @samp{4,321} as @samp{4}, while in the Danish locale, it's treated
-as the full number, 4.321.
+treats @samp{4,321} as 4, while in the Danish locale, it's treated
+as the full number including the fractional part, 4.321.
 
 Some earlier versions of @command{gawk} fully complied with this aspect
 of the standard.  However, many users in non-English locales complained
-about this behavior, since their data used a period as the decimal
+about this behavior, because their data used a period as the decimal
 point, so the default behavior was restored to use a period as the
 decimal point character.  You can use the @option{--use-lc-numeric}
 option (@pxref{Options}) to force @command{gawk} to use the locale's
 decimal point character.  (@command{gawk} also uses the locale's decimal
-point character when in POSIX mode, either via @option{--posix}, or the
+point character when in POSIX mode, either via @option{--posix} or the
 @env{POSIXLY_CORRECT} environment variable, as shown previously.)
 
 @ref{table-locale-affects} describes the cases in which the locale's decimal
@@ -10996,7 +11279,7 @@ point character is used and when a period is used. Some of these
 features have not been described yet.
 
 @float Table,table-locale-affects
-@caption{Locale Decimal Point versus A Period}
+@caption{Locale decimal point versus a period}
 @multitable @columnfractions .15 .20 .45
 @headitem Feature @tab Default @tab @option{--posix} or @option{--use-lc-numeric}
 @item @code{%'g} @tab Use locale @tab Use locale
@@ -11006,15 +11289,15 @@ features have not been described yet.
 @end multitable
 @end float
 
-Finally, modern day formal standards and IEEE standard floating point
+Finally, modern-day formal standards and the IEEE standard floating-point
 representation can have an unusual but important effect on the way
 @command{gawk} converts some special string values to numbers.  The details
 are presented in @ref{POSIX Floating Point Problems}.
 
 @node All Operators
-@section Operators: Doing Something With Values
+@section Operators: Doing Something with Values
 
-This @value{SECTION} introduces the @dfn{operators} which make use
+This @value{SECTION} introduces the @dfn{operators} that make use
 of the values provided by constants and variables.
 
 @menu
@@ -11091,7 +11374,7 @@ Multiplication.
 Division;  because all numbers in @command{awk} are floating-point
 numbers, the result is @emph{not} rounded to an integer---@samp{3 / 4} has
 the value 0.75.  (It is a common mistake, especially for C programmers,
-to forget that @emph{all} numbers in @command{awk} are floating-point,
+to forget that @emph{all} numbers in @command{awk} are floating point,
 and that division of integer-looking constants produces a real number,
 not an integer.)
 
@@ -11176,7 +11459,7 @@ $ @kbd{awk '@{ print "Field number one:" $1 @}' mail-list}
 
 @cindex troubleshooting, string concatenation
 Because string concatenation does not have an explicit operator, it is
-often necessary to insure that it happens at the right time by using
+often necessary to ensure that it happens at the right time by using
 parentheses to enclose the items to concatenate.  For example,
 you might expect that the
 following code fragment concatenates @code{file} and @code{name}:
@@ -11192,7 +11475,7 @@ print "something meaningful" > file name
 @noindent
 This produces a syntax error with some versions of Unix
 @command{awk}.@footnote{It happens that BWK
-@command{awk}, @command{gawk} and @command{mawk} all ``get it right,''
+@command{awk}, @command{gawk}, and @command{mawk} all ``get it right,''
 but you should not rely on this.}
 It is necessary to use the following:
 
@@ -11281,11 +11564,8 @@ you're never quite sure what you'll get.
 
 @node Assignment Ops
 @subsection Assignment Expressions
-@c STARTOFRANGE asop
 @cindex assignment operators
-@c STARTOFRANGE opas
 @cindex operators, assignment
-@c STARTOFRANGE exas
 @cindex expressions, assignment
 @cindex @code{=} (equals sign), @code{=} operator
 @cindex equals sign (@code{=}), @code{=} operator
@@ -11438,7 +11718,14 @@ The indices of @code{bar} are practically guaranteed to be different, because
 @code{rand()} returns different values each time it is called.
 (Arrays and the @code{rand()} function haven't been covered yet.
 @xref{Arrays},
-and see @ref{Numeric Functions}, for more information).
+and
+@ifnotdocbook
+@DBPXREF{Numeric Functions}
+@end ifnotdocbook
+@ifdocbook
+@DBREF{Numeric Functions}
+@end ifdocbook
+for more information.)
 This example illustrates an important fact about assignment
 operators: the lefthand expression is only evaluated @emph{once}.
 
@@ -11471,7 +11758,7 @@ to a number.
 @cindex @code{*} (asterisk), @code{**=} operator
 @cindex asterisk (@code{*}), @code{**=} operator
 @float Table,table-assign-ops
-@caption{Arithmetic Assignment Operators}
+@caption{Arithmetic assignment operators}
 @multitable @columnfractions .30 .70
 @headitem Operator @tab Effect
 @item @var{lvalue} @code{+=} @var{increment} @tab Add @var{increment} to the value of @var{lvalue}.
@@ -11483,7 +11770,7 @@ to a number.
 @cindex extensions, common@comma{} @code{**=} operator
 @cindex @command{awk} language, POSIX version
 @cindex POSIX @command{awk}
-@item @var{lvalue} @code{^=} @var{power} @tab
+@item @var{lvalue} @code{^=} @var{power} @tab Raise @var{lvalue} to the power @var{power}.
 @item @var{lvalue} @code{**=} @var{power} @tab Raise @var{lvalue} to the power @var{power}. @value{COMMONEXT}
 @end multitable
 @end float
@@ -11520,7 +11807,7 @@ This is most notable in some commercial @command{awk} versions.
 For example:
 
 @example
-$ awk /==/ /dev/null
+$ @kbd{awk /==/ /dev/null}
 @error{} awk: syntax error at source line 1
 @error{}  context is
 @error{}         >>> /= <<<
@@ -11535,7 +11822,7 @@ awk '/[=]=/' /dev/null
 @end example
 
 @command{gawk} does not have this problem; BWK @command{awk}
-and @command{mawk} also do not (@pxref{Other Versions}).
+and @command{mawk} also do not.
 
 @docbook
 </sidebar>
@@ -11566,7 +11853,7 @@ This is most notable in some commercial @command{awk} versions.
 For example:
 
 @example
-$ awk /==/ /dev/null
+$ @kbd{awk /==/ /dev/null}
 @error{} awk: syntax error at source line 1
 @error{}  context is
 @error{}         >>> /= <<<
@@ -11581,19 +11868,14 @@ awk '/[=]=/' /dev/null
 @end example
 
 @command{gawk} does not have this problem; BWK @command{awk}
-and @command{mawk} also do not (@pxref{Other Versions}).
+and @command{mawk} also do not.
 @end cartouche
 @end ifnotdocbook
-@c ENDOFRANGE exas
-@c ENDOFRANGE opas
-@c ENDOFRANGE asop
 
 @node Increment Ops
 @subsection Increment and Decrement Operators
 
-@c STARTOFRANGE inop
 @cindex increment operators
-@c STARTOFRANGE opde
 @cindex operators, decrement/increment
 @dfn{Increment} and @dfn{decrement operators} increase or decrease the value of
 a variable by one.  An assignment operator can do the same thing, so
@@ -11617,13 +11899,14 @@ has the value four, but it changes the value of @code{foo} to five.
 In other words, the operator returns the old value of the variable,
 but with the side effect of incrementing it.
 
+@c FIXME: Use @sup here for superscript
 The post-increment @samp{foo++} is nearly the same as writing @samp{(foo
 += 1) - 1}.  It is not perfectly equivalent because all numbers in
-@command{awk} are floating-point---in floating-point, @samp{foo + 1 - 1} does
+@command{awk} are floating point---in floating point, @samp{foo + 1 - 1} does
 not necessarily equal @code{foo}.  But the difference is minute as
 long as you stick to numbers that are fairly small (less than
 @iftex
-@math{10^12}).
+@math{10^{12}}).
 @end iftex
 @ifnottex
 @ifnotdocbook
@@ -11641,7 +11924,6 @@ just like variables.  (Use @samp{$(i++)} when you want to do a field reference
 and a variable increment at the same time.  The parentheses are necessary
 because of the precedence of the field reference operator @samp{$}.)
 
-@c STARTOFRANGE deop
 @cindex decrement operators
 The decrement operator @samp{--} works just like @samp{++}, except that
 it subtracts one instead of adding it.  As with @samp{++}, it can be used before
@@ -11686,8 +11968,8 @@ like @samp{@var{lvalue}++}, but instead of adding, it subtracts.)
 @cindex evaluation order
 @cindex Marx, Groucho
 @quotation
-@i{Doctor, doctor!  It hurts when I do this!@*
-So don't do that!}
+@i{Doctor, it hurts when I do this!@*
+Then don't do that!}
 @author Groucho Marx
 @end quotation
 
@@ -11711,7 +11993,7 @@ print b
 @cindex side effects
 In other words, when do the various side effects prescribed by the
 postfix operators (@samp{b++}) take effect?
-When side effects happen is @dfn{implementation defined}.
+When side effects happen is @dfn{implementation-defined}.
 In other words, it is up to the particular version of @command{awk}.
 The result for the first example may be 12 or 13, and for the second, it
 may be 22 or 23.
@@ -11738,8 +12020,8 @@ You should avoid such things in your own programs.
 @cindex evaluation order
 @cindex Marx, Groucho
 @quotation
-@i{Doctor, doctor!  It hurts when I do this!@*
-So don't do that!}
+@i{Doctor, it hurts when I do this!@*
+Then don't do that!}
 @author Groucho Marx
 @end quotation
 
@@ -11763,7 +12045,7 @@ print b
 @cindex side effects
 In other words, when do the various side effects prescribed by the
 postfix operators (@samp{b++}) take effect?
-When side effects happen is @dfn{implementation defined}.
+When side effects happen is @dfn{implementation-defined}.
 In other words, it is up to the particular version of @command{awk}.
 The result for the first example may be 12 or 13, and for the second, it
 may be 22 or 23.
@@ -11775,14 +12057,11 @@ You should avoid such things in your own programs.
 @c in the mirror in the morning.
 @end cartouche
 @end ifnotdocbook
-@c ENDOFRANGE inop
-@c ENDOFRANGE opde
-@c ENDOFRANGE deop
 
 @node Truth Values and Conditions
 @section Truth Values and Conditions
 
-In certain contexts, expression values also serve as ``truth values;'' i.e.,
+In certain contexts, expression values also serve as ``truth values''; i.e.,
 they determine what should happen next as the program runs. This
 @value{SECTION} describes how @command{awk} defines ``true'' and ``false''
 and how values are compared.
@@ -11839,22 +12118,21 @@ the string constant @code{"0"} is actually true, because it is non-null.
 @subsection Variable Typing and Comparison Expressions
 @quotation
 @i{The Guide is definitive. Reality is frequently inaccurate.}
-@author The Hitchhiker's Guide to the Galaxy
+@author Douglas Adams, @cite{The Hitchhiker's Guide to the Galaxy}
 @end quotation
+@c 2/2015: Antonio Colombo points out that this is really from
+@c The Restaurant at the End of the Universe. But I'm going to
+@c leave it alone.
 
-@c STARTOFRANGE comex
 @cindex comparison expressions
-@c STARTOFRANGE excom
 @cindex expressions, comparison
 @cindex expressions, matching, See comparison expressions
 @cindex matching, expressions, See comparison expressions
 @cindex relational operators, See comparison operators
 @cindex operators, relational, See operators@comma{} comparison
-@c STARTOFRANGE varting
 @cindex variable typing
-@c STARTOFRANGE vartypc
 @cindex variables, types of, comparison expressions and
-Unlike other programming languages, @command{awk} variables do not have a
+Unlike in other programming languages, in @command{awk} variables do not have a
 fixed type. Instead, they can be either a number or a string, depending
 upon the value that is assigned to them.
 We look now at how variables are typed, and how @command{awk}
@@ -11867,7 +12145,7 @@ compares variables.
 @end menu
 
 @node Variable Typing
-@subsubsection String Type Versus Numeric Type
+@subsubsection String Type versus Numeric Type
 
 @cindex numeric, strings
 @cindex strings, numeric
@@ -11883,20 +12161,20 @@ Variable typing follows these rules:
 
 @itemize @value{BULLET}
 @item
-A numeric constant or the result of a numeric operation has the @var{numeric}
+A numeric constant or the result of a numeric operation has the @dfn{numeric}
 attribute.
 
 @item
-A string constant or the result of a string operation has the @var{string}
+A string constant or the result of a string operation has the @dfn{string}
 attribute.
 
 @item
 Fields, @code{getline} input, @code{FILENAME}, @code{ARGV} elements,
 @code{ENVIRON} elements, and the elements of an array created by
-@code{patsplit()}, @code{split()} and @code{match()} that are numeric
-strings have the @var{strnum} attribute.  Otherwise, they have
-the @var{string} attribute.  Uninitialized variables also have the
-@var{strnum} attribute.
+@code{match()}, @code{split()}, and @code{patsplit()} that are numeric
+strings have the @dfn{strnum} attribute.  Otherwise, they have
+the @dfn{string} attribute.  Uninitialized variables also have the
+@dfn{strnum} attribute.
 
 @item
 Attributes propagate across assignments but are not changed by
@@ -12040,30 +12318,31 @@ constant, then a string comparison is performed.  Otherwise, a
 numeric comparison is performed.
 
 This point bears additional emphasis: All user input is made of characters,
-and so is first and foremost of @var{string} type; input strings
-that look numeric are additionally given the @var{strnum} attribute.
+and so is first and foremost of string type; input strings
+that look numeric are additionally given the strnum attribute.
 Thus, the six-character input string @w{@samp{ +3.14}} receives the
-@var{strnum} attribute. In contrast, the eight characters
+strnum attribute. In contrast, the eight characters
 @w{@code{" +3.14"}} appearing in program text comprise a string constant.
 The following examples print @samp{1} when the comparison between
-the two different constants is true, @samp{0} otherwise:
+the two different constants is true, and @samp{0} otherwise:
 
+@c 22.9.2014: Tested with mawk and BWK awk, got same results.
 @example
-$ @kbd{echo ' +3.14' | gawk '@{ print $0 == " +3.14" @}'}    @ii{True}
+$ @kbd{echo ' +3.14' | awk '@{ print($0 == " +3.14") @}'}    @ii{True}
 @print{} 1
-$ @kbd{echo ' +3.14' | gawk '@{ print $0 == "+3.14" @}'}     @ii{False}
+$ @kbd{echo ' +3.14' | awk '@{ print($0 == "+3.14") @}'}     @ii{False}
 @print{} 0
-$ @kbd{echo ' +3.14' | gawk '@{ print $0 == "3.14" @}'}      @ii{False}
+$ @kbd{echo ' +3.14' | awk '@{ print($0 == "3.14") @}'}      @ii{False}
 @print{} 0
-$ @kbd{echo ' +3.14' | gawk '@{ print $0 == 3.14 @}'}        @ii{True}
+$ @kbd{echo ' +3.14' | awk '@{ print($0 == 3.14) @}'}        @ii{True}
 @print{} 1
-$ @kbd{echo ' +3.14' | gawk '@{ print $1 == " +3.14" @}'}    @ii{False}
+$ @kbd{echo ' +3.14' | awk '@{ print($1 == " +3.14") @}'}    @ii{False}
 @print{} 0
-$ @kbd{echo ' +3.14' | gawk '@{ print $1 == "+3.14" @}'}     @ii{True}
+$ @kbd{echo ' +3.14' | awk '@{ print($1 == "+3.14") @}'}     @ii{True}
 @print{} 1
-$ @kbd{echo ' +3.14' | gawk '@{ print $1 == "3.14" @}'}      @ii{False}
+$ @kbd{echo ' +3.14' | awk '@{ print($1 == "3.14") @}'}      @ii{False}
 @print{} 0
-$ @kbd{echo ' +3.14' | gawk '@{ print $1 == 3.14 @}'}        @ii{True}
+$ @kbd{echo ' +3.14' | awk '@{ print($1 == 3.14) @}'}        @ii{True}
 @print{} 1
 @end example
 
@@ -12093,18 +12372,18 @@ operators}, which are a superset of those in C.
 @cindex exclamation point (@code{!}), @code{!~} operator
 @cindex @code{in} operator
 @float Table,table-relational-ops
-@caption{Relational Operators}
+@caption{Relational operators}
 @multitable @columnfractions .25 .75
 @headitem Expression @tab Result
-@item @var{x} @code{<} @var{y} @tab True if @var{x} is less than @var{y}.
-@item @var{x} @code{<=} @var{y} @tab True if @var{x} is less than or equal to @var{y}.
-@item @var{x} @code{>} @var{y} @tab True if @var{x} is greater than @var{y}.
-@item @var{x} @code{>=} @var{y} @tab True if @var{x} is greater than or equal to @var{y}.
-@item @var{x} @code{==} @var{y} @tab True if @var{x} is equal to @var{y}.
-@item @var{x} @code{!=} @var{y} @tab True if @var{x} is not equal to @var{y}.
-@item @var{x} @code{~} @var{y} @tab True if the string @var{x} matches the regexp denoted by @var{y}.
-@item @var{x} @code{!~} @var{y} @tab True if the string @var{x} does not match the regexp denoted by @var{y}.
-@item @var{subscript} @code{in} @var{array} @tab True if the array @var{array} has an element with the subscript @var{subscript}.
+@item @var{x} @code{<} @var{y} @tab True if @var{x} is less than @var{y}
+@item @var{x} @code{<=} @var{y} @tab True if @var{x} is less than or equal to @var{y}
+@item @var{x} @code{>} @var{y} @tab True if @var{x} is greater than @var{y}
+@item @var{x} @code{>=} @var{y} @tab True if @var{x} is greater than or equal to @var{y}
+@item @var{x} @code{==} @var{y} @tab True if @var{x} is equal to @var{y}
+@item @var{x} @code{!=} @var{y} @tab True if @var{x} is not equal to @var{y}
+@item @var{x} @code{~} @var{y} @tab True if the string @var{x} matches the regexp denoted by @var{y}
+@item @var{x} @code{!~} @var{y} @tab True if the string @var{x} does not match the regexp denoted by @var{y}
+@item @var{subscript} @code{in} @var{array} @tab True if the array @var{array} has an element with the subscript @var{subscript}
 @end multitable
 @end float
 
@@ -12137,30 +12416,29 @@ part of the test always succeeds.  Because the operators are
 so similar, this kind of error is very difficult to spot when
 scanning the source code.
 
-@cindex @command{gawk}, comparison operators and
-The following table of expressions illustrates the kind of comparison
-@command{gawk} performs, as well as what the result of the comparison is:
+The following list of expressions illustrates the kinds of comparisons
+@command{awk} performs, as well as what the result of each comparison is:
 
 @table @code
 @item 1.5 <= 2.0
-numeric comparison (true)
+Numeric comparison (true)
 
 @item "abc" >= "xyz"
-string comparison (false)
+String comparison (false)
 
 @item 1.5 != " +2"
-string comparison (true)
+String comparison (true)
 
 @item "1e2" < "3"
-string comparison (true)
+String comparison (true)
 
 @item a = 2; b = "2"
 @itemx a == b
-string comparison (true)
+String comparison (true)
 
 @item a = 2; b = " +2"
 @itemx a == b
-string comparison (false)
+String comparison (false)
 @end table
 
 In this example:
@@ -12176,7 +12454,7 @@ $ @kbd{echo 1e2 3 | awk '@{ print ($1 < $2) ? "true" : "false" @}'}
 @noindent
 the result is @samp{false} because both @code{$1} and @code{$2}
 are user input.  They are numeric strings---therefore both have
-the @var{strnum} attribute, dictating a numeric comparison.
+the strnum attribute, dictating a numeric comparison.
 The purpose of the comparison rules and the use of numeric strings is
 to attempt to produce the behavior that is ``least surprising,'' while
 still ``doing the right thing.''
@@ -12212,8 +12490,8 @@ dynamic regexp (@pxref{Regexp Usage}; also
 
 @cindex @command{awk}, regexp constants and
 @cindex regexp constants
-In modern implementations of @command{awk}, a constant regular
-expression in slashes by itself is also an expression.  The regexp
+A constant regular
+expression in slashes by itself is also an expression.
 @code{/@var{regexp}/} is an abbreviation for the following comparison expression:
 
 @example
@@ -12227,15 +12505,15 @@ One special place where @code{/foo/} is @emph{not} an abbreviation for
 where this is discussed in more detail.
 
 @node POSIX String Comparison
-@subsubsection String Comparison With POSIX Rules
+@subsubsection String Comparison with POSIX Rules
 
 The POSIX standard says that string comparison is performed based
 on the locale's @dfn{collating order}. This is the order in which
 characters sort, as defined by the locale (for more discussion,
-@pxref{Ranges and Locales}).  This order is usually very different
+@pxref{Locales}).  This order is usually very different
 from the results obtained when doing straight character-by-character
 comparison.@footnote{Technically, string comparison is supposed
-to behave the same way as if the strings are compared with the C
+to behave the same way as if the strings were compared with the C
 @code{strcoll()} function.}
 
 Because this behavior differs considerably from existing practice,
@@ -12252,19 +12530,13 @@ $ @kbd{gawk --posix 'BEGIN @{ printf("ABC < abc = %s\n",}
 @print{} ABC < abc = FALSE
 @end example
 
-@c ENDOFRANGE comex
-@c ENDOFRANGE excom
-@c ENDOFRANGE vartypc
-@c ENDOFRANGE varting
 
 @node Boolean Ops
 @subsection Boolean Expressions
 @cindex and Boolean-logic operator
 @cindex or Boolean-logic operator
 @cindex not Boolean-logic operator
-@c STARTOFRANGE exbo
 @cindex expressions, Boolean
-@c STARTOFRANGE boex
 @cindex Boolean expressions
 @cindex operators, Boolean, See Boolean expressions
 @cindex Boolean operators, See Boolean expressions
@@ -12312,7 +12584,7 @@ no substring @samp{foo} in the record.
 True if at least one of @var{boolean1} or @var{boolean2} is true.
 For example, the following statement prints all records in the input
 that contain @emph{either} @samp{edu} or
-@samp{li} or both:
+@samp{li}:
 
 @example
 if ($0 ~ /edu/ || $0 ~ /li/) print
@@ -12321,6 +12593,9 @@ if ($0 ~ /edu/ || $0 ~ /li/) print
 The subexpression @var{boolean2} is evaluated only if @var{boolean1}
 is false.  This can make a difference when @var{boolean2} contains
 expressions that have side effects.
+(Thus, this test never really distinguishes records that contain both
+@samp{edu} and @samp{li}---as soon as @samp{edu} is matched,
+the full test succeeds.)
 
 @item ! @var{boolean}
 True if @var{boolean} is false.  For example,
@@ -12330,7 +12605,7 @@ variable is not defined:
 
 @example
 BEGIN @{ if (! ("HOME" in ENVIRON))
-               print "no home!" @}
+            print "no home!" @}
 @end example
 
 (The @code{in} operator is described in
@@ -12345,7 +12620,7 @@ BEGIN @{ if (! ("HOME" in ENVIRON))
 @cindex vertical bar (@code{|}), @code{||} operator
 The @samp{&&} and @samp{||} operators are called @dfn{short-circuit}
 operators because of the way they work.  Evaluation of the full expression
-is ``short-circuited'' if the result can be determined part way through
+is ``short-circuited'' if the result can be determined partway through
 its evaluation.
 
 @cindex line continuations
@@ -12407,8 +12682,6 @@ next record, and start processing the rules over again at the top.
 The reason it's there is to avoid printing the bracketing
 @samp{START} and @samp{END} lines.
 @end quotation
-@c ENDOFRANGE exbo
-@c ENDOFRANGE boex
 
 @node Conditional Exp
 @subsection Conditional Expressions
@@ -12419,8 +12692,8 @@ The reason it's there is to avoid printing the bracketing
 A @dfn{conditional expression} is a special kind of expression that has
 three operands.  It allows you to use one expression's value to select
 one of two other expressions.
-The conditional expression is the same as in the C language,
-as shown here:
+The conditional expression in @command{awk} is the same as in the C
+language, as shown here:
 
 @example
 @var{selector} ? @var{if-true-exp} : @var{if-false-exp}
@@ -12429,8 +12702,8 @@ as shown here:
 @noindent
 There are three subexpressions.  The first, @var{selector}, is always
 computed first.  If it is ``true'' (not zero or not null), then
-@var{if-true-exp} is computed next and its value becomes the value of
-the whole expression.  Otherwise, @var{if-false-exp} is computed next
+@var{if-true-exp} is computed next, and its value becomes the value of
+the whole expression.  Otherwise, @var{if-false-exp} is computed next,
 and its value becomes the value of the whole expression.
 For example, the following expression produces the absolute value of @code{x}:
 
@@ -12478,15 +12751,15 @@ ask for it by name at any point in the program.  For
 example, the function @code{sqrt()} computes the square root of a number.
 
 @cindex functions, built-in
-A fixed set of functions are @dfn{built-in}, which means they are
+A fixed set of functions are @dfn{built in}, which means they are
 available in every @command{awk} program.  The @code{sqrt()} function is one
-of these.  @xref{Built-in}, for a list of built-in
+of these.  @DBXREF{Built-in} for a list of built-in
 functions and their descriptions.  In addition, you can define
 functions for use in your program.
-@xref{User-defined},
+@DBXREF{User-defined}
 for instructions on how to do this.
 Finally, @command{gawk} lets you write functions in C or C++
-that may be called from your program: see @ref{Dynamic Extensions}.
+that may be called from your program (@pxref{Dynamic Extensions}).
 
 @cindex arguments, in function calls
 The way to use a function is with a @dfn{function call} expression,
@@ -12505,7 +12778,7 @@ rand()                 @ii{no arguments}
 
 @cindex troubleshooting, function call syntax
 @quotation CAUTION
-Do not put any space between the function name and the open-parenthesis!
+Do not put any space between the function name and the opening parenthesis!
 A user-defined function name looks just like the name of a
 variable---a space would make the expression look like concatenation of
 a variable with an expression inside parentheses.
@@ -12526,7 +12799,7 @@ Some of the built-in functions have one or
 more optional arguments.
 If those arguments are not supplied, the functions
 use a reasonable default value.
-@xref{Built-in}, for full details.  If arguments
+@DBXREF{Built-in} for full details.  If arguments
 are omitted in calls to user-defined functions, then those arguments are
 treated as local variables. Such local variables act like the
 empty string if referenced where a string value is required,
@@ -12587,9 +12860,7 @@ $ @kbd{awk -f matchit.awk}
 
 @node Precedence
 @section Operator Precedence (How Operators Nest)
-@c STARTOFRANGE prec
 @cindex precedence
-@c STARTOFRANGE oppr
 @cindex operators, precedence
 
 @dfn{Operator precedence} determines how operators are grouped when
@@ -12629,7 +12900,7 @@ expression because the first @samp{$} has higher precedence than the
 @samp{++}; to avoid the problem the expression can be rewritten as
 @samp{$($0++)--}.
 
-This table presents @command{awk}'s operators, in order of highest
+This list presents @command{awk}'s operators, in order of highest
 to lowest precedence:
 
 @c @asis for docbook to come out right
@@ -12654,7 +12925,7 @@ Increment, decrement.
 @cindex @code{*} (asterisk), @code{**} operator
 @cindex asterisk (@code{*}), @code{**} operator
 @item @code{^ **}
-Exponentiation.  These operators group right-to-left.
+Exponentiation.  These operators group right to left.
 
 @cindex @code{+} (plus sign), @code{+} operator
 @cindex plus sign (@code{+}), @code{+} operator
@@ -12681,7 +12952,7 @@ Multiplication, division, remainder.
 @item @code{+ -}
 Addition, subtraction.
 
-@item String Concatenation
+@item String concatenation
 There is no special symbol for concatenation.
 The operands are simply written side by side
 (@pxref{Concatenation}).
@@ -12720,7 +12991,7 @@ statements belong to the statement level, not to expressions.  The
 redirection does not produce an expression that could be the operand of
 another operator.  As a result, it does not make sense to use a
 redirection operator near another operator of lower precedence without
-parentheses.  Such combinations (for example, @samp{print foo > a ? b : c}),
+parentheses.  Such combinations (e.g., @samp{print foo > a ? b : c})
 result in syntax errors.
 The correct way to write this statement is @samp{print foo > (a ? b : c)}.
 
@@ -12738,17 +13009,17 @@ Array membership.
 @cindex @code{&} (ampersand), @code{&&} operator
 @cindex ampersand (@code{&}), @code{&&} operator
 @item @code{&&}
-Logical ``and''.
+Logical ``and.''
 
 @cindex @code{|} (vertical bar), @code{||} operator
 @cindex vertical bar (@code{|}), @code{||} operator
 @item @code{||}
-Logical ``or''.
+Logical ``or.''
 
 @cindex @code{?} (question mark), @code{?:} operator
 @cindex question mark (@code{?}), @code{?:} operator
 @item @code{?:}
-Conditional.  This operator groups right-to-left.
+Conditional.  This operator groups right to left.
 
 @cindex @code{+} (plus sign), @code{+=} operator
 @cindex plus sign (@code{+}), @code{+=} operator
@@ -12765,7 +13036,7 @@ Conditional.  This operator groups right-to-left.
 @cindex @code{^} (caret), @code{^=} operator
 @cindex caret (@code{^}), @code{^=} operator
 @item @code{= += -= *= /= %= ^= **=}
-Assignment.  These operators group right-to-left.
+Assignment.  These operators group right to left.
 @end table
 
 @cindex POSIX @command{awk}, @code{**} operator and
@@ -12774,11 +13045,9 @@ Assignment.  These operators group right-to-left.
 The @samp{|&}, @samp{**}, and @samp{**=} operators are not specified by POSIX.
 For maximum portability, do not use them.
 @end quotation
-@c ENDOFRANGE prec
-@c ENDOFRANGE oppr
 
 @node Locales
-@section Where You Are Makes A Difference
+@section Where You Are Makes a Difference
 @cindex locale, definition of
 
 Modern systems support the notion of @dfn{locales}: a way to tell the
@@ -12786,8 +13055,8 @@ system about the local character set and language.  The ISO C standard
 defines a default @code{"C"} locale, which is an environment that is
 typical of what many C programmers are used to.
 
-Once upon a time, the locale setting used to affect regexp matching
-(@pxref{Ranges and Locales}), but this is no longer true.
+Once upon a time, the locale setting used to affect regexp matching,
+but this is no longer true (@pxref{Ranges and Locales}).
 
 Locales can affect record splitting.  For the normal case of @samp{RS =
 "\n"}, the locale is largely irrelevant.  For other single-character
@@ -12798,7 +13067,7 @@ character}, to find the record terminator.
 
 Locales can affect how dates and times are formatted (@pxref{Time
 Functions}).  For example, a common way to abbreviate the date September
-4, 2015 in the United States is ``9/4/15.''  In many countries in
+4, 2015, in the United States is ``9/4/15.''  In many countries in
 Europe, however, it is abbreviated ``4.9.15.''  Thus, the @samp{%x}
 specification in a @code{"US"} locale might produce @samp{9/4/15},
 while in a @code{"EUROPE"} locale, it might produce @samp{4.9.15}.
@@ -12817,13 +13086,13 @@ in @ref{Conversion}.
 @itemize @value{BULLET}
 @item
 Expressions are the basic elements of computation in programs.  They are
-built from constants, variables, function calls and combinations of the
+built from constants, variables, function calls, and combinations of the
 various kinds of values with operators.
 
 @item
 @command{awk} supplies three kinds of constants: numeric, string, and
 regexp.  @command{gawk} lets you specify numeric constants in octal
-and hexadecimal (bases 8 and 16) in addition to decimal (base 10).
+and hexadecimal (bases 8 and 16) as well as decimal (base 10).
 In certain contexts, a standalone regexp constant such as @code{/foo/}
 has the same meaning as @samp{$0 ~ /foo/}.
 
@@ -12841,7 +13110,8 @@ Locales can influence the conversions.
 @item
 @command{awk} provides the usual arithmetic operators (addition,
 subtraction, multiplication, division, modulus), and unary plus and minus.
-It also provides comparison operators, boolean operators, and regexp
+It also provides comparison operators, Boolean operators, an array membership
+testing operator, and regexp
 matching operators.  String concatenation is accomplished by placing
 two expressions next to each other; there is no explicit operator.
 The three-operand @samp{?:} operator provides an ``if-else'' test within
@@ -12852,20 +13122,20 @@ Assignment operators provide convenient shorthands for common arithmetic
 operations.
 
 @item
-In @command{awk}, a value is considered to be true if it is non-zero
+In @command{awk}, a value is considered to be true if it is nonzero
 @emph{or} non-null. Otherwise, the value is false.
 
 @item
-A value's type is set upon each assignment and may change over its
+A variable's type is set upon each assignment and may change over its
 lifetime.  The type determines how it behaves in comparisons (string
 or numeric).
 
 @item
-Function calls return a value which may be used as part of a larger
+Function calls return a value that may be used as part of a larger
 expression.  Expressions used to pass parameter values are fully
 evaluated before the function is called.  @command{awk} provides
-built-in and user-defined functions; this is described later on in this
-@value{DOCUMENT}.
+built-in and user-defined functions; this is described in
+@ref{Functions}.
 
 @item
 Operator precedence specifies the order in which operations are performed,
@@ -12878,19 +13148,17 @@ program, and occasionally the format for data read as input.
 
 @end itemize
 
-@c ENDOFRANGE exps
 
 @node Patterns and Actions
 @chapter Patterns, Actions, and Variables
-@c STARTOFRANGE pat
 @cindex patterns
 
 As you have already seen, each @command{awk} statement consists of
 a pattern with an associated action.  This @value{CHAPTER} describes how
 you build patterns and actions, what kinds of things you can do within
-actions, and @command{awk}'s built-in variables.
+actions, and @command{awk}'s predefined variables.
 
-The pattern-action rules and the statements available for use
+The pattern--action rules and the statements available for use
 within actions form the core of @command{awk} programming.
 In a sense, everything covered
 up to here has been the foundation
@@ -12903,7 +13171,7 @@ building something useful.
 * Action Overview::             What goes into an action.
 * Statements::                  Describes the various control statements in
                                 detail.
-* Built-in Variables::          Summarizes the built-in variables.
+* Built-in Variables::          Summarizes the predefined variables.
 * Pattern Action Summary::      Patterns and Actions summary.
 @end menu
 
@@ -12936,7 +13204,7 @@ is nonzero (if a number) or non-null (if a string).
 (@xref{Expression Patterns}.)
 
 @item @var{begpat}, @var{endpat}
-A pair of patterns separated by a comma, specifying a range of records.
+A pair of patterns separated by a comma, specifying a @dfn{range} of records.
 The range includes both the initial record that matches @var{begpat} and
 the final record that matches @var{endpat}.
 (@xref{Ranges}.)
@@ -13078,11 +13346,11 @@ The subexpressions of a Boolean operator in a pattern can be constant regular
 expressions, comparisons, or any other @command{awk} expressions.  Range
 patterns are not expressions, so they cannot appear inside Boolean
 patterns.  Likewise, the special patterns @code{BEGIN}, @code{END},
-@code{BEGINFILE} and @code{ENDFILE},
+@code{BEGINFILE}, and @code{ENDFILE},
 which never match any input record, are not expressions and cannot
 appear inside Boolean patterns.
 
-The precedence of the different operators which can appear in
+The precedence of the different operators that can appear in
 patterns is described in @ref{Precedence}.
 
 @node Ranges
@@ -13108,7 +13376,7 @@ prints every record in @file{myfile} between @samp{on}/@samp{off} pairs, inclusi
 
 A range pattern starts out by matching @var{begpat} against every
 input record.  When a record matches @var{begpat}, the range pattern is
-@dfn{turned on} and the range pattern matches this record as well.  As long as
+@dfn{turned on}, and the range pattern matches this record as well.  As long as
 the range pattern stays turned on, it automatically matches every input
 record read.  The range pattern also matches @var{endpat} against every
 input record; when this succeeds, the range pattern is @dfn{turned off} again
@@ -13179,9 +13447,7 @@ a range pattern.  @value{DARKCORNER}
 @node BEGIN/END
 @subsection The @code{BEGIN} and @code{END} Special Patterns
 
-@c STARTOFRANGE beg
 @cindex @code{BEGIN} pattern
-@c STARTOFRANGE end
 @cindex @code{END} pattern
 All the patterns described so far are for matching input records.
 The @code{BEGIN} and @code{END} special patterns are different.
@@ -13189,7 +13455,7 @@ They supply startup and cleanup actions for @command{awk} programs.
 @code{BEGIN} and @code{END} rules must have actions; there is no default
 action for these rules because there is no current record when they run.
 @code{BEGIN} and @code{END} rules are often referred to as
-``@code{BEGIN} and @code{END} blocks'' by long-time @command{awk}
+``@code{BEGIN} and @code{END} blocks'' by longtime @command{awk}
 programmers.
 
 @menu
@@ -13209,7 +13475,7 @@ input is read.  For example:
 @example
 $ @kbd{awk '}
 > @kbd{BEGIN @{ print "Analysis of \"li\"" @}}
-> @kbd{/li/ @{ ++n @}}
+> @kbd{/li/  @{ ++n @}}
 > @kbd{END   @{ print "\"li\" appears in", n, "records." @}' mail-list}
 @print{} Analysis of "li"
 @print{} "li" appears in 4 records.
@@ -13220,7 +13486,7 @@ $ @kbd{awk '}
 This program finds the number of records in the input file @file{mail-list}
 that contain the string @samp{li}.  The @code{BEGIN} rule prints a title
 for the report.  There is no need to use the @code{BEGIN} rule to
-initialize the counter @code{n} to zero, since @command{awk} does this
+initialize the counter @code{n} to zero, as @command{awk} does this
 automatically (@pxref{Variables}).
 The second rule increments the variable @code{n} every time a
 record containing the pattern @samp{li} is read.  The @code{END} rule
@@ -13248,13 +13514,13 @@ The order in which library functions are named on the command line
 controls the order in which their @code{BEGIN} and @code{END} rules are
 executed.  Therefore, you have to be careful when writing such rules in
 library files so that the order in which they are executed doesn't matter.
-@xref{Options}, for more information on
+@DBXREF{Options} for more information on
 using library functions.
 @xref{Library Functions},
 for a number of useful library functions.
 
 If an @command{awk} program has only @code{BEGIN} rules and no
-other rules, then the program exits after the @code{BEGIN} rule is
+other rules, then the program exits after the @code{BEGIN} rules are
 run.@footnote{The original version of @command{awk} kept
 reading and ignoring input until the end of the file was seen.}  However, if an
 @code{END} rule exists, then the input is read, even if there are
@@ -13282,25 +13548,26 @@ Another way is simply to assign a value to @code{$0}.
 @cindex @code{print} statement, @code{BEGIN}/@code{END} patterns and
 @cindex @code{BEGIN} pattern, @code{print} statement and
 @cindex @code{END} pattern, @code{print} statement and
-The second point is similar to the first but from the other direction.
+The second point is similar to the first, but from the other direction.
 Traditionally, due largely to implementation issues, @code{$0} and
 @code{NF} were @emph{undefined} inside an @code{END} rule.
 The POSIX standard specifies that @code{NF} is available in an @code{END}
 rule. It contains the number of fields from the last input record.
 Most probably due to an oversight, the standard does not say that @code{$0}
 is also preserved, although logically one would think that it should be.
-In fact, @command{gawk} does preserve the value of @code{$0} for use in
-@code{END} rules.  Be aware, however, that BWK @command{awk}, and possibly
-other implementations, do not.
+In fact, all of BWK @command{awk}, @command{mawk}, and @command{gawk}
+preserve the value of @code{$0} for use in @code{END} rules.  Be aware,
+however, that some other implementations and many older versions
+of Unix @command{awk} do not.
 
 The third point follows from the first two.  The meaning of @samp{print}
 inside a @code{BEGIN} or @code{END} rule is the same as always:
 @samp{print $0}.  If @code{$0} is the null string, then this prints an
-empty record.  Many long time @command{awk} programmers use an unadorned
+empty record.  Many longtime @command{awk} programmers use an unadorned
 @samp{print} in @code{BEGIN} and @code{END} rules, to mean @samp{@w{print ""}},
 relying on @code{$0} being null.  Although one might generally get away with
 this in @code{BEGIN} rules, it is a very bad idea in @code{END} rules,
-at least in @command{gawk}.  It is also poor style, since if an empty
+at least in @command{gawk}.  It is also poor style, because if an empty
 line is needed in the output, the program should print one explicitly.
 
 @cindex @code{next} statement, @code{BEGIN}/@code{END} patterns and
@@ -13310,11 +13577,14 @@ line is needed in the output, the program should print one explicitly.
 Finally, the @code{next} and @code{nextfile} statements are not allowed
 in a @code{BEGIN} rule, because the implicit
 read-a-record-and-match-against-the-rules loop has not started yet.  Similarly, those statements
-are not valid in an @code{END} rule, since all the input has been read.
-(@xref{Next Statement}, and see
-@ref{Nextfile Statement}.)
-@c ENDOFRANGE beg
-@c ENDOFRANGE end
+are not valid in an @code{END} rule, because all the input has been read.
+(@DBXREF{Next Statement} and
+@ifnotdocbook
+@DBPXREF{Nextfile Statement}.)
+@end ifnotdocbook
+@ifdocbook
+@DBREF{Nextfile Statement}.)
+@end ifdocbook
 
 @node BEGINFILE/ENDFILE
 @subsection The @code{BEGINFILE} and @code{ENDFILE} Special Patterns
@@ -13367,7 +13637,7 @@ fatal error.
 
 @item
 If you have written extensions that modify the record handling (by
-inserting an ``input parser,'' @pxref{Input Parsers}), you can invoke
+inserting an ``input parser''; @pxref{Input Parsers}), you can invoke
 them at this point, before @command{gawk} has started processing the file.
 (This is a @emph{very} advanced feature, currently used only by the
 @uref{http://gawkextlib.sourceforge.net, @code{gawkextlib} project}.)
@@ -13378,17 +13648,17 @@ the last record in an input file.  For the last input file,
 it will be called before any @code{END} rules.
 The @code{ENDFILE} rule is executed even for empty input files.
 
-Normally, when an error occurs when reading input in the normal input
-processing loop, the error is fatal.  However, if an @code{ENDFILE}
+Normally, when an error occurs when reading input in the normal
+input-processing loop, the error is fatal.  However, if an @code{ENDFILE}
 rule is present, the error becomes non-fatal, and instead @code{ERRNO}
 is set.  This makes it possible to catch and process I/O errors at the
 level of the @command{awk} program.
 
 @cindex @code{next} statement, @code{BEGINFILE}/@code{ENDFILE} patterns and
 The @code{next} statement (@pxref{Next Statement}) is not allowed inside
-either a @code{BEGINFILE} or and @code{ENDFILE} rule.  The @code{nextfile}
-statement (@pxref{Nextfile Statement}) is allowed only inside a
-@code{BEGINFILE} rule, but not inside an @code{ENDFILE} rule.
+either a @code{BEGINFILE} or an @code{ENDFILE} rule.  The @code{nextfile}
+statement is allowed only inside a
+@code{BEGINFILE} rule, not inside an @code{ENDFILE} rule.
 
 @cindex @code{getline} statement, @code{BEGINFILE}/@code{ENDFILE} patterns and
 The @code{getline} statement (@pxref{Getline}) is restricted inside
@@ -13435,7 +13705,6 @@ awk '@{ print $1 @}' mail-list
 
 @noindent
 prints the first field of every record.
-@c ENDOFRANGE pat
 
 @node Using Shell Variables
 @section Using Shell Variables in Programs
@@ -13451,7 +13720,7 @@ There are two ways to get the value of the shell variable
 into the body of the @command{awk} program.
 
 @cindex shells, quoting
-The most common method is to use shell quoting to substitute
+A common method is to use shell quoting to substitute
 the variable's value into the program inside the script.
 For example, consider the following program:
 
@@ -13469,7 +13738,7 @@ The first part is double-quoted, which allows substitution of
 the @code{pattern} shell variable inside the quotes.
 The second part is single-quoted.
 
-Variable substitution via quoting works, but can be potentially
+Variable substitution via quoting works, but can potentially be
 messy.  It requires a good understanding of the shell's quoting rules
 (@pxref{Quoting}),
 and it's often difficult to correctly
@@ -13496,7 +13765,7 @@ The assignment @samp{-v pat="$pattern"} still requires double quotes,
 in case there is whitespace in the value of @code{$pattern}.
 The @command{awk} variable @code{pat} could be named @code{pattern}
 too, but that would be more confusing.  Using a variable also
-provides more flexibility, since the variable can be used anywhere inside
+provides more flexibility, as the variable can be used anywhere inside
 the program---for printing, as an array subscript, or for any other
 use---without requiring the quoting tricks at every point in the program.
 
@@ -13569,7 +13838,7 @@ is used in order to put several statements together in the body of an
 Use the @code{getline} command
 (@pxref{Getline}).
 Also supplied in @command{awk} are the @code{next}
-statement (@pxref{Next Statement}),
+statement (@pxref{Next Statement})
 and the @code{nextfile} statement
 (@pxref{Nextfile Statement}).
 
@@ -13584,11 +13853,8 @@ For deleting array elements.
 
 @node Statements
 @section Control Statements in Actions
-@c STARTOFRANGE csta
 @cindex control statements
-@c STARTOFRANGE acs
 @cindex statements, control, in actions
-@c STARTOFRANGE accs
 @cindex actions, control statements in
 
 @dfn{Control statements}, such as @code{if}, @code{while}, and so on,
@@ -13657,7 +13923,7 @@ else
     print "x is odd"
 @end example
 
-In this example, if the expression @samp{x % 2 == 0} is true (that is,
+In this example, if the expression @samp{x % 2 == 0} is true (i.e.,
 if the value of @code{x} is evenly divisible by two), then the first
 @code{print} statement is executed; otherwise, the second @code{print}
 statement is executed.
@@ -13708,20 +13974,21 @@ If the @var{condition} is true, it executes the statement @var{body}.
 is not zero and not a null string.)
 @end ifinfo
 After @var{body} has been executed,
-@var{condition} is tested again, and if it is still true, @var{body} is
-executed again.  This process repeats until the @var{condition} is no longer
-true.  If the @var{condition} is initially false, the body of the loop is
-never executed and @command{awk} continues with the statement following
+@var{condition} is tested again, and if it is still true, @var{body}
+executes again.  This process repeats until the @var{condition} is no longer
+true.  If the @var{condition} is initially false, the body of the loop
+never executes and @command{awk} continues with the statement following
 the loop.
 This example prints the first three fields of each record, one per line:
 
 @example
-awk '@{
-       i = 1
-       while (i <= 3) @{
-           print $i
-           i++
-       @}
+awk '
+@{
+    i = 1
+    while (i <= 3) @{
+        print $i
+        i++
+    @}
 @}' inventory-shipped
 @end example
 
@@ -13730,13 +13997,13 @@ The body of this loop is a compound statement enclosed in braces,
 containing two statements.
 The loop works in the following manner: first, the value of @code{i} is set to one.
 Then, the @code{while} statement tests whether @code{i} is less than or equal to
-three.  This is true when @code{i} equals one, so the @code{i}-th
+three.  This is true when @code{i} equals one, so the @code{i}th
 field is printed.  Then the @samp{i++} increments the value of @code{i}
 and the loop repeats.  The loop terminates when @code{i} reaches four.
 
 A newline is not required between the condition and the
-body; however using one makes the program clearer unless the body is a
-compound statement or else is very simple.  The newline after the open-brace
+body; however, using one makes the program clearer unless the body is a
+compound statement or else is very simple.  The newline after the open brace
 that begins the compound statement is not required either, but the
 program is harder to read without it.
 
@@ -13755,34 +14022,34 @@ do
 while (@var{condition})
 @end example
 
-Even if the @var{condition} is false at the start, the @var{body} is
-executed at least once (and only once, unless executing @var{body}
+Even if the @var{condition} is false at the start, the @var{body}
+executes at least once (and only once, unless executing @var{body}
 makes @var{condition} true).  Contrast this with the corresponding
 @code{while} statement:
 
 @example
 while (@var{condition})
-  @var{body}
+    @var{body}
 @end example
 
 @noindent
-This statement does not execute @var{body} even once if the @var{condition}
-is false to begin with.
-The following is an example of a @code{do} statement:
+This statement does not execute the @var{body} even once if the
+@var{condition} is false to begin with.  The following is an example of
+a @code{do} statement:
 
 @example
 @{
-       i = 1
-       do @{
-          print $0
-          i++
-       @} while (i <= 10)
+    i = 1
+    do @{
+        print $0
+        i++
+    @} while (i <= 10)
 @}
 @end example
 
 @noindent
 This program prints each input record 10 times.  However, it isn't a very
-realistic example, since in this case an ordinary @code{while} would do
+realistic example, because in this case an ordinary @code{while} would do
 just as well.  This situation reflects actual experience; only
 occasionally is there a real use for a @code{do} statement.
 
@@ -13813,9 +14080,10 @@ compares it against the desired number of iterations.
 For example:
 
 @example
-awk '@{
-       for (i = 1; i <= 3; i++)
-          print $i
+awk '
+@{
+    for (i = 1; i <= 3; i++)
+        print $i
 @}' inventory-shipped
 @end example
 
@@ -13834,7 +14102,7 @@ their assignments as separate statements preceding the @code{for} loop.)
 The same is true of the @var{increment} part. Incrementing additional
 variables requires separate statements at the end of the loop.
 The C compound expression, using C's comma operator, is useful in
-this context but it is not supported in @command{awk}.
+this context, but it is not supported in @command{awk}.
 
 Most often, @var{increment} is an increment expression, as in the previous
 example.  But this is not required; it can be any expression
@@ -13843,7 +14111,7 @@ between 1 and 100:
 
 @example
 for (i = 1; i <= 100; i *= 2)
-  print i
+    print i
 @end example
 
 If there is nothing to be done, any of the three expressions in the
@@ -13878,7 +14146,7 @@ very common in loops.  It can be easier to think of this counting as part
 of looping rather than as something to do inside the loop.
 
 @cindex @code{in} operator
-There is an alternate version of the @code{for} loop, for iterating over
+There is an alternative version of the @code{for} loop, for iterating over
 all the indices of an array:
 
 @example
@@ -13887,7 +14155,7 @@ for (i in array)
 @end example
 
 @noindent
-@xref{Scanning an Array},
+@DBXREF{Scanning an Array}
 for more information on this version of the @code{for} loop.
 
 @node Switch Statement
@@ -13907,7 +14175,7 @@ are checked for a match in the order they are defined.  If no suitable
 
 Each @code{case} contains a single constant, be it numeric, string, or
 regexp.  The @code{switch} expression is evaluated, and then each
-@code{case}'s constant is compared against the result in turn. The type of constant 
+@code{case}'s constant is compared against the result in turn. The type of constant
 determines the comparison: numeric or string do the usual comparisons.
 A regexp constant does a regular expression match against the string
 value of the original expression.  The general form of the @code{switch}
@@ -13925,7 +14193,7 @@ default:
 Control flow in
 the @code{switch} statement works as it does in C. Once a match to a given
 case is made, the case statement bodies execute until a @code{break},
-@code{continue}, @code{next}, @code{nextfile}  or @code{exit} is encountered,
+@code{continue}, @code{next}, @code{nextfile}, or @code{exit} is encountered,
 or the end of the @code{switch} statement itself. For example:
 
 @example
@@ -13954,9 +14222,9 @@ while ((c = getopt(ARGC, ARGV, "aksx")) != -1) @{
 @}
 @end example
 
-Note that if none of the statements specified above halt execution
+Note that if none of the statements specified here halt execution
 of a matched @code{case} statement, execution falls through to the
-next @code{case} until execution halts. In the above example, the
+next @code{case} until execution halts. In this example, the
 @code{case} for @code{"?"} falls through to the @code{default}
 case, which is to call a function named @code{usage()}.
 (The @code{getopt()} function being called here is
@@ -13977,12 +14245,12 @@ numbers:
 # find smallest divisor of num
 @{
     num = $1
-    for (div = 2; div * div <= num; div++) @{
-        if (num % div == 0)
+    for (divisor = 2; divisor * divisor <= num; divisor++) @{
+        if (num % divisor == 0)
             break
     @}
-    if (num % div == 0)
-        printf "Smallest divisor of %d is %d\n", num, div
+    if (num % divisor == 0)
+        printf "Smallest divisor of %d is %d\n", num, divisor
     else
         printf "%d is prime\n", num
 @}
@@ -14003,12 +14271,12 @@ an @code{if}:
 # find smallest divisor of num
 @{
     num = $1
-    for (div = 2; ; div++) @{
-        if (num % div == 0) @{
-            printf "Smallest divisor of %d is %d\n", num, div
+    for (divisor = 2; ; divisor++) @{
+        if (num % divisor == 0) @{
+            printf "Smallest divisor of %d is %d\n", num, divisor
             break
         @}
-        if (div * div > num) @{
+        if (divisor * divisor > num) @{
             printf "%d is prime\n", num
             break
         @}
@@ -14083,7 +14351,7 @@ BEGIN @{
 @end example
 
 @noindent
-This program loops forever once @code{x} reaches 5, since
+This program loops forever once @code{x} reaches 5, because
 the increment (@samp{x++}) is never reached.
 
 @c @cindex @code{continue}, outside of loops
@@ -14099,7 +14367,12 @@ body of a loop.  Historical versions of @command{awk} treated a @code{continue}
 statement outside a loop the same way they treated a @code{break}
 statement outside a loop: as if it were a @code{next}
 statement
+@ifset FOR_PRINT
+(discussed in the following section).
+@end ifset
+@ifclear FOR_PRINT
 (@pxref{Next Statement}).
+@end ifclear
 @value{DARKCORNER}
 Recent versions of BWK @command{awk} no longer work this way, nor
 does @command{gawk}.
@@ -14144,7 +14417,7 @@ Because of the @code{next} statement,
 the program's subsequent rules won't see the bad record.  The error
 message is redirected to the standard error output stream, as error
 messages should be.
-For more detail see
+For more detail, see
 @ref{Special Files}.
 
 If the @code{next} statement causes the end of the input to be reached,
@@ -14163,7 +14436,7 @@ The @code{next} statement is not allowed inside @code{BEGINFILE} and
 @cindex functions, user-defined, @code{next}/@code{nextfile} statements and
 According to the POSIX standard, the behavior is undefined if the
 @code{next} statement is used in a @code{BEGIN} or @code{END} rule.
-@command{gawk} treats it as a syntax error.  Although POSIX permits it,
+@command{gawk} treats it as a syntax error.  Although POSIX does not disallow it,
 most other @command{awk} implementations don't allow the @code{next}
 statement inside function bodies (@pxref{User-defined}).  Just as with any
 other @code{next} statement, a @code{next} statement inside a function
@@ -14210,7 +14483,7 @@ rule to skip over a file that would otherwise cause @command{gawk}
 to exit with a fatal error. In this case, @code{ENDFILE} rules are not
 executed. @xref{BEGINFILE/ENDFILE}.
 
-While one might think that @samp{close(FILENAME)} would accomplish
+Although it might seem that @samp{close(FILENAME)} would accomplish
 the same as @code{nextfile}, this isn't true.  @code{close()} is
 reserved for closing files, pipes, and coprocesses that are
 opened with redirections.  It is not related to the main processing that
@@ -14218,7 +14491,7 @@ opened with redirections.  It is not related to the main processing that
 
 @quotation NOTE
 For many years, @code{nextfile} was a
-@command{gawk} extension. As of September, 2012, it was accepted for
+common extension. In September 2012, it was accepted for
 inclusion into the POSIX standard.
 See @uref{http://austingroupbugs.net/view.php?id=607, the Austin Group website}.
 @end quotation
@@ -14227,8 +14500,8 @@ See @uref{http://austingroupbugs.net/view.php?id=607, the Austin Group website}.
 @cindex @code{nextfile} statement, user-defined functions and
 @cindex Brian Kernighan's @command{awk}
 @cindex @command{mawk} utility
-The current version of BWK @command{awk}, and @command{mawk} (@pxref{Other
-Versions}) also support @code{nextfile}.  However, they don't allow the
+The current version of BWK @command{awk} and @command{mawk}
+also support @code{nextfile}.  However, they don't allow the
 @code{nextfile} statement inside function bodies (@pxref{User-defined}).
 @command{gawk} does; a @code{nextfile} inside a function body reads the
 next record and starts processing it with the first rule in the program,
@@ -14260,14 +14533,14 @@ the program to stop immediately.
 An @code{exit} statement that is not part of a @code{BEGIN} or @code{END}
 rule stops the execution of any further automatic rules for the current
 record, skips reading any remaining input records, and executes the
-@code{END} rule if there is one.
-Any @code{ENDFILE} rules are also skipped; they are not executed.
+@code{END} rule if there is one.  @command{gawk} also skips
+any @code{ENDFILE} rules; they do not execute.
 
 In such a case,
 if you don't want the @code{END} rule to do its job, set a variable
-to nonzero before the @code{exit} statement and check that variable in
+to a nonzero value before the @code{exit} statement and check that variable in
 the @code{END} rule.
-@xref{Assert Function},
+@DBXREF{Assert Function}
 for an example that does this.
 
 @cindex dark corner, @code{exit} statement
@@ -14278,7 +14551,7 @@ In the case where an argument
 is supplied to a first @code{exit} statement, and then @code{exit} is
 called a second time from an @code{END} rule with no argument,
 @command{awk} uses the previously supplied exit value.  @value{DARKCORNER}
-@xref{Exit Status}, for more information.
+@DBXREF{Exit Status} for more information.
 
 @cindex programming conventions, @code{exit} statement
 For example, suppose an error condition occurs that is difficult or
@@ -14304,16 +14577,11 @@ Negative values, and values of 127 or greater, may not produce consistent
 results across different operating systems.
 @end quotation
 
-@c ENDOFRANGE csta
-@c ENDOFRANGE acs
-@c ENDOFRANGE accs
 
 @node Built-in Variables
-@section Built-in Variables
-@c STARTOFRANGE bvar
-@cindex built-in variables
-@c STARTOFRANGE varb
-@cindex variables, built-in
+@section Predefined Variables
+@cindex predefined variables
+@cindex variables, predefined
 
 Most @command{awk} variables are available to use for your own
 purposes; they never change unless your program assigns values to
@@ -14324,8 +14592,8 @@ to tell @command{awk} how to do certain things.  Others are set
 automatically by @command{awk}, so that they carry information from the
 internal workings of @command{awk} to your program.
 
-@cindex @command{gawk}, built-in variables and
-This @value{SECTION} documents all of @command{gawk}'s built-in variables,
+@cindex @command{gawk}, predefined variables and
+This @value{SECTION} documents all of @command{gawk}'s predefined variables,
 most of which are also documented in the @value{CHAPTER}s describing
 their areas of activity.
 
@@ -14339,9 +14607,7 @@ their areas of activity.
 
 @node User-modified
 @subsection Built-in Variables That Control @command{awk}
-@c STARTOFRANGE bvaru
-@cindex built-in variables, user-modifiable
-@c STARTOFRANGE nmbv
+@cindex predefined variables, user-modifiable
 @cindex user-modifiable variables
 
 The following is an alphabetical list of variables that you can change to
@@ -14369,7 +14635,7 @@ respectively, should use binary I/O.  A string value of @code{"rw"} or
 @code{"wr"} indicates that all files should use binary I/O.  Any other
 string value is treated the same as @code{"rw"}, but causes @command{gawk}
 to generate a warning message.  @code{BINMODE} is described in more
-detail in @ref{PC Using}.  @command{mawk} @pxref{Other Versions}),
+detail in @ref{PC Using}.  @command{mawk} (@pxref{Other Versions})
 also supports this variable, but only using numeric values.
 
 @cindex @code{CONVFMT} variable
@@ -14377,7 +14643,7 @@ also supports this variable, but only using numeric values.
 @cindex numbers, converting, to strings
 @cindex strings, converting, numbers to
 @item @code{CONVFMT}
-This string controls conversion of numbers to
+A string that controls the conversion of numbers to
 strings (@pxref{Conversion}).
 It works by being passed, in effect, as the first argument to the
 @code{sprintf()} function
@@ -14395,7 +14661,7 @@ A space-separated list of columns that tells @command{gawk}
 how to split input with fixed columnar boundaries.
 Assigning a value to @code{FIELDWIDTHS}
 overrides the use of @code{FS} and @code{FPAT} for field splitting.
-@xref{Constant Size}, for more information.
+@DBXREF{Constant Size} for more information.
 
 @cindex @command{gawk}, @code{FPAT} variable in
 @cindex @code{FPAT} variable
@@ -14407,7 +14673,7 @@ A regular expression (as a string) that tells @command{gawk}
 to create the fields based on text that matches the regular expression.
 Assigning a value to @code{FPAT}
 overrides the use of @code{FS} and @code{FIELDWIDTHS} for field splitting.
-@xref{Splitting By Content}, for more information.
+@DBXREF{Splitting By Content} for more information.
 
 @cindex @code{FS} variable
 @cindex separators, field
@@ -14452,12 +14718,13 @@ is to simply say @samp{FS = FS}, perhaps with an explanatory comment.
 @cindex regular expressions, case sensitivity
 @item IGNORECASE #
 If @code{IGNORECASE} is nonzero or non-null, then all string comparisons
-and all regular expression matching are case independent.  Thus, regexp
-matching with @samp{~} and @samp{!~}, as well as the @code{gensub()},
-@code{gsub()}, @code{index()}, @code{match()}, @code{patsplit()},
-@code{split()}, and @code{sub()}
-functions, record termination with @code{RS}, and field splitting with
-@code{FS} and @code{FPAT}, all ignore case when doing their particular regexp operations.
+and all regular expression matching are case-independent.
+This applies to
+regexp matching with @samp{~} and @samp{!~},
+the @code{gensub()}, @code{gsub()}, @code{index()}, @code{match()},
+@code{patsplit()}, @code{split()}, and @code{sub()} functions,
+record termination with @code{RS}, and field splitting with
+@code{FS} and @code{FPAT}.
 However, the value of @code{IGNORECASE} does @emph{not} affect array subscripting
 and it does not affect field splitting when using a single-character
 field separator.
@@ -14478,7 +14745,7 @@ Any other true value prints nonfatal warnings.
 Assigning a false value to @code{LINT} turns off the lint warnings.
 
 This variable is a @command{gawk} extension.  It is not special
-in other @command{awk} implementations.  Unlike the other special variables,
+in other @command{awk} implementations.  Unlike with the other special variables,
 changing @code{LINT} does affect the production of lint warnings,
 even if @command{gawk} is in compatibility mode.  Much as
 the @option{--lint} and @option{--traditional} options independently
@@ -14490,13 +14757,13 @@ of @command{awk} being executed.
 @cindex numbers, converting, to strings
 @cindex strings, converting, numbers to
 @item OFMT
-Controls conversion of numbers to
+A string that controls conversion of numbers to
 strings (@pxref{Conversion}) for
 printing with the @code{print} statement.  It works by being passed
 as the first argument to the @code{sprintf()} function
 (@pxref{String Functions}).
 Its default value is @code{"%.6g"}.  Earlier versions of @command{awk}
-also used @code{OFMT} to specify the format for converting numbers to
+used @code{OFMT} to specify the format for converting numbers to
 strings in general expressions; this is now done by @code{CONVFMT}.
 
 @cindex @code{sprintf()} function, @code{OFMT} variable and
@@ -14505,7 +14772,7 @@ strings in general expressions; this is now done by @code{CONVFMT}.
 @cindex separators, field
 @cindex field separators
 @item OFS
-This is the output field separator (@pxref{Output Separators}).  It is
+The output field separator (@pxref{Output Separators}).  It is
 output between the fields printed by a @code{print} statement.  Its
 default value is @w{@code{" "}}, a string consisting of a single space.
 
@@ -14517,13 +14784,13 @@ character.  (@xref{Output Separators}.)
 
 @cindex @code{PREC} variable
 @item PREC #
-The working precision of arbitrary precision floating-point numbers,
+The working precision of arbitrary-precision floating-point numbers,
 53 bits by default (@pxref{Setting precision}).
 
 @cindex @code{ROUNDMODE} variable
 @item ROUNDMODE #
-The rounding mode to use for arbitrary precision arithmetic on
-numbers, by default @code{"N"} (@samp{roundTiesToEven} in
+The rounding mode to use for arbitrary-precision arithmetic on
+numbers, by default @code{"N"} (@code{roundTiesToEven} in
 the IEEE 754 standard; @pxref{Setting the rounding mode}).
 
 @cindex @code{RS} variable
@@ -14552,7 +14819,7 @@ just the first character of @code{RS}'s value is used.
 @item @code{SUBSEP}
 The subscript separator.  It has the default value of
 @code{"\034"} and is used to separate the parts of the indices of a
-multidimensional array.  Thus, the expression @code{@w{foo["A", "B"]}}
+multidimensional array.  Thus, the expression @samp{@w{foo["A", "B"]}}
 really accesses @code{foo["A\034B"]}
 (@pxref{Multidimensional}).
 
@@ -14564,22 +14831,16 @@ really accesses @code{foo["A\034B"]}
 Used for internationalization of programs at the
 @command{awk} level.  It sets the default text domain for specially
 marked string constants in the source text, as well as for the
-@code{dcgettext()}, @code{dcngettext()} and @code{bindtextdomain()} functions
+@code{dcgettext()}, @code{dcngettext()}, and @code{bindtextdomain()} functions
 (@pxref{Internationalization}).
 The default value of @code{TEXTDOMAIN} is @code{"messages"}.
 @end table
-@c ENDOFRANGE bvar
-@c ENDOFRANGE varb
-@c ENDOFRANGE bvaru
-@c ENDOFRANGE nmbv
 
 @node Auto-set
 @subsection Built-in Variables That Convey Information
 
-@c STARTOFRANGE bvconi
-@cindex built-in variables, conveying information
-@c STARTOFRANGE vbconi
-@cindex variables, built-in, conveying information
+@cindex predefined variables, conveying information
+@cindex variables, predefined conveying information
 The following is an alphabetical list of variables that @command{awk}
 sets automatically on certain occasions in order to provide
 information to your program.
@@ -14587,7 +14848,7 @@ information to your program.
 The variables that are specific to @command{gawk} are marked with a pound
 sign (@samp{#}).  These variables are @command{gawk} extensions.  In other
 @command{awk} implementations or if @command{gawk} is in compatibility
-mode (@pxref{Options}), they are not special.
+mode (@pxref{Options}), they are not special:
 
 @c @asis for docbook
 @table @asis
@@ -14628,7 +14889,7 @@ method of accessing command-line arguments.
 The value of @code{ARGV[0]} can vary from system to system.
 Also, you should note that the program text is @emph{not} included in
 @code{ARGV}, nor are any of @command{awk}'s command-line options.
-@xref{ARGC and ARGV}, for information
+@DBXREF{ARGC and ARGV} for information
 about how @command{awk} uses these variables.
 @value{DARKCORNER}
 
@@ -14648,8 +14909,8 @@ successive instances of the same @value{FN} on the command line.
 
 @cindex file names, distinguishing
 While you can change the value of @code{ARGIND} within your @command{awk}
-program, @command{gawk} automatically sets it to a new value when the
-next file is opened.
+program, @command{gawk} automatically sets it to a new value when it
+opens the next file.
 
 @cindex @code{ENVIRON} array
 @cindex environment variables, in @code{ENVIRON} array
@@ -14670,12 +14931,23 @@ that it creates.  You should therefore be especially careful if you
 modify @code{ENVIRON["PATH"]"}, which is the search path for finding
 executable programs.
 
+This can also affect the running @command{gawk} program, since some of the
+built-in functions may pay attention to certain environment variables.
+The most notable instance of this is @code{mktime()} (@pxref{Time
+Functions}), which pays attention the value of the @env{TZ} environment
+variable on many systems.
+
 Some operating systems may not have environment variables.
 On such systems, the @code{ENVIRON} array is empty (except for
 @w{@code{ENVIRON["AWKPATH"]}} and
 @w{@code{ENVIRON["AWKLIBPATH"]}};
-@pxref{AWKPATH Variable}, and
+@DBPXREF{AWKPATH Variable} and
+@ifdocbook
+@DBREF{AWKLIBPATH Variable}).
+@end ifdocbook
+@ifnotdocbook
 @pxref{AWKLIBPATH Variable}).
+@end ifnotdocbook
 
 @cindex @command{gawk}, @code{ERRNO} variable in
 @cindex @code{ERRNO} variable
@@ -14697,6 +14969,11 @@ value to be meaningful when an I/O operation returns a failure value,
 such as @code{getline} returning @minus{}1.  You are, of course, free
 to clear it yourself before doing an I/O operation.
 
+If the value of @code{ERRNO} corresponds to a system error in the C
+@code{errno} variable, then @code{PROCINFO["errno"]} will be set to the value
+of @code{errno}.  For non-system errors, @code{PROCINFO["errno"]} will
+be zero.
+
 @cindex @code{FILENAME} variable
 @cindex dark corner, @code{FILENAME} variable
 @item @code{FILENAME}
@@ -14704,7 +14981,7 @@ The name of the current input file.  When no @value{DF}s are listed
 on the command line, @command{awk} reads from the standard input and
 @code{FILENAME} is set to @code{"-"}.  @code{FILENAME} changes each
 time a new file is read (@pxref{Reading Files}).  Inside a @code{BEGIN}
-rule, the value of @code{FILENAME} is @code{""}, since there are no input
+rule, the value of @code{FILENAME} is @code{""}, because there are no input
 files being processed yet.@footnote{Some early implementations of Unix
 @command{awk} initialized @code{FILENAME} to @code{"-"}, even if there
 were @value{DF}s to be processed. This behavior was incorrect and should
@@ -14714,21 +14991,21 @@ can give @code{FILENAME} a value.
 
 @cindex @code{FNR} variable
 @item @code{FNR}
-The current record number in the current file.  @code{FNR} is
-incremented each time a new record is read
-(@pxref{Records}).  It is reinitialized
-to zero each time a new input file is started.
+The current record number in the current file.  @command{awk} increments
+@code{FNR} each time it reads a new record (@pxref{Records}).
+@command{awk} resets @code{FNR} to zero each time it starts a new
+input file.
 
 @cindex @code{NF} variable
 @item @code{NF}
 The number of fields in the current input record.
 @code{NF} is set each time a new record is read, when a new field is
-created or when @code{$0} changes (@pxref{Fields}).
+created, or when @code{$0} changes (@pxref{Fields}).
 
 Unlike most of the variables described in this @value{SUBSECTION},
 assigning a value to @code{NF} has the potential to affect
 @command{awk}'s internal workings.  In particular, assignments
-to @code{NF} can be used to create or remove fields from the
+to @code{NF} can be used to create fields in or remove fields from the
 current record. @xref{Changing Fields}.
 
 @cindex @code{FUNCTAB} array
@@ -14736,7 +15013,7 @@ current record. @xref{Changing Fields}.
 @cindex differences in @command{awk} and @command{gawk}, @code{FUNCTAB} variable
 @item @code{FUNCTAB #}
 An array whose indices and corresponding values are the names of all
-the built-in, user-defined and extension functions in the program.
+the built-in, user-defined, and extension functions in the program.
 
 @quotation NOTE
 Attempting to use the @code{delete} statement with the @code{FUNCTAB}
@@ -14749,7 +15026,7 @@ array causes a fatal error.  Any attempt to assign to an element of
 The number of input records @command{awk} has processed since
 the beginning of the program's execution
 (@pxref{Records}).
-@code{NR} is incremented each time a new record is read.
+@command{awk} increments @code{NR} each time it reads a new record.
 
 @cindex @command{gawk}, @code{PROCINFO} array in
 @cindex @code{PROCINFO} array
@@ -14765,6 +15042,10 @@ are guaranteed to be available:
 @item PROCINFO["egid"]
 The value of the @code{getegid()} system call.
 
+@item PROCINFO["errno"]
+The value of the C @code{errno} variable when @code{ERRNO} is set to
+the associated error message.
+
 @item PROCINFO["euid"]
 @cindex effective user ID of @command{gawk} user
 The value of the @code{geteuid()} system call.
@@ -14778,7 +15059,7 @@ or @code{"FPAT"} if field matching with @code{FPAT} is in effect.
 @item PROCINFO["identifiers"]
 @cindex program identifiers
 A subarray, indexed by the names of all identifiers used in the text of
-the AWK program.  An @dfn{identifier} is simply the name of a variable
+the @command{awk} program.  An @dfn{identifier} is simply the name of a variable
 (be it scalar or array), built-in function, user-defined function, or
 extension function.  For each identifier, the value of the element is
 one of the following:
@@ -14798,7 +15079,7 @@ The identifier is an extension function loaded via
 The identifier is a scalar.
 
 @item "untyped"
-The identifier is untyped (could be used as a scalar or array,
+The identifier is untyped (could be used as a scalar or an array;
 @command{gawk} doesn't know yet).
 
 @item "user"
@@ -14815,7 +15096,7 @@ while the program runs.
 The value of the @code{getgid()} system call.
 
 @item PROCINFO["pgrpid"]
-@cindex process group idIDof @command{gawk} process
+@cindex process group ID of @command{gawk} process
 The process group ID of the current process.
 
 @item PROCINFO["pid"]
@@ -14829,8 +15110,8 @@ The parent process ID of the current process.
 @item PROCINFO["sorted_in"]
 If this element exists in @code{PROCINFO}, its value controls the
 order in which array indices will be processed by
-@samp{for (@var{index} in @var{array})} loops.
-Since this is an advanced feature, we defer the
+@samp{for (@var{indx} in @var{array})} loops.
+This is an advanced feature, so we defer the
 full description until later; see
 @ref{Scanning an Array}.
 
@@ -14850,10 +15131,10 @@ The version of @command{gawk}.
 
 The following additional elements in the array
 are available to provide information about the MPFR and GMP libraries
-if your version of @command{gawk} supports arbitrary precision numbers
-(@pxref{Arbitrary Precision Arithmetic}): 
+if your version of @command{gawk} supports arbitrary-precision arithmetic
+(@pxref{Arbitrary Precision Arithmetic}):
 
-@table @code 
+@table @code
 @cindex version of GNU MPFR library
 @item PROCINFO["mpfr_version"]
 The version of the GNU MPFR library.
@@ -14867,7 +15148,7 @@ The version of the GNU MP library.
 The maximum precision supported by MPFR.
 
 @item PROCINFO["prec_min"]
-@cindex minimum precision supported by MPFR library
+@cindex minimum precision required by MPFR library
 The minimum precision required by MPFR.
 @end table
 
@@ -14899,14 +15180,19 @@ The @code{PROCINFO} array has the following additional uses:
 
 @itemize @value{BULLET}
 @item
+It may be used to provide a timeout when reading from any
+open input file, pipe, or coprocess.
+@DBXREF{Read Timeout} for more information.
+
+@item
+It may be used to indicate that input may be retried when it fails due to
+certain errors.
+@DBXREF{Retrying Input} for more information.
+
+@item
 It may be used to cause coprocesses to communicate over pseudo-ttys
 instead of through two-way pipes; this is discussed further in
 @ref{Two-way I/O}.
-
-@item
-It may be used to provide a timeout when reading from any
-open input file, pipe, or coprocess.
-@xref{Read Timeout}, for more information.
 @end itemize
 
 @cindex @code{RLENGTH} variable
@@ -14919,7 +15205,7 @@ is the length of the matched string, or @minus{}1 if no match is found.
 
 @cindex @code{RSTART} variable
 @item @code{RSTART}
-The start-index in characters of the substring that is matched by the
+The start index in characters of the substring that is matched by the
 @code{match()} function
 (@pxref{String Functions}).
 @code{RSTART} is set by invoking the @code{match()} function.  Its value
@@ -14937,9 +15223,13 @@ the record separator.  It is set every time a record is read.
 @cindex @code{SYMTAB} array
 @cindex differences in @command{awk} and @command{gawk}, @code{SYMTAB} variable
 @item @code{SYMTAB #}
-An array whose indices are the names of all currently defined
-global variables and arrays in the program.  The array may be used
-for indirect access to read or write the value of a variable:
+An array whose indices are the names of all defined global variables and
+arrays in the program.  @code{SYMTAB} makes @command{gawk}'s symbol table
+visible to the @command{awk} programmer.  It is built as @command{gawk}
+parses the program and is complete before the program starts to run.
+
+The array may be used for indirect access to read or write the value of
+a variable:
 
 @example
 foo = 5
@@ -14982,11 +15272,9 @@ function multiply(variable, amount)
 @quotation NOTE
 In order to avoid severe time-travel paradoxes,@footnote{Not to mention difficult
 implementation issues.} neither @code{FUNCTAB} nor @code{SYMTAB}
-are available as elements within the @code{SYMTAB} array.
+is available as an element within the @code{SYMTAB} array.
 @end quotation
 @end table
-@c ENDOFRANGE bvconi
-@c ENDOFRANGE vbconi
 
 @cindex sidebar, Changing @code{NR} and @code{FNR}
 @ifdocbook
@@ -15142,8 +15430,14 @@ use the @code{delete} statement to remove elements from
 
 All of these actions are typically done in the @code{BEGIN} rule,
 before actual processing of the input begins.
-@xref{Split Program}, and see
-@ref{Tee Program}, for examples
+@DBXREF{Split Program} and
+@ifnotdocbook
+@DBPXREF{Tee Program}
+@end ifnotdocbook
+@ifdocbook
+@DBREF{Tee Program}
+@end ifdocbook
+for examples
 of each way of removing elements from @code{ARGV}.
 
 To actually get options into an @command{awk} program,
@@ -15155,7 +15449,7 @@ awk -f myprog.awk -- -v -q file1 file2 @dots{}
 @end example
 
 The following fragment processes @code{ARGV} in order to examine, and
-then remove, the above command-line options:
+then remove, the previously mentioned command-line options:
 
 @example
 BEGIN @{
@@ -15191,23 +15485,36 @@ gawk -f myprog.awk -q -v file1 file2 @dots{}
 @noindent
 Because @option{-q} is not a valid @command{gawk} option, it and the
 following @option{-v} are passed on to the @command{awk} program.
-(@xref{Getopt Function}, for an @command{awk} library function that
+(@DBXREF{Getopt Function} for an @command{awk} library function that
 parses command-line options.)
 
+When designing your program, you should choose options that don't
+conflict with @command{gawk}'s, because it will process any options
+that it accepts before passing the rest of the command line on to
+your program.  Using @samp{#!} with the @option{-E} option may help
+(@DBPXREF{Executable Scripts}
+and
+@ifnotdocbook
+@DBPXREF{Options}).
+@end ifnotdocbook
+@ifdocbook
+@DBREF{Options}).
+@end ifdocbook
+
 @node Pattern Action Summary
 @section Summary
 
 @itemize @value{BULLET}
 @item
-Pattern-action pairs make up the basic elements of an @command{awk}
+Pattern--action pairs make up the basic elements of an @command{awk}
 program.  Patterns are either normal expressions, range expressions,
-regexp constants, one of the special keywords @code{BEGIN}, @code{END},
-@code{BEGINFILE}, @code{ENDFILE}, or empty.  The action executes if
+or regexp constants; one of the special keywords @code{BEGIN}, @code{END},
+@code{BEGINFILE}, or @code{ENDFILE}; or empty.  The action executes if
 the current record matches the pattern.  Empty (missing) patterns match
 all records.
 
 @item
-I/O from @code{BEGIN} and @code{END} rules have certain constraints.
+I/O from @code{BEGIN} and @code{END} rules has certain constraints.
 This is also true, only more so, for @code{BEGINFILE} and @code{ENDFILE}
 rules.  The latter two give you ``hooks'' into @command{gawk}'s file
 processing, allowing you to recover from a file that otherwise would
@@ -15228,7 +15535,7 @@ input and output statements, and deletion statements.
 The control statements in @command{awk} are @code{if}-@code{else},
 @code{while}, @code{for}, and @code{do}-@code{while}.  @command{gawk}
 adds the @code{switch} statement.  There are two flavors of @code{for}
-statement: one for for performing general looping, and the other iterating
+statement: one for performing general looping, and the other for iterating
 through an array.
 
 @item
@@ -15237,25 +15544,29 @@ iteration of a loop (or get out of a @code{switch}).
 
 @item
 @code{next} and @code{nextfile} let you read the next record and start
-over at the top of your program, or skip to the next input file and
+over at the top of your program or skip to the next input file and
 start over, respectively.
 
 @item
 The @code{exit} statement terminates your program. When executed
-from an action (or function body) it transfers control to the
+from an action (or function body), it transfers control to the
 @code{END} statements. From an @code{END} statement body, it exits
 immediately.  You may pass an optional numeric value to be used
-at @command{awk}'s exit status.
+as @command{awk}'s exit status.
 
 @item
-Some built-in variables provide control over @command{awk}, mainly for I/O.
+Some predefined variables provide control over @command{awk}, mainly for I/O.
 Other variables convey information from @command{awk} to your program.
 
+@item
+@code{ARGC} and @code{ARGV} make the command-line arguments available
+to your program. Manipulating them from a @code{BEGIN} rule lets you
+control how @command{awk} will process the provided @value{DF}s.
+
 @end itemize
 
 @node Arrays
 @chapter Arrays in @command{awk}
-@c STARTOFRANGE arrs
 @cindex arrays
 
 An @dfn{array} is a table of values called @dfn{elements}.  The
@@ -15271,24 +15582,13 @@ The @value{CHAPTER} moves on to discuss @command{gawk}'s facility
 for sorting arrays, and ends with a brief description of @command{gawk}'s
 ability to support true arrays of arrays.
 
-@cindex variables, names of
-@cindex functions, names of
-@cindex arrays, names of, and names of functions/variables
-@cindex names, arrays/variables
-@cindex namespace issues
-@command{awk} maintains a single set
-of names that may be used for naming variables, arrays, and functions
-(@pxref{User-defined}).
-Thus, you cannot have a variable and an array with the same name in the
-same @command{awk} program.
-
 @menu
 * Array Basics::                The basics of arrays.
-* Delete::                      The @code{delete} statement removes an element
-                                from an array.
 * Numeric Array Subscripts::    How to use numbers as subscripts in
                                 @command{awk}.
 * Uninitialized Subscripts::    Using Uninitialized variables as subscripts.
+* Delete::                      The @code{delete} statement removes an element
+                                from an array.
 * Multidimensional::            Emulating multidimensional arrays in
                                 @command{awk}.
 * Arrays of Arrays::            True multidimensional arrays.
@@ -15334,14 +15634,14 @@ as a variable) in the same @command{awk} program.
 Arrays in @command{awk} superficially resemble arrays in other programming
 languages, but there are fundamental differences.  In @command{awk}, it
 isn't necessary to specify the size of an array before starting to use it.
-Additionally, any number or string in @command{awk}, not just consecutive integers,
+Additionally, any number or string, not just consecutive integers,
 may be used as an array index.
 
 In most other languages, arrays must be @dfn{declared} before use,
 including a specification of
 how many elements or components they contain.  In such languages, the
 declaration causes a contiguous block of memory to be allocated for that
-many elements.  Usually, an index in the array must be a positive integer.
+many elements.  Usually, an index in the array must be a nonnegative integer.
 For example, the index zero specifies the first element in the array, which is
 actually stored at the beginning of the block of memory.  Index one
 specifies the second element, which is stored in memory right after the
@@ -15352,19 +15652,21 @@ the declaration.
 indices---e.g., @samp{15 .. 27}---but the size of the array is still fixed when
 the array is declared.)
 
-A contiguous array of four elements might look like the following example,
-conceptually, if the element values are 8, @code{"foo"},
-@code{""}, and 30
+@c 1/2015: Do not put the numeric values into @code. Array element
+@c values are no different than scalar variable values.
+A contiguous array of four elements might look like
 @ifnotdocbook
-as shown in @ref{figure-array-elements}:
+@ref{figure-array-elements},
 @end ifnotdocbook
 @ifdocbook
-as shown in @inlineraw{docbook, <xref linkend="figure-array-elements"/>}:
+@inlineraw{docbook, <xref linkend="figure-array-elements"/>},
 @end ifdocbook
+conceptually, if the element values are eight, @code{"foo"},
+@code{""}, and 30.
 
 @ifnotdocbook
 @float Figure,figure-array-elements
-@caption{A Contiguous Array}
+@caption{A contiguous array}
 @ifinfo
 @center @image{array-elements, , , Basic Program Stages, txt}
 @end ifinfo
@@ -15376,7 +15678,7 @@ as shown in @inlineraw{docbook, <xref linkend="figure-array-elements"/>}:
 
 @docbook
 <figure id="figure-array-elements" float="0">
-<title>A Contiguous Array</title>
+<title>A contiguous array</title>
 <mediaobject>
 <imageobject role="web"><imagedata fileref="array-elements.png" format="PNG"/></imageobject>
 </mediaobject>
@@ -15385,33 +15687,33 @@ as shown in @inlineraw{docbook, <xref linkend="figure-array-elements"/>}:
 
 @noindent
 Only the values are stored; the indices are implicit from the order of
-the values. Here, 8 is the value at index zero, because 8 appears in the
+the values. Here, eight is the value at index zero, because eight appears in the
 position with zero elements before it.
 
-@c STARTOFRANGE arrin
 @cindex arrays, indexing
-@c STARTOFRANGE inarr
 @cindex indexing arrays
 @cindex associative arrays
 @cindex arrays, associative
 Arrays in @command{awk} are different---they are @dfn{associative}.  This means
-that each array is a collection of pairs: an index and its corresponding
+that each array is a collection of pairs---an index and its corresponding
 array element value:
 
 @ifnotdocbook
-@example
-@r{Index} 3     @r{Value} 30
-@r{Index} 1     @r{Value} "foo"
-@r{Index} 0     @r{Value} 8
-@r{Index} 2     @r{Value} ""
-@end example
+@c extra empty column to indent it right
+@multitable @columnfractions .1 .1 .1
+@headitem @tab Index @tab Value
+@item @tab @code{3} @tab @code{30}
+@item @tab @code{1} @tab @code{"foo"}
+@item @tab @code{0} @tab @code{8}
+@item @tab @code{2} @tab @code{""}
+@end multitable
 @end ifnotdocbook
 
 @docbook
 <informaltable>
 <tgroup cols="2">
-<colspec colname="1" align="center"/>
-<colspec colname="2" align="center"/>
+<colspec colname="1" align="left"/>
+<colspec colname="2" align="left"/>
 <thead>
 <row>
 <entry>Index</entry>
@@ -15457,20 +15759,22 @@ at any time.  For example, suppose a tenth element is added to the array
 whose value is @w{@code{"number ten"}}.  The result is:
 
 @ifnotdocbook
-@example
-@r{Index} 10    @r{Value} "number ten"
-@r{Index} 3     @r{Value} 30
-@r{Index} 1     @r{Value} "foo"
-@r{Index} 0     @r{Value} 8
-@r{Index} 2     @r{Value} ""
-@end example
+@c extra empty column to indent it right
+@multitable @columnfractions .1 .1 .2
+@headitem @tab Index @tab Value
+@item @tab @code{10} @tab @code{"number ten"}
+@item @tab @code{3} @tab @code{30}
+@item @tab @code{1} @tab @code{"foo"}
+@item @tab @code{0} @tab @code{8}
+@item @tab @code{2} @tab @code{""}
+@end multitable
 @end ifnotdocbook
 
 @docbook
 <informaltable>
 <tgroup cols="2">
-<colspec colname="1" align="center"/>
-<colspec colname="2" align="center"/>
+<colspec colname="1" align="left"/>
+<colspec colname="2" align="left"/>
 <thead>
 <row>
 <entry>Index</entry>
@@ -15517,24 +15821,25 @@ Now the array is @dfn{sparse}, which just means some indices are missing.
 It has elements 0--3 and 10, but doesn't have elements 4, 5, 6, 7, 8, or 9.
 
 Another consequence of associative arrays is that the indices don't
-have to be positive integers.  Any number, or even a string, can be
+have to be nonnegative integers.  Any number, or even a string, can be
 an index.  For example, the following is an array that translates words from
 English to French:
 
 @ifnotdocbook
-@example
-@r{Index} "dog" @r{Value} "chien"
-@r{Index} "cat" @r{Value} "chat"
-@r{Index} "one" @r{Value} "un"
-@r{Index} 1     @r{Value} "un"
-@end example
+@multitable @columnfractions .1 .1 .1
+@headitem @tab Index @tab Value
+@item @tab @code{"dog"} @tab @code{"chien"}
+@item @tab @code{"cat"} @tab @code{"chat"}
+@item @tab @code{"one"} @tab @code{"un"}
+@item @tab @code{1} @tab @code{"un"}
+@end multitable
 @end ifnotdocbook
 
 @docbook
 <informaltable>
 <tgroup cols="2">
-<colspec colname="1" align="center"/>
-<colspec colname="2" align="center"/>
+<colspec colname="1" align="left"/>
+<colspec colname="2" align="left"/>
 <thead>
 <row>
 <entry>Index</entry>
@@ -15576,7 +15881,7 @@ numbers and strings as indices.
 There are some subtleties to how numbers work when used as
 array subscripts; this is discussed in more detail in
 @ref{Numeric Array Subscripts}.)
-Here, the number @code{1} isn't double-quoted, since @command{awk}
+Here, the number @code{1} isn't double-quoted, because @command{awk}
 automatically converts it to a string.
 
 @cindex @command{gawk}, @code{IGNORECASE} variable in
@@ -15593,8 +15898,6 @@ that array's indices are consecutive integers starting at one.
 
 @command{awk}'s arrays are efficient---the time to access an element
 is independent of the number of elements in the array.
-@c ENDOFRANGE arrin
-@c ENDOFRANGE inarr
 
 @node Reference to Elements
 @subsection Referring to an Array Element
@@ -15603,7 +15906,7 @@ is independent of the number of elements in the array.
 @cindex elements of arrays
 
 The principal way to use an array is to refer to one of its elements.
-An array reference is an expression as follows:
+An @dfn{array reference} is an expression as follows:
 
 @example
 @var{array}[@var{index-expression}]
@@ -15613,8 +15916,11 @@ An array reference is an expression as follows:
 Here, @var{array} is the name of an array.  The expression @var{index-expression} is
 the index of the desired element of the array.
 
+@c 1/2015: Having the 4.3 in @samp is a little iffy. It's essentially
+@c an expression though, so leave be. It's to early in the discussion
+@c to mention that it's really a string.
 The value of the array reference is the current value of that array
-element.  For example, @code{foo[4.3]} is an expression for the element
+element.  For example, @code{foo[4.3]} is an expression referencing the element
 of array @code{foo} at index @samp{4.3}.
 
 @cindex arrays, unassigned elements
@@ -15661,7 +15967,7 @@ This expression tests whether the particular index @var{indx} exists,
 without the side effect of creating that element if it is not present.
 The expression has the value one (true) if @code{@var{array}[@var{indx}]}
 exists and zero (false) if it does not exist.
-(We use @var{indx} here, since @samp{index} is the name of a built-in
+(We use @var{indx} here, because @samp{index} is the name of a built-in
 function.)
 For example, this statement tests whether the array @code{frequencies}
 contains the index @samp{2}:
@@ -15706,7 +16012,7 @@ assign to that element of the array.
 
 The following program takes a list of lines, each beginning with a line
 number, and prints them out in order of line number.  The line numbers
-are not in order when they are first read---instead they
+are not in order when they are first read---instead, they
 are scrambled.  This program sorts the lines by making an array using
 the line numbers as subscripts.  The program then prints out the lines
 in sorted order of their numbers.  It is a very simple program and gets
@@ -15716,14 +16022,14 @@ begin with a number:
 @example
 @c file eg/misc/arraymax.awk
 @{
-  if ($1 > max)
-    max = $1
-  arr[$1] = $0
+    if ($1 > max)
+        max = $1
+    arr[$1] = $0
 @}
 
 END @{
-  for (x = 1; x <= max; x++)
-    print arr[x]
+    for (x = 1; x <= max; x++)
+        print arr[x]
 @}
 @c endfile
 @end example
@@ -15763,9 +16069,9 @@ program's @code{END} rule, as follows:
 
 @example
 END @{
-  for (x = 1; x <= max; x++)
-    if (x in arr)
-      print arr[x]
+    for (x = 1; x <= max; x++)
+        if (x in arr)
+            print arr[x]
 @}
 @end example
 
@@ -15778,7 +16084,7 @@ END @{
 
 In programs that use arrays, it is often necessary to use a loop that
 executes once for each element of an array.  In other languages, where
-arrays are contiguous and indices are limited to positive integers,
+arrays are contiguous and indices are limited to nonnegative integers,
 this is easy: all the valid indices can be found by counting from
 the lowest index up to the highest.  This technique won't do the job
 in @command{awk}, because any number or string can be an array index.
@@ -15787,7 +16093,7 @@ an array:
 
 @example
 for (@var{var} in @var{array})
-  @var{body}
+    @var{body}
 @end example
 
 @noindent
@@ -15800,11 +16106,11 @@ program has previously used, with the variable @var{var} set to that index.
 The following program uses this form of the @code{for} statement.  The
 first rule scans the input records and notes which words appear (at
 least once) in the input, by storing a one into the array @code{used} with
-the word as index.  The second rule scans the elements of @code{used} to
+the word as the index.  The second rule scans the elements of @code{used} to
 find all the distinct words that appear in the input.  It prints each
 word that is more than 10 characters long and also prints the number of
 such words.
-@xref{String Functions},
+@DBXREF{String Functions}
 for more information on the built-in function @code{length()}.
 
 @example
@@ -15827,7 +16133,7 @@ END @{
 @end example
 
 @noindent
-@xref{Word Sorting},
+@DBXREF{Word Sorting}
 for a more detailed example of this type.
 
 @cindex arrays, elements, order of access by @code{in} operator
@@ -15860,7 +16166,7 @@ BEGIN @{
 @}
 @end example
 
-Here is what happens when run with @command{gawk}:
+Here is what happens when run with @command{gawk} (and @command{mawk}):
 
 @example
 $ @kbd{gawk -f loopcheck.awk}
@@ -15882,7 +16188,7 @@ $ @kbd{nawk -f loopcheck.awk}
 @end example
 
 @node Controlling Scanning
-@subsection Using Predefined Array Scanning Orders With @command{gawk}
+@subsection Using Predefined Array Scanning Orders with @command{gawk}
 
 This @value{SUBSECTION} describes a feature that is specific to @command{gawk}.
 
@@ -15897,7 +16203,7 @@ and will vary from one version of @command{awk} to the next.
 Often, though, you may wish to do something simple, such as
 ``traverse the array by comparing the indices in ascending order,''
 or ``traverse the array by comparing the values in descending order.''
-@command{gawk} provides two mechanisms which give you this control.
+@command{gawk} provides two mechanisms that give you this control:
 
 @itemize @value{BULLET}
 @item
@@ -15907,7 +16213,7 @@ We describe this now.
 @item
 Set @code{PROCINFO["sorted_in"]} to the name of a user-defined function
 to use for comparison of array elements. This advanced feature
-is described later, in @ref{Array Sorting}.
+is described later in @ref{Array Sorting}.
 @end itemize
 
 @cindex @code{PROCINFO}, values of @code{sorted_in}
@@ -15925,7 +16231,7 @@ the index is @code{"10"} rather than numeric 10.)
 
 @item "@@ind_num_asc"
 Order by indices in ascending order but force them to be treated as numbers in the process.
-Any index with a non-numeric value will end up positioned as if it were zero. 
+Any index with a non-numeric value will end up positioned as if it were zero.
 
 @item "@@val_type_asc"
 Order by element values in ascending order (rather than by indices).
@@ -15937,11 +16243,11 @@ which in turn come before all subarrays.
 @pxref{Arrays of Arrays}.)
 
 @item "@@val_str_asc"
-Order by element values in ascending order (rather than by indices).  Scalar values are 
+Order by element values in ascending order (rather than by indices).  Scalar values are
 compared as strings.  Subarrays, if present, come out last.
 
 @item "@@val_num_asc"
-Order by element values in ascending order (rather than by indices).  Scalar values are 
+Order by element values in ascending order (rather than by indices).  Scalar values are
 compared as numbers.  Subarrays, if present, come out last.
 When numeric values are equal, the string values are used to provide
 an ordering: this guarantees consistent results across different
@@ -15954,21 +16260,26 @@ across different environments.} which @command{gawk} uses internally
 to perform the sorting.
 
 @item "@@ind_str_desc"
-String indices ordered from high to low.
+Like @code{"@@ind_str_asc"}, but the
+string indices are ordered from high to low.
 
 @item "@@ind_num_desc"
-Numeric indices ordered from high to low.
+Like @code{"@@ind_num_asc"}, but the
+numeric indices are ordered from high to low.
 
 @item "@@val_type_desc"
-Element values, based on type, ordered from high to low.
+Like @code{"@@val_type_asc"}, but the
+element values, based on type, are ordered from high to low.
 Subarrays, if present, come out first.
 
 @item "@@val_str_desc"
-Element values, treated as strings, ordered from high to low.
+Like @code{"@@val_str_asc"}, but the
+element values, treated as strings, are ordered from high to low.
 Subarrays, if present, come out first.
 
 @item "@@val_num_desc"
-Element values, treated as numbers, ordered from high to low.
+Like @code{"@@val_num_asc"}, but the
+element values, treated as numbers, are ordered from high to low.
 Subarrays, if present, come out first.
 @end table
 
@@ -15978,7 +16289,8 @@ does not affect the loop.
 For example:
 
 @example
-$ @kbd{gawk 'BEGIN @{}
+$ @kbd{gawk '}
+> @kbd{BEGIN @{}
 > @kbd{   a[4] = 4}
 > @kbd{   a[3] = 3}
 > @kbd{   for (i in a)}
@@ -15986,7 +16298,8 @@ $ @kbd{gawk 'BEGIN @{}
 > @kbd{@}'}
 @print{} 4 4
 @print{} 3 3
-$ @kbd{gawk 'BEGIN @{}
+$ @kbd{gawk '}
+> @kbd{BEGIN @{}
 > @kbd{   PROCINFO["sorted_in"] = "@@ind_str_asc"}
 > @kbd{   a[4] = 4}
 > @kbd{   a[3] = 3}
@@ -16000,11 +16313,11 @@ $ @kbd{gawk 'BEGIN @{}
 When sorting an array by element values, if a value happens to be
 a subarray then it is considered to be greater than any string or
 numeric value, regardless of what the subarray itself contains,
-and all subarrays are treated as being equal to each other.  Their 
+and all subarrays are treated as being equal to each other.  Their
 order relative to each other is determined by their index strings.
 
 Here are some additional things to bear in mind about sorted
-array traversal.
+array traversal:
 
 @itemize @value{BULLET}
 @item
@@ -16024,7 +16337,7 @@ if (save_sorted)
 @end example
 
 @item
-As mentioned, the default array traversal order is represented by
+As already mentioned, the default array traversal order is represented by
 @code{"@@unsorted"}.  You can also get the default behavior by assigning
 the null string to @code{PROCINFO["sorted_in"]} or by just deleting the
 @code{"sorted_in"} element from the @code{PROCINFO} array with
@@ -16035,118 +16348,6 @@ the @code{delete} statement.
 In addition, @command{gawk} provides built-in functions for
 sorting arrays; see @ref{Array Sorting Functions}.
 
-@node Delete
-@section The @code{delete} Statement
-@cindex @code{delete} statement
-@cindex deleting elements in arrays
-@cindex arrays, elements, deleting
-@cindex elements in arrays, deleting
-
-To remove an individual element of an array, use the @code{delete}
-statement:
-
-@example
-delete @var{array}[@var{index-expression}]
-@end example
-
-Once an array element has been deleted, any value the element once
-had is no longer available. It is as if the element had never
-been referred to or been given a value.
-The following is an example of deleting elements in an array:
-
-@example
-for (i in frequencies)
-  delete frequencies[i]
-@end example
-
-@noindent
-This example removes all the elements from the array @code{frequencies}.
-Once an element is deleted, a subsequent @code{for} statement to scan the array
-does not report that element and the @code{in} operator to check for
-the presence of that element returns zero (i.e., false):
-
-@example
-delete foo[4]
-if (4 in foo)
-    print "This will never be printed"
-@end example
-
-@cindex null strings, and deleting array elements
-It is important to note that deleting an element is @emph{not} the
-same as assigning it a null value (the empty string, @code{""}).
-For example:
-
-@example
-foo[4] = ""
-if (4 in foo)
-  print "This is printed, even though foo[4] is empty"
-@end example
-
-@cindex lint checking, array elements
-It is not an error to delete an element that does not exist.
-However, if @option{--lint} is provided on the command line
-(@pxref{Options}),
-@command{gawk} issues a warning message when an element that
-is not in the array is deleted.
-
-@cindex common extensions, @code{delete} to delete entire arrays
-@cindex extensions, common@comma{} @code{delete} to delete entire arrays
-@cindex arrays, deleting entire contents
-@cindex deleting entire arrays
-@cindex @code{delete} @var{array}
-@cindex differences in @command{awk} and @command{gawk}, array elements, deleting
-All the elements of an array may be deleted with a single statement
-by leaving off the subscript in the @code{delete} statement,
-as follows:
-
-
-@example
-delete @var{array}
-@end example
-
-Using this version of the @code{delete} statement is about three times
-more efficient than the equivalent loop that deletes each element one
-at a time.
-
-@cindex Brian Kernighan's @command{awk}
-@quotation NOTE
-For many years,
-using @code{delete} without a subscript was a @command{gawk} extension.
-As of September, 2012, it was accepted for
-inclusion into the POSIX standard. See @uref{http://austingroupbugs.net/view.php?id=544,
-the Austin Group website}.  This form of the @code{delete} statement is also supported
-by BWK @command{awk} and @command{mawk}, as well as
-by a number of other implementations (@pxref{Other Versions}).
-@end quotation
-
-@cindex portability, deleting array elements
-@cindex Brennan, Michael
-The following statement provides a portable but nonobvious way to clear
-out an array:@footnote{Thanks to Michael Brennan for pointing this out.}
-
-@example
-split("", array)
-@end example
-
-@cindex @code{split()} function, array elements@comma{} deleting
-The @code{split()} function
-(@pxref{String Functions})
-clears out the target array first. This call asks it to split
-apart the null string. Because there is no data to split out, the
-function simply clears the array and then returns.
-
-@quotation CAUTION
-Deleting an array does not change its type; you cannot
-delete an array and then use the array's name as a scalar
-(i.e., a regular variable). For example, the following does not work:
-
-@example
-a[1] = 3
-delete a
-a = 3
-@end example
-@end quotation
-
 @node Numeric Array Subscripts
 @section Using Numbers to Subscript Arrays
 
@@ -16158,7 +16359,7 @@ An important aspect to remember about arrays is that @emph{array subscripts
 are always strings}.  When a numeric value is used as a subscript,
 it is converted to a string value before being used for subscripting
 (@pxref{Conversion}).
-This means that the value of the built-in variable @code{CONVFMT} can
+This means that the value of the predefined variable @code{CONVFMT} can
 affect how your program accesses elements of an array.  For example:
 
 @example
@@ -16181,13 +16382,13 @@ The program then changes
 the value of @code{CONVFMT}.  The test @samp{(xyz in data)} generates a new
 string value from @code{xyz}---this time @code{"12.15"}---because the value of
 @code{CONVFMT} only allows two significant digits.  This test fails,
-since @code{"12.15"} is different from @code{"12.153"}.
+because @code{"12.15"} is different from @code{"12.153"}.
 
 @cindex converting integer array subscripts
 @cindex integer array indices
 According to the rules for conversions
 (@pxref{Conversion}), integer
-values are always converted to strings as integers, no matter what the
+values always convert to strings as integers, no matter what the
 value of @code{CONVFMT} may happen to be.  So the usual case of
 the following works:
 
@@ -16199,19 +16400,19 @@ for (i = 1; i <= maxsub; i++)
 The ``integer values always convert to strings as integers'' rule
 has an additional consequence for array indexing.
 Octal and hexadecimal constants
+@ifnotdocbook
 (@pxref{Nondecimal-numbers})
+@end ifnotdocbook
+@ifdocbook
+(covered in @ref{Nondecimal-numbers})
+@end ifdocbook
 are converted internally into numbers, and their original form
-is forgotten.
-This means, for example, that
-@code{array[17]},
-@code{array[021]},
-and
-@code{array[0x11]}
-all refer to the same element!
+is forgotten.  This means, for example, that @code{array[17]},
+@code{array[021]}, and @code{array[0x11]} all refer to the same element!
 
 As with many things in @command{awk}, the majority of the time
-things work as one would expect them to.  But it is useful to have a precise
-knowledge of the actual rules since they can sometimes have a subtle
+things work as you would expect them to.  But it is useful to have a precise
+knowledge of the actual rules, as they can sometimes have a subtle
 effect on your programs.
 
 @node Uninitialized Subscripts
@@ -16274,6 +16475,119 @@ Even though it is somewhat unusual, the null string
 if @option{--lint} is provided
 on the command line (@pxref{Options}).
 
+@node Delete
+@section The @code{delete} Statement
+@cindex @code{delete} statement
+@cindex deleting elements in arrays
+@cindex arrays, elements, deleting
+@cindex elements in arrays, deleting
+
+To remove an individual element of an array, use the @code{delete}
+statement:
+
+@example
+delete @var{array}[@var{index-expression}]
+@end example
+
+Once an array element has been deleted, any value the element once
+had is no longer available. It is as if the element had never
+been referred to or been given a value.
+The following is an example of deleting elements in an array:
+
+@example
+for (i in frequencies)
+    delete frequencies[i]
+@end example
+
+@noindent
+This example removes all the elements from the array @code{frequencies}.
+Once an element is deleted, a subsequent @code{for} statement to scan the array
+does not report that element and using the @code{in} operator to check for
+the presence of that element returns zero (i.e., false):
+
+@example
+delete foo[4]
+if (4 in foo)
+    print "This will never be printed"
+@end example
+
+@cindex null strings, and deleting array elements
+It is important to note that deleting an element is @emph{not} the
+same as assigning it a null value (the empty string, @code{""}).
+For example:
+
+@example
+foo[4] = ""
+if (4 in foo)
+  print "This is printed, even though foo[4] is empty"
+@end example
+
+@cindex lint checking, array elements
+It is not an error to delete an element that does not exist.
+However, if @option{--lint} is provided on the command line
+(@pxref{Options}),
+@command{gawk} issues a warning message when an element that
+is not in the array is deleted.
+
+@cindex common extensions, @code{delete} to delete entire arrays
+@cindex extensions, common@comma{} @code{delete} to delete entire arrays
+@cindex arrays, deleting entire contents
+@cindex deleting entire arrays
+@cindex @code{delete} @var{array}
+@cindex differences in @command{awk} and @command{gawk}, array elements, deleting
+All the elements of an array may be deleted with a single statement
+by leaving off the subscript in the @code{delete} statement,
+as follows:
+
+
+@example
+delete @var{array}
+@end example
+
+Using this version of the @code{delete} statement is about three times
+more efficient than the equivalent loop that deletes each element one
+at a time.
+
+This form of the @code{delete} statement is also supported
+by BWK @command{awk} and @command{mawk}, as well as
+by a number of other implementations.
+
+@cindex Brian Kernighan's @command{awk}
+@quotation NOTE
+For many years, using @code{delete} without a subscript was a common
+extension.  In September 2012, it was accepted for inclusion into the
+POSIX standard.  See @uref{http://austingroupbugs.net/view.php?id=544,
+the Austin Group website}.
+@end quotation
+
+@cindex portability, deleting array elements
+@cindex Brennan, Michael
+The following statement provides a portable but nonobvious way to clear
+out an array:@footnote{Thanks to Michael Brennan for pointing this out.}
+
+@example
+split("", array)
+@end example
+
+@cindex @code{split()} function, array elements@comma{} deleting
+The @code{split()} function
+(@pxref{String Functions})
+clears out the target array first. This call asks it to split
+apart the null string. Because there is no data to split out, the
+function simply clears the array and then returns.
+
+@quotation CAUTION
+Deleting all the elements from an array does not change its type; you cannot
+clear an array and then use the array's name as a scalar
+(i.e., a regular variable). For example, the following does not work:
+
+@example
+a[1] = 3
+delete a
+a = 3
+@end example
+@end quotation
+
 @node Multidimensional
 @section Multidimensional Arrays
 
@@ -16283,9 +16597,9 @@ on the command line (@pxref{Options}).
 
 @cindex subscripts in arrays, multidimensional
 @cindex arrays, multidimensional
-A multidimensional array is an array in which an element is identified
+A @dfn{multidimensional array} is an array in which an element is identified
 by a sequence of indices instead of a single index.  For example, a
-two-dimensional array requires two indices.  The usual way (in most
+two-dimensional array requires two indices.  The usual way (in many
 languages, including @command{awk}) to refer to an element of a
 two-dimensional array named @code{grid} is with
 @code{grid[@var{x},@var{y}]}.
@@ -16325,7 +16639,7 @@ stored as @samp{foo["a@@b@@c"]}.
 @cindex @code{in} operator, index existence in multidimensional arrays
 To test whether a particular index sequence exists in a
 multidimensional array, use the same operator (@code{in}) that is
-used for single dimensional arrays.  Write the whole sequence of indices
+used for single-dimensional arrays.  Write the whole sequence of indices
 in parentheses, separated by commas, as the left operand:
 
 @example
@@ -16448,8 +16762,8 @@ a[1][2] = 2
 This simulates a true two-dimensional array. Each subarray element can
 contain another subarray as a value, which in turn can hold other arrays
 as well. In this way, you can create arrays of three or more dimensions.
-The indices can be any @command{awk} expression, including scalars
-separated by commas (that is, a regular @command{awk} simulated
+The indices can be any @command{awk} expressions, including scalars
+separated by commas (i.e., a regular @command{awk} simulated
 multidimensional subscript). So the following is valid in
 @command{gawk}:
 
@@ -16460,14 +16774,15 @@ a[1][3][1, "name"] = "barney"
 Each subarray and the main array can be of different length. In fact, the
 elements of an array or its subarray do not all have to have the same
 type. This means that the main array and any of its subarrays can be
-non-rectangular, or jagged in structure. One can assign a scalar value to
-the index @code{4} of the main array @code{a}:
+nonrectangular, or jagged in structure. You can assign a scalar value to
+the index @code{4} of the main array @code{a}, even though @code{a[1]}
+is itself an array and not a scalar:
 
 @example
 a[4] = "An element in a jagged array"
 @end example
-  
-The terms @dfn{dimension}, @dfn{row} and @dfn{column} are
+
+The terms @dfn{dimension}, @dfn{row}, and @dfn{column} are
 meaningless when applied
 to such an array, but we will use ``dimension'' henceforth to imply the
 maximum number of indices needed to refer to an existing element. The
@@ -16483,7 +16798,8 @@ a[4][5][6][7] = "An element in a four-dimensional array"
 
 @noindent
 This removes the scalar value from index @code{4} and then inserts a
-subarray of subarray of subarray containing a scalar. You can also
+three-level nested subarray
+containing a scalar. You can also
 delete an entire subarray or subarray of subarrays:
 
 @example
@@ -16494,7 +16810,7 @@ a[4][5] = "An element in subarray a[4]"
 But recall that you can not delete the main array @code{a} and then use it
 as a scalar.
 
-The built-in functions which take array arguments can also be used
+The built-in functions that take array arguments can also be used
 with subarrays. For example, the following code fragment uses @code{length()}
 (@pxref{String Functions})
 to determine the number of elements in the main array @code{a} and
@@ -16523,14 +16839,14 @@ The @samp{for (item in array)} statement (@pxref{Scanning an Array})
 can be nested to scan all the
 elements of an array of arrays if it is rectangular in structure. In order
 to print the contents (scalar values) of a two-dimensional array of arrays
-(i.e., in which each first-level element is itself an 
-array, not necessarily of the same length) 
+(i.e., in which each first-level element is itself an
+array, not necessarily of the same length),
 you could use the following code:
 
 @example
 for (i in array)
     for (j in array[i])
-        print array[i][j] 
+        print array[i][j]
 @end example
 
 The @code{isarray()} function (@pxref{Type Functions})
@@ -16540,15 +16856,17 @@ lets you test if an array element is itself an array:
 for (i in array) @{
     if (isarray(array[i]) @{
         for (j in array[i]) @{
-            print array[i][j] 
+            print array[i][j]
         @}
     @}
+    else
+        print array[i]
 @}
 @end example
 
 If the structure of a jagged array of arrays is known in advance,
 you can often devise workarounds using control statements. For example,
-the following code prints the elements of our main array @code{a}: 
+the following code prints the elements of our main array @code{a}:
 
 @example
 for (i in a) @{
@@ -16558,13 +16876,13 @@ for (i in a) @{
                 print a[i][j][k]
         @} else
             print a[i][j]
-    @} 
+    @}
 @}
 @end example
 
 @noindent
-@xref{Walking Arrays}, for a user-defined function that ``walks'' an
-arbitrarily-dimensioned array of arrays.
+@DBXREF{Walking Arrays} for a user-defined function that ``walks'' an
+arbitrarily dimensioned array of arrays.
 
 Recall that a reference to an uninitialized array element yields a value
 of @code{""}, the null string. This has one important implication when you
@@ -16614,16 +16932,17 @@ special predefined values to @code{PROCINFO["sorted_in"]}.
 
 @item
 Use @samp{delete @var{array}[@var{indx}]} to delete an individual element.
-You may also use @samp{delete @var{array}} to delete all of the elements
-in the array.  This latter feature has been a common extension for many
+To delete all of the elements in an array,
+use @samp{delete @var{array}}.
+This latter feature has been a common extension for many
 years and is now standard, but may not be supported by all commercial
 versions of @command{awk}.
 
 @item
 Standard @command{awk} simulates multidimensional arrays by separating
-subscript values with a comma.  The values are concatenated into a
+subscript values with commas.  The values are concatenated into a
 single string, separated by the value of @code{SUBSEP}.  The fact
-that such a subscript was created in this way is not retained; thus
+that such a subscript was created in this way is not retained; thus,
 changing @code{SUBSEP} may have unexpected consequences.  You can use
 @samp{(@var{sub1}, @var{sub2}, @dots{}) in @var{array}} to see if such
 a multidimensional subscript exists in @var{array}.
@@ -16632,7 +16951,7 @@ a multidimensional subscript exists in @var{array}.
 @command{gawk} provides true arrays of arrays. You use a separate
 set of square brackets for each dimension in such an array:
 @code{data[row][col]}, for example. Array elements may thus be either
-scalar values (number or string) or another array.
+scalar values (number or string) or other arrays.
 
 @item
 Use the @code{isarray()} built-in function to determine if an array
@@ -16640,25 +16959,26 @@ element is itself a subarray.
 
 @end itemize
 
-@c ENDOFRANGE arrs
 
 @node Functions
 @chapter Functions
 
-@c STARTOFRANGE funcbi
 @cindex functions, built-in
-@c STARTOFRANGE bifunc
 @cindex built-in functions
 This @value{CHAPTER} describes @command{awk}'s built-in functions,
 which fall into three categories: numeric, string, and I/O.
 @command{gawk} provides additional groups of functions
 to work with values that represent time, do
-bit manipulation, sort arrays, and internationalize and localize programs.
+bit manipulation, sort arrays,
+provide type information, and internationalize and localize programs.
 
 Besides the built-in functions, @command{awk} has provisions for
 writing new functions that the rest of a program can use.
 The second half of this @value{CHAPTER} describes these
 @dfn{user-defined} functions.
+Finally, we explore indirect function calls, a @command{gawk}-specific
+extension that lets you determine at runtime what function is to
+be called.
 
 @menu
 * Built-in::                    Summarizes the built-in functions.
@@ -16701,7 +17021,7 @@ is a call to the function @code{atan2()} and has two arguments.
 @cindex programming conventions, functions, calling
 @cindex whitespace, functions@comma{} calling
 Whitespace is ignored between the built-in function name and the
-open parenthesis, but nonetheless it is good practice to avoid using whitespace
+opening parenthesis, but nonetheless it is good practice to avoid using whitespace
 there.  User-defined functions do not permit whitespace in this way, and
 it is easier to avoid mistakes by following a simple
 convention that always works---no whitespace after a function name.
@@ -16738,11 +17058,11 @@ right to left.  For example:
 
 @example
 i = 5
-j = atan2(i++, i *= 2)
+j = atan2(++i, i *= 2)
 @end example
 
 If the order of evaluation is left to right, then @code{i} first becomes
-6, and then 12, and @code{atan2()} is called with the two arguments 6
+six, and then 12, and @code{atan2()} is called with the two arguments six
 and 12.  But if the order of evaluation is right to left, @code{i}
 first becomes 10, then 11, and @code{atan2()} is called with the
 two arguments 11 and 10.
@@ -16769,23 +17089,6 @@ You can use @samp{pi = atan2(0, -1)} to retrieve the value of
 @cindex cosine
 Return the cosine of @var{x}, with @var{x} in radians.
 
-@item @code{div(@var{numerator}, @var{denominator}, @var{result})}
-@cindexawkfunc{div}
-@cindex div
-Perform integer division, similar to the standard C function of the
-same name.  First, truncate @code{numerator} and @code{denominator}
-towards zero, creating integer values.  Clear the @code{result}
-array, and then set @code{result["quotient"]} to the result of
-@samp{numerator / denominator}, truncated towards zero to an integer,
-and set @code{result["remainder"]} to the result of @samp{numerator %
-denominator}, truncated towards zero to an integer.  This function is
-primarily intended for use with arbitrary length integers; it avoids
-creating MPFR arbitrary precision floating-point values (@pxref{Arbitrary
-Precision Integers}).
-
-This function is a @code{gawk} extension.  It is not available in
-compatibility mode (@pxref{Options}).
-
 @item @code{exp(@var{x})}
 @cindexawkfunc{exp}
 @cindex exponent
@@ -16798,10 +17101,26 @@ depends on your machine's floating-point representation.
 @cindex round to nearest integer
 Return the nearest integer to @var{x}, located between @var{x} and zero and
 truncated toward zero.
-
 For example, @code{int(3)} is 3, @code{int(3.9)} is 3, @code{int(-3.9)}
 is @minus{}3, and @code{int(-3)} is @minus{}3 as well.
 
+@item @code{intdiv(@var{numerator}, @var{denominator}, @var{result})}
+@cindexawkfunc{intdiv}
+@cindex intdiv
+Perform integer division, similar to the standard C function of the
+same name.  First, truncate @code{numerator} and @code{denominator}
+towards zero, creating integer values.  Clear the @code{result}
+array, and then set @code{result["quotient"]} to the result of
+@samp{numerator / denominator}, truncated towards zero to an integer,
+and set @code{result["remainder"]} to the result of @samp{numerator %
+denominator}, truncated towards zero to an integer.  This function is
+primarily intended for use with arbitrary length integers; it avoids
+creating MPFR arbitrary precision floating-point values (@pxref{Arbitrary
+Precision Integers}).
+
+This function is a @code{gawk} extension.  It is not available in
+compatibility mode (@pxref{Options}).
+
 @item @code{log(@var{x})}
 @cindexawkfunc{log}
 @cindex logarithm
@@ -16824,17 +17143,18 @@ In fact, @command{gawk} uses the BSD @code{random()} function, which is
 considerably better than @code{rand()}, to produce random numbers.}
 
 Often random integers are needed instead.  Following is a user-defined function
-that can be used to obtain a random non-negative integer less than @var{n}:
+that can be used to obtain a random nonnegative integer less than @var{n}:
 
 @example
-function randint(n) @{
-     return int(n * rand())
+function randint(n)
+@{
+    return int(n * rand())
 @}
 @end example
 
 @noindent
-The multiplication produces a random number greater than zero and less
-than @code{n}.  Using @code{int()}, this result is made into
+The multiplication produces a random number greater than or equal to
+zero and less than @code{n}.  Using @code{int()}, this result is made into
 an integer between zero and @code{n} @minus{} 1, inclusive.
 
 The following example uses a similar function to produce random integers
@@ -16848,8 +17168,7 @@ function roll(n) @{ return 1 + int(rand() * n) @}
 # Roll 3 six-sided dice and
 # print total number of points.
 @{
-      printf("%d points\n",
-             roll(6)+roll(6)+roll(6))
+    printf("%d points\n", roll(6) + roll(6) + roll(6))
 @}
 @end example
 
@@ -16887,8 +17206,8 @@ for generating random numbers to the value @var{x}.
 
 Each seed value leads to a particular sequence of random
 numbers.@footnote{Computer-generated random numbers really are not truly
-random.  They are technically known as ``pseudorandom.''  This means
-that while the numbers in a sequence appear to be random, you can in
+random.  They are technically known as @dfn{pseudorandom}.  This means
+that although the numbers in a sequence appear to be random, you can in
 fact generate the same sequence of random numbers over and over again.}
 Thus, if the seed is set to the same value a second time,
 the same sequence of random numbers is produced again.
@@ -16919,7 +17238,7 @@ implementations.
 The functions in this @value{SECTION} look at or change the text of one
 or more strings.
 
-@code{gawk} understands locales (@pxref{Locales}), and does all
+@command{gawk} understands locales (@pxref{Locales}) and does all
 string processing in terms of @emph{characters}, not @emph{bytes}.
 This distinction is particularly important to understand for locales
 where one character may be represented by multiple bytes.  Thus, for
@@ -16938,7 +17257,7 @@ doing index calculations, particularly if you are used to C.
 In the following list, optional parameters are enclosed in square brackets@w{ ([ ]).}
 Several functions perform string substitution; the full discussion is
 provided in the description of the @code{sub()} function, which comes
-towards the end since the list is presented in alphabetic order.
+toward the end, because the list is presented alphabetically.
 
 Those functions that are specific to @command{gawk} are marked with a
 pound sign (@samp{#}).  They are not available in compatibility mode
@@ -16964,10 +17283,10 @@ These two functions are similar in behavior, so they are described
 together.
 
 @quotation NOTE
-The following description ignores the third argument, @var{how}, since it
+The following description ignores the third argument, @var{how}, as it
 requires understanding features that we have not discussed yet.  Thus,
 the discussion here is a deliberate simplification.  (We do provide all
-the details later on: @xref{Array Sorting Functions}, for the full story.)
+the details later on; see @DBREF{Array Sorting Functions} for the full story.)
 @end quotation
 
 Both functions return the number of elements in the array @var{source}.
@@ -16982,6 +17301,7 @@ When comparing strings, @code{IGNORECASE} affects the sorting
 (@pxref{Array Sorting Functions}).  If the
 @var{source} array contains subarrays as values (@pxref{Arrays of
 Arrays}), they will come last, after all scalar values.
+Subarrays are @emph{not} recursively sorted.
 
 For example, if the contents of @code{a} are as follows:
 
@@ -17007,7 +17327,7 @@ a[2] = "de"
 a[3] = "sac"
 @end example
 
-The @code{asorti()} function works similarly to @code{asort()}, however,
+The @code{asorti()} function works similarly to @code{asort()}; however,
 the @emph{indices} are sorted, instead of the values. Thus, in the
 previous example, starting with the same initial set of indices and
 values in @code{a}, calling @samp{asorti(a)} would yield:
@@ -17118,7 +17438,11 @@ $ @kbd{awk 'BEGIN @{ print index("peanut", "an") @}'}
 @noindent
 If @var{find} is not found, @code{index()} returns zero.
 
-It is a fatal error to use a regexp constant for @var{find}.
+@cindex dark corner, regexp as second argument to @code{index()}
+With BWK @command{awk} and @command{gawk},
+it is a fatal error to use a regexp constant for @var{find}.
+Other implementations allow it, simply treating the regexp
+constant as an expression meaning @samp{$0 ~ /regexp/}. @value{DARKCORNER}
 
 @item @code{length(}[@var{string}]@code{)}
 @cindexawkfunc{length}
@@ -17201,7 +17525,7 @@ If @option{--posix} is supplied, using an array argument is a fatal error
 @cindex string, regular expression match
 @cindex match regexp in string
 Search @var{string} for the
-longest, leftmost substring matched by the regular expression,
+longest, leftmost substring matched by the regular expression
 @var{regexp} and return the character position (index)
 at which that substring begins (one, if it starts at the beginning of
 @var{string}).  If no match is found, return zero.
@@ -17209,11 +17533,11 @@ at which that substring begins (one, if it starts at the beginning of
 The @var{regexp} argument may be either a regexp constant
 (@code{/}@dots{}@code{/}) or a string constant (@code{"}@dots{}@code{"}).
 In the latter case, the string is treated as a regexp to be matched.
-@xref{Computed Regexps}, for a
+@DBXREF{Computed Regexps} for a
 discussion of the difference between the two forms, and the
 implications for writing your program correctly.
 
-The order of the first two arguments is backwards from most other string
+The order of the first two arguments is the opposite of most other string
 functions that work with regular expressions, such as
 @code{sub()} and @code{gsub()}.  It might help to remember that
 for @code{match()}, the order is the same as for the @samp{~} operator:
@@ -17222,8 +17546,8 @@ for @code{match()}, the order is the same as for the @samp{~} operator:
 @cindex @code{RSTART} variable, @code{match()} function and
 @cindex @code{RLENGTH} variable, @code{match()} function and
 @cindex @code{match()} function, @code{RSTART}/@code{RLENGTH} variables
-The @code{match()} function sets the built-in variable @code{RSTART} to
-the index.  It also sets the built-in variable @code{RLENGTH} to the
+The @code{match()} function sets the predefined variable @code{RSTART} to
+the index.  It also sets the predefined variable @code{RLENGTH} to the
 length in characters of the matched substring.  If no match is found,
 @code{RSTART} is set to zero, and @code{RLENGTH} to @minus{}1.
 
@@ -17232,13 +17556,12 @@ For example:
 @example
 @c file eg/misc/findpat.awk
 @{
-       if ($1 == "FIND")
-         regex = $2
-       else @{
-         where = match($0, regex)
-         if (where != 0)
-           print "Match of", regex, "found at",
-                     where, "in", $0
+    if ($1 == "FIND")
+        regex = $2
+    else @{
+        where = match($0, regex)
+        if (where != 0)
+            print "Match of", regex, "found at", where, "in", $0
        @}
 @}
 @c endfile
@@ -17303,7 +17626,7 @@ $ @kbd{echo foooobazbarrrrr |}
 @end example
 
 There may not be subscripts for the start and index for every parenthesized
-subexpression, since they may not all have matched text; thus they
+subexpression, because they may not all have matched text; thus, they
 should be tested for with the @code{in} operator
 (@pxref{Reference to Elements}).
 
@@ -17334,7 +17657,7 @@ Any leading separator will be in @code{@var{seps}[0]}.
 
 The @code{patsplit()} function splits strings into pieces in a
 manner similar to the way input lines are split into fields using @code{FPAT}
-(@pxref{Splitting By Content}.
+(@pxref{Splitting By Content}).
 
 Before splitting the string, @code{patsplit()} deletes any previously existing
 elements in the arrays @var{array} and @var{seps}.
@@ -17347,19 +17670,18 @@ and store the pieces in @var{array} and the separator strings in the
 @code{@var{array}[1]}, the second piece in @code{@var{array}[2]}, and so
 forth.  The string value of the third argument, @var{fieldsep}, is
 a regexp describing where to split @var{string} (much as @code{FS} can
-be a regexp describing where to split input records;
-@pxref{Regexp Field Splitting}).
+be a regexp describing where to split input records).
 If @var{fieldsep} is omitted, the value of @code{FS} is used.
 @code{split()} returns the number of elements created.
-@var{seps} is a @command{gawk} extension with @code{@var{seps}[@var{i}]} 
+@var{seps} is a @command{gawk} extension, with @code{@var{seps}[@var{i}]}
 being the separator string
-between @code{@var{array}[@var{i}]} and @code{@var{array}[@var{i}+1]}. 
+between @code{@var{array}[@var{i}]} and @code{@var{array}[@var{i}+1]}.
 If @var{fieldsep} is a single
-space then any leading whitespace goes into @code{@var{seps}[0]} and 
+space, then any leading whitespace goes into @code{@var{seps}[0]} and
 any trailing
-whitespace goes into @code{@var{seps}[@var{n}]} where @var{n} is the 
-return value of 
-@code{split()} (that is, the number of elements in @var{array}).
+whitespace goes into @code{@var{seps}[@var{n}]}, where @var{n} is the
+return value of
+@code{split()} (i.e., the number of elements in @var{array}).
 
 The @code{split()} function splits strings into pieces in a
 manner similar to the way input lines are split into fields.  For example:
@@ -17370,7 +17692,7 @@ split("cul-de-sac", a, "-", seps)
 
 @noindent
 @cindex strings splitting, example
-splits the string @samp{cul-de-sac} into three fields using @samp{-} as the
+splits the string @code{"cul-de-sac"} into three fields using @samp{-} as the
 separator.  It sets the contents of the array @code{a} as follows:
 
 @example
@@ -17395,21 +17717,20 @@ As with input field-splitting, when the value of @var{fieldsep} is
 the elements of
 @var{array} but not in @var{seps}, and the elements
 are separated by runs of whitespace.
-Also as with input field-splitting, if @var{fieldsep} is the null string, each
+Also, as with input field splitting, if @var{fieldsep} is the null string, each
 individual character in the string is split into its own array element.
 @value{COMMONEXT}
 
 Note, however, that @code{RS} has no effect on the way @code{split()}
-works. Even though @samp{RS = ""} causes newline to also be an input
+works. Even though @samp{RS = ""} causes the newline character to also be an input
 field separator, this does not affect how @code{split()} splits strings.
 
 @cindex dark corner, @code{split()} function
 Modern implementations of @command{awk}, including @command{gawk}, allow
-the third argument to be a regexp constant (@code{/abc/}) as well as a
-string.
-@value{DARKCORNER}
+the third argument to be a regexp constant (@w{@code{/}@dots{}@code{/}})
+as well as a string.  @value{DARKCORNER}
 The POSIX standard allows this as well.
-@xref{Computed Regexps}, for a
+@DBXREF{Computed Regexps} for a
 discussion of the difference between using a string constant or a regexp constant,
 and the implications for writing your program correctly.
 
@@ -17460,7 +17781,7 @@ Using the @code{strtonum()} function is @emph{not} the same as adding zero
 to a string value; the automatic coercion of strings to numbers
 works only for decimal data, not for octal or hexadecimal.@footnote{Unless
 you use the @option{--non-decimal-data} option, which isn't recommended.
-@xref{Nondecimal Data}, for more information.}
+@DBXREF{Nondecimal Data} for more information.}
 
 Note also that @code{strtonum()} uses the current locale's decimal point
 for recognizing numbers (@pxref{Locales}).
@@ -17478,7 +17799,7 @@ Return the number of substitutions made (zero or one).
 The @var{regexp} argument may be either a regexp constant
 (@code{/}@dots{}@code{/}) or a string constant (@code{"}@dots{}@code{"}).
 In the latter case, the string is treated as a regexp to be matched.
-@xref{Computed Regexps}, for a
+@DBXREF{Computed Regexps} for a
 discussion of the difference between the two forms, and the
 implications for writing your program correctly.
 
@@ -17544,7 +17865,7 @@ an @samp{&}:
 @cindex @code{sub()} function, arguments of
 @cindex @code{gsub()} function, arguments of
 As mentioned, the third argument to @code{sub()} must
-be a variable, field or array element.
+be a variable, field, or array element.
 Some versions of @command{awk} allow the third argument to
 be an expression that is not an lvalue.  In such a case, @code{sub()}
 still searches for the pattern and returns zero or one, but the result of
@@ -17643,8 +17964,61 @@ Nonalphabetic characters are left unchanged.  For example,
 @code{toupper("MiXeD cAsE 123")} returns @code{"MIXED CASE 123"}.
 @end table
 
+@cindex sidebar, Matching the Null String
+@ifdocbook
+@docbook
+<sidebar><title>Matching the Null String</title>
+@end docbook
+
+@cindex matching, null strings
+@cindex null strings, matching
+@cindex @code{*} (asterisk), @code{*} operator, null strings@comma{} matching
+@cindex asterisk (@code{*}), @code{*} operator, null strings@comma{} matching
+
+In @command{awk}, the @samp{*} operator can match the null string.
+This is particularly important for the @code{sub()}, @code{gsub()},
+and @code{gensub()} functions.  For example:
+
+@example
+$ @kbd{echo abc | awk '@{ gsub(/m*/, "X"); print @}'}
+@print{} XaXbXcX
+@end example
+
+@noindent
+Although this makes a certain amount of sense, it can be surprising.
+
+@docbook
+</sidebar>
+@end docbook
+@end ifdocbook
+
+@ifnotdocbook
+@cartouche
+@center @b{Matching the Null String}
+
+
+@cindex matching, null strings
+@cindex null strings, matching
+@cindex @code{*} (asterisk), @code{*} operator, null strings@comma{} matching
+@cindex asterisk (@code{*}), @code{*} operator, null strings@comma{} matching
+
+In @command{awk}, the @samp{*} operator can match the null string.
+This is particularly important for the @code{sub()}, @code{gsub()},
+and @code{gensub()} functions.  For example:
+
+@example
+$ @kbd{echo abc | awk '@{ gsub(/m*/, "X"); print @}'}
+@print{} XaXbXcX
+@end example
+
+@noindent
+Although this makes a certain amount of sense, it can be surprising.
+@end cartouche
+@end ifnotdocbook
+
+
 @node Gory Details
-@subsubsection More About @samp{\} and @samp{&} with @code{sub()}, @code{gsub()}, and @code{gensub()}
+@subsubsection More about @samp{\} and @samp{&} with @code{sub()}, @code{gsub()}, and @code{gensub()}
 
 @cindex escape processing, @code{gsub()}/@code{gensub()}/@code{sub()} functions
 @cindex @code{sub()} function, escape processing
@@ -17656,7 +18030,7 @@ Nonalphabetic characters are left unchanged.  For example,
 @cindex ampersand (@code{&}), @code{gsub()}/@code{gensub()}/@code{sub()} functions and
 
 @quotation CAUTION
-This section has been known to cause headaches.
+This subsubsection has been reported to cause headaches.
 You might want to skip it upon first reading.
 @end quotation
 
@@ -17683,15 +18057,15 @@ example, @code{"a\qb"} is treated as @code{"aqb"}.
 
 At the runtime level, the various functions handle sequences of
 @samp{\} and @samp{&} differently.  The situation is (sadly) somewhat complex.
-Historically, the @code{sub()} and @code{gsub()} functions treated the two
-character sequence @samp{\&} specially; this sequence was replaced in
+Historically, the @code{sub()} and @code{gsub()} functions treated the
+two-character sequence @samp{\&} specially; this sequence was replaced in
 the generated text with a single @samp{&}.  Any other @samp{\} within
 the @var{replacement} string that did not precede an @samp{&} was passed
 through unchanged.  This is illustrated in @ref{table-sub-escapes}.
 
 @c Thank to Karl Berry for help with the TeX stuff.
 @float Table,table-sub-escapes
-@caption{Historical Escape Sequence Processing for @code{sub()} and @code{gsub()}}
+@caption{Historical escape sequence processing for @code{sub()} and @code{gsub()}}
 @tex
 \vbox{\bigskip
 % We need more characters for escape and tab ...
@@ -17742,7 +18116,7 @@ _bigskip}
 @end float
 
 @noindent
-This table shows both the lexical-level processing, where
+This table shows the lexical-level processing, where
 an odd number of backslashes becomes an even number at the runtime level,
 as well as the runtime processing done by @code{sub()}.
 (For the sake of simplicity, the rest of the following tables only show the
@@ -17763,7 +18137,7 @@ This is shown in
 @ref{table-sub-proposed}.
 
 @float Table,table-sub-proposed
-@caption{GNU @command{awk} Rules For @code{sub()} And Backslash}
+@caption{@command{gawk} rules for @code{sub()} and backslash}
 @tex
 \vbox{\bigskip
 % We need more characters for escape and tab ...
@@ -17808,7 +18182,7 @@ _bigskip}
 @end float
 
 In a nutshell, at the runtime level, there are now three special sequences
-of characters (@samp{\\\&}, @samp{\\&} and @samp{\&}) whereas historically
+of characters (@samp{\\\&}, @samp{\\&}, and @samp{\&}) whereas historically
 there was only one.  However, as in the historical case, any @samp{\} that
 is not part of one of these three sequences is not special and appears
 in the output literally.
@@ -17826,7 +18200,7 @@ by anything else is not special; the @samp{\} is placed straight into the output
 These rules are presented in @ref{table-posix-sub}.
 
 @float Table,table-posix-sub
-@caption{POSIX Rules For @code{sub()} And @code{gsub()}}
+@caption{POSIX rules for @code{sub()} and @code{gsub()}}
 @tex
 \vbox{\bigskip
 % We need more characters for escape and tab ...
@@ -17874,13 +18248,13 @@ The only case where the difference is noticeable is the last one: @samp{\\\\}
 is seen as @samp{\\} and produces @samp{\} instead of @samp{\\}.
 
 Starting with @value{PVERSION} 3.1.4, @command{gawk} followed the POSIX rules
-when @option{--posix} is specified (@pxref{Options}). Otherwise,
-it continued to follow the proposed rules, since
+when @option{--posix} was specified (@pxref{Options}). Otherwise,
+it continued to follow the proposed rules, as
 that had been its behavior for many years.
 
 When @value{PVERSION} 4.0.0 was released, the @command{gawk} maintainer
 made the POSIX rules the default, breaking well over a decade's worth
-of backwards compatibility.@footnote{This was rather naive of him, despite
+of backward compatibility.@footnote{This was rather naive of him, despite
 there being a note in this section indicating that the next major version
 would move to the POSIX rules.} Needless to say, this was a bad idea,
 and as of @value{PVERSION} 4.0.1, @command{gawk} resumed its historical
@@ -17895,7 +18269,7 @@ appears in the generated text and the @samp{\} does not,
 as shown in @ref{table-gensub-escapes}.
 
 @float Table,table-gensub-escapes
-@caption{Escape Sequence Processing For @code{gensub()}}
+@caption{Escape sequence processing for @code{gensub()}}
 @tex
 \vbox{\bigskip
 % We need more characters for escape and tab ...
@@ -17942,63 +18316,11 @@ _bigskip}
 @end ifnottex
 @end float
 
-Because of the complexity of the lexical and runtime level processing
+Because of the complexity of the lexical- and runtime-level processing
 and the special cases for @code{sub()} and @code{gsub()},
 we recommend the use of @command{gawk} and @code{gensub()} when you have
 to do substitutions.
 
-@cindex sidebar, Matching the Null String
-@ifdocbook
-@docbook
-<sidebar><title>Matching the Null String</title>
-@end docbook
-
-@cindex matching, null strings
-@cindex null strings, matching
-@cindex @code{*} (asterisk), @code{*} operator, null strings@comma{} matching
-@cindex asterisk (@code{*}), @code{*} operator, null strings@comma{} matching
-
-In @command{awk}, the @samp{*} operator can match the null string.
-This is particularly important for the @code{sub()}, @code{gsub()},
-and @code{gensub()} functions.  For example:
-
-@example
-$ @kbd{echo abc | awk '@{ gsub(/m*/, "X"); print @}'}
-@print{} XaXbXcX
-@end example
-
-@noindent
-Although this makes a certain amount of sense, it can be surprising.
-
-@docbook
-</sidebar>
-@end docbook
-@end ifdocbook
-
-@ifnotdocbook
-@cartouche
-@center @b{Matching the Null String}
-
-
-@cindex matching, null strings
-@cindex null strings, matching
-@cindex @code{*} (asterisk), @code{*} operator, null strings@comma{} matching
-@cindex asterisk (@code{*}), @code{*} operator, null strings@comma{} matching
-
-In @command{awk}, the @samp{*} operator can match the null string.
-This is particularly important for the @code{sub()}, @code{gsub()},
-and @code{gensub()} functions.  For example:
-
-@example
-$ @kbd{echo abc | awk '@{ gsub(/m*/, "X"); print @}'}
-@print{} XaXbXcX
-@end example
-
-@noindent
-Although this makes a certain amount of sense, it can be surprising.
-@end cartouche
-@end ifnotdocbook
-
 @node I/O Functions
 @subsection Input/Output Functions
 @cindex input/output functions
@@ -18014,12 +18336,13 @@ Optional parameters are enclosed in square brackets ([ ]):
 Close the file @var{filename} for input or output. Alternatively, the
 argument may be a shell command that was used for creating a coprocess, or
 for redirecting to or from a pipe; then the coprocess or pipe is closed.
-@xref{Close Files And Pipes},
+@DBXREF{Close Files And Pipes}
 for more information.
 
 When closing a coprocess, it is occasionally useful to first close
 one end of the two-way pipe and then to close the other.  This is done
 by providing a second argument to @code{close()}.  This second argument
+(@var{how})
 should be one of the two string values @code{"to"} or @code{"from"},
 indicating which end of the pipe to close.  Case in the string does
 not matter.
@@ -18038,26 +18361,25 @@ a pipe or coprocess.
 
 @cindex buffers, flushing
 @cindex output, buffering
-Many utility programs @dfn{buffer} their output; i.e., they save information
+Many utility programs @dfn{buffer} their output (i.e., they save information
 to write to a disk file or the screen in memory until there is enough
-for it to be worthwhile to send the data to the output device.
+for it to be worthwhile to send the data to the output device).
 This is often more efficient than writing
 every little bit of information as soon as it is ready.  However, sometimes
-it is necessary to force a program to @dfn{flush} its buffers; that is,
-write the information to its destination, even if a buffer is not full.
+it is necessary to force a program to @dfn{flush} its buffers (i.e.,
+write the information to its destination, even if a buffer is not full).
 This is the purpose of the @code{fflush()} function---@command{gawk} also
-buffers its output and the @code{fflush()} function forces
+buffers its output, and the @code{fflush()} function forces
 @command{gawk} to flush its buffers.
 
 @cindex extensions, common@comma{} @code{fflush()} function
 @cindex Brian Kernighan's @command{awk}
-@code{fflush()} was added to BWK @command{awk} in
-April of 1992.  For two decades, it was not part of the POSIX standard.
-As of December, 2012, it was accepted for inclusion into the POSIX
-standard.
+Brian Kernighan added @code{fflush()} to his @command{awk} in April
+1992.  For two decades, it was a common extension.  In December
+2012, it was accepted for inclusion into the POSIX standard.
 See @uref{http://austingroupbugs.net/view.php?id=634, the Austin Group website}.
 
-POSIX standardizes @code{fflush()} as follows: If there
+POSIX standardizes @code{fflush()} as follows: if there
 is no argument, or if the argument is the null string (@w{@code{""}}),
 then @command{awk} flushes the buffers for @emph{all} open output files
 and pipes.
@@ -18068,7 +18390,7 @@ would flush only the standard output if there was no argument,
 and flush all output files and pipes if the argument was the null
 string. This was changed in order to be compatible with Brian
 Kernighan's @command{awk}, in the hope that standardizing this
-feature in POSIX would then be easier (which indeed helped).
+feature in POSIX would then be easier (which indeed proved to be the case).
 
 With @command{gawk},
 you can use @samp{fflush("/dev/stdout")} if you wish to flush
@@ -18079,7 +18401,7 @@ only the standard output.
 @c @cindex warnings, automatic
 @cindex troubleshooting, @code{fflush()} function
 @code{fflush()} returns zero if the buffer is successfully flushed;
-otherwise, it returns non-zero. (@command{gawk} returns @minus{}1.)
+otherwise, it returns a nonzero value. (@command{gawk} returns @minus{}1.)
 In the case where all buffers are flushed, the return value is zero
 only if all buffers were flushed successfully.  Otherwise, it is
 @minus{}1, and @command{gawk} warns about the problem @var{filename}.
@@ -18089,53 +18411,6 @@ a file or pipe that was opened for reading (such as with @code{getline}),
 or if @var{filename} is not an open file, pipe, or coprocess.
 In such a case, @code{fflush()} returns @minus{}1, as well.
 
-@item @code{system(@var{command})}
-@cindexawkfunc{system}
-@cindex invoke shell command
-@cindex interacting with other programs
-Execute the operating-system
-command @var{command} and then return to the @command{awk} program.
-Return @var{command}'s exit status.
-
-For example, if the following fragment of code is put in your @command{awk}
-program:
-
-@example
-END @{
-     system("date | mail -s 'awk run done' root")
-@}
-@end example
-
-@noindent
-the system administrator is sent mail when the @command{awk} program
-finishes processing input and begins its end-of-input processing.
-
-Note that redirecting @code{print} or @code{printf} into a pipe is often
-enough to accomplish your task.  If you need to run many commands, it
-is more efficient to simply print them down a pipeline to the shell:
-
-@example
-while (@var{more stuff to do})
-    print @var{command} | "/bin/sh"
-close("/bin/sh")
-@end example
-
-@noindent
-@cindex troubleshooting, @code{system()} function
-@cindex @option{--sandbox} option, disabling @code{system()} function
-However, if your @command{awk}
-program is interactive, @code{system()} is useful for running large
-self-contained programs, such as a shell or an editor.
-Some operating systems cannot implement the @code{system()} function.
-@code{system()} causes a fatal error if it is not supported.
-
-@quotation NOTE
-When @option{--sandbox} is specified, the @code{system()} function is disabled
-(@pxref{Options}).
-@end quotation
-
-@end table
-
 @cindex sidebar, Interactive Versus Noninteractive Buffering
 @ifdocbook
 @docbook
@@ -18144,16 +18419,16 @@ When @option{--sandbox} is specified, the @code{system()} function is disabled
 
 @cindex buffering, interactive vs.@: noninteractive
 
-As a side point, buffering issues can be even more confusing, depending
-upon whether your program is @dfn{interactive}, i.e., communicating
-with a user sitting at a keyboard.@footnote{A program is interactive
+As a side point, buffering issues can be even more confusing if
+your program is @dfn{interactive} (i.e., communicating
+with a user sitting at a keyboard).@footnote{A program is interactive
 if the standard output is connected to a terminal device. On modern
 systems, this means your keyboard and screen.}
 
 @c Thanks to Walter.Mecky@dresdnerbank.de for this example, and for
 @c motivating me to write this section.
-Interactive programs generally @dfn{line buffer} their output; i.e., they
-write out every line.  Noninteractive programs wait until they have
+Interactive programs generally @dfn{line buffer} their output (i.e., they
+write out every line).  Noninteractive programs wait until they have
 a full buffer, which may be many lines of output.
 Here is an example of the difference:
 
@@ -18195,16 +18470,16 @@ it is all buffered and sent down the pipe to @command{cat} in one shot.
 
 @cindex buffering, interactive vs.@: noninteractive
 
-As a side point, buffering issues can be even more confusing, depending
-upon whether your program is @dfn{interactive}, i.e., communicating
-with a user sitting at a keyboard.@footnote{A program is interactive
+As a side point, buffering issues can be even more confusing if
+your program is @dfn{interactive} (i.e., communicating
+with a user sitting at a keyboard).@footnote{A program is interactive
 if the standard output is connected to a terminal device. On modern
 systems, this means your keyboard and screen.}
 
 @c Thanks to Walter.Mecky@dresdnerbank.de for this example, and for
 @c motivating me to write this section.
-Interactive programs generally @dfn{line buffer} their output; i.e., they
-write out every line.  Noninteractive programs wait until they have
+Interactive programs generally @dfn{line buffer} their output (i.e., they
+write out every line).  Noninteractive programs wait until they have
 a full buffer, which may be many lines of output.
 Here is an example of the difference:
 
@@ -18236,6 +18511,53 @@ it is all buffered and sent down the pipe to @command{cat} in one shot.
 @end cartouche
 @end ifnotdocbook
 
+@item @code{system(@var{command})}
+@cindexawkfunc{system}
+@cindex invoke shell command
+@cindex interacting with other programs
+Execute the operating system
+command @var{command} and then return to the @command{awk} program.
+Return @var{command}'s exit status.
+
+For example, if the following fragment of code is put in your @command{awk}
+program:
+
+@example
+END @{
+     system("date | mail -s 'awk run done' root")
+@}
+@end example
+
+@noindent
+the system administrator is sent mail when the @command{awk} program
+finishes processing input and begins its end-of-input processing.
+
+Note that redirecting @code{print} or @code{printf} into a pipe is often
+enough to accomplish your task.  If you need to run many commands, it
+is more efficient to simply print them down a pipeline to the shell:
+
+@example
+while (@var{more stuff to do})
+    print @var{command} | "/bin/sh"
+close("/bin/sh")
+@end example
+
+@noindent
+@cindex troubleshooting, @code{system()} function
+@cindex @option{--sandbox} option, disabling @code{system()} function
+However, if your @command{awk}
+program is interactive, @code{system()} is useful for running large
+self-contained programs, such as a shell or an editor.
+Some operating systems cannot implement the @code{system()} function.
+@code{system()} causes a fatal error if it is not supported.
+
+@quotation NOTE
+When @option{--sandbox} is specified, the @code{system()} function is disabled
+(@pxref{Options}).
+@end quotation
+
+@end table
+
 @cindex sidebar, Controlling Output Buffering with @code{system()}
 @ifdocbook
 @docbook
@@ -18259,7 +18581,7 @@ system("")   # flush output
 @command{gawk} treats this use of the @code{system()} function as a special
 case and is smart enough not to run a shell (or other command
 interpreter) with the empty command.  Therefore, with @command{gawk}, this
-idiom is not only useful, it is also efficient.  While this method should work
+idiom is not only useful, it is also efficient.  Although this method should work
 with other @command{awk} implementations, it does not necessarily avoid
 starting an unnecessary shell.  (Other implementations may only
 flush the buffer associated with the standard output and not necessarily
@@ -18324,7 +18646,7 @@ system("")   # flush output
 @command{gawk} treats this use of the @code{system()} function as a special
 case and is smart enough not to run a shell (or other command
 interpreter) with the empty command.  Therefore, with @command{gawk}, this
-idiom is not only useful, it is also efficient.  While this method should work
+idiom is not only useful, it is also efficient.  Although this method should work
 with other @command{awk} implementations, it does not necessarily avoid
 starting an unnecessary shell.  (Other implementations may only
 flush the buffer associated with the standard output and not necessarily
@@ -18368,18 +18690,14 @@ you would see the latter (undesirable) output.
 @subsection Time Functions
 @cindex time functions
 
-@c STARTOFRANGE tst
 @cindex timestamps
-@c STARTOFRANGE logftst
 @cindex log files, timestamps in
-@c STARTOFRANGE filogtst
 @cindex files, log@comma{} timestamps in
-@c STARTOFRANGE gawtst
 @cindex @command{gawk}, timestamps
 @cindex POSIX @command{awk}, timestamps and
-@code{awk} programs are commonly used to process log files
+@command{awk} programs are commonly used to process log files
 containing timestamp information, indicating when a
-particular log record was written.  Many programs log their timestamp
+particular log record was written.  Many programs log their timestamps
 in the form returned by the @code{time()} system call, which is the
 number of seconds since a particular epoch.  On POSIX-compliant systems,
 it is the number of seconds since
@@ -18406,6 +18724,7 @@ which is sufficient to represent times through
 2038-01-19 03:14:07 UTC.  Many systems support a wider range of timestamps,
 including negative timestamps that represent times before the
 epoch.
+@c FIXME: Use @sup here for superscript
 
 @cindex @command{date} utility, GNU
 @cindex time, retrieving
@@ -18440,7 +18759,7 @@ The values of these numbers need not be within the ranges specified;
 for example, an hour of @minus{}1 means 1 hour before midnight.
 The origin-zero Gregorian calendar is assumed, with year 0 preceding
 year 1 and year @minus{}1 preceding year 0.
-The time is assumed to be in the local timezone.
+The time is assumed to be in the local time zone.
 If the daylight-savings flag is positive, the time is assumed to be
 daylight savings time; if zero, the time is assumed to be standard
 time; and if negative (the default), @code{mktime()} attempts to determine
@@ -18451,8 +18770,7 @@ is out of range, @code{mktime()} returns @minus{}1.
 
 @cindex @command{gawk}, @code{PROCINFO} array in
 @cindex @code{PROCINFO} array
-@item @code{strftime(} [@var{format} [@code{,} @var{timestamp} [@code{,} @var{utc-flag}] ] ]@code{)}
-@c STARTOFRANGE strf
+@item @code{strftime(}[@var{format} [@code{,} @var{timestamp} [@code{,} @var{utc-flag}] ] ]@code{)}
 @cindexgawkfunc{strftime}
 @cindex format time string
 Format the time specified by @var{timestamp}
@@ -18464,14 +18782,14 @@ Mean Time). Otherwise, the value is formatted for the local time zone.
 The @var{timestamp} is in the same format as the value returned by the
 @code{systime()} function.  If no @var{timestamp} argument is supplied,
 @command{gawk} uses the current time of day as the timestamp.
-If no @var{format} argument is supplied, @code{strftime()} uses
+Without a @var{format} argument, @code{strftime()} uses
 the value of @code{PROCINFO["strftime"]} as the format string
 (@pxref{Built-in Variables}).
 The default string value is
 @code{@w{"%a %b %e %H:%M:%S %Z %Y"}}.  This format string produces
 output that is equivalent to that of the @command{date} utility.
 You can assign a new value to @code{PROCINFO["strftime"]} to
-change the default format; see below for the various format directives.
+change the default format; see the following list for the various format directives.
 
 @item @code{systime()}
 @cindexgawkfunc{systime}
@@ -18548,9 +18866,9 @@ This is the ISO 8601 date format.
 
 @item %g
 The year modulo 100 of the ISO 8601 week number, as a decimal number (00--99).
-For example, January 1, 2012 is in week 53 of 2011. Thus, the year
+For example, January 1, 2012, is in week 53 of 2011. Thus, the year
 of its ISO 8601 week number is 2011, even though its year is 2012.
-Similarly, December 31, 2012 is in week 1 of 2013. Thus, the year
+Similarly, December 31, 2012, is in week 1 of 2013. Thus, the year
 of its ISO week number is 2013, even though its year is 2012.
 
 @item %G
@@ -18601,12 +18919,12 @@ Equivalent to specifying @samp{%H:%M:%S}.
 The weekday as a decimal number (1--7).  Monday is day one.
 
 @item %U
-The week number of the year (the first Sunday as the first day of week one)
+The week number of the year (with the first Sunday as the first day of week one)
 as a decimal number (00--53).
 
 @c @cindex ISO 8601
 @item %V
-The week number of the year (the first Monday as the first
+The week number of the year (with the first Monday as the first
 day of week one) as a decimal number (01--53).
 The method for determining the week number is as specified by ISO 8601.
 (To wit: if the week containing January 1 has four or more days in the
@@ -18617,7 +18935,7 @@ and the next week is week one.)
 The weekday as a decimal number (0--6).  Sunday is day zero.
 
 @item %W
-The week number of the year (the first Monday as the first day of week one)
+The week number of the year (with the first Monday as the first day of week one)
 as a decimal number (00--53).
 
 @item %x
@@ -18637,8 +18955,8 @@ The full year as a decimal number (e.g., 2015).
 @c @cindex RFC 822
 @c @cindex RFC 1036
 @item %z
-The timezone offset in a +HHMM format (e.g., the format necessary to
-produce RFC 822/RFC 1036 date headers).
+The time zone offset in a @samp{+@var{HHMM}} format (e.g., the format
+necessary to produce RFC 822/RFC 1036 date headers).
 
 @item %Z
 The time zone name or abbreviation; no characters if
@@ -18646,7 +18964,7 @@ no time zone is determinable.
 
 @item %Ec %EC %Ex %EX %Ey %EY %Od %Oe %OH
 @itemx %OI %Om %OM %OS %Ou %OU %OV %Ow %OW %Oy
-``Alternate representations'' for the specifications
+``Alternative representations'' for the specifications
 that use only the second letter (@samp{%c}, @samp{%C},
 and so on).@footnote{If you don't understand any of this, don't worry about
 it; these facilities are meant to make it easier to ``internationalize''
@@ -18659,7 +18977,7 @@ Other internationalization features are described in
 A literal @samp{%}.
 @end table
 
-If a conversion specifier is not one of the above, the behavior is
+If a conversion specifier is not one of those just listed, the behavior is
 undefined.@footnote{This is because ISO C leaves the
 behavior of the C version of @code{strftime()} undefined and @command{gawk}
 uses the system's version of @code{strftime()} if it's there.
@@ -18686,11 +19004,11 @@ Single-digit numbers are padded with a space.
 @ignore
 @item %N
 The ``Emperor/Era'' name.
-Equivalent to @code{%C}.
+Equivalent to @samp{%C}.
 
 @item %o
 The ``Emperor/Era'' year.
-Equivalent to @code{%y}.
+Equivalent to @samp{%y}.
 @end ignore
 
 @item %s
@@ -18701,9 +19019,8 @@ The time as a decimal timestamp in seconds since the epoch.
 The date in VMS format (e.g., @samp{20-JUN-1991}).
 @end ignore
 @end table
-@c ENDOFRANGE strf
 
-Additionally, the alternate representations are recognized but their
+Additionally, the alternative representations are recognized but their
 normal representations are used.
 
 @cindex @code{date} utility, POSIX
@@ -18717,8 +19034,8 @@ interprets the current time according to the format specifiers in
 the string.  For example:
 
 @example
-$ date '+Today is %A, %B %d, %Y.'
-@print{} Today is Monday, May 05, 2014.
+$ @kbd{date '+Today is %A, %B %d, %Y.'}
+@print{} Today is Monday, September 22, 2014.
 @end example
 
 Here is the @command{gawk} version of the @command{date} utility.
@@ -18752,23 +19069,14 @@ gawk 'BEGIN  @{
     exit exitval
 @}' "$@@"
 @end example
-@c ENDOFRANGE tst
-@c ENDOFRANGE logftst
-@c ENDOFRANGE filogtst
-@c ENDOFRANGE gawtst
 
 @node Bitwise Functions
 @subsection Bit-Manipulation Functions
 @cindex bit-manipulation functions
-@c STARTOFRANGE bit
 @cindex bitwise, operations
-@c STARTOFRANGE and
 @cindex AND bitwise operation
-@c STARTOFRANGE oro
 @cindex OR bitwise operation
-@c STARTOFRANGE xor
 @cindex XOR bitwise operation
-@c STARTOFRANGE opbit
 @cindex operations, bitwise
 @quotation
 @i{I can explain it for you, but I can't understand it for you.}
@@ -18781,12 +19089,14 @@ each successive pair of bits in the operands.
 Three common operations are bitwise AND, OR, and XOR.
 The operations are described in @ref{table-bitwise-ops}.
 
+@c 11/2014: Postprocessing turns the docbook informaltable
+@c into a table. Hurray for scripting!
 @float Table,table-bitwise-ops
-@caption{Bitwise Operations}
+@caption{Bitwise operations}
 @ifnottex
 @ifnotdocbook
 @display
-                Bit Operator
+                Bit operator
           |  AND  |   OR  |  XOR
           |---+---+---+---+---+---
 Operands  | 0 | 1 | 0 | 1 | 0 | 1
@@ -18844,7 +19154,7 @@ Operands  | 0 | 1 | 0 | 1 | 0 | 1
 <tbody>
 <row>
 <entry colsep="0"></entry>
-<entry spanname="optitle"><emphasis role="bold">Bit Operator</emphasis></entry>
+<entry spanname="optitle"><emphasis role="bold">Bit operator</emphasis></entry>
 </row>
 
 <row rowsep="1">
@@ -18908,21 +19218,19 @@ of a given value.
 Finally, two other common operations are to shift the bits left or right.
 For example, if you have a bit string @samp{10111001} and you shift it
 right by three bits, you end up with @samp{00010111}.@footnote{This example
-shows that 0's come in on the left side. For @command{gawk}, this is
+shows that zeros come in on the left side. For @command{gawk}, this is
 always true, but in some languages, it's possible to have the left side
-fill with 1's. Caveat emptor.}
-@c Purposely decided to use   0's   and   1's   here.  2/2001.
-If you start over
-again with @samp{10111001} and shift it left by three bits, you end up
-with @samp{11001000}.
-@command{gawk} provides built-in functions that implement the
-bitwise operations just described. They are:
+fill with ones.}
+If you start over again with @samp{10111001} and shift it left by three
+bits, you end up with @samp{11001000}.  The following list describes
+@command{gawk}'s built-in functions that implement the bitwise operations.
+Optional parameters are enclosed in square brackets ([ ]):
 
 @cindex @command{gawk}, bitwise operations in
 @table @code
 @cindexgawkfunc{and}
 @cindex bitwise AND
-@item @code{and(@var{v1}, @var{v2}} [@code{,} @dots{}]@code{)}
+@item @code{and(}@var{v1}@code{,} @var{v2} [@code{,} @dots{}]@code{)}
 Return the bitwise AND of the arguments. There must be at least two.
 
 @cindexgawkfunc{compl}
@@ -18937,7 +19245,7 @@ Return the value of @var{val}, shifted left by @var{count} bits.
 
 @cindexgawkfunc{or}
 @cindex bitwise OR
-@item @code{or(@var{v1}, @var{v2}} [@code{,} @dots{}]@code{)}
+@item @code{or(}@var{v1}@code{,} @var{v2} [@code{,} @dots{}]@code{)}
 Return the bitwise OR of the arguments. There must be at least two.
 
 @cindexgawkfunc{rshift}
@@ -18947,11 +19255,11 @@ Return the value of @var{val}, shifted right by @var{count} bits.
 
 @cindexgawkfunc{xor}
 @cindex bitwise XOR
-@item @code{xor(@var{v1}, @var{v2}} [@code{,} @dots{}]@code{)}
+@item @code{xor(}@var{v1}@code{,} @var{v2} [@code{,} @dots{}]@code{)}
 Return the bitwise XOR of the arguments. There must be at least two.
 @end table
 
-For all of these functions, first the double precision floating-point value is
+For all of these functions, first the double-precision floating-point value is
 converted to the widest C unsigned integer type, then the bitwise operation is
 performed.  If the result cannot be represented exactly as a C @code{double},
 leading nonzero bits are removed one by one until it can be represented
@@ -18966,7 +19274,7 @@ that illustrates the use of these functions:
 @example
 @group
 @c file eg/lib/bits2str.awk
-# bits2str --- turn a byte into readable 1's and 0's
+# bits2str --- turn a byte into readable ones and zeros
 
 function bits2str(bits,        data, mask)
 @{
@@ -19040,17 +19348,18 @@ $ @kbd{gawk -f testbits.awk}
 @cindex converting, numbers to strings
 @cindex number as string of bits
 The @code{bits2str()} function turns a binary number into a string.
-The number @code{1} represents a binary value where the rightmost bit
-is set to 1.  Using this mask,
+Initializing @code{mask} to one creates
+a binary value where the rightmost bit
+is set to one.  Using this mask,
 the function repeatedly checks the rightmost bit.
 ANDing the mask with the value indicates whether the
-rightmost bit is 1 or not. If so, a @code{"1"} is concatenated onto the front
+rightmost bit is one or not. If so, a @code{"1"} is concatenated onto the front
 of the string.
 Otherwise, a @code{"0"} is added.
 The value is then shifted right by one bit and the loop continues
-until there are no more 1 bits.
+until there are no more one bits.
 
-If the initial value is zero it returns a simple @code{"0"}.
+If the initial value is zero, it returns a simple @code{"0"}.
 Otherwise, at the end, it pads the value with zeros to represent multiples
 of 8-bit quantities. This is typical in modern computers.
 
@@ -19059,25 +19368,20 @@ decimal and octal values for the same numbers
 (@pxref{Nondecimal-numbers}),
 and then demonstrates the
 results of the @code{compl()}, @code{lshift()}, and @code{rshift()} functions.
-@c ENDOFRANGE bit
-@c ENDOFRANGE and
-@c ENDOFRANGE oro
-@c ENDOFRANGE xor
-@c ENDOFRANGE opbit
 
 @node Type Functions
 @subsection Getting Type Information
 
 @command{gawk} provides a single function that lets you distinguish
 an array from a scalar variable.  This is necessary for writing code
-that traverses every element of an array of arrays.
+that traverses every element of an array of arrays
 (@pxref{Arrays of Arrays}).
 
 @table @code
 @cindexgawkfunc{isarray}
 @cindex scalar or array
 @item isarray(@var{x})
-Return a true value if @var{x} is an array. Otherwise return false.
+Return a true value if @var{x} is an array. Otherwise, return false.
 @end table
 
 @code{isarray()} is meant for use in two circumstances. The first is when
@@ -19086,12 +19390,14 @@ an array or not.  The second is inside the body of a user-defined function
 (not discussed yet; @pxref{User-defined}), to test if a parameter is an
 array or not.
 
-Note, however, that using @code{isarray()} at the global level to test 
-variables makes no sense. Since you are the one writing the program, you
+@quotation NOTE
+Using @code{isarray()} at the global level to test
+variables makes no sense. Because you are the one writing the program, you
 are supposed to know if your variables are arrays or not. And in fact,
 due to the way @command{gawk} works, if you pass the name of a variable
 that has not been previously used to @code{isarray()}, @command{gawk}
-will end up turning it into a scalar.
+ends up turning it into a scalar.
+@end quotation
 
 @node I18N Functions
 @subsection String-Translation Functions
@@ -19136,25 +19442,21 @@ The default value for @var{category} is @code{"LC_MESSAGES"}.
 Return the plural form used for @var{number} of the
 translation of @var{string1} and @var{string2} in text domain
 @var{domain} for locale category @var{category}. @var{string1} is the
-English singular variant of a message, and @var{string2} the English plural
+English singular variant of a message, and @var{string2} is the English plural
 variant of the same message.
 The default value for @var{domain} is the current value of @code{TEXTDOMAIN}.
 The default value for @var{category} is @code{"LC_MESSAGES"}.
 @end table
-@c ENDOFRANGE funcbi
-@c ENDOFRANGE bifunc
 
 @node User-defined
 @section User-Defined Functions
 
-@c STARTOFRANGE udfunc
 @cindex user-defined functions
-@c STARTOFRANGE funcud
 @cindex functions, user-defined
 Complicated @command{awk} programs can often be simplified by defining
 your own functions.  User-defined functions can be called just like
 built-in ones (@pxref{Function Calls}), but it is up to you to define
-them, i.e., to tell @command{awk} what they should do.
+them (i.e., to tell @command{awk} what they should do).
 
 @menu
 * Definition Syntax::           How to write definitions and what they mean.
@@ -19169,12 +19471,11 @@ them, i.e., to tell @command{awk} what they should do.
 @subsection Function Definition Syntax
 
 @quotation
-@i{It's entirely fair to say that the @command{awk} syntax for local
+@i{It's entirely fair to say that the awk syntax for local
 variable definitions is appallingly awful.}
 @author Brian Kernighan
 @end quotation
 
-@c STARTOFRANGE fdef
 @cindex functions, defining
 Definitions of functions can appear anywhere between the rules of an
 @command{awk} program.  Thus, the general form of an @command{awk} program is
@@ -19212,14 +19513,23 @@ the call.
 
 A function cannot have two parameters with the same name, nor may it
 have a parameter with the same name as the function itself.
-In addition, according to the POSIX standard, function parameters
-cannot have the same name as one of the special built-in variables
-(@pxref{Built-in Variables}).  Not all versions of @command{awk} enforce
-this restriction.
+
+@quotation CAUTION
+According to the POSIX standard, function parameters
+cannot have the same name as one of the special predefined variables
+(@pxref{Built-in Variables}), nor may a function parameter have the
+same name as another function.
+
+Not all versions of @command{awk} enforce
+these restrictions.
+@command{gawk} always enforces the first restriction.
+With @option{--posix} (@pxref{Options}),
+it also enforces the second restriction.
+@end quotation
 
 Local variables act like the empty string if referenced where a string
 value is required, and like zero if referenced where a numeric value
-is required. This is the same as regular variables that have never been
+is required. This is the same as the behavior of regular variables that have never been
 assigned a value.  (There is more to understand about local variables;
 @pxref{Dynamic Typing}.)
 
@@ -19253,7 +19563,7 @@ During execution of the function body, the arguments and local variable
 values hide, or @dfn{shadow}, any variables of the same names used in the
 rest of the program.  The shadowed variables are not accessible in the
 function definition, because there is no way to name them while their
-names have been taken away for the local variables.  All other variables
+names have been taken away for the arguments and local variables.  All other variables
 used in the @command{awk} program can be referenced or set normally in the
 function's body.
 
@@ -19293,13 +19603,13 @@ func foo() @{ a = sqrt($1) ; print a @}
 @end example
 
 @noindent
-Instead it defines a rule that, for each record, concatenates the value
+Instead, it defines a rule that, for each record, concatenates the value
 of the variable @samp{func} with the return value of the function @samp{foo}.
 If the resulting string is non-null, the action is executed.
 This is probably not what is desired.  (@command{awk} accepts this input as
 syntactically valid, because functions may be used before they are defined
 in @command{awk} programs.@footnote{This program won't actually run,
-since @code{foo()} is undefined.})
+because @code{foo()} is undefined.})
 
 @cindex portability, functions@comma{} defining
 To ensure that your @command{awk} programs are portable, always use the
@@ -19320,7 +19630,7 @@ function myprint(num)
 @end example
 
 @noindent
-To illustrate, here is an @command{awk} rule that uses our @code{myprint}
+To illustrate, here is an @command{awk} rule that uses our @code{myprint()}
 function:
 
 @example
@@ -19352,7 +19662,7 @@ extra whitespace signifies the start of the local variable list):
 function delarray(a,    i)
 @{
     for (i in a)
-       delete a[i]
+        delete a[i]
 @}
 @end example
 
@@ -19361,16 +19671,16 @@ in an array and start over with a new list of elements
 (@pxref{Delete}).
 Instead of having
 to repeat this loop everywhere that you need to clear out
-an array, your program can just call @code{delarray}.
+an array, your program can just call @code{delarray()}.
 (This guarantees portability.  The use of @samp{delete @var{array}} to delete
-the contents of an entire array is a recent@footnote{Late in 2012.}
+the contents of an entire array is a relatively recent@footnote{Late in 2012.}
 addition to the POSIX standard.)
 
 The following is an example of a recursive function.  It takes a string
-as an input parameter and returns the string in backwards order.
+as an input parameter and returns the string in reverse order.
 Recursive functions must always have a test that stops the recursion.
 In this case, the recursion terminates when the input string is
-already empty.
+already empty:
 
 @c 8/2014: Thanks to Mike Brennan for the improved formulation
 @cindex @code{rev()} user-defined function
@@ -19393,7 +19703,7 @@ $ @kbd{echo "Don't Panic!" |}
 @print{} !cinaP t'noD
 @end example
 
-The C @code{ctime()} function takes a timestamp and returns it in a string,
+The C @code{ctime()} function takes a timestamp and returns it as a string,
 formatted in a well-known fashion.
 The following example uses the built-in @code{strftime()} function
 (@pxref{Time Functions})
@@ -19408,19 +19718,23 @@ to create an @command{awk} version of @code{ctime()}:
 
 function ctime(ts,    format)
 @{
-    format = PROCINFO["strftime"]
+    format = "%a %b %e %H:%M:%S %Z %Y"
+
     if (ts == 0)
         ts = systime()       # use current time as default
     return strftime(format, ts)
 @}
 @c endfile
 @end example
-@c ENDOFRANGE fdef
+
+You might think that @code{ctime()} could use @code{PROCINFO["strftime"]}
+for its format string. That would be a mistake, because @code{ctime()} is
+supposed to return the time formatted in a standard fashion, and user-level
+code could have changed @code{PROCINFO["strftime"]}.
 
 @node Function Caveats
 @subsection Calling User-Defined Functions
 
-@c STARTOFRANGE fudc
 @cindex functions, user-defined, calling
 @dfn{Calling a function} means causing the function to run and do its job.
 A function call is an expression and its value is the value returned by
@@ -19433,7 +19747,7 @@ the function.
 @end menu
 
 @node Calling A Function
-@subsubsection Writing A Function Call
+@subsubsection Writing a Function Call
 
 A function call consists of the function name followed by the arguments
 in parentheses.  @command{awk} expressions are what you write in the
@@ -19448,7 +19762,7 @@ foo(x y, "lose", 4 * z)
 
 @quotation CAUTION
 Whitespace characters (spaces and TABs) are not allowed
-between the function name and the open-parenthesis of the argument list.
+between the function name and the opening parenthesis of the argument list.
 If you write whitespace by mistake, @command{awk} might think that you mean
 to concatenate a variable with an expression in parentheses.  However, it
 notices that you used a function name and not a variable name, and reports
@@ -19460,7 +19774,7 @@ an error.
 
 @cindex local variables, in a function
 @cindex variables, local to a function
-Unlike many languages,
+Unlike in many languages,
 there is no way to make a variable local to a @code{@{} @dots{} @code{@}} block in
 @command{awk}, but you can make a variable local to a function. It is
 good practice to do so whenever a variable is needed only in that
@@ -19469,7 +19783,7 @@ function.
 To make a variable local to a function, simply declare the variable as
 an argument after the actual function arguments
 (@pxref{Definition Syntax}).
-Look at the following example where variable
+Look at the following example, where variable
 @code{i} is a global variable used by both functions @code{foo()} and
 @code{bar()}:
 
@@ -19488,7 +19802,7 @@ function foo(j)
     print "foo's i=" i
 @}
 
-BEGIN @{ 
+BEGIN @{
       i = 10
       print "top's i=" i
       foo(0)
@@ -19510,14 +19824,14 @@ foo's i=3
 top's i=3
 @end example
 
-If you want @code{i} to be local to both @code{foo()} and @code{bar()} do as
-follows (the extra-space before @code{i} is a coding convention to
+If you want @code{i} to be local to both @code{foo()} and @code{bar()}, do as
+follows (the extra space before @code{i} is a coding convention to
 indicate that @code{i} is a local variable, not an argument):
 
 @example
 function bar(    i)
 @{
-    for (i = 0; i < 3; i++) 
+    for (i = 0; i < 3; i++)
         print "bar's i=" i
 @}
 
@@ -19529,10 +19843,10 @@ function foo(j,    i)
     print "foo's i=" i
 @}
 
-BEGIN @{ 
+BEGIN @{
       i = 10
       print "top's i=" i
-      foo(0) 
+      foo(0)
       print "top's i=" i
 @}
 @end example
@@ -19591,21 +19905,16 @@ At level 2, index 2 is found in a
 @end example
 
 @node Pass By Value/Reference
-@subsubsection Passing Function Arguments By Value Or By Reference
+@subsubsection Passing Function Arguments by Value Or by Reference
 
 In @command{awk}, when you declare a function, there is no way to
 declare explicitly whether the arguments are passed @dfn{by value} or
 @dfn{by reference}.
 
-Instead the passing convention is determined at runtime when
-the function is called according to the following rule:
-
-@itemize
-@item
-If the argument is an array variable, then it is passed by reference,
-@item
-Otherwise the argument is passed by value.
-@end itemize
+Instead, the passing convention is determined at runtime when
+the function is called, according to the following rule:
+if the argument is an array variable, then it is passed by reference.
+Otherwise, the argument is passed by value.
 
 @cindex call by value
 Passing an argument by value means that when a function is called, it
@@ -19680,7 +19989,7 @@ prints @samp{a[1] = 1, a[2] = two, a[3] = 3}, because
 @cindex undefined functions
 @cindex functions, undefined
 Some @command{awk} implementations allow you to call a function that
-has not been defined. They only report a problem at runtime when the
+has not been defined. They only report a problem at runtime, when the
 program actually tries to call the function. For example:
 
 @example
@@ -19708,10 +20017,15 @@ If @option{--lint} is specified
 Some @command{awk} implementations generate a runtime
 error if you use either the @code{next} statement
 or the @code{nextfile} statement
-(@pxref{Next Statement}, also @pxref{Nextfile Statement})
+(@pxref{Next Statement}, and
+@ifdocbook
+@ref{Nextfile Statement})
+@end ifdocbook
+@ifnotdocbook
+@pxref{Nextfile Statement})
+@end ifnotdocbook
 inside a user-defined function.
 @command{gawk} does not have this limitation.
-@c ENDOFRANGE fudc
 
 @node Return Statement
 @subsection The @code{return} Statement
@@ -19734,15 +20048,15 @@ makes the returned value undefined, and therefore, unpredictable.
 In practice, though, all versions of @command{awk} simply return the
 null string, which acts like zero if used in a numeric context.
 
-A @code{return} statement with no value expression is assumed at the end of
-every function definition.  So if control reaches the end of the function
-body, then technically, the function returns an unpredictable value.
+A @code{return} statement without an @var{expression} is assumed at the end of
+every function definition.  So, if control reaches the end of the function
+body, then technically the function returns an unpredictable value.
 In practice, it returns the empty string.  @command{awk}
 does @emph{not} warn you if you use the return value of such a function.
 
 Sometimes, you want to write a function for what it does, not for
 what it returns.  Such a function corresponds to a @code{void} function
-in C, C++ or Java, or to a @code{procedure} in Ada.  Thus, it may be appropriate to not
+in C, C++, or Java, or to a @code{procedure} in Ada.  Thus, it may be appropriate to not
 return any value; simply bear in mind that you should not be using the
 return value of such a function.
 
@@ -19764,8 +20078,8 @@ function maxelt(vec,   i, ret)
 @noindent
 You call @code{maxelt()} with one argument, which is an array name.  The local
 variables @code{i} and @code{ret} are not intended to be arguments;
-while there is nothing to stop you from passing more than one argument
-to @code{maxelt()}, the results would be strange.  The extra space before
+there is nothing to stop you from passing more than one argument
+to @code{maxelt()} but the results would be strange.  The extra space before
 @code{i} in the function parameter list indicates that @code{i} and
 @code{ret} are local variables.
 You should follow this convention when defining functions.
@@ -19839,7 +20153,6 @@ does report the second error.
 
 Usually, such things aren't a big issue, but it's worth
 being aware of them.
-@c ENDOFRANGE udfunc
 
 @node Indirect Calls
 @section Indirect Function Calls
@@ -19862,13 +20175,15 @@ function calls, you can specify the name of the function to call as a
 string variable, and then call the function.  Let's look at an example.
 
 Suppose you have a file with your test scores for the classes you
-are taking.  The first field is the class name. The following fields
+are taking, and
+you wish to get the sum and the average of
+your test scores.
+The first field is the class name. The following fields
 are the functions to call to process the data, up to a ``marker''
 field @samp{data:}.  Following the marker, to the end of the record,
 are the various numeric test scores.
 
-Here is the initial file; you wish to get the sum and the average of
-your test scores:
+Here is the initial file:
 
 @example
 @c file eg/data/class_data1
@@ -19902,8 +20217,8 @@ variable as the @emph{name} of the function to call.
 @cindex indirect function calls, @code{@@}-notation
 @cindex function calls, indirect, @code{@@}-notation for
 The syntax is similar to that of a regular function call: an identifier
-immediately followed by a left parenthesis, any arguments, and then
-a closing right parenthesis, with the addition of a leading @samp{@@}
+immediately followed by an opening parenthesis, any arguments, and then
+a closing parenthesis, with the addition of a leading @samp{@@}
 character:
 
 @example
@@ -19912,7 +20227,7 @@ result = @@the_func()   # calls the sum() function
 @end example
 
 Here is a full program that processes the previously shown data,
-using indirect function calls.
+using indirect function calls:
 
 @example
 @c file eg/prog/indirectcall.awk
@@ -19951,9 +20266,9 @@ function sum(first, last,   ret, i)
 @c endfile
 @end example
 
-These two functions expect to work on fields; thus the parameters
+These two functions expect to work on fields; thus, the parameters
 @code{first} and @code{last} indicate where in the fields to start and end.
-Otherwise they perform the expected computations and are not unusual.
+Otherwise, they perform the expected computations and are not unusual:
 
 @example
 @c file eg/prog/indirectcall.awk
@@ -19998,11 +20313,11 @@ $ @kbd{gawk -f indirectcall.awk class_data1}
 @print{} Biology 101:
 @print{}     sum: <352.8>
 @print{}     average: <88.2>
-@print{} 
+@print{}
 @print{} Chemistry 305:
 @print{}     sum: <356.4>
 @print{}     average: <89.1>
-@print{} 
+@print{}
 @print{} English 401:
 @print{}     sum: <376.1>
 @print{}     average: <94.025>
@@ -20012,8 +20327,8 @@ The ability to use indirect function calls is more powerful than you may
 think at first.  The C and C++ languages provide ``function pointers,'' which
 are a mechanism for calling a function chosen at runtime.  One of the most
 well-known uses of this ability is the C @code{qsort()} function, which sorts
-an array using the famous ``quick sort'' algorithm
-(see @uref{http://en.wikipedia.org/wiki/Quick_sort, the Wikipedia article}
+an array using the famous ``quicksort'' algorithm
+(see @uref{http://en.wikipedia.org/wiki/Quicksort, the Wikipedia article}
 for more information).  To use this function, you supply a pointer to a comparison
 function.  This mechanism allows you to sort arbitrary data in an arbitrary
 fashion.
@@ -20032,11 +20347,11 @@ We can do something similar using @command{gawk}, like this:
 # January 2009
 
 @c endfile
-
 @end ignore
 @c file eg/lib/quicksort.awk
-# quicksort --- C.A.R. Hoare's quick sort algorithm. See Wikipedia
-#               or almost any algorithms or computer science text
+
+# quicksort --- C.A.R. Hoare's quicksort algorithm. See Wikipedia
+#               or almost any algorithms or computer science text.
 @c endfile
 @ignore
 @c file eg/lib/quicksort.awk
@@ -20063,7 +20378,7 @@ function quicksort(data, left, right, less_than,    i, last)
 
 # quicksort_swap --- helper function for quicksort, should really be inline
 
-function quicksort_swap(data, i, j, temp)
+function quicksort_swap(data, i, j,      temp)
 @{
     temp = data[i]
     data[i] = data[j]
@@ -20074,7 +20389,7 @@ function quicksort_swap(data, i, j, temp)
 
 The @code{quicksort()} function receives the @code{data} array, the starting and ending
 indices to sort (@code{left} and @code{right}), and the name of a function that
-performs a ``less than'' comparison.  It then implements the quick sort algorithm.
+performs a ``less than'' comparison.  It then implements the quicksort algorithm.
 
 To make use of the sorting function, we return to our previous example. The
 first thing to do is write some comparison functions:
@@ -20124,7 +20439,7 @@ function do_sort(first, last, compare,      data, i, retval)
     retval = data[1]
     for (i = 2; i in data; i++)
         retval = retval " " data[i]
-    
+
     return retval
 @}
 @c endfile
@@ -20170,13 +20485,13 @@ $ @kbd{gawk -f quicksort.awk -f indirectcall.awk class_data2}
 @print{}     average: <88.2>
 @print{}     sort: <78.5 87.0 92.4 94.9>
 @print{}     rsort: <94.9 92.4 87.0 78.5>
-@print{} 
+@print{}
 @print{} Chemistry 305:
 @print{}     sum: <356.4>
 @print{}     average: <89.1>
 @print{}     sort: <75.2 88.2 94.7 98.3>
 @print{}     rsort: <98.3 94.7 88.2 75.2>
-@print{} 
+@print{}
 @print{} English 401:
 @print{}     sum: <376.1>
 @print{}     average: <94.025>
@@ -20184,14 +20499,30 @@ $ @kbd{gawk -f quicksort.awk -f indirectcall.awk class_data2}
 @print{}     rsort: <100.0 95.6 93.4 87.1>
 @end example
 
+Another example where indirect functions calls are useful can be found in
+processing arrays. This is described in @ref{Walking Arrays}.
+
 Remember that you must supply a leading @samp{@@} in front of an indirect function call.
 
 Starting with @value{PVERSION} 4.1.2 of @command{gawk}, indirect function
 calls may also be used with built-in functions and with extension functions
-(@pxref{Dynamic Extensions}).  The only thing you cannot do is pass a regular
-expression constant to a built-in function through an indirect function
-call.@footnote{This may change in a future version; recheck the documentation that
-comes with your version of @command{gawk} to see if it has.}
+(@pxref{Dynamic Extensions}). There are some limitations when calling
+built-in functions indirectly, as follows.
+
+@itemize @value{BULLET}
+@item
+You cannot pass a regular expression constant to a built-in function
+through an indirect function call.@footnote{This may change in a future
+version; recheck the documentation that comes with your version of
+@command{gawk} to see if it has.} This applies to the @code{sub()},
+@code{gsub()}, @code{gensub()}, @code{match()}, @code{split()} and
+@code{patsplit()} functions.
+
+@item
+If calling @code{sub()} or @code{gsub()}, you may only pass two arguments,
+since those functions are unusual in that they update their third argument.
+This means that @code{$0} will be updated.
+@end itemize
 
 @command{gawk} does its best to make indirect function calls efficient.
 For example, in the following case:
@@ -20202,7 +20533,7 @@ for (i = 1; i <= n; i++)
 @end example
 
 @noindent
-@code{gawk} looks up the actual function to call only once.
+@command{gawk} looks up the actual function to call only once.
 
 @node Functions Summary
 @section Summary
@@ -20214,10 +20545,11 @@ functions.
 
 @item
 POSIX @command{awk} provides three kinds of built-in functions: numeric,
-string, and I/O.  @command{gawk} provides functions that work with values
-representing time, do bit manipulation, sort arrays, and internationalize
-and localize programs.  @command{gawk} also provides several extensions to
-some of standard functions, typically in the form of additional arguments.
+string, and I/O.  @command{gawk} provides functions that sort arrays, work
+with values representing time, do bit manipulation, determine variable
+type (array versus scalar), and internationalize and localize programs.
+@command{gawk} also provides several extensions to some of standard
+functions, typically in the form of additional arguments.
 
 @item
 Functions accept zero or more arguments and return a value.  The
@@ -20268,10 +20600,9 @@ program. This is equivalent to function pointers in C and C++.
 
 @end itemize
 
-@c ENDOFRANGE funcud
 
 @ifnotinfo
-@part @value{PART2}Problem Solving With @command{awk}
+@part @value{PART2}Problem Solving with @command{awk}
 @end ifnotinfo
 
 @ifdocbook
@@ -20281,27 +20612,24 @@ It contains the following chapters:
 
 @itemize @value{BULLET}
 @item
-@ref{Library Functions}.
+@ref{Library Functions}
 
 @item
-@ref{Sample Programs}.
+@ref{Sample Programs}
 @end itemize
 @end ifdocbook
 
 @node Library Functions
 @chapter A Library of @command{awk} Functions
-@c STARTOFRANGE libf
 @cindex libraries of @command{awk} functions
-@c STARTOFRANGE flib
 @cindex functions, library
-@c STARTOFRANGE fudlib
 @cindex functions, user-defined, library of
 
 @DBREF{User-defined} describes how to write
 your own @command{awk} functions.  Writing functions is important, because
 it allows you to encapsulate algorithms and program tasks in a single
 place.  It simplifies programming, making program development more
-manageable, and making programs more readable.
+manageable and making programs more readable.
 
 @cindex Kernighan, Brian
 @cindex Plauger, P.J.@:
@@ -20345,9 +20673,9 @@ and would like to contribute them to the @command{awk} user community, see
 @cindex portability, example programs
 The programs in this @value{CHAPTER} and in
 @ref{Sample Programs},
-freely use features that are @command{gawk}-specific.
+freely use @command{gawk}-specific features.
 Rewriting these programs for different implementations of @command{awk}
-is pretty straightforward.
+is pretty straightforward:
 
 @itemize @value{BULLET}
 @item
@@ -20417,7 +20745,7 @@ Library functions often need to have global variables that they can use to
 preserve state information between calls to the function---for example,
 @code{getopt()}'s variable @code{_opti}
 (@pxref{Getopt Function}).
-Such variables are called @dfn{private}, since the only functions that need to
+Such variables are called @dfn{private}, as the only functions that need to
 use them are the ones in the library.
 
 When writing a library function, you should try to choose names for your
@@ -20430,7 +20758,7 @@ often use variable names like these for their own purposes.
 The example programs shown in this @value{CHAPTER} all start the names of their
 private variables with an underscore (@samp{_}).  Users generally don't use
 leading underscores in their variable names, so this convention immediately
-decreases the chances that the variable name will be accidentally shared
+decreases the chances that the variable names will be accidentally shared
 with the user's program.
 
 @cindex @code{_} (underscore), in names of private variables
@@ -20439,28 +20767,28 @@ In addition, several of the library functions use a prefix that helps
 indicate what function or set of functions use the variables---for example,
 @code{_pw_byname()} in the user database routines
 (@pxref{Passwd Functions}).
-This convention is recommended, since it even further decreases the
+This convention is recommended, as it even further decreases the
 chance of inadvertent conflict among variable names.  Note that this
 convention is used equally well for variable names and for private
-function names.@footnote{While all the library routines could have
+function names.@footnote{Although all the library routines could have
 been rewritten to use this convention, this was not done, in order to
 show how our own @command{awk} programming style has evolved and to
 provide some basis for this discussion.}
 
 As a final note on variable naming, if a function makes global variables
-available for use by a main program, it is a good convention to start that
-variable's name with a capital letter---for
+available for use by a main program, it is a good convention to start those
+variables' names with a capital letter---for
 example, @code{getopt()}'s @code{Opterr} and @code{Optind} variables
 (@pxref{Getopt Function}).
 The leading capital letter indicates that it is global, while the fact that
 the variable name is not all capital letters indicates that the variable is
-not one of @command{awk}'s built-in variables, such as @code{FS}.
+not one of @command{awk}'s predefined variables, such as @code{FS}.
 
 @cindex @option{--dump-variables} option, using for library functions
 It is also important that @emph{all} variables in library
 functions that do not need to save state are, in fact, declared
 local.@footnote{@command{gawk}'s @option{--dump-variables} command-line
-option is useful for verifying this.} If this is not done, the variable
+option is useful for verifying this.} If this is not done, the variables
 could accidentally be used in the user's program, leading to bugs that
 are very difficult to track down:
 
@@ -20468,8 +20796,9 @@ are very difficult to track down:
 function lib_func(x, y,    l1, l2)
 @{
     @dots{}
-    @var{use variable} some_var   # some_var should be local
-    @dots{}                     # but is not by oversight
+    # some_var should be local but by oversight is not
+    @var{use variable} some_var
+    @dots{}
 @}
 @end example
 
@@ -20510,10 +20839,11 @@ programming use.
 * Join Function::               A function to join an array into a string.
 * Getlocaltime Function::       A function to get formatted times.
 * Readfile Function::           A function to read an entire file at once.
+* Shell Quoting::               A function to quote strings for the shell.
 @end menu
 
 @node Strtonum Function
-@subsection Converting Strings To Numbers
+@subsection Converting Strings to Numbers
 
 The @code{strtonum()} function (@pxref{String Functions})
 is a @command{gawk} extension.  The following function
@@ -20580,8 +20910,8 @@ function mystrtonum(str,        ret, n, i, k, c)
 #     a[5] = "123.45"
 #     a[6] = "1.e3"
 #     a[7] = "1.32"
-#     a[7] = "1.32E2"
-# 
+#     a[8] = "1.32E2"
+#
 #     for (i = 1; i in a; i++)
 #         print a[i], strtonum(a[i]), mystrtonum(a[i])
 # @}
@@ -20591,9 +20921,12 @@ function mystrtonum(str,        ret, n, i, k, c)
 The function first looks for C-style octal numbers (base 8).
 If the input string matches a regular expression describing octal
 numbers, then @code{mystrtonum()} loops through each character in the
-string.  It sets @code{k} to the index in @code{"01234567"} of the current
-octal digit.  Since the return value is one-based, the @samp{k--}
-adjusts @code{k} so it can be used in computing the return value.
+string.  It sets @code{k} to the index in @code{"1234567"} of the current
+octal digit.
+The return value will either be the same number as the digit, or zero
+if the character is not there, which will be true for a @samp{0}.
+This is safe, because the regexp test in the @code{if} ensures that
+only octal values are converted.
 
 Similar logic applies to the code that checks for and converts a
 hexadecimal value, which starts with @samp{0x} or @samp{0X}.
@@ -20612,13 +20945,9 @@ be tested with @command{gawk} and the results compared to the built-in
 @node Assert Function
 @subsection Assertions
 
-@c STARTOFRANGE asse
 @cindex assertions
-@c STARTOFRANGE assef
 @cindex @code{assert()} function (C library)
-@c STARTOFRANGE libfass
 @cindex libraries of @command{awk} functions, assertions
-@c STARTOFRANGE flibass
 @cindex functions, library, assertions
 @cindex @command{awk} programs, lengthy, assertions
 When writing large programs, it is often useful to know
@@ -20626,7 +20955,7 @@ that a condition or set of conditions is true.  Before proceeding with a
 particular computation, you make a statement about what you believe to be
 the case.  Such a statement is known as an
 @dfn{assertion}.  The C language provides an @code{<assert.h>} header file
-and corresponding @code{assert()} macro that the programmer can use to make
+and corresponding @code{assert()} macro that a programmer can use to make
 assertions.  If an assertion fails, the @code{assert()} macro arranges to
 print a diagnostic message describing the condition that should have
 been true but was not, and then it kills the program.  In C, using
@@ -20657,7 +20986,7 @@ Following is the function:
 
 @example
 @c file eg/lib/assert.awk
-# assert --- assert that a condition is true. Otherwise exit.
+# assert --- assert that a condition is true. Otherwise, exit.
 
 @c endfile
 @ignore
@@ -20693,7 +21022,7 @@ is false, it prints a message to standard error, using the @code{string}
 parameter to describe the failed condition.  It then sets the variable
 @code{_assert_exit} to one and executes the @code{exit} statement.
 The @code{exit} statement jumps to the @code{END} rule. If the @code{END}
-rules finds @code{_assert_exit} to be true, it exits immediately.
+rule finds @code{_assert_exit} to be true, it exits immediately.
 
 The purpose of the test in the @code{END} rule is to
 keep any other @code{END} rules from running.  When an assertion fails, the
@@ -20734,10 +21063,6 @@ most likely causing the program to hang as it waits for input.
 There is a simple workaround to this:
 make sure that such a @code{BEGIN} rule always ends
 with an @code{exit} statement.
-@c ENDOFRANGE asse
-@c ENDOFRANGE assef
-@c ENDOFRANGE flibass
-@c ENDOFRANGE libfass
 
 @node Round Function
 @subsection Rounding Numbers
@@ -20939,7 +21264,7 @@ is always 1.  This means that on those systems, characters
 have numeric values from 128 to 255.
 Finally, large mainframe systems use the EBCDIC character set, which
 uses all 256 values.
-While there are other character sets in use on some older systems,
+There are other character sets in use on some older systems, but
 they are not really worth worrying about:
 
 @example
@@ -20989,11 +21314,11 @@ all the strings in an array into one long string.  The following function,
 the application programs
 (@pxref{Sample Programs}).
 
-Good function design is important; this function needs to be general but it
+Good function design is important; this function needs to be general, but it
 should also have a reasonable default behavior.  It is called with an array
 as well as the beginning and ending indices of the elements in the array to be
 merged.  This assumes that the array indices are numeric---a reasonable
-assumption since the array was likely created with @code{split()}
+assumption, as the array was likely created with @code{split()}
 (@pxref{String Functions}):
 
 @cindex @code{join()} user-defined function
@@ -21046,7 +21371,7 @@ more difficult than they really need to be.}
 The @code{systime()} and @code{strftime()} functions described in
 @DBREF{Time Functions}
 provide the minimum functionality necessary for dealing with the time of day
-in human readable form.  While @code{strftime()} is extensive, the control
+in human-readable form.  Although @code{strftime()} is extensive, the control
 formats are not necessarily easy to remember or intuitively obvious when
 reading a program.
 
@@ -21096,7 +21421,7 @@ function getlocaltime(time,    ret, now, i)
     now = systime()
 
     # return date(1)-style output
-    ret = strftime(PROCINFO["strftime"], now)
+    ret = strftime("%a %b %e %H:%M:%S %Z %Y", now)
 
     # clear out target array
     delete time
@@ -21137,7 +21462,7 @@ allowed the user to supply an optional timestamp value to use instead
 of the current time.
 
 @node Readfile Function
-@subsection Reading A Whole File At Once
+@subsection Reading a Whole File at Once
 
 Often, it is convenient to have the entire contents of a file available
 in memory as a single string. A straightforward but naive way to
@@ -21194,13 +21519,13 @@ function readfile(file,     tmp, save_rs)
 
 It works by setting @code{RS} to @samp{^$}, a regular expression that
 will never match if the file has contents.  @command{gawk} reads data from
-the file into @code{tmp} attempting to match @code{RS}.  The match fails
+the file into @code{tmp}, attempting to match @code{RS}.  The match fails
 after each read, but fails quickly, such that @command{gawk} fills
 @code{tmp} with the entire contents of the file.
-(@xref{Records}, for information on @code{RT} and @code{RS}.)
+(@DBXREF{Records} for information on @code{RT} and @code{RS}.)
 
 In the case that @code{file} is empty, the return value is the null
-string.  Thus calling code may use something like:
+string.  Thus, calling code may use something like:
 
 @example
 contents = readfile("/some/path")
@@ -21211,14 +21536,92 @@ if (length(contents) == 0)
 This tests the result to see if it is empty or not. An equivalent
 test would be @samp{contents == ""}.
 
+@DBXREF{Extension Sample Readfile} for an extension function that
+also reads an entire file into memory.
+
+@node Shell Quoting
+@subsection Quoting Strings to Pass to the Shell
+
+@c included by permission
+@ignore
+Date: Sun, 27 Jul 2014 17:16:16 -0700
+Message-ID: <CAKuGj+iCF_obaCLDUX60aSAgbfocFVtguG39GyeoNxTFby5sqQ@mail.gmail.com>
+Subject: Useful awk function
+From: Mike Brennan <mike@madronabluff.com>
+To: Arnold Robbins <arnold@skeeve.com>
+@end ignore
+
+Michael Brennan offers the following programming pattern,
+which he uses frequently:
+
+@example
+#! /bin/sh
+
+awkp='
+   @dots{}
+   '
+
+@var{input_program} | awk "$awkp" | /bin/sh
+@end example
+
+For example, a program of his named @command{flac-edit} has this form:
+
+@example
+$ @kbd{flac-edit -song="Whoope! That's Great" file.flac}
+@end example
+
+It generates the following output, which is to be piped to
+the shell (@file{/bin/sh}):
+
+@example
+chmod +w file.flac
+metaflac --remove-tag=TITLE file.flac
+LANG=en_US.88591 metaflac --set-tag=TITLE='Whoope! That'"'"'s Great' file.flac
+chmod -w file.flac
+@end example
+
+Note the need for shell quoting.  The function @code{shell_quote()}
+does it.  @code{SINGLE} is the one-character string @code{"'"} and
+@code{QSINGLE} is the three-character string @code{"\"'\""}:
+
+@example
+@c file eg/lib/shellquote.awk
+# shell_quote --- quote an argument for passing to the shell
+@c endfile
+@ignore
+@c file eg/lib/shellquote.awk
+#
+# Michael Brennan
+# brennan@@madronabluff.com
+# September 2014
+@c endfile
+@end ignore
+@c file eg/lib/shellquote.awk
+
+function shell_quote(s,             # parameter
+    SINGLE, QSINGLE, i, X, n, ret)  # locals
+@{
+    if (s == "")
+        return "\"\""
+
+    SINGLE = "\x27"  # single quote
+    QSINGLE = "\"\x27\""
+    n = split(s, X, SINGLE)
+
+    ret = SINGLE X[1] SINGLE
+    for (i = 2; i <= n; i++)
+        ret = ret QSINGLE SINGLE X[i] SINGLE
+
+    return ret
+@}
+@c endfile
+@end example
+
 @node Data File Management
 @section @value{DDF} Management
 
-@c STARTOFRANGE dataf
 @cindex files, managing
-@c STARTOFRANGE libfdataf
 @cindex libraries of @command{awk} functions, managing, data files
-@c STARTOFRANGE flibdataf
 @cindex functions, library, managing data files
 This @value{SECTION} presents functions that are useful for managing
 command-line @value{DF}s.
@@ -21236,12 +21639,12 @@ command-line @value{DF}s.
 
 @cindex files, managing, data file boundaries
 @cindex files, initialization and cleanup
-The @code{BEGIN} and @code{END} rules are each executed exactly once at
+The @code{BEGIN} and @code{END} rules are each executed exactly once, at
 the beginning and end of your @command{awk} program, respectively
 (@pxref{BEGIN/END}).
 We (the @command{gawk} authors) once had a user who mistakenly thought that the
-@code{BEGIN} rule is executed at the beginning of each @value{DF} and the
-@code{END} rule is executed at the end of each @value{DF}.
+@code{BEGIN} rules were executed at the beginning of each @value{DF} and the
+@code{END} rules were executed at the end of each @value{DF}.
 
 When informed
 that this was not the case, the user requested that we add new special
@@ -21268,21 +21671,20 @@ Besides solving the problem in only nine(!) lines of code, it does so
 @c # Arnold Robbins, arnold@@skeeve.com, Public Domain
 @c # January 1992
 
-FILENAME != _oldfilename \
-@{
+FILENAME != _oldfilename @{
     if (_oldfilename != "")
         endfile(_oldfilename)
     _oldfilename = FILENAME
     beginfile(FILENAME)
 @}
 
-END   @{ endfile(FILENAME) @}
+END @{ endfile(FILENAME) @}
 @end example
 
 This file must be loaded before the user's ``main'' program, so that the
 rule it supplies is executed first.
 
-This rule relies on @command{awk}'s @code{FILENAME} variable that
+This rule relies on @command{awk}'s @code{FILENAME} variable, which
 automatically changes for each new @value{DF}.  The current @value{FN} is
 saved in a private variable, @code{_oldfilename}.  If @code{FILENAME} does
 not equal @code{_oldfilename}, then a new @value{DF} is being processed and
@@ -21298,7 +21700,7 @@ first @value{DF}.
 The program also supplies an @code{END} rule to do the final processing for
 the last file.  Because this @code{END} rule comes before any @code{END} rules
 supplied in the ``main'' program, @code{endfile()} is called first.  Once
-again the value of multiple @code{BEGIN} and @code{END} rules should be clear.
+again, the value of multiple @code{BEGIN} and @code{END} rules should be clear.
 
 @cindex @code{beginfile()} user-defined function
 @cindex @code{endfile()} user-defined function
@@ -21309,7 +21711,7 @@ The following version solves the problem:
 
 @example
 @c file eg/lib/ftrans.awk
-# ftrans.awk --- handle data file transitions
+# ftrans.awk --- handle datafile transitions
 #
 # user supplies beginfile() and endfile() functions
 @c endfile
@@ -21329,7 +21731,7 @@ FNR == 1 @{
     beginfile(FILENAME)
 @}
 
-END  @{ endfile(_filename_) @}
+END @{ endfile(_filename_) @}
 @c endfile
 @end example
 
@@ -21337,24 +21739,25 @@ END  @{ endfile(_filename_) @}
 shows how this library function can be used and
 how it simplifies writing the main program.
 
-@cindex sidebar, So Why Does @command{gawk} have @code{BEGINFILE} and @code{ENDFILE}?
+@cindex sidebar, So Why Does @command{gawk} Have @code{BEGINFILE} and @code{ENDFILE}?
 @ifdocbook
 @docbook
-<sidebar><title>So Why Does @command{gawk} have @code{BEGINFILE} and @code{ENDFILE}?</title>
+<sidebar><title>So Why Does @command{gawk} Have @code{BEGINFILE} and @code{ENDFILE}?</title>
 @end docbook
 
 
 You are probably wondering, if @code{beginfile()} and @code{endfile()}
 functions can do the job, why does @command{gawk} have
-@code{BEGINFILE} and @code{ENDFILE} patterns (@pxref{BEGINFILE/ENDFILE})?
+@code{BEGINFILE} and @code{ENDFILE} patterns?
 
 Good question.  Normally, if @command{awk} cannot open a file, this
 causes an immediate fatal error.  In this case, there is no way for a
-user-defined function to deal with the problem, since the mechanism for
+user-defined function to deal with the problem, as the mechanism for
 calling it relies on the file being open and at the first record.  Thus,
 the main reason for @code{BEGINFILE} is to give you a ``hook'' to catch
 files that cannot be processed.  @code{ENDFILE} exists for symmetry,
 and because it provides an easy way to do per-file cleanup processing.
+For more information, refer to @ref{BEGINFILE/ENDFILE}.
 
 @docbook
 </sidebar>
@@ -21363,21 +21766,22 @@ and because it provides an easy way to do per-file cleanup processing.
 
 @ifnotdocbook
 @cartouche
-@center @b{So Why Does @command{gawk} have @code{BEGINFILE} and @code{ENDFILE}?}
+@center @b{So Why Does @command{gawk} Have @code{BEGINFILE} and @code{ENDFILE}?}
 
 
 
 You are probably wondering, if @code{beginfile()} and @code{endfile()}
 functions can do the job, why does @command{gawk} have
-@code{BEGINFILE} and @code{ENDFILE} patterns (@pxref{BEGINFILE/ENDFILE})?
+@code{BEGINFILE} and @code{ENDFILE} patterns?
 
 Good question.  Normally, if @command{awk} cannot open a file, this
 causes an immediate fatal error.  In this case, there is no way for a
-user-defined function to deal with the problem, since the mechanism for
+user-defined function to deal with the problem, as the mechanism for
 calling it relies on the file being open and at the first record.  Thus,
 the main reason for @code{BEGINFILE} is to give you a ``hook'' to catch
 files that cannot be processed.  @code{ENDFILE} exists for symmetry,
 and because it provides an easy way to do per-file cleanup processing.
+For more information, refer to @ref{BEGINFILE/ENDFILE}.
 @end cartouche
 @end ifnotdocbook
 
@@ -21385,7 +21789,7 @@ and because it provides an easy way to do per-file cleanup processing.
 @subsection Rereading the Current File
 
 @cindex files, reading
-Another request for a new built-in function was for a @code{rewind()}
+Another request for a new built-in function was for a
 function that would make it possible to reread the current file.
 The requesting user didn't want to have to use @code{getline}
 (@pxref{Getline})
@@ -21394,7 +21798,7 @@ inside a loop.
 However, as long as you are not in the @code{END} rule, it is
 quite easy to arrange to immediately close the current input file
 and then start over with it from the top.
-For lack of a better name, we'll call it @code{rewind()}:
+For lack of a better name, we'll call the function @code{rewind()}:
 
 @cindex @code{rewind()} user-defined function
 @example
@@ -21428,24 +21832,12 @@ function rewind(    i)
 @c endfile
 @end example
 
-This code relies on the @code{ARGIND} variable
-(@pxref{Auto-set}),
-which is specific to @command{gawk}.
-If you are not using
-@command{gawk}, you can use ideas presented in
-@ifnotinfo
-the previous @value{SECTION}
-@end ifnotinfo
-@ifinfo
-@ref{Filetrans Function},
-@end ifinfo
-to either update @code{ARGIND} on your own
-or modify this code as appropriate.
-
-The @code{rewind()} function also relies on the @code{nextfile} keyword
-(@pxref{Nextfile Statement}).  Because of this, you should not call it
-from an @code{ENDFILE} rule.  (This isn't necessary anyway, since as soon
-as an @code{ENDFILE} rule finishes @command{gawk} goes to the next file!)
+The @code{rewind()} function relies on the @code{ARGIND} variable
+(@pxref{Auto-set}), which is specific to @command{gawk}.  It also
+relies on the @code{nextfile} keyword (@pxref{Nextfile Statement}).
+Because of this, you should not call it from an @code{ENDFILE} rule.
+(This isn't necessary anyway, because @command{gawk} goes to the next
+file as soon as an @code{ENDFILE} rule finishes!)
 
 @node File Checking
 @subsection Checking for Readable @value{DDF}s
@@ -21478,7 +21870,7 @@ the following program to your @command{awk} program:
 
 BEGIN @{
     for (i = 1; i < ARGC; i++) @{
-        if (ARGV[i] ~ /^[[:alpha:]_][[:alnum:]_]*=.*/ \
+        if (ARGV[i] ~ /^[a-zA-Z_][a-zA-Z0-9_]*=.*/ \
             || ARGV[i] == "-" || ARGV[i] == "/dev/stdin")
             continue    # assignment or standard input
         else if ((getline junk < ARGV[i]) < 0) # unreadable
@@ -21493,17 +21885,22 @@ BEGIN @{
 @cindex troubleshooting, @code{getline} function
 This works, because the @code{getline} won't be fatal.
 Removing the element from @code{ARGV} with @code{delete}
-skips the file (since it's no longer in the list).
+skips the file (because it's no longer in the list).
 See also @ref{ARGC and ARGV}.
 
+Because @command{awk} variable names only allow the English letters,
+the regular expression check purposely does not use character classes
+such as @samp{[:alpha:]} and @samp{[:alnum:]}
+(@pxref{Bracket Expressions}).
+
 @node Empty Files
-@subsection Checking for Zero-length Files
+@subsection Checking for Zero-Length Files
 
 All known @command{awk} implementations silently skip over zero-length files.
-This is a by-product of @command{awk}'s implicit 
+This is a by-product of @command{awk}'s implicit
 read-a-record-and-match-against-the-rules loop: when @command{awk}
 tries to read a record from an empty file, it immediately receives an
-end of file indication, closes the file, and proceeds on to the next
+end-of-file indication, closes the file, and proceeds on to the next
 command-line @value{DF}, @emph{without} executing any user-level
 @command{awk} program code.
 
@@ -21568,7 +21965,7 @@ Occasionally, you might not want @command{awk} to process command-line
 variable assignments
 (@pxref{Assignment Options}).
 In particular, if you have a @value{FN} that contains an @samp{=} character,
-@command{awk} treats the @value{FN} as an assignment, and does not process it.
+@command{awk} treats the @value{FN} as an assignment and does not process it.
 
 Some users have suggested an additional command-line option for @command{gawk}
 to disable command-line assignments.  However, some simple programming with
@@ -21592,7 +21989,7 @@ a library file does the trick:
 function disable_assigns(argc, argv,    i)
 @{
     for (i = 1; i < argc; i++)
-        if (argv[i] ~ /^[[:alpha:]_][[:alnum:]_]*=.*/)
+        if (argv[i] ~ /^[a-zA-Z_][a-zA-Z0-9_]*=.*/)
             argv[i] = ("./" argv[i])
 @}
 
@@ -21618,30 +22015,22 @@ The use of @code{No_command_assign} allows you to disable command-line
 assignments at invocation time, by giving the variable a true value.
 When not set, it is initially zero (i.e., false), so the command-line arguments
 are left alone.
-@c ENDOFRANGE dataf
-@c ENDOFRANGE flibdataf
-@c ENDOFRANGE libfdataf
 
 @node Getopt Function
 @section Processing Command-Line Options
 
-@c STARTOFRANGE libfclo
 @cindex libraries of @command{awk} functions, command-line options
-@c STARTOFRANGE flibclo
 @cindex functions, library, command-line options
-@c STARTOFRANGE clop
 @cindex command-line options, processing
-@c STARTOFRANGE oclp
 @cindex options, command-line, processing
-@c STARTOFRANGE clibf
 @cindex functions, library, C library
 @cindex arguments, processing
-Most utilities on POSIX compatible systems take options on
+Most utilities on POSIX-compatible systems take options on
 the command line that can be used to change the way a program behaves.
 @command{awk} is an example of such a program
 (@pxref{Options}).
-Often, options take @dfn{arguments}; i.e., data that the program needs to
-correctly obey the command-line option.  For example, @command{awk}'s
+Often, options take @dfn{arguments} (i.e., data that the program needs to
+correctly obey the command-line option).  For example, @command{awk}'s
 @option{-F} option requires a string to use as the field separator.
 The first occurrence on the command line of either @option{--} or a
 string that does not begin with @samp{-} ends the options.
@@ -21745,7 +22134,7 @@ necessary for accessing individual characters
 (@pxref{String Functions}).@footnote{This
 function was written before @command{gawk} acquired the ability to
 split strings into single characters using @code{""} as the separator.
-We have left it alone, since using @code{substr()} is more portable.}
+We have left it alone, as using @code{substr()} is more portable.}
 
 The discussion that follows walks through the code a bit at a time:
 
@@ -21913,9 +22302,9 @@ next element in @code{argv}.  If neither condition is true, then only
 on the next call to @code{getopt()}.
 
 The @code{BEGIN} rule initializes both @code{Opterr} and @code{Optind} to one.
-@code{Opterr} is set to one, since the default behavior is for @code{getopt()}
+@code{Opterr} is set to one, because the default behavior is for @code{getopt()}
 to print a diagnostic message upon seeing an invalid option.  @code{Optind}
-is set to one, since there's no reason to look at the program name, which is
+is set to one, because there's no reason to look at the program name, which is
 in @code{ARGV[0]}:
 
 @example
@@ -21938,8 +22327,8 @@ BEGIN @{
 @c endfile
 @end example
 
-The rest of the @code{BEGIN} rule is a simple test program.  Here is the
-result of two sample runs of the test program:
+The rest of the @code{BEGIN} rule is a simple test program.  Here are the
+results of two sample runs of the test program:
 
 @example
 $ @kbd{awk -f getopt.awk -v _getopt_test=1 -- -a -cbARG bax -x}
@@ -21964,41 +22353,45 @@ In both runs, the first @option{--} terminates the arguments to
 etc., as its own options.
 
 @quotation NOTE
-After @code{getopt()} is through, it is the responsibility of the
-user level code to clear out all the elements of @code{ARGV} from 1
+After @code{getopt()} is through,
+user-level code must clear out all the elements of @code{ARGV} from 1
 to @code{Optind}, so that @command{awk} does not try to process the
 command-line options as @value{FN}s.
 @end quotation
 
+Using @samp{#!} with the @option{-E} option may help avoid
+conflicts between your program's options and @command{gawk}'s options,
+as @option{-E} causes @command{gawk} to abandon processing of
+further options
+(@DBPXREF{Executable Scripts} and
+@ifnotdocbook
+@pxref{Options}).
+@end ifnotdocbook
+@ifdocbook
+@ref{Options}).
+@end ifdocbook
+
 Several of the sample programs presented in
 @ref{Sample Programs},
 use @code{getopt()} to process their arguments.
-@c ENDOFRANGE libfclo
-@c ENDOFRANGE flibclo
-@c ENDOFRANGE clop
-@c ENDOFRANGE oclp
 
 @node Passwd Functions
 @section Reading the User Database
 
-@c STARTOFRANGE libfudata
 @cindex libraries of @command{awk} functions, user database, reading
-@c STARTOFRANGE flibudata
 @cindex functions, library, user database@comma{} reading
-@c STARTOFRANGE udatar
 @cindex user database@comma{} reading
-@c STARTOFRANGE dataur
 @cindex database, users@comma{} reading
 @cindex @code{PROCINFO} array
 The @code{PROCINFO} array
 (@pxref{Built-in Variables})
 provides access to the current user's real and effective user and group ID
-numbers, and if available, the user's supplementary group set.
+numbers, and, if available, the user's supplementary group set.
 However, because these are numbers, they do not provide very useful
 information to the average user.  There needs to be some way to find the
 user information associated with the user and group ID numbers.  This
 @value{SECTION} presents a suite of functions for retrieving information from the
-user database.  @xref{Group Functions},
+user database.  @DBXREF{Group Functions}
 for a similar suite that retrieves information from the group database.
 
 @cindex @code{getpwent()} function (C library)
@@ -22013,11 +22406,11 @@ kept.  Instead, it provides the @code{<pwd.h>} header file
 and several C language subroutines for obtaining user information.
 The primary function is @code{getpwent()}, for ``get password entry.''
 The ``password'' comes from the original user database file,
-@file{/etc/passwd}, which stores user information, along with the
+@file{/etc/passwd}, which stores user information along with the
 encrypted passwords (hence the name).
 
 @cindex @command{pwcat} program
-While an @command{awk} program could simply read @file{/etc/passwd}
+Although an @command{awk} program could simply read @file{/etc/passwd}
 directly, this file may not contain complete information about the
 system's set of users.@footnote{It is often the case that password
 information is stored in a network database.} To be sure you are able to
@@ -22112,12 +22505,12 @@ The user's encrypted password.  This may not be available on some systems.
 
 @item User-ID
 The user's numeric user ID number.
-(On some systems it's a C @code{long}, and not an @code{int}.  Thus
+(On some systems, it's a C @code{long}, and not an @code{int}.  Thus,
 we cast it to @code{long} for all cases.)
 
 @item Group-ID
 The user's numeric group ID number.
-(Similar comments about @code{long} vs.@: @code{int} apply here.)
+(Similar comments about @code{long} versus @code{int} apply here.)
 
 @item Full name
 The user's full name, and perhaps other information associated with the
@@ -22139,7 +22532,7 @@ A few lines representative of @command{pwcat}'s output are as follows:
 @cindex Robbins, Miriam
 @example
 $ @kbd{pwcat}
-@print{} root:3Ov02d5VaUPB6:0:1:Operator:/:/bin/sh
+@print{} root:x:0:1:Operator:/:/bin/sh
 @print{} nobody:*:65534:65534::/:
 @print{} daemon:*:1:1::/:
 @print{} sys:*:2:2::/:/bin/csh
@@ -22214,27 +22607,23 @@ The @code{BEGIN} rule sets a private variable to the directory where
 routine, we have chosen to put it in @file{/usr/local/libexec/awk};
 however, you might want it to be in a different directory on your system.
 
-The function @code{_pw_init()} keeps three copies of the user information
-in three associative arrays.  The arrays are indexed by username
+The function @code{_pw_init()} fills three copies of the user information
+into three associative arrays.  The arrays are indexed by username
 (@code{_pw_byname}), by user ID number (@code{_pw_byuid}), and by order of
 occurrence (@code{_pw_bycount}).
-The variable @code{_pw_inited} is used for efficiency, since @code{_pw_init()}
+The variable @code{_pw_inited} is used for efficiency, as @code{_pw_init()}
 needs to be called only once.
 
+@cindex @code{PROCINFO} array, testing the field splitting
 @cindex @code{getline} command, @code{_pw_init()} function
 Because this function uses @code{getline} to read information from
 @command{pwcat}, it first saves the values of @code{FS}, @code{RS}, and @code{$0}.
 It notes in the variable @code{using_fw} whether field splitting
 with @code{FIELDWIDTHS} is in effect or not.
-Doing so is necessary, since these functions could be called
+Doing so is necessary, as these functions could be called
 from anywhere within a user's program, and the user may have his
-or her
-own way of splitting records and fields.
-
-@cindex @code{PROCINFO} array, testing the field splitting
-The @code{using_fw} variable checks @code{PROCINFO["FS"]}, which
-is @code{"FIELDWIDTHS"} if field splitting is being done with
-@code{FIELDWIDTHS}.  This makes it possible to restore the correct
+or her own way of splitting records and fields.
+This makes it possible to restore the correct
 field-splitting mechanism later.  The test can only be true for
 @command{gawk}.  It is false if using @code{FS} or @code{FPAT},
 or on some other @command{awk} implementation.
@@ -22243,7 +22632,7 @@ The code that checks for using @code{FPAT}, using @code{using_fpat}
 and @code{PROCINFO["FS"]}, is similar.
 
 The main part of the function uses a loop to read database lines, split
-the line into fields, and then store the line into each array as necessary.
+the lines into fields, and then store the lines into each array as necessary.
 When the loop is done, @code{@w{_pw_init()}} cleans up by closing the pipeline,
 setting @code{@w{_pw_inited}} to one, and restoring @code{FS}
 (and @code{FIELDWIDTHS} or @code{FPAT}
@@ -22333,26 +22722,18 @@ In turn, calling @code{_pw_init()} is not too expensive, because the
 once.  If you are worried about squeezing every last cycle out of your
 @command{awk} program, the check of @code{_pw_inited} could be moved out of
 @code{_pw_init()} and duplicated in all the other functions.  In practice,
-this is not necessary, since most @command{awk} programs are I/O-bound,
+this is not necessary, as most @command{awk} programs are I/O-bound,
 and such a change would clutter up the code.
 
 The @command{id} program in @DBREF{Id Program}
 uses these functions.
-@c ENDOFRANGE libfudata
-@c ENDOFRANGE flibudata
-@c ENDOFRANGE udatar
-@c ENDOFRANGE dataur
 
 @node Group Functions
 @section Reading the Group Database
 
-@c STARTOFRANGE libfgdata
 @cindex libraries of @command{awk} functions, group database, reading
-@c STARTOFRANGE flibgdata
 @cindex functions, library, group database@comma{} reading
-@c STARTOFRANGE gdatar
 @cindex group database, reading
-@c STARTOFRANGE datagr
 @cindex database, group, reading
 @cindex @code{PROCINFO} array, and group membership
 @cindex @code{getgrent()} function (C library)
@@ -22468,11 +22849,11 @@ it is usually empty or set to @samp{*}.
 @item Group ID Number
 The group's numeric group ID number;
 the association of name to number must be unique within the file.
-(On some systems it's a C @code{long}, and not an @code{int}.  Thus
+(On some systems it's a C @code{long}, and not an @code{int}.  Thus,
 we cast it to @code{long} for all cases.)
 
 @item Group Member List
-A comma-separated list of user names.  These users are members of the group.
+A comma-separated list of usernames.  These users are members of the group.
 Modern Unix systems allow users to be members of several groups
 simultaneously.  If your system does, then there are elements
 @code{"group1"} through @code{"group@var{N}"} in @code{PROCINFO}
@@ -22548,8 +22929,7 @@ function _gr_init(    oldfs, oldrs, olddol0, grcat,
         n = split($4, a, "[ \t]*,[ \t]*")
         for (i = 1; i <= n; i++)
             if (a[i] in _gr_groupsbyuser)
-                _gr_groupsbyuser[a[i]] = \
-                    _gr_groupsbyuser[a[i]] " " $1
+                _gr_groupsbyuser[a[i]] = gr_groupsbyuser[a[i]] " " $1
             else
                 _gr_groupsbyuser[a[i]] = $1
 
@@ -22583,32 +22963,32 @@ The @code{@w{_gr_init()}} function first saves @code{FS},
 @code{$0}, and then sets @code{FS} and @code{RS} to the correct values for
 scanning the group information.
 It also takes care to note whether @code{FIELDWIDTHS} or @code{FPAT}
-is being used, and to restore the appropriate field splitting mechanism.
+is being used, and to restore the appropriate field-splitting mechanism.
 
-The group information is stored is several associative arrays.
+The group information is stored in several associative arrays.
 The arrays are indexed by group name (@code{@w{_gr_byname}}), by group ID number
 (@code{@w{_gr_bygid}}), and by position in the database (@code{@w{_gr_bycount}}).
-There is an additional array indexed by user name (@code{@w{_gr_groupsbyuser}}),
+There is an additional array indexed by username (@code{@w{_gr_groupsbyuser}}),
 which is a space-separated list of groups to which each user belongs.
 
-Unlike the user database, it is possible to have multiple records in the
+Unlike in the user database, it is possible to have multiple records in the
 database for the same group.  This is common when a group has a large number
 of members.  A pair of such entries might look like the following:
 
 @example
-tvpeople:*:101:johny,jay,arsenio
+tvpeople:*:101:johnny,jay,arsenio
 tvpeople:*:101:david,conan,tom,joan
 @end example
 
 For this reason, @code{_gr_init()} looks to see if a group name or
-group ID number is already seen.  If it is, then the user names are
-simply concatenated onto the previous list of users.@footnote{There is actually a
+group ID number is already seen.  If so, the usernames are
+simply concatenated onto the previous list of users.@footnote{There is a
 subtle problem with the code just presented.  Suppose that
 the first time there were no names. This code adds the names with
 a leading comma. It also doesn't check that there is a @code{$4}.}
 
 Finally, @code{_gr_init()} closes the pipeline to @command{grcat}, restores
-@code{FS} (and @code{FIELDWIDTHS} or @code{FPAT} if necessary), @code{RS}, and @code{$0},
+@code{FS} (and @code{FIELDWIDTHS} or @code{FPAT}, if necessary), @code{RS}, and @code{$0},
 initializes @code{_gr_count} to zero
 (it is used later), and makes @code{_gr_inited} nonzero.
 
@@ -22647,7 +23027,7 @@ function getgrgid(gid)
 
 @cindex @code{getgruser()} function (C library)
 The @code{getgruser()} function does not have a C counterpart. It takes a
-user name and returns the list of groups that have the user as a member:
+username and returns the list of groups that have the user as a member:
 
 @cindex @code{getgruser()} function, user-defined
 @example
@@ -22676,7 +23056,6 @@ function getgrent()
 @}
 @c endfile
 @end example
-@c ENDOFRANGE clibf
 
 @cindex @code{endgrent()} function (C library)
 The @code{endgrent()} function resets @code{_gr_count} to zero so that @code{getgrent()} can
@@ -22709,12 +23088,12 @@ uses these functions.
 
 @DBREF{Arrays of Arrays} described how @command{gawk}
 provides arrays of arrays.  In particular, any element of
-an array may be either a scalar, or another array. The
+an array may be either a scalar or another array. The
 @code{isarray()} function (@pxref{Type Functions})
 lets you distinguish an array
 from a scalar.
 The following function, @code{walk_array()}, recursively traverses
-an array, printing each element's indices and value.
+an array, printing the element indices and values.
 You call it with the array and a string representing the name
 of the array:
 
@@ -22757,18 +23136,74 @@ When run, the program produces the following output:
 
 @example
 $ @kbd{gawk -f walk_array.awk}
-@print{} a[4][1][1] = 411
-@print{} a[4][2] = 42
 @print{} a[1] = 1
 @print{} a[2][1] = 21
 @print{} a[2][2] = 22
 @print{} a[3] = 3
+@print{} a[4][1][1] = 411
+@print{} a[4][2] = 42
+@end example
+
+The function just presented simply prints the
+name and value of each scalar array element. However, it is easy to
+generalize it, by passing in the name of a function to call
+when walking an array. The modified function looks like this:
+
+@example
+@c file eg/lib/processarray.awk
+function process_array(arr, name, process, do_arrays,   i, new_name)
+@{
+    for (i in arr) @{
+        new_name = (name "[" i "]")
+        if (isarray(arr[i])) @{
+            if (do_arrays)
+                @@process(new_name, arr[i])
+            process_array(arr[i], new_name, process, do_arrays)
+        @} else
+            @@process(new_name, arr[i])
+    @}
+@}
+@c endfile
 @end example
 
-@c ENDOFRANGE libfgdata
-@c ENDOFRANGE flibgdata
-@c ENDOFRANGE gdatar
-@c ENDOFRANGE libf
+The arguments are as follows:
+
+@table @code
+@item arr
+The array.
+
+@item name
+The name of the array (a string).
+
+@item process
+The name of the function to call.
+
+@item do_arrays
+If this is true, the function can handle elements that are subarrays.
+@end table
+
+If subarrays are to be processed, that is done before walking them further.
+
+When run with the following scaffolding, the function produces the same
+results as does the earlier version of @code{walk_array()}:
+
+@example
+BEGIN @{
+    a[1] = 1
+    a[2][1] = 21
+    a[2][2] = 22
+    a[3] = 3
+    a[4][1][1] = 411
+    a[4][2] = 42
+
+    process_array(a, "a", "do_print", 0)
+@}
+
+function do_print(name, element)
+@{
+    printf "%s = %s\n", name, element
+@}
+@end example
 
 @node Library Functions Summary
 @section Summary
@@ -22776,8 +23211,8 @@ $ @kbd{gawk -f walk_array.awk}
 @itemize @value{BULLET}
 @item
 Reading programs is an excellent way to learn Good Programming.
-The functions provided in this @value{CHAPTER} and the next are intended
-to serve that purpose.
+The functions and programs provided in this @value{CHAPTER} and the next
+are intended to serve that purpose.
 
 @item
 When writing general-purpose library functions, put some thought into how
@@ -22790,24 +23225,24 @@ The functions presented here fit into the following categories:
 @c nested list
 @table @asis
 @item General problems
-Number to string conversion, assertions, rounding, random number
+Number-to-string conversion, testing assertions, rounding, random number
 generation, converting characters to numbers, joining strings, getting
 easily usable time-of-day information, and reading a whole file in
-one shot.
+one shot
 
 @item Managing @value{DF}s
 Noting @value{DF} boundaries, rereading the current file, checking for
 readable files, checking for zero-length files, and treating assignments
-as @value{FN}s.
+as @value{FN}s
 
 @item Processing command-line options
-An @command{awk} version of the standard C @code{getopt()} function.
+An @command{awk} version of the standard C @code{getopt()} function
 
 @item Reading the user and group databases
-Two sets of routines that parallel the C library versions.
+Two sets of routines that parallel the C library versions
 
 @item Traversing arrays of arrays
-A simple function to traverse an array of arrays to any depth.
+Two functions that traverse an array of arrays to any depth
 @end table
 @c end nested list
 
@@ -22850,7 +23285,7 @@ ARGIND != Argind @{
 @}
 END @{
     if (ARGIND < ARGC - 1)
-        ARGIND = ARGC - 1 
+        ARGIND = ARGC - 1
     if (ARGIND > Argind)
         for (Argind++; Argind <= ARGIND; Argind++)
             zerofile(ARGV[Argind], Argind)
@@ -22882,13 +23317,9 @@ output identical to that of the original version.
 @end enumerate
 @c EXCLUDE END
 
-@c ENDOFRANGE flib
-@c ENDOFRANGE fudlib
-@c ENDOFRANGE datagr
 
 @node Sample Programs
 @chapter Practical @command{awk} Programs
-@c STARTOFRANGE awkpex
 @cindex @command{awk} programs, examples of
 
 @c FULLXREF ON
@@ -22906,10 +23337,10 @@ in this @value{CHAPTER}.
 The second presents @command{awk}
 versions of several common POSIX utilities.
 These are programs that you are hopefully already familiar with,
-and therefore, whose problems are understood.
+and therefore whose problems are understood.
 By reimplementing these programs in @command{awk},
 you can focus on the @command{awk}-related aspects of solving
-the programming problem.
+the programming problems.
 
 The third is a grab bag of interesting programs.
 These solve a number of different data-manipulation and management
@@ -22958,7 +23389,6 @@ cut.awk -- -c1-8 myfiles > results
 
 @node Clones
 @section Reinventing Wheels for Fun and Profit
-@c STARTOFRANGE posimawk
 @cindex POSIX, programs@comma{} implementing in @command{awk}
 
 This @value{SECTION} presents a number of POSIX utilities implemented in
@@ -22970,7 +23400,7 @@ It should be noted that these programs are not necessarily intended to
 replace the installed versions on your system.
 Nor may all of these programs be fully compliant with the most recent
 POSIX standard.  This is not a problem; their
-purpose is to illustrate @command{awk} language programming for ``real world''
+purpose is to illustrate @command{awk} language programming for ``real-world''
 tasks.
 
 The programs are presented in alphabetical order.
@@ -22986,14 +23416,11 @@ The programs are presented in alphabetical order.
 @end menu
 
 @node Cut Program
-@subsection Cutting out Fields and Columns
+@subsection Cutting Out Fields and Columns
 
 @cindex @command{cut} utility
-@c STARTOFRANGE cut
 @cindex @command{cut} utility
-@c STARTOFRANGE ficut
 @cindex fields, cutting
-@c STARTOFRANGE colcut
 @cindex columns, cutting
 The @command{cut} utility selects, or ``cuts,'' characters or fields
 from its standard input and sends them to its standard output.
@@ -23002,7 +23429,7 @@ but you may supply a command-line option to change the field
 @dfn{delimiter} (i.e., the field-separator character). @command{cut}'s
 definition of fields is less general than @command{awk}'s.
 
-A common use of @command{cut} might be to pull out just the login name of
+A common use of @command{cut} might be to pull out just the login names of
 logged-on users from the output of @command{who}.  For example, the following
 pipeline generates a sorted, unique list of the logged-on users:
 
@@ -23064,22 +23491,16 @@ supplied:
 # Requires getopt() and join() library functions
 
 @group
-function usage(    e1, e2)
+function usage()
 @{
-    e1 = "usage: cut [-f list] [-d c] [-s] [files...]"
-    e2 = "usage: cut [-c list] [files...]"
-    print e1 > "/dev/stderr"
-    print e2 > "/dev/stderr"
+    print("usage: cut [-f list] [-d c] [-s] [files...]") > "/dev/stderr"
+    print("usage: cut [-c list] [files...]") > "/dev/stderr"
     exit 1
 @}
 @end group
 @c endfile
 @end example
 
-@noindent
-The variables @code{e1} and @code{e2} are used so that the function
-fits nicely on the @value{PAGE}.
-
 @cindex @code{BEGIN} pattern, running @command{awk} programs and
 @cindex @code{FS} variable, running @command{awk} programs and
 Next comes a @code{BEGIN} rule that parses the command-line options.
@@ -23269,7 +23690,7 @@ function set_charlist(    field, i, j, f, g, n, m, t,
 @c endfile
 @end example
 
-Next is the rule that actually processes the data.  If the @option{-s} option
+Next is the rule that processes the data.  If the @option{-s} option
 is given, then @code{suppress} is true.  The first @code{if} statement
 makes sure that the input record does have the field separator.  If
 @command{cut} is processing fields, @code{suppress} is true, and the field
@@ -23301,27 +23722,20 @@ written out between the fields:
 @end example
 
 This version of @command{cut} relies on @command{gawk}'s @code{FIELDWIDTHS}
-variable to do the character-based cutting.  While it is possible in
+variable to do the character-based cutting.  It is possible in
 other @command{awk} implementations to use @code{substr()}
-(@pxref{String Functions}),
+(@pxref{String Functions}), but
 it is also extremely painful.
 The @code{FIELDWIDTHS} variable supplies an elegant solution to the problem
 of picking the input line apart by characters.
-@c ENDOFRANGE cut
-@c ENDOFRANGE ficut
-@c ENDOFRANGE colcut
 
 
 @node Egrep Program
 @subsection Searching for Regular Expressions in Files
 
-@c STARTOFRANGE regexps
 @cindex regular expressions, searching for
-@c STARTOFRANGE sfregexp
 @cindex searching, files for regular expressions
-@c STARTOFRANGE fsregexp
 @cindex files, searching for regular expressions
-@c STARTOFRANGE egrep
 @cindex @command{egrep} utility
 The @command{egrep} utility searches files for patterns.  It uses regular
 expressions that are almost identical to those available in @command{awk}
@@ -23374,7 +23788,7 @@ and the file transition library program
 The program begins with a descriptive comment and then a @code{BEGIN} rule
 that processes the command-line arguments with @code{getopt()}.  The @option{-i}
 (ignore case) option is particularly easy with @command{gawk}; we just use the
-@code{IGNORECASE} built-in variable
+@code{IGNORECASE} predefined variable
 (@pxref{Built-in Variables}):
 
 @cindex @code{egrep.awk} program
@@ -23448,7 +23862,7 @@ matched lines in the output:
 @c endfile
 @end example
 
-The last two lines are commented out, since they are not needed in
+The last two lines are commented out, as they are not needed in
 @command{gawk}.  They should be uncommented if you have to use another version
 of @command{awk}.
 
@@ -23458,7 +23872,7 @@ into lowercase if the @option{-i} option is specified.@footnote{It
 also introduces a subtle bug;
 if a match happens, we output the translated line, not the original.}
 The rule is
-commented out since it is not necessary with @command{gawk}:
+commented out as it is not necessary with @command{gawk}:
 
 @example
 @c file eg/prog/egrep.awk
@@ -23524,7 +23938,7 @@ successful or unsuccessful match.  If the line does not match, the
 @code{next} statement just moves on to the next record.
 
 A number of additional tests are made, but they are only done if we
-are not counting lines.  First, if the user only wants exit status
+are not counting lines.  First, if the user only wants the exit status
 (@code{no_print} is true), then it is enough to know that @emph{one}
 line in this file matched, and we can skip on to the next file with
 @code{nextfile}.  Similarly, if we are only printing @value{FN}s, we can
@@ -23565,7 +23979,7 @@ if necessary:
 @end example
 
 The @code{END} rule takes care of producing the correct exit status. If
-there are no matches, the exit status is one; otherwise it is zero:
+there are no matches, the exit status is one; otherwise, it is zero:
 
 @example
 @c file eg/prog/egrep.awk
@@ -23580,30 +23994,21 @@ and then exits:
 
 @example
 @c file eg/prog/egrep.awk
-function usage(    e)
+function usage()
 @{
-    e = "Usage: egrep [-csvil] [-e pat] [files ...]"
-    e = e "\n\tegrep [-csvil] pat [files ...]"
-    print e > "/dev/stderr"
+    print("Usage: egrep [-csvil] [-e pat] [files ...]") > "/dev/stderr"
+    print("\n\tegrep [-csvil] pat [files ...]") > "/dev/stderr"
     exit 1
 @}
 @c endfile
 @end example
 
-The variable @code{e} is used so that the function fits nicely
-on the printed page.
-
-@c ENDOFRANGE regexps
-@c ENDOFRANGE sfregexp
-@c ENDOFRANGE fsregexp
-@c ENDOFRANGE egrep
 
 @node Id Program
-@subsection Printing out User Information
+@subsection Printing Out User Information
 
 @cindex printing, user information
 @cindex users, information about, printing
-@c STARTOFRANGE id
 @cindex @command{id} utility
 The @command{id} utility lists a user's real and effective user ID numbers,
 real and effective group ID numbers, and the user's group set, if any.
@@ -23626,7 +24031,8 @@ Here is a simple version of @command{id} written in @command{awk}.
 It uses the user database library functions
 (@pxref{Passwd Functions})
 and the group database library functions
-(@pxref{Group Functions}):
+(@pxref{Group Functions})
+from @ref{Library Functions}.
 
 The program is fairly straightforward.  All the work is done in the
 @code{BEGIN} rule.  The user and group ID numbers are obtained from
@@ -23650,6 +24056,7 @@ numbers:
 # May 1993
 # Revised February 1996
 # Revised May 2014
+# Revised September 2014
 
 @c endfile
 @end ignore
@@ -23668,26 +24075,22 @@ BEGIN @{
 
     printf("uid=%d", uid)
     pw = getpwuid(uid)
-    if (pw != "")
-        pr_first_field(pw)
+    pr_first_field(pw)
 
     if (euid != uid) @{
         printf(" euid=%d", euid)
         pw = getpwuid(euid)
-        if (pw != "")
-            pr_first_field(pw)
+        pr_first_field(pw)
     @}
 
     printf(" gid=%d", gid)
     pw = getgrgid(gid)
-    if (pw != "")
-        pr_first_field(pw)
+    pr_first_field(pw)
 
     if (egid != gid) @{
         printf(" egid=%d", egid)
         pw = getgrgid(egid)
-        if (pw != "")
-            pr_first_field(pw)
+        pr_first_field(pw)
     @}
 
     for (i = 1; ("group" i) in PROCINFO; i++) @{
@@ -23696,8 +24099,7 @@ BEGIN @{
         group = PROCINFO["group" i]
         printf("%d", group)
         pw = getgrgid(group)
-        if (pw != "")
-            pr_first_field(pw)
+        pr_first_field(pw)
         if (("group" (i+1)) in PROCINFO)
             printf(",")
     @}
@@ -23707,8 +24109,10 @@ BEGIN @{
 
 function pr_first_field(str,  a)
 @{
-    split(str, a, ":")
-    printf("(%s)", a[1])
+    if (str != "") @{
+        split(str, a, ":")
+        printf("(%s)", a[1])
+    @}
 @}
 @c endfile
 @end example
@@ -23716,7 +24120,7 @@ function pr_first_field(str,  a)
 The test in the @code{for} loop is worth noting.
 Any supplementary groups in the @code{PROCINFO} array have the
 indices @code{"group1"} through @code{"group@var{N}"} for some
-@var{N}, i.e., the total number of supplementary groups.
+@var{N} (i.e., the total number of supplementary groups).
 However, we don't know in advance how many of these groups
 there are.
 
@@ -23731,18 +24135,16 @@ tested, and the loop body never executes.
 
 The @code{pr_first_field()} function simply isolates out some
 code that is used repeatedly, making the whole program
-slightly shorter and cleaner.
+shorter and cleaner. In particular, moving the check for
+the empty string into this function saves several lines of code.
 
-@c ENDOFRANGE id
 
 @node Split Program
 @subsection Splitting a Large File into Pieces
 
 @c FIXME: One day, update to current POSIX version of split
 
-@c STARTOFRANGE filspl
 @cindex files, splitting
-@c STARTOFRANGE split
 @cindex @code{split} utility
 The @command{split} program splits large text files into smaller pieces.
 Usage is as follows:@footnote{This is the traditional usage. The
@@ -23755,10 +24157,10 @@ aims to demonstrate.}
 
 By default,
 the output files are named @file{xaa}, @file{xab}, and so on. Each file has
-1000 lines in it, with the likely exception of the last file. To change the
+1,000 lines in it, with the likely exception of the last file. To change the
 number of lines in each file, supply a number on the command line
-preceded with a minus; e.g., @samp{-500} for files with 500 lines in them
-instead of 1000.  To change the name of the output files to something like
+preceded with a minus sign (e.g., @samp{-500} for files with 500 lines in them
+instead of 1,000).  To change the names of the output files to something like
 @file{myfileaa}, @file{myfileab}, and so on, supply an additional
 argument that specifies the @value{FN} prefix.
 
@@ -23806,7 +24208,7 @@ BEGIN @{
     @}
     # test argv in case reading from stdin instead of file
     if (i in ARGV)
-        i++    # skip data file name
+        i++    # skip datafile name
     if (i in ARGV) @{
         outfile = ARGV[i]
         ARGV[i] = ""
@@ -23858,19 +24260,14 @@ The @code{usage()} function simply prints an error message and exits:
 
 @example
 @c file eg/prog/split.awk
-function usage(   e)
+function usage()
 @{
-    e = "usage: split [-num] [file] [outname]"
-    print e > "/dev/stderr"
+    print("usage: split [-num] [file] [outname]") > "/dev/stderr"
     exit 1
 @}
 @c endfile
 @end example
 
-@noindent
-The variable @code{e} is used so that the function
-fits nicely on the @value{PAGE}.
-
 This program is a bit sloppy; it relies on @command{awk} to automatically close the last file
 instead of doing it in an @code{END} rule.
 It also assumes that letters are contiguous in the character set,
@@ -23882,15 +24279,12 @@ You might want to consider how to eliminate the use of
 way as to solve the EBCDIC issue as well.
 @end ifset
 
-@c ENDOFRANGE filspl
-@c ENDOFRANGE split
 
 @node Tee Program
 @subsection Duplicating Output into Multiple Files
 
 @cindex files, multiple@comma{} duplicating output into
 @cindex output, duplicating into files
-@c STARTOFRANGE tee
 @cindex @code{tee} utility
 The @code{tee} program is known as a ``pipe fitting.''  @code{tee} copies
 its standard input to its standard output and also duplicates it to the
@@ -23905,8 +24299,8 @@ truncating them and starting over.
 
 The @code{BEGIN} rule first makes a copy of all the command-line arguments
 into an array named @code{copy}.
-@code{ARGV[0]} is not copied, since it is not needed.
-@code{tee} cannot use @code{ARGV} directly, since @command{awk} attempts to
+@code{ARGV[0]} is not needed, so it is not copied.
+@code{tee} cannot use @code{ARGV} directly, because @command{awk} attempts to
 process each @value{FN} in @code{ARGV} as input data.
 
 @cindex flag variables
@@ -23955,7 +24349,7 @@ BEGIN @{
 @c endfile
 @end example
 
-The following single rule does all the work.  Since there is no pattern, it is
+The following single rule does all the work.  Because there is no pattern, it is
 executed for each line of input.  The body of the rule simply prints the
 line into each file on the command line, and then to the standard output:
 
@@ -23986,7 +24380,7 @@ for (i in copy)
 @end example
 
 @noindent
-This is more concise but it is also less efficient.  The @samp{if} is
+This is more concise, but it is also less efficient.  The @samp{if} is
 tested for each record and for each output file.  By duplicating the loop
 body, the @samp{if} is only tested once for each input record.  If there are
 @var{N} input records and @var{M} output files, the first method only
@@ -24003,18 +24397,14 @@ END @{
 @}
 @c endfile
 @end example
-@c ENDOFRANGE tee
 
 @node Uniq Program
 @subsection Printing Nonduplicated Lines of Text
 
 @c FIXME: One day, update to current POSIX version of uniq
 
-@c STARTOFRANGE prunt
 @cindex printing, unduplicated lines of text
-@c STARTOFRANGE tpul
 @cindex text@comma{} printing, unduplicated lines of
-@c STARTOFRANGE uniq
 @cindex @command{uniq} utility
 The @command{uniq} utility reads sorted lines of data on its standard
 input, and by default removes duplicate lines.  In other words, it only
@@ -24029,10 +24419,10 @@ The options for @command{uniq} are:
 
 @table @code
 @item -d
-Print only repeated lines.
+Print only repeated (duplicated) lines.
 
 @item -u
-Print only nonrepeated lines.
+Print only nonrepeated (unique) lines.
 
 @item -c
 Count lines. This option overrides @option{-d} and @option{-u}.  Both repeated
@@ -24101,10 +24491,9 @@ standard output, @file{/dev/stdout}:
 @end ignore
 @c file eg/prog/uniq.awk
 
-function usage(    e)
+function usage()
 @{
-    e = "Usage: uniq [-udc [-n]] [+n] [ in [ out ]]"
-    print e > "/dev/stderr"
+    print("Usage: uniq [-udc [-n]] [+n] [ in [ out ]]") > "/dev/stderr"
     exit 1
 @}
 
@@ -24158,22 +24547,20 @@ BEGIN @{
 @end example
 
 The following function, @code{are_equal()}, compares the current line,
-@code{$0}, to the
-previous line, @code{last}.  It handles skipping fields and characters.
-If no field count and no character count are specified, @code{are_equal()}
-simply returns one or zero depending upon the result of a simple string
-comparison of @code{last} and @code{$0}.  Otherwise, things get more
-complicated.
-If fields have to be skipped, each line is broken into an array using
-@code{split()}
-(@pxref{String Functions});
-the desired fields are then joined back into a line using @code{join()}.
-The joined lines are stored in @code{clast} and @code{cline}.
-If no fields are skipped, @code{clast} and @code{cline} are set to
-@code{last} and @code{$0}, respectively.
-Finally, if characters are skipped, @code{substr()} is used to strip off the
-leading @code{charcount} characters in @code{clast} and @code{cline}.  The
-two strings are then compared and @code{are_equal()} returns the result:
+@code{$0}, to the previous line, @code{last}.  It handles skipping fields
+and characters.  If no field count and no character count are specified,
+@code{are_equal()} returns one or zero depending upon the result of a
+simple string comparison of @code{last} and @code{$0}.
+
+Otherwise, things get more complicated.  If fields have to be skipped,
+each line is broken into an array using @code{split()} (@pxref{String
+Functions}); the desired fields are then joined back into a line
+using @code{join()}.  The joined lines are stored in @code{clast} and
+@code{cline}.  If no fields are skipped, @code{clast} and @code{cline}
+are set to @code{last} and @code{$0}, respectively.  Finally, if
+characters are skipped, @code{substr()} is used to strip off the leading
+@code{charcount} characters in @code{clast} and @code{cline}.  The two
+strings are then compared and @code{are_equal()} returns the result:
 
 @example
 @c file eg/prog/uniq.awk
@@ -24209,10 +24596,10 @@ The second rule does the work. The variable @code{equal} is one or zero,
 depending upon the results of @code{are_equal()}'s comparison. If @command{uniq}
 is counting repeated lines, and the lines are equal, then it increments the @code{count} variable.
 Otherwise, it prints the line and resets @code{count},
-since the two lines are not equal.
+because the two lines are not equal.
 
 If @command{uniq} is not counting, and if the lines are equal, @code{count} is incremented.
-Nothing is printed, since the point is to remove duplicates.
+Nothing is printed, as the point is to remove duplicates.
 Otherwise, if @command{uniq} is counting repeated lines and more than
 one line is seen, or if @command{uniq} is counting nonrepeated lines
 and only one line is seen, then the line is printed, and @code{count}
@@ -24264,6 +24651,13 @@ END @{
 @c endfile
 @end example
 
+@c FIXME: Include this?
+@ignore
+This program does not follow our recommended convention of naming
+global variables with a leading capital letter.  Doing that would
+make the program a little easier to follow.
+@end ignore
+
 @ifset FOR_PRINT
 The logic for choosing which lines to print represents a @dfn{state
 machine}, which is ``a device that can be in one of a set number of stable
@@ -24271,34 +24665,25 @@ conditions depending on its previous condition and on the present values
 of its inputs.''@footnote{This is the definition returned from entering
 @code{define: state machine} into Google.}
 Brian Kernighan suggests that
-``an alternative approach to state mechines is to just read
+``an alternative approach to state machines is to just read
 the input into an array, then use indexing.  It's almost always
 easier code, and for most inputs where you would use this, just
-as fast.''  Consider how to rewrite the logic to follow this 
+as fast.''  Consider how to rewrite the logic to follow this
 suggestion.
 @end ifset
 
 
-@c ENDOFRANGE prunt
-@c ENDOFRANGE tpul
-@c ENDOFRANGE uniq
 
 @node Wc Program
 @subsection Counting Things
 
 @c FIXME: One day, update to current POSIX version of wc
 
-@c STARTOFRANGE count
 @cindex counting
-@c STARTOFRANGE infco
 @cindex input files, counting elements in
-@c STARTOFRANGE woco
 @cindex words, counting
-@c STARTOFRANGE chco
 @cindex characters, counting
-@c STARTOFRANGE lico
 @cindex lines, counting
-@c STARTOFRANGE wc
 @cindex @command{wc} utility
 The @command{wc} (word count) utility counts lines, words, and characters in
 one or more input files. Its usage is as follows:
@@ -24309,7 +24694,7 @@ one or more input files. Its usage is as follows:
 
 If no files are specified on the command line, @command{wc} reads its standard
 input. If there are multiple files, it also prints total counts for all
-the files.  The options and their meanings are shown in the following list:
+the files.  The options and their meanings are as follows:
 
 @table @code
 @item -l
@@ -24326,7 +24711,7 @@ Count only characters.
 @end table
 
 Implementing @command{wc} in @command{awk} is particularly elegant,
-since @command{awk} does a lot of the work for us; it splits lines into
+because @command{awk} does a lot of the work for us; it splits lines into
 words (i.e., fields) and counts them, it counts lines (i.e., records),
 and it can easily tell us how long a line is.
 
@@ -24431,7 +24816,7 @@ function endfile(file)
 @end example
 
 There is one rule that is executed for each line. It adds the length of
-the record, plus one, to @code{chars}.@footnote{Since @command{gawk}
+the record, plus one, to @code{chars}.@footnote{Because @command{gawk}
 understands multibyte locales, this code counts characters, not bytes.}
 Adding one plus the record length
 is needed because the newline character separating records (the value
@@ -24468,13 +24853,6 @@ END @{
 @}
 @c endfile
 @end example
-@c ENDOFRANGE count
-@c ENDOFRANGE infco
-@c ENDOFRANGE lico
-@c ENDOFRANGE woco
-@c ENDOFRANGE chco
-@c ENDOFRANGE wc
-@c ENDOFRANGE posimawk
 
 @node Miscellaneous Programs
 @section A Grab Bag of @command{awk} Programs
@@ -24605,9 +24983,7 @@ Aharon Robbins <arnold@skeeve.com> wrote:
 @author Erik Quanstrom
 @end quotation
 
-@c STARTOFRANGE tialarm
 @cindex time, alarm clock example program
-@c STARTOFRANGE alaex
 @cindex alarm clock example program
 The following program is a simple ``alarm clock'' program.
 You give it a time of day and an optional message.  At the specified time,
@@ -24623,7 +24999,7 @@ checking and setting of defaults: the delay, the count, and the message to
 print.  If the user supplied a message without the ASCII BEL
 character (known as the ``alert'' character, @code{"\a"}), then it is added to
 the message.  (On many systems, printing the ASCII BEL generates an
-audible alert. Thus when the alarm goes off, the system calls attention
+audible alert. Thus, when the alarm goes off, the system calls attention
 to itself in case the user is not looking at the computer.)
 Just for a change, this program uses a @code{switch} statement
 (@pxref{Switch Statement}), but the processing could be done with a series of
@@ -24759,15 +25135,11 @@ seconds are necessary:
 @}
 @c endfile
 @end example
-@c ENDOFRANGE tialarm
-@c ENDOFRANGE alaex
 
 @node Translate Program
 @subsection Transliterating Characters
 
-@c STARTOFRANGE chtra
 @cindex characters, transliterating
-@c STARTOFRANGE tr
 @cindex @command{tr} utility
 The system @command{tr} utility transliterates characters.  For example, it is
 often used to map uppercase letters into lowercase for further processing:
@@ -24779,8 +25151,8 @@ often used to map uppercase letters into lowercase for further processing:
 @command{tr} requires two lists of characters.@footnote{On some older
 systems, including Solaris, the system version of @command{tr} may require
 that the lists be written as range expressions enclosed in square brackets
-(@samp{[a-z]}) and quoted, to prevent the shell from attempting a file
-name expansion.  This is not a feature.}  When processing the input, the
+(@samp{[a-z]}) and quoted, to prevent the shell from attempting a
+@value{FN} expansion.  This is not a feature.}  When processing the input, the
 first character in the first list is replaced with the first character
 in the second list, the second character in the first list is replaced
 with the second character in the second list, and so on.  If there are
@@ -24790,34 +25162,31 @@ character of the ``to'' list is used for the remaining characters in the
 
 Once upon a time,
 @c early or mid-1989!
-a user proposed that a transliteration function should
-be added to @command{gawk}.
+a user proposed adding a transliteration function
+to @command{gawk}.
 @c Wishing to avoid gratuitous new features,
 @c at least theoretically
 The following program was written to
 prove that character transliteration could be done with a user-level
-function.  This program is not as complete as the system @command{tr} utility
+function.  This program is not as complete as the system @command{tr} utility,
 but it does most of the job.
 
-The @command{translate} program demonstrates one of the few weaknesses
-of standard @command{awk}: dealing with individual characters is very
-painful, requiring repeated use of the @code{substr()}, @code{index()},
-and @code{gsub()} built-in functions
-(@pxref{String Functions}).@footnote{This
-program was also written before @command{gawk} acquired the ability to
-split each character in a string into separate array elements.}
-There are two functions.  The first, @code{stranslate()}, takes three
-arguments:
+The @command{translate} program was written long before @command{gawk}
+acquired the ability to split each character in a string into separate
+array elements.  Thus, it makes repeated use of the @code{substr()},
+@code{index()}, and @code{gsub()} built-in functions (@pxref{String
+Functions}).  There are two functions.  The first, @code{stranslate()},
+takes three arguments:
 
 @table @code
 @item from
-A list of characters from which to translate.
+A list of characters from which to translate
 
 @item to
-A list of characters to which to translate.
+A list of characters to which to translate
 
 @item target
-The string on which to do the translation.
+The string on which to do the translation
 @end table
 
 Associative arrays make the translation part fairly easy. @code{t_ar} holds
@@ -24826,7 +25195,7 @@ loop goes through @code{from}, one character at a time.  For each character
 in @code{from}, if the character appears in @code{target},
 it is replaced with the corresponding @code{to} character.
 
-The @code{translate()} function simply calls @code{stranslate()} using @code{$0}
+The @code{translate()} function calls @code{stranslate()}, using @code{$0}
 as the target.  The main program sets two global variables, @code{FROM} and
 @code{TO}, from the command line, and then changes @code{ARGV} so that
 @command{awk} reads from the standard input.
@@ -24848,7 +25217,7 @@ Finally, the processing rule simply calls @code{translate()} for each record:
 @c endfile
 @end ignore
 @c file eg/prog/translate.awk
-# Bugs: does not handle things like: tr A-Z a-z, it has
+# Bugs: does not handle things like tr A-Z a-z; it has
 # to be spelled out. However, if `to' is shorter than `from',
 # the last character in `to' is used for the rest of `from'.
 
@@ -24898,9 +25267,9 @@ BEGIN @{
 @c endfile
 @end example
 
-While it is possible to do character transliteration in a user-level
-function, it is not necessarily efficient, and we (the @command{gawk}
-authors) started to consider adding a built-in function.  However,
+It is possible to do character transliteration in a user-level
+function, but it is not necessarily efficient, and we (the @command{gawk}
+developers) started to consider adding a built-in function.  However,
 shortly after writing this program, we learned that Brian Kernighan
 had added the @code{toupper()} and @code{tolower()} functions to his
 @command{awk} (@pxref{String Functions}).  These functions handle the
@@ -24918,17 +25287,13 @@ such as @samp{a-z}, as allowed by the @command{tr} utility.
 Look at the code for @file{cut.awk} (@pxref{Cut Program})
 for inspiration.
 
-@c ENDOFRANGE chtra
-@c ENDOFRANGE tr
 
 @node Labels Program
 @subsection Printing Mailing Labels
 
-@c STARTOFRANGE prml
 @cindex printing, mailing labels
-@c STARTOFRANGE mlprint
 @cindex mailing labels@comma{} printing
-Here is a ``real world''@footnote{``Real world'' is defined as
+Here is a ``real-world''@footnote{``Real world'' is defined as
 ``a program actually used to get something done.''}
 program.  This
 script reads lists of names and
@@ -24937,14 +25302,14 @@ on it, two across and 10 down.  The addresses are guaranteed to be no more
 than five lines of data.  Each address is separated from the next by a blank
 line.
 
-The basic idea is to read 20 labels worth of data.  Each line of each label
+The basic idea is to read 20 labels' worth of data.  Each line of each label
 is stored in the @code{line} array.  The single rule takes care of filling
 the @code{line} array and printing the page when 20 labels have been read.
 
 The @code{BEGIN} rule simply sets @code{RS} to the empty string, so that
 @command{awk} splits records at blank lines
 (@pxref{Records}).
-It sets @code{MAXLINES} to 100, since 100 is the maximum number
+It sets @code{MAXLINES} to 100, because 100 is the maximum number
 of lines on the page
 @iftex
 (@math{20 @cdot 5 = 100}).
@@ -24960,12 +25325,12 @@ of lines on the page
 
 Most of the work is done in the @code{printpage()} function.
 The label lines are stored sequentially in the @code{line} array.  But they
-have to print horizontally; @code{line[1]} next to @code{line[6]},
-@code{line[2]} next to @code{line[7]}, and so on.  Two loops are used to
+have to print horizontally: @code{line[1]} next to @code{line[6]},
+@code{line[2]} next to @code{line[7]}, and so on.  Two loops
 accomplish this.  The outer loop, controlled by @code{i}, steps through
 every 10 lines of data; this is each row of labels.  The inner loop,
 controlled by @code{j}, goes through the lines within the row.
-As @code{j} goes from 0 to 4, @samp{i+j} is the @code{j}-th line in
+As @code{j} goes from 0 to 4, @samp{i+j} is the @code{j}th line in
 the row, and @samp{i+j+5} is the entry next to it.  The output ends up
 looking something like this:
 
@@ -24990,7 +25355,6 @@ that there are two blank lines at the top and two blank lines at the bottom.
 The @code{END} rule arranges to flush the final page of labels; there may
 not have been an even multiple of 20 labels in the data:
 
-@c STARTOFRANGE labels
 @cindex @code{labels.awk} program
 @example
 @c file eg/prog/labels.awk
@@ -25055,14 +25419,10 @@ END @{
 @}
 @c endfile
 @end example
-@c ENDOFRANGE prml
-@c ENDOFRANGE mlprint
-@c ENDOFRANGE labels
 
 @node Word Sorting
 @subsection Generating Word-Usage Counts
 
-@c STARTOFRANGE worus
 @cindex words, usage counts@comma{} generating
 
 When working with large amounts of text, it can be interesting to know
@@ -25075,7 +25435,7 @@ in a useful format.
 At first glance, a program like this would seem to do the job:
 
 @example
-# Print list of word frequencies
+# wordfreq-first-try.awk --- print list of word frequencies
 
 @{
     for (i = 1; i <= NF; i++)
@@ -25088,8 +25448,8 @@ END @{
 @}
 @end example
 
-The program relies on @command{awk}'s default field splitting
-mechanism to break each line up into ``words,'' and uses an
+The program relies on @command{awk}'s default field-splitting
+mechanism to break each line up into ``words'' and uses an
 associative array named @code{freq}, indexed by each word, to count
 the number of times the word occurs. In the @code{END} rule,
 it prints the counts.
@@ -25101,9 +25461,9 @@ useful on real text files:
 @item
 The @command{awk} language considers upper- and lowercase characters to be
 distinct.  Therefore, ``bartender'' and ``Bartender'' are not treated
-as the same word.  This is undesirable, since in normal text, words
-are capitalized if they begin sentences, and a frequency analyzer should not
-be sensitive to capitalization.
+as the same word.  This is undesirable, because words are capitalized
+if they begin sentences in normal text, and a frequency analyzer should
+not be sensitive to capitalization.
 
 @item
 Words are detected using the @command{awk} convention that fields are
@@ -25124,7 +25484,6 @@ to remove punctuation characters.  Finally, we solve the third problem
 by using the system @command{sort} utility to process the output of the
 @command{awk} script.  Here is the new version of the program:
 
-@c STARTOFRANGE wordfreq
 @cindex @code{wordfreq.awk} program
 @example
 @c file eg/prog/wordfreq.awk
@@ -25145,8 +25504,8 @@ END @{
 @}
 @end example
 
-The regexp @samp{/[^[:alnum:]_[:blank:]]/} might have been written
-@samp{/[[:punct:]]/}, but then underscores would also be removed,
+The regexp @code{/[^[:alnum:]_[:blank:]]/} might have been written
+@code{/[[:punct:]]/}, but then underscores would also be removed,
 and we want to keep them.
 
 Assuming we have saved this program in a file named @file{wordfreq.awk},
@@ -25189,16 +25548,13 @@ This way of sorting must be used on systems that do not
 have true pipes at the command-line (or batch-file) level.
 See the general operating system documentation for more information on how
 to use the @command{sort} program.
-@c ENDOFRANGE worus
-@c ENDOFRANGE wordfreq
 
 @node History Sorting
 @subsection Removing Duplicates from Unsorted Text
 
-@c STARTOFRANGE lidu
 @cindex lines, duplicate@comma{} removing
 The @command{uniq} program
-(@pxref{Uniq Program}),
+(@pxref{Uniq Program})
 removes duplicate lines from @emph{sorted} data.
 
 Suppose, however, you need to remove duplicate lines from a @value{DF} but
@@ -25220,7 +25576,6 @@ Each element of @code{lines} is a unique command, and the indices of
 The @code{END} rule simply prints out the lines, in order:
 
 @cindex Rakitzis, Byron
-@c STARTOFRANGE histsort
 @cindex @code{histsort.awk} program
 @example
 @c file eg/prog/histsort.awk
@@ -25263,15 +25618,11 @@ print data[lines[i]], lines[i]
 @noindent
 This works because @code{data[$0]} is incremented each time a line is
 seen.
-@c ENDOFRANGE lidu
-@c ENDOFRANGE histsort
 
 @node Extract Program
 @subsection Extracting Programs from Texinfo Source Files
 
-@c STARTOFRANGE texse
 @cindex Texinfo, extracting programs from source files
-@c STARTOFRANGE fitex
 @cindex files, Texinfo@comma{} extracting programs from
 @ifnotinfo
 Both this chapter and the previous chapter
@@ -25284,24 +25635,24 @@ The nodes
 and @ref{Sample Programs},
 are the top level nodes for a large number of @command{awk} programs.
 @end ifinfo
-If you want to experiment with these programs, it is tedious to have to type
+If you want to experiment with these programs, it is tedious to type
 them in by hand.  Here we present a program that can extract parts of a
 Texinfo input file into separate files.
 
 @cindex Texinfo
 This @value{DOCUMENT} is written in @uref{http://www.gnu.org/software/texinfo/, Texinfo},
-the GNU project's document formatting language.
+the GNU Project's document formatting language.
 A single Texinfo source file can be used to produce both
-printed and online documentation.
+printed documentation, with @TeX{}, and online documentation.
 @ifnotinfo
-Texinfo is fully documented in the book
+(Texinfo is fully documented in the book
 @cite{Texinfo---The GNU Documentation Format},
 available from the Free Software Foundation,
-and also available @uref{http://www.gnu.org/software/texinfo/manual/texinfo/, online}.
+and also available @uref{http://www.gnu.org/software/texinfo/manual/texinfo/, online}.)
 @end ifnotinfo
 @ifinfo
-The Texinfo language is described fully, starting with
-@inforef{Top, , Texinfo, texinfo,Texinfo---The GNU Documentation Format}.
+(The Texinfo language is described fully, starting with
+@inforef{Top, , Texinfo, texinfo,Texinfo---The GNU Documentation Format}.)
 @end ifinfo
 
 For our purposes, it is enough to know three things about Texinfo input
@@ -25349,7 +25700,7 @@ The Texinfo file looks something like this:
 
 @example
 @dots{}
-This program has a @@code@{BEGIN@} rule,
+This program has a @@code@{BEGIN@} rule
 that prints a nice message:
 
 @@example
@@ -25362,7 +25713,7 @@ It also prints some final advice:
 
 @@example
 @@c file examples/messages.awk
-END @@@{ print "Always avoid bored archeologists!" @@@}
+END @@@{ print "Always avoid bored archaeologists!" @@@}
 @@c end file
 @@end example
 @dots{}
@@ -25375,12 +25726,10 @@ The first rule handles calling @code{system()}, checking that a command is
 given (@code{NF} is at least three) and also checking that the command
 exits with a zero exit status, signifying OK:
 
-@c STARTOFRANGE extract
 @cindex @code{extract.awk} program
 @example
 @c file eg/prog/extract.awk
-# extract.awk --- extract files and run programs
-#                 from texinfo files
+# extract.awk --- extract files and run programs from Texinfo files
 @c endfile
 @ignore
 @c file eg/prog/extract.awk
@@ -25394,8 +25743,7 @@ exits with a zero exit status, signifying OK:
 
 BEGIN    @{ IGNORECASE = 1 @}
 
-/^@@c(omment)?[ \t]+system/    \
-@{
+/^@@c(omment)?[ \t]+system/ @{
     if (NF < 3) @{
         e = ("extract: " FILENAME ":" FNR)
         e = (e  ": badly formed `system' line")
@@ -25422,12 +25770,12 @@ The second rule handles moving data into files.  It verifies that a
 @value{FN} is given in the directive.  If the file named is not the
 current file, then the current file is closed.  Keeping the current file
 open until a new file is encountered allows the use of the @samp{>}
-redirection for printing the contents, keeping open file management
+redirection for printing the contents, keeping open-file management
 simple.
 
 The @code{for} loop does the work.  It reads lines using @code{getline}
 (@pxref{Getline}).
-For an unexpected end of file, it calls the @code{@w{unexpected_eof()}}
+For an unexpected end-of-file, it calls the @code{@w{unexpected_eof()}}
 function.  If the line is an ``endfile'' line, then it breaks out of
 the loop.
 If the line is an @samp{@@group} or @samp{@@end group} line, then it
@@ -25452,8 +25800,7 @@ line.  That line is then printed to the output file:
 
 @example
 @c file eg/prog/extract.awk
-/^@@c(omment)?[ \t]+file/    \
-@{
+/^@@c(omment)?[ \t]+file/ @{
     if (NF != 3) @{
         e = ("extract: " FILENAME ":" FNR ": badly formed `file' line")
         print e > "/dev/stderr"
@@ -25513,7 +25860,7 @@ The @code{END} rule handles the final cleanup, closing the open file:
 function unexpected_eof()
 @{
     printf("extract: %s:%d: unexpected EOF or error\n",
-        FILENAME, FNR) > "/dev/stderr"
+                     FILENAME, FNR) > "/dev/stderr"
     exit 1
 @}
 @end group
@@ -25524,29 +25871,26 @@ END @{
 @}
 @c endfile
 @end example
-@c ENDOFRANGE texse
-@c ENDOFRANGE fitex
-@c ENDOFRANGE extract
 
 @node Simple Sed
 @subsection A Simple Stream Editor
 
 @cindex @command{sed} utility
 @cindex stream editors
-The @command{sed} utility is a stream editor, a program that reads a
+The @command{sed} utility is a @dfn{stream editor}, a program that reads a
 stream of data, makes changes to it, and passes it on.
 It is often used to make global changes to a large file or to a stream
 of data generated by a pipeline of commands.
-While @command{sed} is a complicated program in its own right, its most common
+Although @command{sed} is a complicated program in its own right, its most common
 use is to perform global substitutions in the middle of a pipeline:
 
 @example
-command1 < orig.data | sed 's/old/new/g' | command2 > result
+@var{command1} < orig.data | sed 's/old/new/g' | @var{command2} > result
 @end example
 
 Here, @samp{s/old/new/g} tells @command{sed} to look for the regexp
 @samp{old} on each input line and globally replace it with the text
-@samp{new}, i.e., all the occurrences on a line.  This is similar to
+@samp{new} (i.e., all the occurrences on a line).  This is similar to
 @command{awk}'s @code{gsub()} function
 (@pxref{String Functions}).
 
@@ -25556,7 +25900,6 @@ additional arguments are treated as @value{DF} names to process. If none
 are provided, the standard input is used:
 
 @cindex Brennan, Michael
-@c STARTOFRANGE awksed
 @cindex @command{awksed.awk} program
 @c @cindex simple stream editor
 @c @cindex stream editor, simple
@@ -25630,17 +25973,14 @@ not treated as @value{FN}s
 (@pxref{ARGC and ARGV}).
 
 The @code{usage()} function prints an error message and exits.
-Finally, the single rule handles the printing scheme outlined above,
+Finally, the single rule handles the printing scheme outlined earlier,
 using @code{print} or @code{printf} as appropriate, depending upon the
 value of @code{RT}.
-@c ENDOFRANGE awksed
 
 @node Igawk Program
 @subsection An Easy Way to Use Library Functions
 
-@c STARTOFRANGE libfex
 @cindex libraries of @command{awk} functions, example program for using
-@c STARTOFRANGE flibex
 @cindex functions, library, example program for using
 In @ref{Include Files}, we saw how @command{gawk} provides a built-in
 file-inclusion capability.  However, this is a @command{gawk} extension.
@@ -25674,15 +26014,15 @@ BEGIN @{
 
 The following program, @file{igawk.sh}, provides this service.
 It simulates @command{gawk}'s searching of the @env{AWKPATH} variable
-and also allows @dfn{nested} includes; i.e., a file that is included
-with @code{@@include} can contain further @code{@@include} statements.
+and also allows @dfn{nested} includes (i.e., a file that is included
+with @code{@@include} can contain further @code{@@include} statements).
 @command{igawk} makes an effort to only include files once, so that nested
 includes don't accidentally include a library function twice.
 
 @command{igawk} should behave just like @command{gawk} externally.  This
 means it should accept all of @command{gawk}'s command-line arguments,
 including the ability to have multiple source files specified via
-@option{-f}, and the ability to mix command-line and library source files.
+@option{-f} and the ability to mix command-line and library source files.
 
 The program is written using the POSIX Shell (@command{sh}) command
 language.@footnote{Fully explaining the @command{sh} language is beyond
@@ -25705,10 +26045,10 @@ Literal text, provided with @option{-e} or @option{--source}.  This
 text is just appended directly.
 
 @item
-Source @value{FN}s, provided with @option{-f}.  We use a neat trick and append
-@samp{@@include @var{filename}} to the shell variable's contents.  Since the file-inclusion
-program works the way @command{gawk} does, this gets the text
-of the file included into the program at the correct point.
+Source @value{FN}s, provided with @option{-f}.  We use a neat trick and
+append @samp{@@include @var{filename}} to the shell variable's contents.
+Because the file-inclusion program works the way @command{gawk} does, this
+gets the text of the file included in the program at the correct point.
 @end enumerate
 
 @item
@@ -25721,7 +26061,7 @@ Run the expanded program with @command{gawk} and any other original command-line
 arguments that the user supplied (such as the @value{DF} names).
 @end enumerate
 
-This program uses shell variables extensively: for storing command-line arguments,
+This program uses shell variables extensively: for storing command-line arguments and
 the text of the @command{awk} program that will expand the user's program, for the
 user's original program, and for the expanded program.  Doing so removes some
 potential problems that might arise were we to use temporary files instead,
@@ -25773,12 +26113,12 @@ should be the @command{awk} program.  If there are no command-line
 arguments left, @command{igawk} prints an error message and exits.
 Otherwise, the first argument is appended to @code{program}.
 In any case, after the arguments have been processed,
+the shell variable
 @code{program} contains the complete text of the original @command{awk}
 program.
 
 The program is as follows:
 
-@c STARTOFRANGE igawk
 @cindex @code{igawk.sh} program
 @example
 @c file eg/prog/igawk.sh
@@ -25895,8 +26235,8 @@ the path, and an attempt is made to open the generated @value{FN}.
 The only way to test if a file can be read in @command{awk} is to go
 ahead and try to read it with @code{getline}; this is what @code{pathto()}
 does.@footnote{On some very old versions of @command{awk}, the test
-@samp{getline junk < t} can loop forever if the file exists but is empty.
-Caveat emptor.} If the file can be read, it is closed and the @value{FN}
+@samp{getline junk < t} can loop forever if the file exists but is empty.}
+If the file can be read, it is closed and the @value{FN}
 is returned:
 
 @ignore
@@ -26006,9 +26346,10 @@ EOF
 @c endfile
 @end example
 
-The shell construct @samp{@var{command} << @var{marker}} is called a @dfn{here document}.
-Everything in the shell script up to the @var{marker} is fed to @var{command} as input.
-The shell processes the contents of the here document for variable and command substitution
+The shell construct @samp{@var{command} << @var{marker}} is called
+a @dfn{here document}.  Everything in the shell script up to the
+@var{marker} is fed to @var{command} as input.  The shell processes
+the contents of the here document for variable and command substitution
 (and possibly other things as well, depending upon the shell).
 
 The shell construct @samp{$(@dots{})} is called @dfn{command substitution}.
@@ -26023,34 +26364,21 @@ It's done in these steps:
 @enumerate
 @item
 Run @command{gawk} with the @code{@@include}-processing program (the
-value of the @code{expand_prog} shell variable) on standard input.
+value of the @code{expand_prog} shell variable) reading standard input.
 
 @item
-Standard input is the contents of the user's program, from the shell variable @code{program}.
-Its contents are fed to @command{gawk} via a here document.
+Standard input is the contents of the user's program,
+from the shell variable @code{program}.
+Feed its contents to @command{gawk} via a here document.
 
 @item
-The results of this processing are saved in the shell variable @code{processed_program} by using command substitution.
+Save the results of this processing in the shell variable
+@code{processed_program} by using command substitution.
 @end enumerate
 
 The last step is to call @command{gawk} with the expanded program,
 along with the original
-options and command-line arguments that the user supplied.
-
-@c this causes more problems than it solves, so leave it out.
-@ignore
-The special file @file{/dev/null} is passed as a @value{DF} to @command{gawk}
-to handle an interesting case. Suppose that the user's program only has
-a @code{BEGIN} rule and there are no @value{DF}s to read.
-The program should exit without reading any @value{DF}s.
-However, suppose that an included library file defines an @code{END}
-rule of its own. In this case, @command{gawk} will hang, reading standard
-input. In order to avoid this, @file{/dev/null} is explicitly added to the
-command line. Reading from @file{/dev/null} always returns an immediate
-end of file indication.
-
-@c Hmm. Add /dev/null if $# is 0?  Still messes up ARGV. Sigh.
-@end ignore
+options and command-line arguments that the user supplied:
 
 @example
 @c file eg/prog/igawk.sh
@@ -26096,19 +26424,13 @@ in C or C++, and it is frequently easier to do certain kinds of string
 and argument manipulation using the shell than it is in @command{awk}.
 
 Finally, @command{igawk} shows that it is not always necessary to add new
-features to a program; they can often be layered on top.
-@ignore
-With @command{igawk},
-there is no real reason to build @code{@@include} processing into
-@command{gawk} itself.
-@end ignore
-@c ENDOFRANGE libfex
-@c ENDOFRANGE flibex
-@c ENDOFRANGE awkpex
-@c ENDOFRANGE igawk
+features to a program; they can often be layered on top.@footnote{@command{gawk}
+does @code{@@include} processing itself in order to support the use
+of @command{awk} programs as Web CGI scripts.}
+
 
 @node Anagram Program
-@subsection Finding Anagrams From A Dictionary
+@subsection Finding Anagrams from a Dictionary
 
 @cindex anagrams, finding
 An interesting programming challenge is to
@@ -26117,25 +26439,23 @@ word list (such as
 @file{/usr/share/dict/words} on many GNU/Linux systems).
 One word is an anagram of another if both words contain
 the same letters
-(for example, ``babbling'' and ``blabbing'').
+(e.g., ``babbling'' and ``blabbing'').
 
-An elegant algorithm is presented in Column 2, Problem C of
-Jon Bentley's @cite{Programming Pearls}, second edition.
-The idea is to give words that are anagrams a common signature,
-sort all the words together by their signature, and then print them.
-Dr.@: Bentley observes that taking the letters in each word and
-sorting them produces that common signature.
+Column 2, Problem C, of Jon Bentley's @cite{Programming Pearls}, Second
+Edition, presents an elegant algorithm.  The idea is to give words that
+are anagrams a common signature, sort all the words together by their
+signatures, and then print them.  Dr.@: Bentley observes that taking the
+letters in each word and sorting them produces those common signatures.
 
 The following program uses arrays of arrays to bring together
 words with the same signature and array sorting to print the words
-in sorted order.
+in sorted order:
 
-@c STARTOFRANGE anagram
 @cindex @code{anagram.awk} program
 @example
 @c file eg/prog/anagram.awk
-# anagram.awk --- An implementation of the anagram finding algorithm
-#                 from Jon Bentley's "Programming Pearls", 2nd edition.
+# anagram.awk --- An implementation of the anagram-finding algorithm
+#                 from Jon Bentley's "Programming Pearls," 2nd edition.
 #                 Addison Wesley, 2000, ISBN 0-201-65788-0.
 #                 Column 2, Problem C, section 2.8, pp 18-20.
 @c endfile
@@ -26183,7 +26503,7 @@ sorts the letters, and then joins them back together:
 
 @example
 @c file eg/prog/anagram.awk
-# word2key --- split word apart into letters, sort, joining back together
+# word2key --- split word apart into letters, sort, and join back together
 
 function word2key(word,     a, i, n, result)
 @{
@@ -26200,7 +26520,7 @@ function word2key(word,     a, i, n, result)
 
 Finally, the @code{END} rule traverses the array
 and prints out the anagram lists.  It sends the output
-to the system @command{sort} command, since otherwise
+to the system @command{sort} command because otherwise
 the anagrams would appear in arbitrary order:
 
 @example
@@ -26228,21 +26548,20 @@ Here is some partial output when the program is run:
 @example
 $ @kbd{gawk -f anagram.awk /usr/share/dict/words | grep '^b'}
 @dots{}
-babbled blabbed 
-babbler blabber brabble 
-babblers blabbers brabbles 
-babbling blabbing 
-babbly blabby 
-babel bable 
-babels beslab 
-babery yabber 
+babbled blabbed
+babbler blabber brabble
+babblers blabbers brabbles
+babbling blabbing
+babbly blabby
+babel bable
+babels beslab
+babery yabber
 @dots{}
 @end example
 
-@c ENDOFRANGE anagram
 
 @node Signature Program
-@subsection And Now For Something Completely Different
+@subsection And Now for Something Completely Different
 
 @cindex signature program
 @cindex Brini, Davide
@@ -26282,28 +26601,28 @@ Subject: The GNU Awk User's Guide, Section 13.3.11
 From: "Chris Johansen" <johansen@main.nc.us>
 Message-ID: <op.v0iw6wlv7finx3@asusodin.thrudvang.lan>
 
-Arnold, you don't know me, but we have a tenuous connection.  My wife is  
+Arnold, you don't know me, but we have a tenuous connection.  My wife is
 Barbara A. Field, FAIA, GIT '65 (B. Arch.).
 
-I have had a couple of paper copies of "Effective Awk Programming" for  
-years, and now I'm going through a Kindle version of "The GNU Awk User's  
-Guide" again.  When I got to section 13.3.11, I reformatted and lightly  
+I have had a couple of paper copies of "Effective Awk Programming" for
+years, and now I'm going through a Kindle version of "The GNU Awk User's
+Guide" again.  When I got to section 13.3.11, I reformatted and lightly
 commented Davide Brin's signature script to understand its workings.
 
-It occurs to me that this might have pedagogical value as an example  
-(although imperfect) of the value of whitespace and comments, and a  
-starting point for that discussion.  It certainly helped _me_ understand  
-what's going on.  You are welcome to it, as-is or modified (subject to  
+It occurs to me that this might have pedagogical value as an example
+(although imperfect) of the value of whitespace and comments, and a
+starting point for that discussion.  It certainly helped _me_ understand
+what's going on.  You are welcome to it, as-is or modified (subject to
 Davide's constraints, of course, which I think I have met).
 
-If I were to include it in a future edition, I would put it at some  
-distance from section 13.3.11, say, as a note or an appendix, so as not to  
+If I were to include it in a future edition, I would put it at some
+distance from section 13.3.11, say, as a note or an appendix, so as not to
 be a "spoiler" to the puzzle.
 
 Best regards,
--- 
+--
 Chris Johansen {johansen at main dot nc dot us}
-  . . . collapsing the probability wave function, sending ripples of  
+  . . . collapsing the probability wave function, sending ripples of
 certainty through the space-time continuum.
 
 
@@ -26312,7 +26631,7 @@ certainty through the space-time continuum.
 # From "13.3.11 And Now For Something Completely Different"
 #   http://www.gnu.org/software/gawk/manual/html_node/Signature-Program.html#Signature-Program
 
-# Copyright © 2008 Davide Brini 
+# Copyright © 2008 Davide Brini
 
 # Copying and distribution of the code published in this page, with
 # or without modification, are permitted in any medium without
@@ -26358,7 +26677,7 @@ BEGIN {
 
 @itemize @value{BULLET}
 @item
-The functions provided in this @value{CHAPTER} and the previous one
+The programs provided in this @value{CHAPTER}
 continue on the theme that reading programs is an excellent way to learn
 Good Programming.
 
@@ -26379,12 +26698,13 @@ characters.  The ability to use @code{split()} with the empty string as
 the separator can considerably simplify such tasks.
 
 @item
-The library functions from @ref{Library Functions}, proved their
-usefulness for a number of real (if small) programs.
+The examples here demonstrate the usefulness of the library
+functions from @DBREF{Library Functions}
+for a number of real (if small) programs.
 
 @item
 Besides reinventing POSIX wheels, other programs solved a selection of
-interesting problems, such as finding duplicates words in text, printing
+interesting problems, such as finding duplicate words in text, printing
 mailing labels, and finding anagrams.
 
 @end itemize
@@ -26396,7 +26716,7 @@ mailing labels, and finding anagrams.
 @enumerate
 @item
 Rewrite @file{cut.awk} (@pxref{Cut Program})
-using @code{split()} with @code{""} as the seperator.
+using @code{split()} with @code{""} as the separator.
 
 @item
 In @ref{Egrep Program}, we mentioned that @samp{egrep -i} could be
@@ -26428,10 +26748,10 @@ conditions depending on its previous condition and on the present values
 of its inputs.''@footnote{This is the definition returned from entering
 @code{define: state machine} into Google.}
 Brian Kernighan suggests that
-``an alternative approach to state mechines is to just read
+``an alternative approach to state machines is to just read
 the input into an array, then use indexing.  It's almost always
 easier code, and for most inputs where you would use this, just
-as fast.''  Rewrite the logic to follow this 
+as fast.''  Rewrite the logic to follow this
 suggestion.
 
 
@@ -26532,7 +26852,7 @@ the use of the external @command{sort} utility.
 @c EXCLUDE END
 
 @ifnotinfo
-@part @value{PART3}Moving Beyond Standard @command{awk} With @command{gawk}
+@part @value{PART3}Moving Beyond Standard @command{awk} with @command{gawk}
 @end ifnotinfo
 
 @ifdocbook
@@ -26541,27 +26861,25 @@ It contains the following chapters:
 
 @itemize @value{BULLET}
 @item
-@ref{Advanced Features}.
+@ref{Advanced Features}
 
 @item
-@ref{Internationalization}.
+@ref{Internationalization}
 
 @item
-@ref{Debugger}.
+@ref{Debugger}
 
 @item
-@ref{Arbitrary Precision Arithmetic}.
+@ref{Arbitrary Precision Arithmetic}
 
 @item
-@ref{Dynamic Extensions}.
+@ref{Dynamic Extensions}
 @end itemize
 @end ifdocbook
 
 @node Advanced Features
 @chapter Advanced Features of @command{gawk}
-@c STARTOFRANGE gawadv
 @cindex @command{gawk}, features, advanced
-@c STARTOFRANGE advgaw
 @cindex advanced features, @command{gawk}
 @ignore
 Contributed by: Peter Langston <pud!psl@bellcore.bellcore.com>
@@ -26582,18 +26900,18 @@ a violent psychopath who knows where you live.}
 This @value{CHAPTER} discusses advanced features in @command{gawk}.
 It's a bit of a ``grab bag'' of items that are otherwise unrelated
 to each other.
-First, a command-line option allows @command{gawk} to recognize
+First, we look at a command-line option that allows @command{gawk} to recognize
 nondecimal numbers in input data, not just in @command{awk}
 programs.
 Then, @command{gawk}'s special features for sorting arrays are presented.
 Next, two-way I/O, discussed briefly in earlier parts of this
 @value{DOCUMENT}, is described in full detail, along with the basics
-of TCP/IP networking.  Finally, @command{gawk}
+of TCP/IP networking.  Finally, we see how @command{gawk}
 can @dfn{profile} an @command{awk} program, making it possible to tune
 it for performance.
 
 @c FULLXREF ON
-A number of advanced features require separate @value{CHAPTER}s of their
+Additional advanced features are discussed in separate @value{CHAPTER}s of their
 own:
 
 @itemize @value{BULLET}
@@ -26635,13 +26953,11 @@ discusses the ability to dynamically add new built-in functions to
 @cindex constants, nondecimal
 
 If you run @command{gawk} with the @option{--non-decimal-data} option,
-you can have nondecimal constants in your input data:
+you can have nondecimal values in your input data:
 
-@c line break here for small book format
 @example
 $ @kbd{echo 0123 123 0x123 |}
-> @kbd{gawk --non-decimal-data '@{ printf "%d, %d, %d\n",}
->                                         @kbd{$1, $2, $3 @}'}
+> @kbd{gawk --non-decimal-data '@{ printf "%d, %d, %d\n", $1, $2, $3 @}'}
 @print{} 83, 123, 291
 @end example
 
@@ -26682,12 +26998,15 @@ Instead, use the @code{strtonum()} function to convert your data
 (@pxref{String Functions}).
 This makes your programs easier to write and easier to read, and
 leads to less surprising results.
+
+This option may disappear in a future version of @command{gawk}.
 @end quotation
 
 @node Array Sorting
 @section Controlling Array Traversal and Array Sorting
 
-@command{gawk} lets you control the order in which a @samp{for (i in array)}
+@command{gawk} lets you control the order in which a
+@samp{for (@var{indx} in @var{array})}
 loop traverses an array.
 
 In addition, two built-in functions, @code{asort()} and @code{asorti()},
@@ -26703,7 +27022,7 @@ to order the elements during sorting.
 @node Controlling Array Traversal
 @subsection Controlling Array Traversal
 
-By default, the order in which a @samp{for (i in array)} loop
+By default, the order in which a @samp{for (@var{indx} in @var{array})} loop
 scans an array is not defined; it is generally based upon
 the internal implementation of arrays inside @command{awk}.
 
@@ -26712,11 +27031,13 @@ in a particular order that you, the programmer, choose.  @command{gawk}
 lets you do this.
 
 @DBREF{Controlling Scanning} describes how you can assign special,
-pre-defined values to @code{PROCINFO["sorted_in"]} in order to
+predefined values to @code{PROCINFO["sorted_in"]} in order to
 control the order in which @command{gawk} traverses an array
 during a @code{for} loop.
 
-In addition, the value of @code{PROCINFO["sorted_in"]} can be a function name.
+In addition, the value of @code{PROCINFO["sorted_in"]} can be a
+function name.@footnote{This is why the predefined sorting orders
+start with an @samp{@@} character, which cannot be part of an identifier.}
 This lets you traverse an array based on any custom criterion.
 The array elements are ordered according to the return value of this
 function.  The comparison function should be defined with at least
@@ -26730,23 +27051,23 @@ function comp_func(i1, v1, i2, v2)
 @}
 @end example
 
-Here, @var{i1} and @var{i2} are the indices, and @var{v1} and @var{v2}
+Here, @code{i1} and @code{i2} are the indices, and @code{v1} and @code{v2}
 are the corresponding values of the two elements being compared.
-Either @var{v1} or @var{v2}, or both, can be arrays if the array being
+Either @code{v1} or @code{v2}, or both, can be arrays if the array being
 traversed contains subarrays as values.
-(@xref{Arrays of Arrays}, for more information about subarrays.)
+(@DBXREF{Arrays of Arrays} for more information about subarrays.)
 The three possible return values are interpreted as follows:
 
 @table @code
 @item comp_func(i1, v1, i2, v2) < 0
-Index @var{i1} comes before index @var{i2} during loop traversal.
+Index @code{i1} comes before index @code{i2} during loop traversal.
 
 @item comp_func(i1, v1, i2, v2) == 0
-Indices @var{i1} and @var{i2}
-come together but the relative order with respect to each other is undefined.
+Indices @code{i1} and @code{i2}
+come together, but the relative order with respect to each other is undefined.
 
 @item comp_func(i1, v1, i2, v2) > 0
-Index @var{i1} comes after index @var{i2} during loop traversal.
+Index @code{i1} comes after index @code{i2} during loop traversal.
 @end table
 
 Our first comparison function can be used to scan an array in
@@ -26777,7 +27098,7 @@ function cmp_str_val(i1, v1, i2, v2)
 
 The third
 comparison function makes all numbers, and numeric strings without
-any leading or trailing spaces, come out first during loop traversal:  
+any leading or trailing spaces, come out first during loop traversal:
 
 @example
 function cmp_num_str_val(i1, v1, i2, v2,   n1, n2)
@@ -26785,10 +27106,10 @@ function cmp_num_str_val(i1, v1, i2, v2,   n1, n2)
      # numbers before string value comparison, ascending order
      n1 = v1 + 0
      n2 = v2 + 0
-     if (n1 == v1) 
+     if (n1 == v1)
          return (n2 == v2) ? (n1 - n2) : -1
      else if (n2 == v2)
-         return 1 
+         return 1
      return (v1 < v2) ? -1 : (v1 != v2)
 @}
 @end example
@@ -26803,7 +27124,7 @@ BEGIN @{
     data[10] = "one"
     data[100] = 100
     data[20] = "two"
-    
+
     f[1] = "cmp_num_idx"
     f[2] = "cmp_str_val"
     f[3] = "cmp_num_str_val"
@@ -26827,14 +27148,14 @@ $ @kbd{gawk -f compdemo.awk}
 @print{}     data[10] = one
 @print{}     data[20] = two
 @print{}     data[100] = 100
-@print{} 
+@print{}
 @print{} Sort function: cmp_str_val      @ii{Sort by element values as strings}
 @print{}     data[one] = 10
 @print{}     data[100] = 100             @ii{String 100 is less than string 20}
 @print{}     data[two] = 20
 @print{}     data[10] = one
 @print{}     data[20] = two
-@print{} 
+@print{}
 @print{} Sort function: cmp_num_str_val  @ii{Sort all numeric values before all strings}
 @print{}     data[one] = 10
 @print{}     data[two] = 20
@@ -26845,10 +27166,10 @@ $ @kbd{gawk -f compdemo.awk}
 
 Consider sorting the entries of a GNU/Linux system password file
 according to login name.  The following program sorts records
-by a specific field position and can be used for this purpose:   
+by a specific field position and can be used for this purpose:
 
 @example
-# sort.awk --- simple program to sort by field position
+# passwd-sort.awk --- simple program to sort by field position
 # field position is specified by the global variable POS
 
 function cmp_field(i1, v1, i2, v2)
@@ -26891,7 +27212,7 @@ $ @kbd{gawk -v POS=1 -F: -f sort.awk /etc/passwd}
 
 The comparison should normally always return the same value when given a
 specific pair of array elements as its arguments.  If inconsistent
-results are returned then the order is undefined.  This behavior can be
+results are returned, then the order is undefined.  This behavior can be
 exploited to introduce random order into otherwise seemingly
 ordered data:
 
@@ -26903,11 +27224,11 @@ function cmp_randomize(i1, v1, i2, v2)
 @}
 @end example
 
-As mentioned above, the order of the indices is arbitrary if two
+As already mentioned, the order of the indices is arbitrary if two
 elements compare equal.  This is usually not a problem, but letting
 the tied elements come out in arbitrary order can be an issue, especially
 when comparing item values.  The partial ordering of the equal elements
-may change during the next loop traversal, if other elements are added or
+may change the next time the array is traversed, if other elements are added to or
 removed from the array.  One way to resolve ties when comparing elements
 with otherwise equal values is to include the indices in the comparison
 rules.  Note that doing this may make the loop traversal less efficient,
@@ -26944,21 +27265,21 @@ When string comparisons are made during a sort, either for element
 values where one or both aren't numbers, or for element indices
 handled as strings, the value of @code{IGNORECASE}
 (@pxref{Built-in Variables}) controls whether
-the comparisons treat corresponding uppercase and lowercase letters as
+the comparisons treat corresponding upper- and lowercase letters as
 equivalent or distinct.
 
-Another point to keep in mind is that in the case of subarrays
+Another point to keep in mind is that in the case of subarrays,
 the element values can themselves be arrays; a production comparison
 function should use the @code{isarray()} function
-(@pxref{Type Functions}),
+(@pxref{Type Functions})
 to check for this, and choose a defined sorting order for subarrays.
 
 All sorting based on @code{PROCINFO["sorted_in"]}
 is disabled in POSIX mode,
-since the @code{PROCINFO} array is not special in that case.
+because the @code{PROCINFO} array is not special in that case.
 
 As a side note, sorting the array indices before traversing
-the array has been reported to add 15% to 20% overhead to the
+the array has been reported to add a 15% to 20% overhead to the
 execution time of @command{awk} programs. For this reason,
 sorted array traversal is not the default.
 
@@ -26976,8 +27297,8 @@ sorted array traversal is not the default.
 @cindex @code{asorti()} function (@command{gawk}), arrays@comma{} sorting
 @cindex sort function, arrays, sorting
 In most @command{awk} implementations, sorting an array requires writing
-a @code{sort()} function.  While this can be educational for exploring
-different sorting algorithms, usually that's not the point of the program.
+a @code{sort()} function.  This can be educational for exploring
+different sorting algorithms, but usually that's not the point of the program.
 @command{gawk} provides the built-in @code{asort()} and @code{asorti()}
 functions (@pxref{String Functions}) for sorting arrays.  For example:
 
@@ -27017,7 +27338,7 @@ However, the @code{source} array is not affected.
 Often, what's needed is to sort on the values of the @emph{indices}
 instead of the values of the elements.  To do that, use the
 @code{asorti()} function.  The interface and behavior are identical to
-that of @code{asort()}, except that the index values are used for sorting,
+that of @code{asort()}, except that the index values are used for sorting
 and become the values of the result array:
 
 @example
@@ -27052,8 +27373,8 @@ it chooses}, taking into account just the indices, just the values,
 or both.  This is extremely powerful.
 
 Once the array is sorted, @code{asort()} takes the @emph{values} in
-their final order, and uses them to fill in the result array, whereas
-@code{asorti()} takes the @emph{indices} in their final order, and uses
+their final order and uses them to fill in the result array, whereas
+@code{asorti()} takes the @emph{indices} in their final order and uses
 them to fill in the result array.
 
 @cindex reference counting, sorting arrays
@@ -27073,10 +27394,9 @@ Because @code{IGNORECASE} affects string comparisons, the value
 of @code{IGNORECASE} also affects sorting for both @code{asort()} and @code{asorti()}.
 Note also that the locale's sorting order does @emph{not}
 come into play; comparisons are based on character values only.@footnote{This
-is true because locale-based comparison occurs only when in POSIX
-compatibility mode, and since @code{asort()} and @code{asorti()} are
+is true because locale-based comparison occurs only when in
+POSIX-compatibility mode, and because @code{asort()} and @code{asorti()} are
 @command{gawk} extensions, they are not available in that case.}
-Caveat Emptor.
 
 @node Two-way I/O
 @section Two-Way Communications with Another Process
@@ -27142,7 +27462,7 @@ for example, @file{/tmp} will not do, as another user might happen
 to be using a temporary file with the same name.@footnote{Michael
 Brennan suggests the use of @command{rand()} to generate unique
 @value{FN}s. This is a valid point; nevertheless, temporary files
-remain more difficult than two-way pipes.} @c 8/2014
+remain more difficult to use than two-way pipes.} @c 8/2014
 
 @cindex coprocesses
 @cindex input/output, two-way
@@ -27151,7 +27471,7 @@ remain more difficult than two-way pipes.} @c 8/2014
 @cindex @command{csh} utility, @code{|&} operator, comparison with
 However, with @command{gawk}, it is possible to
 open a @emph{two-way} pipe to another process.  The second process is
-termed a @dfn{coprocess}, since it runs in parallel with @command{gawk}.
+termed a @dfn{coprocess}, as it runs in parallel with @command{gawk}.
 The two-way connection is created using the @samp{|&} operator
 (borrowed from the Korn shell, @command{ksh}):@footnote{This is very
 different from the same operator in the C shell and in Bash.}
@@ -27256,7 +27576,7 @@ like so:
 @example
 command = "sort -nr"           # command, save in convenience variable
 PROCINFO[command, "pty"] = 1   # update PROCINFO
-print @dots{} |& command       # start two-way pipe
+print @dots{} |& command           # start two-way pipe
 @dots{}
 @end example
 
@@ -27270,7 +27590,6 @@ using regular pipes.
 @section Using @command{gawk} for Network Programming
 @cindex advanced features, network programming
 @cindex networks, programming
-@c STARTOFRANGE tcpip
 @cindex TCP/IP
 @cindex @code{/inet/@dots{}} special files (@command{gawk})
 @cindex files, @code{/inet/@dots{}} (@command{gawk})
@@ -27281,21 +27600,23 @@ using regular pipes.
 @cindex @code{EMISTERED}
 @ifnotdocbook
 @quotation
-@code{EMISTERED}:@*
+@code{EMRED}:@*
 @ @ @ @ @i{A host is a host from coast to coast,@*
-@ @ @ @ and no-one can talk to host that's close,@*
+@ @ @ @ and nobody talks to a host that's close,@*
 @ @ @ @ unless the host that isn't close@*
-@ @ @ @ is busy hung or dead.}
+@ @ @ @ is busy, hung, or dead.}
+@author Mike O'Brien (aka Mr.@: Protocol)
 @end quotation
 @end ifnotdocbook
 
 @docbook
 <blockquote>
+<attribution>Mike O'Brien (aka Mr.&nbsp;Protocol)</attribution>
 <literallayout class="normal"><literal>EMISTERED</literal>:
 &nbsp;&nbsp;&nbsp;&nbsp;<emphasis>A host is a host from coast to coast,</emphasis>
 &nbsp;&nbsp;&nbsp;&nbsp;<emphasis>and no-one can talk to host that's close,</emphasis>
 &nbsp;&nbsp;&nbsp;&nbsp;<emphasis>unless the host that isn't close</emphasis>
-&nbsp;&nbsp;&nbsp;&nbsp;<emphasis>is busy hung or dead.</emphasis></literallayout>
+&nbsp;&nbsp;&nbsp;&nbsp;<emphasis>is busy, hung, or dead.</emphasis></literallayout>
 </blockquote>
 @end docbook
 
@@ -27309,7 +27630,7 @@ You can think of this as just a @emph{very long} two-way pipeline to
 a coprocess.
 The way @command{gawk} decides that you want to use TCP/IP networking is
 by recognizing special @value{FN}s that begin with one of @samp{/inet/},
-@samp{/inet4/} or @samp{/inet6/}.
+@samp{/inet4/}, or @samp{/inet6/}.
 
 The full syntax of the special @value{FN} is
 @file{/@var{net-type}/@var{protocol}/@var{local-port}/@var{remote-host}/@var{remote-port}}.
@@ -27326,7 +27647,7 @@ the system default, most likely IPv4.
 @item protocol
 The protocol to use over IP.  This must be either @samp{tcp}, or
 @samp{udp}, for a TCP or UDP IP connection,
-respectively.  The use of TCP is recommended for most applications.
+respectively.  TCP should be used for most applications.
 
 @item local-port
 @cindex @code{getaddrinfo()} function (C library)
@@ -27338,7 +27659,7 @@ or @samp{http}, in which case @command{gawk} attempts to determine
 the predefined port number using the C @code{getaddrinfo()} function.
 
 @item remote-host
-The IP address or fully-qualified domain name of the Internet
+The IP address or fully qualified domain name of the Internet
 host to which you want to connect.
 
 @item remote-port
@@ -27350,7 +27671,7 @@ service name.
 @cindex @command{gawk}, @code{ERRNO} variable in
 @cindex @code{ERRNO} variable
 @quotation NOTE
-Failure in opening a two-way socket will result in a non-fatal error
+Failure in opening a two-way socket will result in a nonfatal error
 being returned to the calling code. The value of @code{ERRNO} indicates
 the error (@pxref{Auto-set}).
 @end quotation
@@ -27359,39 +27680,36 @@ Consider the following very simple example:
 
 @example
 BEGIN @{
-  Service = "/inet/tcp/0/localhost/daytime"
-  Service |& getline
-  print $0
-  close(Service)
+    Service = "/inet/tcp/0/localhost/daytime"
+    Service |& getline
+    print $0
+    close(Service)
 @}
 @end example
 
 This program reads the current date and time from the local system's
-TCP @samp{daytime} server.
+TCP @code{daytime} server.
 It then prints the results and closes the connection.
 
 Because this topic is extensive, the use of @command{gawk} for
 TCP/IP programming is documented separately.
 @ifinfo
 See
-@inforef{Top, , General Introduction, gawkinet, TCP/IP Internetworking with @command{gawk}},
+@inforef{Top, , General Introduction, gawkinet, @value{GAWKINETTITLE}},
 @end ifinfo
 @ifnotinfo
 See
 @uref{http://www.gnu.org/software/gawk/manual/gawkinet/,
-@cite{TCP/IP Internetworking with @command{gawk}}},
+@cite{@value{GAWKINETTITLE}}},
 which comes as part of the @command{gawk} distribution,
 @end ifnotinfo
 for a much more complete introduction and discussion, as well as
 extensive examples.
 
-@c ENDOFRANGE tcpip
 
 @node Profiling
 @section Profiling Your @command{awk} Programs
-@c STARTOFRANGE awkp
 @cindex @command{awk} programs, profiling
-@c STARTOFRANGE proawk
 @cindex profiling @command{awk} programs
 @cindex @code{awkprof.out} file
 @cindex files, @code{awkprof.out}
@@ -27412,12 +27730,12 @@ gawk --profile=myprog.prof -f myprog.awk data1 data2
 @end example
 
 @noindent
-In the above example, @command{gawk} places the profile in
+In the preceding example, @command{gawk} places the profile in
 @file{myprog.prof} instead of in @file{awkprof.out}.
 
-Here is a sample session showing a simple @command{awk} program, its input data, and the
-results from running @command{gawk} with the @option{--profile} option.
-First, the @command{awk} program:
+Here is a sample session showing a simple @command{awk} program,
+its input data, and the results from running @command{gawk} with the
+@option{--profile} option.  First, the @command{awk} program:
 
 @example
 BEGIN @{ print "First BEGIN rule" @}
@@ -27458,16 +27776,16 @@ junk
 @end example
 
 Here is the @file{awkprof.out} that results from running the
-@command{gawk} profiler on this program and data. (This example also
+@command{gawk} profiler on this program and data (this example also
 illustrates that @command{awk} programmers sometimes get up very early
-in the morning to work.)
+in the morning to work):
 
 @cindex @code{BEGIN} pattern, and profiling
 @cindex @code{END} pattern, and profiling
 @example
-    # gawk profile, created Thu Feb 27 05:16:21 2014
+    # gawk profile, created Mon Sep 29 05:16:21 2014
 
-    # BEGIN block(s)
+    # BEGIN rule(s)
 
     BEGIN @{
  1          print "First BEGIN rule"
@@ -27494,7 +27812,7 @@ in the morning to work.)
             @}
     @}
 
-    # END block(s)
+    # END rule(s)
 
     END @{
  1          print "First END rule"
@@ -27520,8 +27838,8 @@ They are as follows:
 @item
 The program is printed in the order @code{BEGIN} rules,
 @code{BEGINFILE} rules,
-pattern/action rules,
-@code{ENDFILE} rules, @code{END} rules and functions, listed
+pattern--action rules,
+@code{ENDFILE} rules, @code{END} rules, and functions, listed
 alphabetically.
 Multiple @code{BEGIN} and @code{END} rules retain their
 separate identities, as do
@@ -27529,7 +27847,7 @@ multiple @code{BEGINFILE} and @code{ENDFILE} rules.
 
 @cindex patterns, counts, in a profile
 @item
-Pattern-action rules have two counts.
+Pattern--action rules have two counts.
 The first count, to the left of the rule, shows how many times
 the rule's pattern was @emph{tested}.
 The second count, to the right of the rule's opening left brace
@@ -27575,7 +27893,7 @@ the body of an @code{if}, @code{else}, or loop is only a single statement.
 @item
 Parentheses are used only where needed, as indicated by the structure
 of the program and the precedence rules.
-For example, @samp{(3 + 5) * 4} means add three plus five, then multiply
+For example, @samp{(3 + 5) * 4} means add three and five, then multiply
 the total by four.  However, @samp{3 + 5 * 4} has no parentheses, and
 means @samp{3 + (5 * 4)}.
 
@@ -27596,16 +27914,15 @@ the target of a redirection isn't a scalar, it gets parenthesized.
 @command{gawk} supplies leading comments in
 front of the @code{BEGIN} and @code{END} rules,
 the @code{BEGINFILE} and @code{ENDFILE} rules,
-the pattern/action rules, and the functions.
+the pattern--action rules, and the functions.
 
 @end itemize
 
 The profiled version of your program may not look exactly like what you
 typed when you wrote it.  This is because @command{gawk} creates the
-profiled version by ``pretty printing'' its internal representation of
+profiled version by ``pretty-printing'' its internal representation of
 the program.  The advantage to this is that @command{gawk} can produce
-a standard representation.  The disadvantage is that all source-code
-comments are lost.
+a standard representation.
 Also, things such as:
 
 @example
@@ -27622,7 +27939,7 @@ come out as:
 @end example
 
 @noindent
-which is correct, but possibly surprising.
+which is correct, but possibly unexpected.
 
 @cindex profiling @command{awk} programs, dynamically
 @cindex @command{gawk} program, dynamic profiling
@@ -27654,7 +27971,7 @@ $ @kbd{kill -USR1 13992}
 
 @noindent
 As usual, the profiled version of the program is written to
-@file{awkprof.out}, or to a different file if one specified with
+@file{awkprof.out}, or to a different file if one was specified with
 the @option{--profile} option.
 
 Along with the regular profile, as shown earlier, the profile file
@@ -27686,24 +28003,38 @@ If you use the @code{HUP} signal instead of the @code{USR1} signal,
 @cindex @code{SIGQUIT} signal (MS-Windows)
 @cindex signals, @code{QUIT}/@code{SIGQUIT} (MS-Windows)
 When @command{gawk} runs on MS-Windows systems, it uses the
-@code{INT} and @code{QUIT} signals for producing the profile and, in
+@code{INT} and @code{QUIT} signals for producing the profile, and in
 the case of the @code{INT} signal, @command{gawk} exits.  This is
 because these systems don't support the @command{kill} command, so the
 only signals you can deliver to a program are those generated by the
 keyboard.  The @code{INT} signal is generated by the
-@kbd{Ctrl-@key{C}} or @kbd{Ctrl-@key{BREAK}} key, while the
-@code{QUIT} signal is generated by the @kbd{Ctrl-@key{\}} key.
+@kbd{Ctrl-c} or @kbd{Ctrl-BREAK} key, while the
+@code{QUIT} signal is generated by the @kbd{Ctrl-\} key.
 
 Finally, @command{gawk} also accepts another option, @option{--pretty-print}.
-When called this way, @command{gawk} ``pretty prints'' the program into
+When called this way, @command{gawk} ``pretty-prints'' the program into
 @file{awkprof.out}, without any execution counts.
 
 @quotation NOTE
 Once upon a time, the @option{--pretty-print} option would also run
 your program.  This is is no longer the case.
 @end quotation
-@c ENDOFRANGE awkp
-@c ENDOFRANGE proawk
+
+There is a significant difference between the output created when
+profiling, and that created when pretty-printing.  Pretty-printed output
+preserves the original comments that were in the program, although their
+placement may not correspond exactly to their original locations in the
+source code.
+
+However, as a deliberate design decision, profiling output @emph{omits}
+the original program's comments. This allows you to focus on the
+execution count data and helps you avoid the temptation to use the
+profiler for pretty-printing.
+
+Additionally, pretty-printed output does not have the leading indentation
+that the profiling output does. This makes it easy to pretty-print your
+code once development is completed, and then use the result as the final
+version of your program.
 
 @node Advanced Features Summary
 @section Summary
@@ -27714,6 +28045,7 @@ The @option{--non-decimal-data} option causes @command{gawk} to treat
 octal- and hexadecimal-looking input data as octal and hexadecimal.
 This option should be used with caution or not at all; use of @code{strtonum()}
 is preferable.
+Note that this option may disappear in a future version of @command{gawk}.
 
 @item
 You can take over complete control of sorting in @samp{for (@var{indx} in @var{array})}
@@ -27727,15 +28059,15 @@ those functions sort arrays. Or you may provide one of the predefined control
 strings that work for @code{PROCINFO["sorted_in"]}.
 
 @item
-You can use the @samp{|&} operator to create a two-way pipe to a co-process.
-You read from the co-process with @code{getline} and write to it with @code{print}
-or @code{printf}. Use @code{close()} to close off the co-process completely, or
+You can use the @samp{|&} operator to create a two-way pipe to a coprocess.
+You read from the coprocess with @code{getline} and write to it with @code{print}
+or @code{printf}. Use @code{close()} to close off the coprocess completely, or
 optionally, close off one side of the two-way communications.
 
 @item
-By using special ``@value{FN}s'' with the @samp{|&} operator, you can open a
-TCP/IP (or UDP/IP) connection to remote hosts in the Internet. @command{gawk}
-supports both IPv4 an IPv6.
+By using special @value{FN}s with the @samp{|&} operator, you can open a
+TCP/IP (or UDP/IP) connection to remote hosts on the Internet. @command{gawk}
+supports both IPv4 and IPv6.
 
 @item
 You can generate statement count profiles of your program. This can help you
@@ -27744,13 +28076,11 @@ you tune them more easily.  Sending the @code{USR1} signal while profiling cause
 @command{gawk} to dump the profile and keep going, including a function call stack.
 
 @item
-You can also just ``pretty print'' the program. This currently also runs
+You can also just ``pretty-print'' the program. This currently also runs
 the program, but that will change in the next major release.
 
 @end itemize
 
-@c ENDOFRANGE advgaw
-@c ENDOFRANGE gawadv
 
 @node Internationalization
 @chapter Internationalization with @command{gawk}
@@ -27763,7 +28093,6 @@ countries, they were able to sell more systems.
 As a result, internationalization and localization
 of programs and software systems became a common practice.
 
-@c STARTOFRANGE inloc
 @cindex internationalization, localization
 @cindex @command{gawk}, internationalization and, See internationalization
 @cindex internationalization, localization, @command{gawk} and
@@ -27796,7 +28125,7 @@ a requirement.
 @cindex localization
 @dfn{Internationalization} means writing (or modifying) a program once,
 in such a way that it can use multiple languages without requiring
-further source-code changes.
+further source code changes.
 @dfn{Localization} means providing the data necessary for an
 internationalized program to work in a particular language.
 Most typically, these terms refer to features such as the language
@@ -27808,11 +28137,10 @@ monetary values are printed and read.
 @section GNU @command{gettext}
 
 @cindex internationalizing a program
-@c STARTOFRANGE gettex
 @cindex @command{gettext} library
 @command{gawk} uses GNU @command{gettext} to provide its internationalization
 features.
-The facilities in GNU @command{gettext} focus on messages; strings printed
+The facilities in GNU @command{gettext} focus on messages: strings printed
 by a program, either directly or via formatting with @code{printf} or
 @code{sprintf()}.@footnote{For some operating systems, the @command{gawk}
 port doesn't support GNU @command{gettext}.
@@ -27833,8 +28161,7 @@ following steps, in this order:
 
 @enumerate
 @item
-The programmer goes
-through the source for all of @command{guide}'s components
+The programmer reviews the source for all of @command{guide}'s components
 and marks each string that is a candidate for translation.
 For example, @code{"`-F': option required"} is a good candidate for translation.
 A table with strings of option names is not (e.g., @command{gawk}'s
@@ -27861,7 +28188,6 @@ lookup of the translations.
 
 @cindex @code{.po} files
 @cindex files, @code{.po}
-@c STARTOFRANGE portobfi
 @cindex portable object files
 @cindex files, portable object
 @item
@@ -27873,7 +28199,6 @@ For example, there might be a @file{fr.po} for a French translation.
 @cindex @code{.gmo} files
 @cindex files, @code{.gmo}
 @cindex message object files
-@c STARTOFRANGE portmsgfi
 @cindex files, message object
 @item
 Each language's @file{.po} file is converted into a binary
@@ -27954,8 +28279,8 @@ if necessary.  (It is almost never necessary to supply a different category.)
 @cindex sorting characters in different languages
 @cindex @code{LC_COLLATE} locale category
 @item LC_COLLATE
-Text-collation information; i.e., how different characters
-and/or groups of characters sort in a given language.
+Text-collation information (i.e., how different characters
+and/or groups of characters sort in a given language).
 
 @cindex @code{LC_CTYPE} locale category
 @item LC_CTYPE
@@ -27973,7 +28298,7 @@ In June 2001 Bruno Haible wrote:
 This information is accessed via the
 POSIX character classes in regular expressions,
 such as @code{/[[:alnum:]]/}
-(@pxref{Regexp Operators}).
+(@pxref{Bracket Expressions}).
 
 @cindex monetary information, localization
 @cindex currency symbols, localization
@@ -28001,14 +28326,12 @@ before or after the day in a date, local month abbreviations, and so on.
 @item LC_ALL
 All of the above.  (Not too useful in the context of @command{gettext}.)
 @end table
-@c ENDOFRANGE gettex
 
 @node Programmer i18n
 @section Internationalizing @command{awk} Programs
-@c STARTOFRANGE inap
 @cindex @command{awk} programs, internationalizing
 
-@command{gawk} provides the following variables and functions for
+@command{gawk} provides the following variables for
 internationalization:
 
 @table @code
@@ -28024,7 +28347,12 @@ value is @code{"messages"}.
 String constants marked with a leading underscore
 are candidates for translation at runtime.
 String constants without a leading underscore are not translated.
+@end table
 
+@command{gawk} provides the following functions for
+internationalization:
+
+@table @code
 @cindexgawkfunc{dcgettext}
 @item @code{dcgettext(@var{string}} [@code{,} @var{domain} [@code{,} @var{category}]]@code{)}
 Return the translation of @var{string} in
@@ -28056,7 +28384,7 @@ default arguments.
 Return the plural form used for @var{number} of the
 translation of @var{string1} and @var{string2} in text domain
 @var{domain} for locale category @var{category}. @var{string1} is the
-English singular variant of a message, and @var{string2} the English plural
+English singular variant of a message, and @var{string2} is the English plural
 variant of the same message.
 The default value for @var{domain} is the current value of @code{TEXTDOMAIN}.
 The default value for @var{category} is @code{"LC_MESSAGES"}.
@@ -28081,15 +28409,7 @@ If @var{directory} is the null string (@code{""}), then
 given @var{domain}.
 @end table
 
-To use these facilities in your @command{awk} program, follow the steps
-outlined in
-@ifnotinfo
-the previous @value{SECTION},
-@end ifnotinfo
-@ifinfo
-@ref{Explaining gettext},
-@end ifinfo
-like so:
+To use these facilities in your @command{awk} program, follow these steps:
 
 @enumerate
 @cindex @code{BEGIN} pattern, @code{TEXTDOMAIN} variable and
@@ -28144,9 +28464,11 @@ This example would be better done with @code{dcngettext()}:
 
 @example
 if (groggy)
-    message = dcngettext("%d customer disturbing me\n", "%d customers disturbing me\n", "adminprog")
+    message = dcngettext("%d customer disturbing me\n",
+                         "%d customers disturbing me\n", "adminprog")
 else
-    message = dcngettext("enjoying %d customer\n", "enjoying %d customers\n", "adminprog")
+    message = dcngettext("enjoying %d customer\n",
+                         "enjoying %d customers\n", "adminprog")
 printf(message, ncustomers)
 @end example
 
@@ -28172,7 +28494,7 @@ BEGIN @{
 
 @end enumerate
 
-@xref{I18N Example},
+@DBXREF{I18N Example}
 for an example program showing the steps to create
 and use translations from @command{awk}.
 
@@ -28218,7 +28540,7 @@ First, use the @option{--gen-pot} command-line option to create
 the initial @file{.pot} file:
 
 @example
-$ @kbd{gawk --gen-pot -f guide.awk > guide.pot}
+gawk --gen-pot -f guide.awk > guide.pot
 @end example
 
 @cindex @code{xgettext} utility
@@ -28233,11 +28555,9 @@ second argument to @code{dcngettext()}.@footnote{The
 You should distribute the generated @file{.pot} file with
 your @command{awk} program; translators will eventually use it
 to provide you translations that you can also then distribute.
-@xref{I18N Example},
+@DBXREF{I18N Example}
 for the full list of steps to go through to create and test
 translations for @command{guide}.
-@c ENDOFRANGE portobfi
-@c ENDOFRANGE portmsgfi
 
 @node Printf Ordering
 @subsection Rearranging @code{printf} Arguments
@@ -28282,11 +28602,11 @@ example, @samp{string} is the first argument and @samp{length(string)} is the se
 
 @example
 $ @kbd{gawk 'BEGIN @{}
->     @kbd{string = "Dont Panic"}
+>     @kbd{string = "Don\47t Panic"}
 >     @kbd{printf "%2$d characters live in \"%1$s\"\n",}
 >                         @kbd{string, length(string)}
 > @kbd{@}'}
-@print{} 10 characters live in "Dont Panic"
+@print{} 11 characters live in "Don't Panic"
 @end example
 
 If present, positional specifiers come first in the format specification,
@@ -28361,7 +28681,7 @@ change:
 @cindex @code{TEXTDOMAIN} variable, portability and
 @item
 Assignments to @code{TEXTDOMAIN} won't have any effect,
-since @code{TEXTDOMAIN} is not special in other @command{awk} implementations.
+because @code{TEXTDOMAIN} is not special in other @command{awk} implementations.
 
 @item
 Non-GNU versions of @command{awk} treat marked strings
@@ -28372,7 +28692,7 @@ the null string (@code{""}) as its value, leaving the original string constant a
 the result.
 
 @item
-By defining ``dummy'' functions to replace @code{dcgettext()}, @code{dcngettext()}
+By defining ``dummy'' functions to replace @code{dcgettext()}, @code{dcngettext()},
 and @code{bindtextdomain()}, the @command{awk} program can be made to run, but
 all the messages are output in the original language.
 For example:
@@ -28409,11 +28729,10 @@ enough arguments are supplied in the function call.  Many versions of
 underlying C library version of @code{sprintf()}, but only one format and
 argument at a time.  What happens if a positional specification is
 used is anybody's guess.
-However, since the positional specifications are primarily for use in
-@emph{translated} format strings, and since non-GNU @command{awk}s never
+However, because the positional specifications are primarily for use in
+@emph{translated} format strings, and because non-GNU @command{awk}s never
 retrieve the translated string, this should not be a problem in practice.
 @end itemize
-@c ENDOFRANGE inap
 
 @node I18N Example
 @section A Simple Internationalization Example
@@ -28473,7 +28792,7 @@ called ``Hippy.'' Ah, well.}
 
 @example
 @group
-$ cp guide.pot guide-mellow.po
+$ @kbd{cp guide.pot guide-mellow.po}
 @var{Add translations to} guide-mellow.po @dots{}
 @end group
 @end example
@@ -28498,7 +28817,8 @@ msgstr "Like, the scoop is"
 @cindex GNU/Linux
 The next step is to make the directory to hold the binary message object
 file and then to create the @file{guide.mo} file.
-We pretend that our file is to be used in the @code{en_US.UTF-8} locale.
+We pretend that our file is to be used in the @code{en_US.UTF-8} locale,
+because we have to use a locale name known to the C @command{gettext} routines.
 The directory layout shown here is standard for GNU @command{gettext} on
 GNU/Linux systems.  Other versions of @command{gettext} may use a different
 layout:
@@ -28519,8 +28839,8 @@ $ @kbd{mkdir en_US.UTF-8 en_US.UTF-8/LC_MESSAGES}
 The @command{msgfmt} utility does the conversion from human-readable
 @file{.po} file to machine-readable @file{.mo} file.
 By default, @command{msgfmt} creates a file named @file{messages}.
-This file must be renamed and placed in the proper directory so that
-@command{gawk} can find it:
+This file must be renamed and placed in the proper directory (using
+the @option{-o} option) so that @command{gawk} can find it:
 
 @example
 $ @kbd{msgfmt guide-mellow.po -o en_US.UTF-8/LC_MESSAGES/guide.mo}
@@ -28535,7 +28855,7 @@ $ @kbd{gawk -f guide.awk}
 @print{} Pardon me, Zaphod who?
 @end example
 
-If the three replacement functions for @code{dcgettext()}, @code{dcngettext()}
+If the three replacement functions for @code{dcgettext()}, @code{dcngettext()},
 and @code{bindtextdomain()}
 (@pxref{I18N Portability})
 are in a file named @file{libintl.awk},
@@ -28556,15 +28876,15 @@ using the GNU @command{gettext} package.
 (GNU @command{gettext} is described in
 complete detail in
 @ifinfo
-@inforef{Top, , GNU @command{gettext} utilities, gettext, GNU gettext tools}.)
+@inforef{Top, , GNU @command{gettext} utilities, gettext, GNU @command{gettext} utilities}.)
 @end ifinfo
 @ifnotinfo
 @uref{http://www.gnu.org/software/gettext/manual/,
-@cite{GNU gettext tools}}.)
+@cite{GNU @command{gettext} utilities}}.)
 @end ifnotinfo
 As of this writing, the latest version of GNU @command{gettext} is
-@uref{ftp://ftp.gnu.org/gnu/gettext/gettext-0.19.1.tar.gz,
-@value{PVERSION} 0.19.1}.
+@uref{ftp://ftp.gnu.org/gnu/gettext/gettext-0.19.4.tar.gz,
+@value{PVERSION} 0.19.4}.
 
 If a translation of @command{gawk}'s messages exists,
 then @command{gawk} produces usage messages, warnings,
@@ -28576,7 +28896,7 @@ and fatal errors in the local language.
 @itemize @value{BULLET}
 @item
 Internationalization means writing a program such that it can use multiple
-languages without requiring source-code changes.  Localization means
+languages without requiring source code changes.  Localization means
 providing the data necessary for an internationalized program to work
 in a particular language.
 
@@ -28593,9 +28913,9 @@ file, and the @file{.po} files are compiled into @file{.gmo} files for
 use at runtime.
 
 @item
-You can use position specifications with @code{sprintf()} and
+You can use positional specifications with @code{sprintf()} and
 @code{printf} to rearrange the placement of argument values in formatted
-strings and output. This is useful for the translations of format
+strings and output. This is useful for the translation of format
 control strings.
 
 @item
@@ -28608,7 +28928,6 @@ a number of translations for its messages.
 
 @end itemize
 
-@c ENDOFRANGE inloc
 
 @node Debugger
 @chapter Debugging @command{awk} Programs
@@ -28637,7 +28956,7 @@ how to use @command{gawk} for debugging your program is easy.
 @end menu
 
 @node Debugging
-@section Introduction to The @command{gawk} Debugger
+@section Introduction to the @command{gawk} Debugger
 
 This @value{SECTION} introduces debugging in general and begins
 the discussion of debugging in @command{gawk}.
@@ -28652,11 +28971,10 @@ the discussion of debugging in @command{gawk}.
 @subsection Debugging in General
 
 (If you have used debuggers in other languages, you may want to skip
-ahead to the next section on the specific features of the @command{awk}
-debugger.)
+ahead to @ref{Awk Debugging}.)
 
-Of course, a debugging program cannot remove bugs for you, since it has
-no way of knowing what you or your users consider a ``bug'' and what is a
+Of course, a debugging program cannot remove bugs for you, because it has
+no way of knowing what you or your users consider a ``bug'' versus a
 ``feature.''  (Sometimes, we humans have a hard time with this ourselves.)
 In that case, what can you expect from such a tool?  The answer to that
 depends on the language being debugged, but in general, you can expect at
@@ -28677,7 +28995,7 @@ having to change your source files.
 @item
 The chance to see the values of data in the program at any point in
 execution, and also to change that data on the fly, to see how that
-affects what happens afterwards.  (This often includes the ability
+affects what happens afterward.  (This often includes the ability
 to look at internal data structures besides the variables you actually
 defined in your code.)
 
@@ -28692,16 +29010,16 @@ is going wrong (or, for that matter, to better comprehend a perfectly
 functional program that you or someone else wrote).
 
 @node Debugging Terms
-@subsection Additional Debugging Concepts
+@subsection Debugging Concepts
 
 Before diving in to the details, we need to introduce several
 important concepts that apply to just about all debuggers.
 The following list defines terms used throughout the rest of
-this @value{CHAPTER}.
+this @value{CHAPTER}:
 
 @table @dfn
 @cindex stack frame
-@item Stack Frame
+@item Stack frame
 Programs generally call functions during the course of their execution.
 One function can call another, or a function can call itself (recursion).
 You can view the chain of called functions (main program calls A, which
@@ -28736,7 +29054,7 @@ as many breakpoints as you like.
 A watchpoint is similar to a breakpoint.  The difference is that
 breakpoints are oriented around the code: stop when a certain point in the
 code is reached.  A watchpoint, however, specifies that program execution
-should stop when a @emph{data value} is changed.  This is useful, since
+should stop when a @emph{data value} is changed.  This is useful, as
 sometimes it happens that a variable receives an erroneous value, and it's
 hard to track down where this happens just by looking at the code.
 By using a watchpoint, you can stop whenever a variable is assigned to,
@@ -28744,26 +29062,26 @@ and usually find the errant code quite quickly.
 @end table
 
 @node Awk Debugging
-@subsection Awk Debugging
+@subsection @command{awk} Debugging
 
 Debugging an @command{awk} program has some specific aspects that are
-not shared with other programming languages.
+not shared with programs written in other languages.
 
 First of all, the fact that @command{awk} programs usually take input
-line-by-line from a file or files and operate on those lines using specific
+line by line from a file or files and operate on those lines using specific
 rules makes it especially useful to organize viewing the execution of
 the program in terms of these rules.  As we will see, each @command{awk}
 rule is treated almost like a function call, with its own specific block
 of instructions.
 
-In addition, since @command{awk} is by design a very concise language,
+In addition, because @command{awk} is by design a very concise language,
 it is easy to lose sight of everything that is going on ``inside''
 each line of @command{awk} code.  The debugger provides the opportunity
 to look at the individual primitive instructions carried out
 by the higher-level @command{awk} commands.
 
 @node Sample Debugging Session
-@section Sample Debugging Session
+@section Sample @command{gawk} Debugging Session
 @cindex sample debugging session
 
 In order to illustrate the use of @command{gawk} as a debugger, let's look at a sample
@@ -28781,9 +29099,9 @@ as our example.
 @cindex starting the debugger
 @cindex debugger, how to start
 
-Starting the debugger is almost exactly like running @command{gawk},
-except you have to pass an additional option @option{--debug} or the
-corresponding short option @option{-D}.  The file(s) containing the
+Starting the debugger is almost exactly like running @command{gawk} normally,
+except you have to pass an additional option, @option{--debug}, or the
+corresponding short option, @option{-D}.  The file(s) containing the
 program and any supporting code are given on the command line as arguments
 to one or more @option{-f} options. (@command{gawk} is not designed
 to debug command-line programs, only programs contained in files.)
@@ -28796,10 +29114,11 @@ $ @kbd{gawk -D -f getopt.awk -f join.awk -f uniq.awk -1 inputfile}
 @noindent
 where both @file{getopt.awk} and @file{uniq.awk} are in @env{$AWKPATH}.
 (Experienced users of GDB or similar debuggers should note that
-this syntax is slightly different from what they are used to.
+this syntax is slightly different from what you are used to.
 With the @command{gawk} debugger, you give the arguments for running the program
 in the command line to the debugger rather than as part of the @code{run}
 command at the debugger prompt.)
+The @option{-1} is an option to @file{uniq.awk}.
 
 Instead of immediately running the program on @file{inputfile}, as
 @command{gawk} would ordinarily do, the debugger merely loads all
@@ -28882,7 +29201,7 @@ gawk> @kbd{bt}
 @end example
 
 This tells us that @code{are_equal()} was called by the main program at
-line 88 of @file{uniq.awk}.  (This is not a big surprise, since this
+line 88 of @file{uniq.awk}.  (This is not a big surprise, because this
 is the only call to @code{are_equal()} in the program, but in more complex
 programs, knowing who called a function and with what parameters can be
 the key to finding the source of the problem.)
@@ -28899,7 +29218,7 @@ gawk> @kbd{p n}
 @end example
 
 @noindent
-In this case, @code{n} is an uninitialized local variable, since the
+In this case, @code{n} is an uninitialized local variable, because the
 function was called without arguments (@pxref{Function Calls}).
 
 A more useful variable to display might be the current record:
@@ -28910,8 +29229,8 @@ gawk> @kbd{p $0}
 @end example
 
 @noindent
-This might be a bit puzzling at first since this is the second line of
-our test input above.  Let's look at @code{NR}:
+This might be a bit puzzling at first, as this is the second line of
+our test input.  Let's look at @code{NR}:
 
 @example
 gawk> @kbd{p NR}
@@ -28949,10 +29268,10 @@ gawk> @kbd{n}
 @end example
 
 This tells us that @command{gawk} is now ready to execute line 66, which
-decides whether to give the lines the special ``field skipping'' treatment
+decides whether to give the lines the special ``field-skipping'' treatment
 indicated by the @option{-1} command-line option.  (Notice that we skipped
-from where we were before at line 63 to here, since the condition in line 63
-@samp{if (fcount == 0 && charcount == 0)} was false.)
+from where we were before, at line 63, to here, because the condition
+in line 63, @samp{if (fcount == 0 && charcount == 0)}, was false.)
 
 Continuing to step, we now get to the splitting of the current and
 last records:
@@ -28981,7 +29300,7 @@ gawk> @kbd{p n m alast aline}
 
 This is kind of disappointing, though.  All we found out is that there
 are five elements in @code{alast}; @code{m} and @code{aline} don't have
-values yet since we are at line 68 but haven't executed it yet.
+values because we are at line 68 but haven't executed it yet.
 This information is useful enough (we now know that
 none of the words were accidentally left out), but what if we want to see
 inside the array?
@@ -29026,7 +29345,7 @@ gawk> @kbd{n}
 
 Well, here we are at our error (sorry to spoil the suspense).  What we
 had in mind was to join the fields starting from the second one to make
-the virtual record to compare, and if the first field was numbered zero,
+the virtual record to compare, and if the first field were numbered zero,
 this would work.  Let's look at what we've got:
 
 @example
@@ -29035,7 +29354,7 @@ gawk> @kbd{p cline clast}
 @print{} clast = "awk is a wonderful program!"
 @end example
 
-Hey, those look pretty familiar!  They're just our original, unaltered,
+Hey, those look pretty familiar!  They're just our original, unaltered
 input records.  A little thinking (the human brain is still the best
 debugging tool), and we realize that we were off by one!
 
@@ -29085,13 +29404,14 @@ Miscellaneous
 @end itemize
 
 Each of these are discussed in the following subsections.
-In the following descriptions, commands which may be abbreviated
+In the following descriptions, commands that may be abbreviated
 show the abbreviation on a second description line.
 A debugger command name may also be truncated if that partial
 name is unambiguous. The debugger has the built-in capability to
-automatically repeat the previous command just by hitting @key{Enter}.
-This works for the commands @code{list}, @code{next}, @code{nexti}, @code{step}, @code{stepi}
-and @code{continue} executed without any argument.
+automatically repeat the previous command just by hitting @kbd{Enter}.
+This works for the commands @code{list}, @code{next}, @code{nexti},
+@code{step}, @code{stepi}, and @code{continue} executed without any
+argument.
 
 @menu
 * Breakpoint Control::          Control of Breakpoints.
@@ -29106,9 +29426,9 @@ and @code{continue} executed without any argument.
 @node Breakpoint Control
 @subsection Control of Breakpoints
 
-As we saw above, the first thing you probably want to do in a debugging
-session is to get your breakpoints set up, since otherwise your program
-will just run as if it was not under the debugger.  The commands for
+As we saw earlier, the first thing you probably want to do in a debugging
+session is to get your breakpoints set up, because your program
+will otherwise just run as if it was not under the debugger.  The commands for
 controlling breakpoints are:
 
 @table @asis
@@ -29138,7 +29458,7 @@ Set a breakpoint at entry to (the first instruction of)
 function @var{function}.
 @end table
 
-Each breakpoint is assigned a number which can be used to delete it from
+Each breakpoint is assigned a number that can be used to delete it from
 the breakpoint list using the @code{delete} command.
 
 With a breakpoint, you may also supply a condition.  This is an
@@ -29174,12 +29494,13 @@ Delete breakpoint(s) set at entry to function @var{function}.
 @cindex breakpoint condition
 @item @code{condition} @var{n} @code{"@var{expression}"}
 Add a condition to existing breakpoint or watchpoint @var{n}. The
-condition is an @command{awk} expression that the debugger evaluates
+condition is an @command{awk} expression @emph{enclosed in double quotes}
+that the debugger evaluates
 whenever the breakpoint or watchpoint is reached. If the condition is true, then
 the debugger stops execution and prompts for a command. Otherwise,
 the debugger continues executing the program. If the condition expression is
-not specified, any existing condition is removed; i.e., the breakpoint or
-watchpoint is made unconditional. 
+not specified, any existing condition is removed (i.e., the breakpoint or
+watchpoint is made unconditional).
 
 @cindex debugger commands, @code{d} (@code{delete})
 @cindex debugger commands, @code{delete}
@@ -29189,7 +29510,7 @@ watchpoint is made unconditional.
 @cindex breakpoint, delete by number
 @item @code{delete} [@var{n1 n2} @dots{}] [@var{n}--@var{m}]
 @itemx @code{d} [@var{n1 n2} @dots{}] [@var{n}--@var{m}]
-Delete specified breakpoints or a range of breakpoints. Deletes
+Delete specified breakpoints or a range of breakpoints. Delete
 all defined breakpoints if no argument is supplied.
 
 @cindex debugger commands, @code{disable}
@@ -29198,7 +29519,7 @@ all defined breakpoints if no argument is supplied.
 @cindex breakpoint, how to disable or enable
 @item @code{disable} [@var{n1 n2} @dots{} | @var{n}--@var{m}]
 Disable specified breakpoints or a range of breakpoints. Without
-any argument, disables all breakpoints.
+any argument, disable all breakpoints.
 
 @cindex debugger commands, @code{e} (@code{enable})
 @cindex debugger commands, @code{enable}
@@ -29208,18 +29529,18 @@ any argument, disables all breakpoints.
 @item @code{enable} [@code{del} | @code{once}] [@var{n1 n2} @dots{}] [@var{n}--@var{m}]
 @itemx @code{e} [@code{del} | @code{once}] [@var{n1 n2} @dots{}] [@var{n}--@var{m}]
 Enable specified breakpoints or a range of breakpoints. Without
-any argument, enables all breakpoints.
-Optionally, you can specify how to enable the breakpoint:
+any argument, enable all breakpoints.
+Optionally, you can specify how to enable the breakpoints:
 
 @c nested table
 @table @code
 @item del
-Enable the breakpoint(s) temporarily, then delete it when
-the program stops at the breakpoint.
+Enable the breakpoints temporarily, then delete each one when
+the program stops at it.
 
 @item once
-Enable the breakpoint(s) temporarily, then disable it when
-the program stops at the breakpoint.
+Enable the breakpoints temporarily, then disable each one when
+the program stops at it.
 @end table
 
 @cindex debugger commands, @code{ignore}
@@ -29287,7 +29608,7 @@ gawk>
 @item @code{continue} [@var{count}]
 @itemx @code{c} [@var{count}]
 Resume program execution. If continued from a breakpoint and @var{count} is
-specified, ignores the breakpoint at that location the next @var{count} times
+specified, ignore the breakpoint at that location the next @var{count} times
 before stopping.
 
 @cindex debugger commands, @code{finish}
@@ -29320,7 +29641,7 @@ Execute one (or @var{count}) instruction(s), stepping over function calls.
 @item @code{return} [@var{value}]
 Cancel execution of a function call. If @var{value} (either a string or a
 number) is specified, it is used as the function's return value. If used in a
-frame other than the innermost one (the currently executing function, i.e.,
+frame other than the innermost one (the currently executing function; i.e.,
 frame number 0), discard all inner frames in addition to the selected one,
 and the caller of that frame becomes the innermost frame.
 
@@ -29341,7 +29662,7 @@ automatic display variables, and debugger options.
 @item @code{step} [@var{count}]
 @itemx @code{s} [@var{count}]
 Continue execution until control reaches a different source line in the
-current stack frame. @code{step} steps inside any function called within
+current stack frame, stepping inside any function called within
 the line.  If the argument @var{count} is supplied, steps that many times before
 stopping, unless it encounters a breakpoint or watchpoint.
 
@@ -29362,7 +29683,7 @@ see the output shown under @code{dump} in @ref{Miscellaneous Debugger Commands}.
 @item @code{until} [[@var{filename}@code{:}]@var{n} | @var{function}]
 @itemx @code{u} [[@var{filename}@code{:}]@var{n} | @var{function}]
 Without any argument, continue execution until a line past the current
-line in current stack frame is reached. With an argument,
+line in the current stack frame is reached. With an argument,
 continue execution until the specified location is reached, or the current
 stack frame returns.
 @end table
@@ -29386,7 +29707,7 @@ gawk> @kbd{display x}
 @end example
 
 @noindent
-displays the assigned item number, the variable name and its current value.
+This displays the assigned item number, the variable name, and its current value.
 If the display variable refers to a function parameter, it is silently
 deleted from the list as soon as the execution reaches a context where
 no such variable of the given name exists.
@@ -29426,7 +29747,7 @@ gawk> @kbd{print $3}
 @noindent
 This prints the third field in the input record (if the specified field does not
 exist, it prints @samp{Null field}). A variable can be an array element, with
-the subscripts being constant values. To print the contents of an array,
+the subscripts being constant string values. To print the contents of an array,
 prefix the name of the array with the @samp{@@} symbol:
 
 @example
@@ -29454,7 +29775,7 @@ or field.
 String values must be enclosed between double quotes (@code{"}@dots{}@code{"}).
 
 You can also set special @command{awk} variables, such as @code{FS},
-@code{NF}, @code{NR}, etc.
+@code{NF}, @code{NR}, and so on.
 
 @cindex debugger commands, @code{w} (@code{watch})
 @cindex debugger commands, @code{watch}
@@ -29466,7 +29787,7 @@ You can also set special @command{awk} variables, such as @code{FS},
 Add variable @var{var} (or field @code{$@var{n}}) to the watch list.
 The debugger then stops whenever
 the value of the variable or field changes. Each watched item is assigned a
-number which can be used to delete it from the watch list using the
+number that can be used to delete it from the watch list using the
 @code{unwatch} command.
 
 With a watchpoint, you may also supply a condition.  This is an
@@ -29492,27 +29813,33 @@ watch list.
 @end table
 
 @node Execution Stack
-@subsection Dealing with the Stack
+@subsection Working with the Stack
 
-Whenever you run a program which contains any function calls,
+Whenever you run a program that contains any function calls,
 @command{gawk} maintains a stack of all of the function calls leading up
 to where the program is right now.  You can see how you got to where you are,
 and also move around in the stack to see what the state of things was in the
-functions which called the one you are in.  The commands for doing this are:
+functions that called the one you are in.  The commands for doing this are:
 
 @table @asis
 @cindex debugger commands, @code{bt} (@code{backtrace})
 @cindex debugger commands, @code{backtrace}
+@cindex debugger commands, @code{where} (@code{backtrace})
 @cindex @code{backtrace} debugger command
 @cindex @code{bt} debugger command (alias for @code{backtrace})
+@cindex @code{where} debugger command
+@cindex @code{where} debugger command (alias for @code{backtrace})
 @cindex call stack, display in debugger
 @cindex traceback, display in debugger
 @item @code{backtrace} [@var{count}]
 @itemx @code{bt} [@var{count}]
+@itemx @code{where} [@var{count}]
 Print a backtrace of all function calls (stack frames), or innermost @var{count}
 frames if @var{count} > 0. Print the outermost @var{count} frames if
 @var{count} < 0.  The backtrace displays the name and arguments to each
 function, the source @value{FN}, and the line number.
+The alias @code{where} for @code{backtrace} is provided for longtime
+GDB users who may be used to that command.
 
 @cindex debugger commands, @code{down}
 @cindex @code{down} debugger command
@@ -29527,8 +29854,8 @@ Then select and print the frame.
 @item @code{frame} [@var{n}]
 @itemx @code{f} [@var{n}]
 Select and print stack frame @var{n}.  Frame 0 is the currently executing,
-or @dfn{innermost}, frame (function call), frame 1 is the frame that
-called the innermost one. The highest numbered frame is the one for the
+or @dfn{innermost}, frame (function call); frame 1 is the frame that
+called the innermost one. The highest-numbered frame is the one for the
 main program.  The printed information consists of the frame number,
 function and argument names, source file, and the source line.
 
@@ -29540,11 +29867,11 @@ Then select and print the frame.
 @end table
 
 @node Debugger Info
-@subsection Obtaining Information about the Program and the Debugger State
+@subsection Obtaining Information About the Program and the Debugger State
 
 Besides looking at the values of variables, there is often a need to get
 other sorts of information about the state of your program and of the
-debugging environment itself.  The @command{gawk} debugger has one command which
+debugging environment itself.  The @command{gawk} debugger has one command that
 provides this information, appropriately called @code{info}.  @code{info}
 is used with one of a number of arguments that tell it exactly what
 you want to know:
@@ -29562,7 +29889,7 @@ The value for @var{what} should be one of the following:
 @table @code
 @item args
 @cindex show function arguments, in debugger
-Arguments of the selected frame.
+List arguments of the selected frame.
 
 @item break
 @cindex show breakpoints
@@ -29574,7 +29901,7 @@ List all items in the automatic display list.
 
 @item frame
 @cindex describe call stack frame, in debugger
-Description of the selected stack frame.
+Give a description of the selected stack frame.
 
 @item functions
 @cindex list function definitions, in debugger
@@ -29583,11 +29910,11 @@ line numbers.
 
 @item locals
 @cindex show local variables, in debugger
-Local variables of the selected frame.
+List local variables of the selected frame.
 
 @item source
 @cindex show name of current source file, in debugger
-The name of the current source file. Each time the program stops, the
+Print the name of the current source file. Each time the program stops, the
 current source file is the file containing the current instruction.
 When the debugger first starts, the current source file is the first file
 included via the @option{-f} option. The
@@ -29632,12 +29959,12 @@ The available options are:
 @table @asis
 @item @code{history_size}
 @cindex debugger history size
-The maximum number of lines to keep in the history file @file{./.gawk_history}.
-The default is 100.
+Set the maximum number of lines to keep in the history file
+@file{./.gawk_history}.  The default is 100.
 
 @item @code{listsize}
 @cindex debugger default list amount
-The number of lines that @code{list} prints. The default is 15.
+Specify the number of lines that @code{list} prints. The default is 15.
 
 @item @code{outfile}
 @cindex redirect @command{gawk} output, in debugger
@@ -29647,7 +29974,7 @@ standard output.
 
 @item @code{prompt}
 @cindex debugger prompt
-The debugger prompt. The default is @samp{@w{gawk> }}.
+Change the debugger prompt. The default is @samp{@w{gawk> }}.
 
 @item @code{save_history} [@code{on} | @code{off}]
 @cindex debugger history file
@@ -29658,7 +29985,7 @@ The default is @code{on}.
 @cindex save debugger options
 Save current options to file @file{./.gawkrc} upon exit.
 The default is @code{on}.
-Options are read back in to the next session upon startup.
+Options are read back into the next session upon startup.
 
 @item @code{trace} [@code{on} | @code{off}]
 @cindex instruction tracing, in debugger
@@ -29681,7 +30008,7 @@ command in the file. Also, the list of commands may include additional
 @code{source} commands; however, the @command{gawk} debugger will not source the
 same file more than once in order to avoid infinite recursion.
 
-In addition to, or instead of the @code{source} command, you can use
+In addition to, or instead of, the @code{source} command, you can use
 the @option{-D @var{file}} or @option{--debug=@var{file}} command-line
 options to execute commands from a file non-interactively
 (@pxref{Options}).
@@ -29690,68 +30017,69 @@ options to execute commands from a file non-interactively
 @node Miscellaneous Debugger Commands
 @subsection Miscellaneous Commands
 
-There are a few more commands which do not fit into the
+There are a few more commands that do not fit into the
 previous categories, as follows:
 
 @table @asis
 @cindex debugger commands, @code{dump}
 @cindex @code{dump} debugger command
 @item @code{dump} [@var{filename}]
-Dump bytecode of the program to standard output or to the file
+Dump byte code of the program to standard output or to the file
 named in @var{filename}.  This prints a representation of the internal
-instructions which @command{gawk} executes to implement the @command{awk}
+instructions that @command{gawk} executes to implement the @command{awk}
 commands in a program.  This can be very enlightening, as the following
 partial dump of Davide Brini's obfuscated code
 (@pxref{Signature Program}) demonstrates:
 
+@c FIXME: This will need updating if num-handler branch is ever merged in.
 @smallexample
 gawk> @kbd{dump}
 @print{}        # BEGIN
-@print{} 
-@print{} [     1:0xfcd340] Op_rule             : [in_rule = BEGIN] [source_file = brini.awk]
-@print{} [     1:0xfcc240] Op_push_i           : "~" [MALLOC|STRING|STRCUR]
-@print{} [     1:0xfcc2a0] Op_push_i           : "~" [MALLOC|STRING|STRCUR]
-@print{} [     1:0xfcc280] Op_match            : 
-@print{} [     1:0xfcc1e0] Op_store_var        : O
-@print{} [     1:0xfcc2e0] Op_push_i           : "==" [MALLOC|STRING|STRCUR]
-@print{} [     1:0xfcc340] Op_push_i           : "==" [MALLOC|STRING|STRCUR]
-@print{} [     1:0xfcc320] Op_equal            : 
-@print{} [     1:0xfcc200] Op_store_var        : o
-@print{} [     1:0xfcc380] Op_push             : o
-@print{} [     1:0xfcc360] Op_plus_i           : 0 [MALLOC|NUMCUR|NUMBER]
-@print{} [     1:0xfcc220] Op_push_lhs         : o [do_reference = true]
-@print{} [     1:0xfcc300] Op_assign_plus      : 
-@print{} [      :0xfcc2c0] Op_pop              : 
-@print{} [     1:0xfcc400] Op_push             : O
-@print{} [     1:0xfcc420] Op_push_i           : "" [MALLOC|STRING|STRCUR]
-@print{} [      :0xfcc4a0] Op_no_op            : 
-@print{} [     1:0xfcc480] Op_push             : O
-@print{} [      :0xfcc4c0] Op_concat           : [expr_count = 3] [concat_flag = 0]
-@print{} [     1:0xfcc3c0] Op_store_var        : x
-@print{} [     1:0xfcc440] Op_push_lhs         : X [do_reference = true]
-@print{} [     1:0xfcc3a0] Op_postincrement    : 
-@print{} [     1:0xfcc4e0] Op_push             : x
-@print{} [     1:0xfcc540] Op_push             : o
-@print{} [     1:0xfcc500] Op_plus             : 
-@print{} [     1:0xfcc580] Op_push             : o
-@print{} [     1:0xfcc560] Op_plus             : 
-@print{} [     1:0xfcc460] Op_leq              : 
-@print{} [      :0xfcc5c0] Op_jmp_false        : [target_jmp = 0xfcc5e0]
-@print{} [     1:0xfcc600] Op_push_i           : "%c" [MALLOC|STRING|STRCUR]
-@print{} [      :0xfcc660] Op_no_op            : 
-@print{} [     1:0xfcc520] Op_assign_concat    : c
-@print{} [      :0xfcc620] Op_jmp              : [target_jmp = 0xfcc440]
-@print{} 
-@dots{} 
-@print{} 
+@print{}
+@print{} [  1:0xfcd340] Op_rule           : [in_rule = BEGIN] [source_file = brini.awk]
+@print{} [  1:0xfcc240] Op_push_i         : "~" [MALLOC|STRING|STRCUR]
+@print{} [  1:0xfcc2a0] Op_push_i         : "~" [MALLOC|STRING|STRCUR]
+@print{} [  1:0xfcc280] Op_match          :
+@print{} [  1:0xfcc1e0] Op_store_var      : O
+@print{} [  1:0xfcc2e0] Op_push_i         : "==" [MALLOC|STRING|STRCUR]
+@print{} [  1:0xfcc340] Op_push_i         : "==" [MALLOC|STRING|STRCUR]
+@print{} [  1:0xfcc320] Op_equal          :
+@print{} [  1:0xfcc200] Op_store_var      : o
+@print{} [  1:0xfcc380] Op_push           : o
+@print{} [  1:0xfcc360] Op_plus_i         : 0 [MALLOC|NUMCUR|NUMBER]
+@print{} [  1:0xfcc220] Op_push_lhs       : o [do_reference = true]
+@print{} [  1:0xfcc300] Op_assign_plus    :
+@print{} [   :0xfcc2c0] Op_pop            :
+@print{} [  1:0xfcc400] Op_push           : O
+@print{} [  1:0xfcc420] Op_push_i         : "" [MALLOC|STRING|STRCUR]
+@print{} [   :0xfcc4a0] Op_no_op          :
+@print{} [  1:0xfcc480] Op_push           : O
+@print{} [   :0xfcc4c0] Op_concat         : [expr_count = 3] [concat_flag = 0]
+@print{} [  1:0xfcc3c0] Op_store_var      : x
+@print{} [  1:0xfcc440] Op_push_lhs       : X [do_reference = true]
+@print{} [  1:0xfcc3a0] Op_postincrement  :
+@print{} [  1:0xfcc4e0] Op_push           : x
+@print{} [  1:0xfcc540] Op_push           : o
+@print{} [  1:0xfcc500] Op_plus           :
+@print{} [  1:0xfcc580] Op_push           : o
+@print{} [  1:0xfcc560] Op_plus           :
+@print{} [  1:0xfcc460] Op_leq            :
+@print{} [   :0xfcc5c0] Op_jmp_false      : [target_jmp = 0xfcc5e0]
+@print{} [  1:0xfcc600] Op_push_i         : "%c" [MALLOC|STRING|STRCUR]
+@print{} [   :0xfcc660] Op_no_op          :
+@print{} [  1:0xfcc520] Op_assign_concat  : c
+@print{} [   :0xfcc620] Op_jmp            : [target_jmp = 0xfcc440]
+@print{}
+@dots{}
+@print{}
 @print{} [     2:0xfcc5a0] Op_K_printf         : [expr_count = 17] [redir_type = ""]
-@print{} [      :0xfcc140] Op_no_op            : 
-@print{} [      :0xfcc1c0] Op_atexit           : 
-@print{} [      :0xfcc640] Op_stop             : 
-@print{} [      :0xfcc180] Op_no_op            : 
-@print{} [      :0xfcd150] Op_after_beginfile  : 
-@print{} [      :0xfcc160] Op_no_op            : 
-@print{} [      :0xfcc1a0] Op_after_endfile    : 
+@print{} [      :0xfcc140] Op_no_op            :
+@print{} [      :0xfcc1c0] Op_atexit           :
+@print{} [      :0xfcc640] Op_stop             :
+@print{} [      :0xfcc180] Op_no_op            :
+@print{} [      :0xfcd150] Op_after_beginfile  :
+@print{} [      :0xfcc160] Op_no_op            :
+@print{} [      :0xfcc1a0] Op_after_endfile    :
 gawk>
 @end smallexample
 
@@ -29777,7 +30105,7 @@ are as follows:
 
 @c nested table
 @table @asis
-@item @code{-}
+@item @code{-} (Minus)
 Print lines before the lines last printed.
 
 @item @code{+}
@@ -29795,7 +30123,7 @@ Print lines centered around line number @var{n} in
 source file @var{filename}. This command may change the current source file.
 
 @item @var{function}
-Print lines centered around beginning of the
+Print lines centered around the beginning of the
 function @var{function}. This command may change the current source file.
 @end table
 
@@ -29807,16 +30135,16 @@ function @var{function}. This command may change the current source file.
 @item @code{quit}
 @itemx @code{q}
 Exit the debugger.  Debugging is great fun, but sometimes we all have
-to tend to other obligations in life, and sometimes we find the bug,
-and are free to go on to the next one!  As we saw above, if you are
-running a program, the debugger warns you if you accidentally type
+to tend to other obligations in life, and sometimes we find the bug
+and are free to go on to the next one!  As we saw earlier, if you are
+running a program, the debugger warns you when you type
 @samp{q} or @samp{quit}, to make sure you really want to quit.
 
 @cindex debugger commands, @code{trace}
 @cindex @code{trace} debugger command
 @item @code{trace} [@code{on} | @code{off}]
-Turn on or off a continuous printing of instructions which are about to
-be executed, along with printing the @command{awk} line which they
+Turn on or off continuous printing of the instructions that are about to
+be executed, along with the @command{awk} lines they
 implement.  The default is @code{off}.
 
 It is to be hoped that most of the ``opcodes'' in these instructions are
@@ -29832,7 +30160,7 @@ fairly self-explanatory, and using @code{stepi} and @code{nexti} while
 
 If @command{gawk} is compiled with
 @uref{http://cnswww.cns.cwru.edu/php/chet/readline/readline.html,
-the @code{readline} library}, you can take advantage of that library's
+the GNU Readline library}, you can take advantage of that library's
 command completion and history expansion features. The following types
 of completion are available:
 
@@ -29865,11 +30193,11 @@ and
 @end table
 
 @node Limitations
-@section Limitations and Future Plans
+@section Limitations
 
 We hope you find the @command{gawk} debugger useful and enjoyable to work with,
 but as with any program, especially in its early releases, it still has
-some limitations.  A few which are worth being aware of are:
+some limitations.  A few that it's worth being aware of are:
 
 @itemize @value{BULLET}
 @item
@@ -29885,13 +30213,13 @@ If you perused the dump of opcodes in @ref{Miscellaneous Debugger Commands}
 (or if you are already familiar with @command{gawk} internals),
 you will realize that much of the internal manipulation of data
 in @command{gawk}, as in many interpreters, is done on a stack.
-@code{Op_push}, @code{Op_pop}, etc., are the ``bread and butter'' of
+@code{Op_push}, @code{Op_pop}, and the like are the ``bread and butter'' of
 most @command{gawk} code.
 
 Unfortunately, as of now, the @command{gawk}
 debugger does not allow you to examine the stack's contents.
 That is, the intermediate results of expression evaluation are on the
-stack, but cannot be printed.  Rather, only variables which are defined
+stack, but cannot be printed.  Rather, only variables that are defined
 in the program can be printed.  Of course, a workaround for
 this is to use more explicit variables at the debugging stage and then
 change back to obscure, perhaps more optimal code later.
@@ -29899,22 +30227,24 @@ change back to obscure, perhaps more optimal code later.
 @item
 There is no way to look ``inside'' the process of compiling
 regular expressions to see if you got it right.  As an @command{awk}
-programmer, you are expected to know what @code{/[^[:alnum:][:blank:]]/}
-means.
+programmer, you are expected to know the meaning of
+@code{/[^[:alnum:][:blank:]]/}.
 
 @item
 The @command{gawk} debugger is designed to be used by running a program (with all its
 parameters) on the command line, as described in @ref{Debugger Invocation}.
-There is no way (as of now) to attach or ``break in'' to a running program.
-This seems reasonable for a language which is used mainly for quickly
+There is no way (as of now) to attach or ``break into'' a running program.
+This seems reasonable for a language that is used mainly for quickly
 executing, short programs.
 
 @item
-The @command{gawk} debugger only accepts source supplied with the @option{-f} option.
+The @command{gawk} debugger only accepts source code supplied with the @option{-f} option.
 @end itemize
 
+@ignore
 Look forward to a future release when these and other missing features may
 be added, and of course feel free to try to add them yourself!
+@end ignore
 
 @node Debugging Summary
 @section Summary
@@ -29922,8 +30252,8 @@ be added, and of course feel free to try to add them yourself!
 @itemize @value{BULLET}
 @item
 Programs rarely work correctly the first time.  Finding bugs
-is @dfn{debugging} and a program that helps you find bugs is a
-@dfn{debugger}.  @command{gawk} has a built-in debugger that works very
+is called debugging, and a program that helps you find bugs is a
+debugger.  @command{gawk} has a built-in debugger that works very
 similarly to the GNU Debugger, GDB.
 
 @item
@@ -29943,27 +30273,26 @@ breakpoints, execution, viewing and changing data, working with the stack,
 getting information, and other tasks.
 
 @item
-If the @code{readline} library is available when @command{gawk} is
+If the GNU Readline library is available when @command{gawk} is
 compiled, it is used by the debugger to provide command-line history
 and editing.
 
 @end itemize
 
 @node Arbitrary Precision Arithmetic
-@chapter Arithmetic and Arbitrary Precision Arithmetic with @command{gawk}
+@chapter Arithmetic and Arbitrary-Precision Arithmetic with @command{gawk}
 @cindex arbitrary precision
 @cindex multiple precision
 @cindex infinite precision
 @cindex floating-point, numbers@comma{} arbitrary precision
 
 This @value{CHAPTER} introduces some basic concepts relating to
-how computers do arithmetic and briefly lists the features in
-@command{gawk} for performing arbitrary precision floating point
-computations.  It then proceeds to describe floating-point arithmetic,
+how computers do arithmetic and defines some important terms.
+It then proceeds to describe floating-point arithmetic,
 which is what @command{awk} uses for all its computations, including a
-discussion of arbitrary precision floating point arithmetic, which is
+discussion of arbitrary-precision floating-point arithmetic, which is
 a feature available only in @command{gawk}. It continues on to present
-arbitrary precision integers, and concludes with a description of some
+arbitrary-precision integers, and concludes with a description of some
 points where @command{gawk} and the POSIX standard are not quite in
 agreement.
 
@@ -30008,7 +30337,7 @@ paper and pencil (and/or a calculator). In theory, numbers can have an
 arbitrary number of digits on either side (or both sides) of the decimal
 point, and the results of a computation are always exact.
 
-Some modern system can do decimal arithmetic in hardware, but usually you
+Some modern systems can do decimal arithmetic in hardware, but usually you
 need a special software library to provide access to these instructions.
 There are also libraries that do decimal arithmetic entirely in software.
 
@@ -30026,52 +30355,82 @@ The disadvantage is that their range is limited.
 @cindex integers, unsigned
 In computers, integer values come in two flavors: @dfn{signed} and
 @dfn{unsigned}.  Signed values may be negative or positive, whereas
-unsigned values are always positive (that is, greater than or equal
-to zero).
+unsigned values are always greater than or equal
+to zero.
 
 In computer systems, integer arithmetic is exact, but the possible
 range of values is limited.  Integer arithmetic is generally faster than
-floating point arithmetic.
+floating-point arithmetic.
 
-@item Floating point arithmetic
+@item Floating-point arithmetic
 Floating-point numbers represent what were called in school ``real''
-numbers; i.e., those that have a fractional part, such as 3.1415927.
+numbers (i.e., those that have a fractional part, such as 3.1415927).
 The advantage to floating-point numbers is that they can represent a
 much larger range of values than can integers.  The disadvantage is that
 there are numbers that they cannot represent exactly.
 
-Modern systems support floating point arithmetic in hardware, with a
+Modern systems support floating-point arithmetic in hardware, with a
 limited range of values.  There are software libraries that allow
-the use of arbitrary precision floating point calculations.
+the use of arbitrary-precision floating-point calculations.
 
-POSIX @command{awk} uses @dfn{double precision} floating-point numbers, which
-can hold more digits than @dfn{single precision} floating-point numbers.
-@command{gawk} has facilities for performing arbitrary precision floating
-point arithmetic, which we describe in more detail shortly.
+POSIX @command{awk} uses @dfn{double-precision} floating-point numbers, which
+can hold more digits than @dfn{single-precision} floating-point numbers.
+@command{gawk} has facilities for performing arbitrary-precision
+floating-point arithmetic, which we describe in more detail shortly.
 @end table
 
-Computers work with integer and floating point values of different
-ranges. Integer values are usually either 32 or 64 bits in size.  Single
-precision floating point values occupy 32 bits, whereas double precision
-floating point values occupy 64 bits.  Floating point values are always
-signed. The possible ranges of values are shown in the following table.
+Computers work with integer and floating-point values of different
+ranges. Integer values are usually either 32 or 64 bits in size.
+Single-precision floating-point values occupy 32 bits, whereas double-precision
+floating-point values occupy 64 bits.  Floating-point values are always
+signed. The possible ranges of values are shown in @ref{table-numeric-ranges}.
 
+@float Table,table-numeric-ranges
+@caption{Value ranges for different numeric representations}
 @multitable @columnfractions .34 .33 .33
-@headitem Numeric representation @tab Miniumum value @tab Maximum value
+@headitem Numeric representation @tab Minimum value @tab Maximum value
 @item 32-bit signed integer @tab @minus{}2,147,483,648 @tab 2,147,483,647
 @item 32-bit unsigned integer @tab 0 @tab 4,294,967,295
 @item 64-bit signed integer @tab @minus{}9,223,372,036,854,775,808 @tab 9,223,372,036,854,775,807
 @item 64-bit unsigned integer @tab 0 @tab 18,446,744,073,709,551,615
-@item Single precision floating point (approximate) @tab @code{1.175494e-38} @tab @code{3.402823e+38}
-@item Double precision floating point (approximate) @tab @code{2.225074e-308} @tab @code{1.797693e+308}
+@iftex
+@item Single-precision floating point (approximate) @tab @math{1.175494^{-38}} @tab @math{3.402823^{38}}
+@item Double-precision floating point (approximate) @tab @math{2.225074^{-308}} @tab @math{1.797693^{308}}
+@end iftex
+@ifnottex
+@ifnotdocbook
+@item Single-precision floating point (approximate) @tab 1.175494e-38 @tab 3.402823e38
+@item Double-precision floating point (approximate) @tab 2.225074e-308 @tab 1.797693e308
+@end ifnotdocbook
+@end ifnottex
+@ifdocbook
+@item Single-precision floating point (approximate) @tab
+@c FIXME: Use @sup here for superscript
+@docbook
+1.175494<superscript>-38</superscript>
+@end docbook
+@tab
+@docbook
+3.402823<superscript>38</superscript>
+@end docbook
+@item Double-precision floating point (approximate) @tab
+@docbook
+2.225074<superscript>-308</superscript>
+@end docbook
+@tab
+@docbook
+1.797693<superscript>308</superscript>
+@end docbook
+@end ifdocbook
 @end multitable
+@end float
 
 @node Math Definitions
-@section Other Stuff To Know
+@section Other Stuff to Know
 
 The rest of this @value{CHAPTER} uses a number of terms. Here are some
 informal definitions that should help you work your way through the material
-here.
+here:
 
 @table @dfn
 @item Accuracy
@@ -30092,14 +30451,12 @@ A special value representing infinity. Operations involving another
 number and infinity produce infinity.
 
 @item NaN
-``Not A Number.''@footnote{Thanks
-to Michael Brennan for this description, which I have paraphrased, and
-for the examples}.
-A special value that results from attempting a
-calculation that has no answer as a real number.  In such a case,
-programs can either receive a floating-point exception, or get @code{NaN}
-back as the result. The IEEE 754 standard recommends that systems return
-@code{NaN}. Some examples:
+``Not a number.''@footnote{Thanks to Michael Brennan for this description,
+which we have paraphrased, and for the examples.} A special value that
+results from attempting a calculation that has no answer as a real number.
+In such a case, programs can either receive a floating-point exception,
+or get @code{NaN} back as the result. The IEEE 754 standard recommends
+that systems return @code{NaN}. Some examples:
 
 @table @code
 @item sqrt(-1)
@@ -30137,8 +30494,8 @@ formula:
 @end display
 
 @noindent
-Here, @var{prec} denotes the binary precision
-(measured in bits) and @var{dps} (short for decimal places)
+Here, @emph{prec} denotes the binary precision
+(measured in bits) and @emph{dps} (short for decimal places)
 is the decimal digits.
 
 @item Rounding mode
@@ -30146,7 +30503,7 @@ How numbers are rounded up or down when necessary.
 More details are provided later.
 
 @item Significand
-A floating point value consists the significand multiplied by 10
+A floating-point value consists of the significand multiplied by 10
 to the power of the exponent. For example, in @code{1.2345e67},
 the significand is @code{1.2345}.
 
@@ -30164,19 +30521,19 @@ on some of those terms.
 On modern systems, floating-point hardware uses the representation and
 operations defined by the IEEE 754 standard.
 Three of the standard IEEE 754 types are 32-bit single precision,
-64-bit double precision and 128-bit quadruple precision.
+64-bit double precision, and 128-bit quadruple precision.
 The standard also specifies extended precision formats
 to allow greater precisions and larger exponent ranges.
-(@command{awk} uses only the 64-bit double precision format.)
+(@command{awk} uses only the 64-bit double-precision format.)
 
 @ref{table-ieee-formats} lists the precision and exponent
-field values for the basic IEEE 754 binary formats:
+field values for the basic IEEE 754 binary formats.
 
 @float Table,table-ieee-formats
-@caption{Basic IEEE Format Context Values}
+@caption{Basic IEEE format values}
 @multitable @columnfractions .20 .20 .20 .20 .20
-@headitem Name @tab Total bits @tab Precision @tab emin @tab emax
-@item Single @tab 32 @tab 24 @tab @minus{}126 @tab +127 
+@headitem Name @tab Total bits @tab Precision @tab Minimum exponent @tab Maximum exponent
+@item Single @tab 32 @tab 24 @tab @minus{}126 @tab +127
 @item Double @tab 64 @tab 53 @tab @minus{}1022 @tab +1023
 @item Quadruple @tab 128 @tab 113 @tab @minus{}16382 @tab +16383
 @end multitable
@@ -30188,19 +30545,19 @@ one extra bit of significand.
 @end quotation
 
 @node MPFR features
-@section Arbitrary Precison Arithmetic Features In @command{gawk}
+@section Arbitrary-Precision Arithmetic Features in @command{gawk}
 
-By default, @command{gawk} uses the double precision floating point values
+By default, @command{gawk} uses the double-precision floating-point values
 supplied by the hardware of the system it runs on.  However, if it was
-compiled to do, @command{gawk} uses the @uref{http://www.mpfr.org, GNU
-MPFR} and @uref{http://gmplib.org, GNU MP} (GMP) libraries for arbitrary
-precision arithmetic on numbers.  You can see if MPFR support is available
-like so:
+compiled to do so, @command{gawk} uses the @uref{http://www.mpfr.org,
+GNU MPFR} and @uref{http://gmplib.org, GNU MP} (GMP) libraries for
+arbitrary-precision arithmetic on numbers.  You can see if MPFR support
+is available like so:
 
 @example
 $ @kbd{gawk --version}
-@print{} GNU Awk 4.1.1, API: 1.1 (GNU MPFR 3.1.0-p3, GNU MP 5.0.2)
-@print{} Copyright (C) 1989, 1991-2014 Free Software Foundation.
+@print{} GNU Awk 4.1.2, API: 1.1 (GNU MPFR 3.1.0-p3, GNU MP 5.0.2)
+@print{} Copyright (C) 1989, 1991-2015 Free Software Foundation.
 @dots{}
 @end example
 
@@ -30219,26 +30576,27 @@ results.  With the @option{-M} command-line option,
 all floating-point arithmetic operators and numeric functions
 can yield results to any desired precision level supported by MPFR.
 
-Two built-in variables, @code{PREC} and @code{ROUNDMODE},
+Two predefined variables, @code{PREC} and @code{ROUNDMODE},
 provide control over the working precision and the rounding mode.
 The precision and the rounding mode are set globally for every operation
 to follow.
-@xref{Auto-set}, for more information.
+@DBXREF{Setting precision} and @DBREF{Setting the rounding mode}
+for more information.
 
 @node FP Math Caution
-@section Floating Point Arithmetic: Caveat Emptor!
+@section Floating-Point Arithmetic: Caveat Emptor!
 
 @quotation
 @i{Math class is tough!}
 @author Teen Talk Barbie, July 1992
 @end quotation
 
-This @value{SECTION} provides a high level overview of the issues
+This @value{SECTION} provides a high-level overview of the issues
 involved when doing lots of floating-point arithmetic.@footnote{There
 is a very nice @uref{http://www.validlab.com/goldberg/paper.pdf,
 paper on floating-point arithmetic} by David Goldberg, ``What Every
-Computer Scientist Should Know About Floating-point Arithmetic,''
-@cite{ACM Computing Surveys} @strong{23}, 1 (1991-03), 5-48.  This is
+Computer Scientist Should Know About Floating-Point Arithmetic,''
+@cite{ACM Computing Surveys} @strong{23}, 1 (1991-03): 5-48.  This is
 worth reading if you are interested in the details, but it does require
 a background in computer science.}
 The discussion applies to both hardware and arbitrary-precision
@@ -30259,17 +30617,17 @@ rely just on what we tell you.
 @end menu
 
 @node Inexactness of computations
-@subsection Floating Point Arithmetic Is Not Exact
+@subsection Floating-Point Arithmetic Is Not Exact
 
 Binary floating-point representations and arithmetic are inexact.
 Simple values like 0.1 cannot be precisely represented using
 binary floating-point numbers, and the limited precision of
 floating-point numbers means that slight changes in
 the order of operations or the precision of intermediate storage
-can change the result. To make matters worse, with arbitrary precision
-floating-point, you can set the precision before starting a computation,
-but then you cannot be sure of the number of significant decimal places
-in the final result.
+can change the result. To make matters worse, with arbitrary-precision
+floating-point arithmetic, you can set the precision before starting a
+computation, but then you cannot be sure of the number of significant
+decimal places in the final result.
 
 @menu
 * Inexact representation::      Numbers are not exactly represented.
@@ -30291,7 +30649,7 @@ y = 0.425
 
 Unlike the number in @code{y}, the number stored in @code{x}
 is exactly representable
-in binary since it can be written as a finite sum of one or
+in binary because it can be written as a finite sum of one or
 more fractions whose denominators are all powers of two.
 When @command{gawk} reads a floating-point number from
 program source, it automatically rounds that number to whatever
@@ -30307,7 +30665,7 @@ $ @kbd{gawk 'BEGIN @{ x = 0.875; y = 0.425}
 
 Often the error is so small you do not even notice it, and if you do,
 you can always specify how much precision you would like in your output.
-Usually this is a format string like @code{"%.15g"}, which when
+Usually this is a format string like @code{"%.15g"}, which, when
 used in the previous example, produces an output identical to the input.
 
 @node Comparing FP Values
@@ -30317,7 +30675,7 @@ Because the underlying representation can be a little bit off from the exact val
 comparing floating-point values to see if they are exactly equal is generally a bad idea.
 Here is an example where it does not work like you would expect:
 
-@example 
+@example
 $ @kbd{gawk 'BEGIN @{ print (0.1 + 12.2 == 12.3) @}'}
 @print{} 0
 @end example
@@ -30326,7 +30684,7 @@ The general wisdom when comparing floating-point values is to see if
 they are within some small range of each other (called a @dfn{delta},
 or @dfn{tolerance}).
 You have to decide how small a delta is important to you. Code to do
-this looks something like this:
+this looks something like the following:
 
 @example
 delta = 0.00001                 # for example
@@ -30337,12 +30695,16 @@ else
     # not ok
 @end example
 
+@noindent
+(We assume that you have a simple absolute value function named
+@code{abs()} defined elsewhere in your program.)
+
 @node Errors accumulate
 @subsubsection Errors Accumulate
 
 The loss of accuracy during a single computation with floating-point
 numbers usually isn't enough to worry about. However, if you compute a
-value which is the result of a sequence of floating point operations,
+value that is the result of a sequence of floating-point operations,
 the error can accumulate and greatly affect the computation itself.
 Here is an attempt to compute the value of @value{PI} using one of its
 many series representations:
@@ -30388,23 +30750,23 @@ $ @kbd{gawk 'BEGIN @{}
 @end example
 
 @node Getting Accuracy
-@subsection Getting The Accuracy You Need
+@subsection Getting the Accuracy You Need
 
-Can arbitrary precision arithmetic give exact results? There are
+Can arbitrary-precision arithmetic give exact results? There are
 no easy answers. The standard rules of algebra often do not apply
 when using floating-point arithmetic.
 Among other things, the distributive and associative laws
 do not hold completely, and order of operation may be important
-for your computation. Rounding error, cumulative precision loss
+for your computation. Rounding error, cumulative precision loss,
 and underflow are often troublesome.
 
 When @command{gawk} tests the expressions @samp{0.1 + 12.2} and
-@samp{12.3} for equality using the machine double precision arithmetic,
+@samp{12.3} for equality using the machine double-precision arithmetic,
 it decides that they are not equal!  (@xref{Comparing FP Values}.)
 You can get the result you want by increasing the precision; 56 bits in
 this case does the job:
 
-@example 
+@example
 $ @kbd{gawk -M -v PREC=56 'BEGIN @{ print (0.1 + 12.2 == 12.3) @}'}
 @print{} 1
 @end example
@@ -30413,7 +30775,7 @@ If adding more bits is good, perhaps adding even more bits of
 precision is better?
 Here is what happens if we use an even larger value of @code{PREC}:
 
-@example 
+@example
 $ @kbd{gawk -M -v PREC=201 'BEGIN @{ print (0.1 + 12.2 == 12.3) @}'}
 @print{} 0
 @end example
@@ -30422,20 +30784,21 @@ This is not a bug in @command{gawk} or in the MPFR library.
 It is easy to forget that the finite number of bits used to store the value
 is often just an approximation after proper rounding.
 The test for equality succeeds if and only if @emph{all} bits in the two operands
-are exactly the same. Since this is not necessarily true after floating-point
-computations with a particular precision and effective rounding rule,
+are exactly the same. Because this is not necessarily true after floating-point
+computations with a particular precision and effective rounding mode,
 a straight test for equality may not work. Instead, compare the
 two numbers to see if they are within the desirable delta of each other.
 
 In applications where 15 or fewer decimal places suffice,
-hardware double precision arithmetic can be adequate, and is usually much faster.
+hardware double-precision arithmetic can be adequate, and is usually much faster.
 But you need to keep in mind that every floating-point operation
-can suffer a new rounding error with catastrophic consequences as illustrated
+can suffer a new rounding error with catastrophic consequences, as illustrated
 by our earlier attempt to compute the value of @value{PI}.
 Extra precision can greatly enhance the stability and the accuracy
 of your computation in such cases.
 
-Repeated addition is not necessarily equivalent to multiplication
+Additionally, you should understand that
+repeated addition is not necessarily equivalent to multiplication
 in floating-point arithmetic. In the example in
 @ref{Errors accumulate}:
 
@@ -30454,9 +30817,9 @@ an arbitrarily large value for @code{PREC}. Reformulation of
 the problem at hand is often the correct approach in such situations.
 
 @node Try To Round
-@subsection Try A Few Extra Bits of Precision and Rounding
+@subsection Try a Few Extra Bits of Precision and Rounding
 
-Instead of arbitrary precision floating-point arithmetic,
+Instead of arbitrary-precision floating-point arithmetic,
 often all you need is an adjustment of your logic
 or a different order for the operations in your calculation.
 The stability and the accuracy of the computation of @value{PI}
@@ -30468,7 +30831,7 @@ simple algebraic transformation:
 @end example
 
 @noindent
-After making this, change the program converges to
+After making this change, the program converges to
 @value{PI} in under 30 iterations:
 
 @example
@@ -30484,26 +30847,26 @@ $ @kbd{gawk -f pi2.awk}
 @end example
 
 @node Setting precision
-@subsection Setting The Precision
+@subsection Setting the Precision
 
 @command{gawk} uses a global working precision; it does not keep track of
 the precision or accuracy of individual numbers. Performing an arithmetic
 operation or calling a built-in function rounds the result to the current
 working precision. The default working precision is 53 bits, which you can
-modify using the built-in variable @code{PREC}. You can also set the
+modify using the predefined variable @code{PREC}. You can also set the
 value to one of the predefined case-insensitive strings
 shown in @ref{table-predefined-precision-strings},
 to emulate an IEEE 754 binary format.
 
 @float Table,table-predefined-precision-strings
-@caption{Predefined Precision Strings For @code{PREC}}
+@caption{Predefined precision strings for @code{PREC}}
 @multitable {@code{"double"}} {12345678901234567890123456789012345}
-@headitem @code{PREC} @tab IEEE 754 Binary Format
-@item @code{"half"} @tab 16-bit half-precision.
-@item @code{"single"} @tab Basic 32-bit single precision.
-@item @code{"double"} @tab Basic 64-bit double precision.
-@item @code{"quad"} @tab Basic 128-bit quadruple precision.
-@item @code{"oct"} @tab 256-bit octuple precision.
+@headitem @code{PREC} @tab IEEE 754 binary format
+@item @code{"half"} @tab 16-bit half-precision
+@item @code{"single"} @tab Basic 32-bit single precision
+@item @code{"double"} @tab Basic 64-bit double precision
+@item @code{"quad"} @tab Basic 128-bit quadruple precision
+@item @code{"oct"} @tab 256-bit octuple precision
 @end multitable
 @end float
 
@@ -30522,7 +30885,7 @@ Be wary of floating-point constants! When reading a floating-point
 constant from program source code, @command{gawk} uses the default
 precision (that of a C @code{double}), unless overridden by an assignment
 to the special variable @code{PREC} on the command line, to store it
-internally as a MPFR number.  Changing the precision using @code{PREC}
+internally as an MPFR number.  Changing the precision using @code{PREC}
 in the program text does @emph{not} change the precision of a constant.
 
 If you need to represent a floating-point constant at a higher precision
@@ -30530,11 +30893,10 @@ than the default and cannot use a command-line assignment to @code{PREC},
 you should either specify the constant as a string, or as a rational
 number, whenever possible. The following example illustrates the
 differences among various ways to print a floating-point constant:
-@end quotation
 
 @example
 $ @kbd{gawk -M 'BEGIN @{ PREC = 113; printf("%0.25f\n", 0.1) @}'}
-@print{} 0.1000000000000000055511151 
+@print{} 0.1000000000000000055511151
 $ @kbd{gawk -M -v PREC=113 'BEGIN @{ printf("%0.25f\n", 0.1) @}'}
 @print{} 0.1000000000000000000000000
 $ @kbd{gawk -M 'BEGIN @{ PREC = 113; printf("%0.25f\n", "0.1") @}'}
@@ -30542,22 +30904,23 @@ $ @kbd{gawk -M 'BEGIN @{ PREC = 113; printf("%0.25f\n", "0.1") @}'}
 $ @kbd{gawk -M 'BEGIN @{ PREC = 113; printf("%0.25f\n", 1/10) @}'}
 @print{} 0.1000000000000000000000000
 @end example
+@end quotation
 
 @node Setting the rounding mode
-@subsection Setting The Rounding Mode
+@subsection Setting the Rounding Mode
 
 The @code{ROUNDMODE} variable provides
-program level control over the rounding mode.
+program-level control over the rounding mode.
 The correspondence between @code{ROUNDMODE} and the IEEE
 rounding modes is shown in @ref{table-gawk-rounding-modes}.
 
 @float Table,table-gawk-rounding-modes
-@caption{@command{gawk} Rounding Modes}
+@caption{@command{gawk} rounding modes}
 @multitable @columnfractions .45 .30 .25
-@headitem Rounding Mode @tab IEEE Name @tab @code{ROUNDMODE}
+@headitem Rounding mode @tab IEEE name @tab @code{ROUNDMODE}
 @item Round to nearest, ties to even @tab @code{roundTiesToEven} @tab @code{"N"} or @code{"n"}
-@item Round toward plus Infinity @tab @code{roundTowardPositive} @tab @code{"U"} or @code{"u"}
-@item Round toward negative Infinity @tab @code{roundTowardNegative} @tab @code{"D"} or @code{"d"}
+@item Round toward positive infinity @tab @code{roundTowardPositive} @tab @code{"U"} or @code{"u"}
+@item Round toward negative infinity @tab @code{roundTowardNegative} @tab @code{"D"} or @code{"d"}
 @item Round toward zero @tab @code{roundTowardZero} @tab @code{"Z"} or @code{"z"}
 @item Round to nearest, ties away from zero @tab @code{roundTiesToAway} @tab @code{"A"} or @code{"a"}
 @end multitable
@@ -30567,7 +30930,7 @@ rounding modes is shown in @ref{table-gawk-rounding-modes}.
 selects the IEEE 754 rounding mode @code{roundTiesToEven}.
 In @ref{table-gawk-rounding-modes}, the value @code{"A"} selects
 @code{roundTiesToAway}.  This is only available if your version of the
-MPFR library supports it; otherwise setting @code{ROUNDMODE} to @code{"A"}
+MPFR library supports it; otherwise, setting @code{ROUNDMODE} to @code{"A"}
 has no effect.
 
 The default mode @code{roundTiesToEven} is the most preferred,
@@ -30618,8 +30981,8 @@ distributes upward and downward rounds of exact halves, which might
 cause any accumulating round-off error to cancel itself out. This is the
 default rounding mode for IEEE 754 computing functions and operators.
 
-The other rounding modes are rarely used.  Round toward positive infinity
-(@code{roundTowardPositive}) and round toward negative infinity
+The other rounding modes are rarely used.  Rounding toward positive infinity
+(@code{roundTowardPositive}) and toward negative infinity
 (@code{roundTowardNegative}) are often used to implement interval
 arithmetic, where you adjust the rounding mode to calculate upper and
 lower bounds for the range of output. The @code{roundTowardZero} mode can
@@ -30638,14 +31001,14 @@ accumulation of round-off error, look for a significant difference in
 output when you change the rounding mode to be sure.
 
 @node Arbitrary Precision Integers
-@section Arbitrary Precision Integer Arithmetic with @command{gawk}
+@section Arbitrary-Precision Integer Arithmetic with @command{gawk}
 @cindex integers, arbitrary precision
 @cindex arbitrary precision integers
 
 When given the @option{-M} option,
-@command{gawk} performs all integer arithmetic using GMP arbitrary
-precision integers.  Any number that looks like an integer in a source
-or @value{DF} is stored as an arbitrary precision integer.  The size
+@command{gawk} performs all integer arithmetic using GMP arbitrary-precision
+integers.  Any number that looks like an integer in a source
+or @value{DF} is stored as an arbitrary-precision integer.  The size
 of the integer is limited only by the available memory.  For example,
 the following computes
 @iftex
@@ -30660,33 +31023,34 @@ the following computes
 5<superscript>4<superscript>3<superscript>2</superscript></superscript></superscript>, @c
 @end docbook
 the result of which is beyond the
-limits of ordinary hardware double-precision floating point values:
+limits of ordinary hardware double-precision floating-point values:
+@c FIXME: Use @sup here for superscript
 
 @example
 $ @kbd{gawk -M 'BEGIN @{}
 >   @kbd{x = 5^4^3^2}
->   @kbd{print "# of digits =", length(x)}
+>   @kbd{print "number of digits =", length(x)}
 >   @kbd{print substr(x, 1, 20), "...", substr(x, length(x) - 19, 20)}
 > @kbd{@}'}
-@print{} # of digits = 183231
+@print{} number of digits = 183231
 @print{} 62060698786608744707 ... 92256259918212890625
 @end example
 
-If instead you were to compute the same value using arbitrary precision
+If instead you were to compute the same value using arbitrary-precision
 floating-point values, the precision needed for correct output (using
 the formula
 @iftex
-@math{prec = 3.322 @cdot dps}),
+@math{prec = 3.322 @cdot dps})
 would be @math{3.322 @cdot 183231},
 @end iftex
 @ifnottex
 @ifnotdocbook
-@samp{prec = 3.322 * dps}),
+@samp{prec = 3.322 * dps})
 would be 3.322 x 183231,
 @end ifnotdocbook
 @end ifnottex
 @docbook
-<emphasis>prec</emphasis> = 3.322 &sdot; <emphasis>dps</emphasis>),
+<emphasis>prec</emphasis> = 3.322 &sdot; <emphasis>dps</emphasis>)
 would be
 <emphasis>prec</emphasis> = 3.322 &sdot; 183231, @c
 @end docbook
@@ -30717,14 +31081,14 @@ floating-point results exactly. You can either increase the precision
 @samp{2.0} with an integer, to perform all computations using integer
 arithmetic to get the correct output.
 
-Sometimes @command{gawk} must implicitly convert an arbitrary precision
-integer into an arbitrary precision floating-point value.  This is
+Sometimes @command{gawk} must implicitly convert an arbitrary-precision
+integer into an arbitrary-precision floating-point value.  This is
 primarily because the MPFR library does not always provide the relevant
-interface to process arbitrary precision integers or mixed-mode numbers
+interface to process arbitrary-precision integers or mixed-mode numbers
 as needed by an operation or function.  In such a case, the precision is
 set to the minimum value necessary for exact conversion, and the working
 precision is not used for this purpose.  If this is not what you need or
-want, you can employ a subterfuge, and convert the integer to floating
+want, you can employ a subterfuge and convert the integer to floating
 point first, like this:
 
 @example
@@ -30738,7 +31102,7 @@ to begin with:
 gawk -M 'BEGIN @{ n = 13.0; print n % 2.0 @}'
 @end example
 
-Note that for the particular example above, it is likely best
+Note that for this particular example, it is likely best
 to just use the following:
 
 @example
@@ -30750,27 +31114,30 @@ When dividing two arbitrary precision integers with either
 precision floating point value (unless the denominator evenly
 divides into the numerator).  In order to do integer division
 or remainder with arbitrary precision integers, use the built-in
-@code{div()} function (@pxref{Numeric Functions}).
+@code{intdiv()} function (@pxref{Numeric Functions}).
 
-You can simulate the @code{div()} function in standard @command{awk}
+You can simulate the @code{intdiv()} function in standard @command{awk}
 using this user-defined function:
 
 @example
-@c file eg/lib/div.awk
-# div --- do integer division
+@c file eg/lib/intdiv.awk
+# intdiv --- do integer division
 
 @c endfile
 @ignore
-@c file eg/lib/div.awk
+@c file eg/lib/intdiv.awk
 #
 # Arnold Robbins, arnold@@skeeve.com, Public Domain
 # July, 2014
+#
+# Name changed from div() to intdiv()
+# April, 2015
 
 @c endfile
 
 @end ignore
-@c file eg/lib/div.awk
-function div(numerator, denominator, result,    i)
+@c file eg/lib/intdiv.awk
+function intdiv(numerator, denominator, result)
 @{
     split("", result)
 
@@ -30784,10 +31151,84 @@ function div(numerator, denominator, result,    i)
 @c endfile
 @end example
 
+The following example program, contributed by Katie Wasserman,
+uses @code{intdiv()} to
+compute the digits of @value{PI} to as many places as you
+choose to set:
+
+@example
+@c file eg/prog/pi.awk
+# pi.awk --- compute the digits of pi
+@c endfile
+@c endfile
+@ignore
+@c file eg/prog/pi.awk
+#
+# Katie Wasserman, katie@@wass.net
+# August 2014
+@c endfile
+@end ignore
+@c file eg/prog/pi.awk
+
+BEGIN @{
+    digits = 100000
+    two = 2 * 10 ^ digits
+    pi = two
+    for (m = digits * 4; m > 0; --m) @{
+        d = m * 2 + 1
+        x = pi * m
+        intdiv(x, d, result)
+        pi = result["quotient"]
+        pi = pi + two
+    @}
+    print pi
+@}
+@c endfile
+@end example
+
+@ignore
+Date: Wed, 20 Aug 2014 10:19:11 -0400
+To: arnold@skeeve.com
+From: Katherine Wasserman <katie@wass.net>
+Subject: Re: computation of digits of pi?
+
+Arnold,
+
+>The program that you sent to compute the digits of pi using div(). Is
+>that some standard algorithm that every math student knows? If so,
+>what's it called?
+
+It's not that well known but it's not that obscure either
+
+It's Euler's modification to Newton's method for calculating pi.
+
+Take a look at lines (23) - (25)  here: http://mathworld.wolfram.com/PiFormulas.htm
+
+The algorithm I wrote simply expands the multiply by 2 and works from the innermost expression outwards.  I used this to program HP calculators because it's quite easy to modify for tiny memory devices with smallish word sizes.   
+
+http://www.hpmuseum.org/cgi-sys/cgiwrap/hpmuseum/articles.cgi?read=899
+
+-Katie
+@end ignore
+
+When asked about the algorithm used, Katie replied:
+
+@quotation
+It's not that well known but it's not that obscure either.
+It's Euler's modification to Newton's method for calculating pi.
+Take a look at lines (23) - (25) here: @uref{http://mathworld.wolfram.com/PiFormulas.html}.
+
+The algorithm I wrote simply expands the multiply by 2 and works from
+the innermost expression outwards.  I used this to program HP calculators
+because it's quite easy to modify for tiny memory devices with smallish
+word sizes. See
+@uref{http://www.hpmuseum.org/cgi-sys/cgiwrap/hpmuseum/articles.cgi?read=899}.
+@end quotation
+
 @node POSIX Floating Point Problems
 @section Standards Versus Existing Practice
 
-Historically, @command{awk} has converted any non-numeric looking string
+Historically, @command{awk} has converted any nonnumeric-looking string
 to the numeric value zero, when required.  Furthermore, the original
 definition of the language and the original POSIX standards specified that
 @command{awk} only understands decimal numbers (base 10), and not octal
@@ -30799,13 +31240,13 @@ should support additional features.  These features are:
 
 @itemize @value{BULLET}
 @item
-Interpretation of floating point data values specified in hexadecimal
+Interpretation of floating-point data values specified in hexadecimal
 notation (e.g., @code{0xDEADBEEF}). (Note: data values, @emph{not}
 source code constants.)
 
 @item
-Support for the special IEEE 754 floating point values ``Not A Number''
-(NaN), positive Infinity (``inf'') and negative Infinity (``@minus{}inf'').
+Support for the special IEEE 754 floating-point values ``not a number''
+(NaN), positive infinity (``inf''), and negative infinity (``@minus{}inf'').
 In particular, the format for these values is as specified by the ISO 1999
 C standard, which ignores case and can allow implementation-dependent additional
 characters after the @samp{nan} and allow either @samp{inf} or @samp{infinity}.
@@ -30816,8 +31257,8 @@ practice:
 
 @itemize @value{BULLET}
 @item
-The @command{gawk} maintainer feels that supporting hexadecimal floating
-point values, in particular, is ugly, and was never intended by the
+The @command{gawk} maintainer feels that supporting hexadecimal
+floating-point values, in particular, is ugly, and was never intended by the
 original designers to be part of the language.
 
 @item
@@ -30825,22 +31266,22 @@ Allowing completely alphabetic strings to have valid numeric
 values is also a very severe departure from historical practice.
 @end itemize
 
-The second problem is that the @code{gawk} maintainer feels that this
-interpretation of the standard, which requires a certain amount of
+The second problem is that the @command{gawk} maintainer feels that this
+interpretation of the standard, which required a certain amount of
 ``language lawyering'' to arrive at in the first place, was not even
-intended by the standard developers.  In other words, ``we see how you
+intended by the standard developers.  In other words, ``We see how you
 got where you are, but we don't think that that's where you want to be.''
 
-Recognizing the above issues, but attempting to provide compatibility
+Recognizing these issues, but attempting to provide compatibility
 with the earlier versions of the standard,
 the 2008 POSIX standard added explicit wording to allow, but not require,
-that @command{awk} support hexadecimal floating point values and
-special values for ``Not A Number'' and infinity.
+that @command{awk} support hexadecimal floating-point values and
+special values for ``not a number'' and infinity.
 
 Although the @command{gawk} maintainer continues to feel that
 providing those features is inadvisable,
 nevertheless, on systems that support IEEE floating point, it seems
-reasonable to provide @emph{some} way to support NaN and Infinity values.
+reasonable to provide @emph{some} way to support NaN and infinity values.
 The solution implemented in @command{gawk} is as follows:
 
 @itemize @value{BULLET}
@@ -30860,7 +31301,7 @@ $ @kbd{echo 0xDeadBeef | gawk --posix '@{ print $1 + 0 @}'}
 @end example
 
 @item
-Without @option{--posix}, @command{gawk} interprets the four strings
+Without @option{--posix}, @command{gawk} interprets the four string values
 @samp{+inf},
 @samp{-inf},
 @samp{+nan},
@@ -30882,7 +31323,7 @@ $ @kbd{echo 0xDeadBeef | gawk '@{ print $1 + 0 @}'}
 @end example
 
 @command{gawk} ignores case in the four special values.
-Thus @samp{+nan} and @samp{+NaN} are the same.
+Thus, @samp{+nan} and @samp{+NaN} are the same.
 @end itemize
 
 @node Floating point summary
@@ -30891,13 +31332,13 @@ Thus @samp{+nan} and @samp{+NaN} are the same.
 @itemize @value{BULLET}
 @item
 Most computer arithmetic is done using either integers or floating-point
-values.  The default for @command{awk} is to use double-precision
+values.  Standard @command{awk} uses double-precision
 floating-point values.
 
 @item
-In the early 1990's, Barbie mistakenly said ``Math class is tough!''
-While math isn't tough, floating-point arithmetic isn't the same
-as pencil and paper math, and care must be taken:
+In the early 1990s Barbie mistakenly said, ``Math class is tough!''
+Although math isn't tough, floating-point arithmetic isn't the same
+as pencil-and-paper math, and care must be taken:
 
 @c nested list
 @itemize @value{MINUS}
@@ -30929,12 +31370,12 @@ arithmetic. Use @code{PREC} to set the precision in bits, and
 
 @item
 With @option{-M}, @command{gawk} performs
-arbitrary precision integer arithmetic using the GMP library.
-This is faster and more space efficient than using MPFR for
+arbitrary-precision integer arithmetic using the GMP library.
+This is faster and more space-efficient than using MPFR for
 the same calculations.
 
 @item
-There are several ``dark corners'' with respect to floating-point
+There are several areas with respect to floating-point
 numbers where @command{gawk} disagrees with the POSIX standard.
 It pays to be aware of them.
 
@@ -30942,7 +31383,7 @@ It pays to be aware of them.
 Overall, there is no need to be unduly suspicious about the results from
 floating-point arithmetic. The lesson to remember is that floating-point
 arithmetic is always more complex than arithmetic using pencil and
-paper. In order to take advantage of the power of computer floating-point,
+paper. In order to take advantage of the power of floating-point arithmetic,
 you need to know its limitations and work within them. For most casual
 use of floating-point arithmetic, you will often get the expected result
 if you simply round the display of your final results to the correct number
@@ -30984,7 +31425,7 @@ When @option{--sandbox} is specified, extensions are disabled
 * Finding Extensions::          How @command{gawk} finds compiled extensions.
 * Extension Example::           Example C code for an extension.
 * Extension Samples::           The sample extensions that ship with
-                                @code{gawk}.
+                                @command{gawk}.
 * gawkextlib::                  The @code{gawkextlib} project.
 * Extension summary::           Extension summary.
 * Extension Exercises::         Exercises.
@@ -31003,15 +31444,15 @@ Extensions are useful because they allow you (of course) to extend
 @command{gawk}'s functionality. For example, they can provide access to
 system calls (such as @code{chdir()} to change directory) and to other
 C library routines that could be of use.  As with most software,
-``the sky is the limit;'' if you can imagine something that you might
+``the sky is the limit''; if you can imagine something that you might
 want to do and can write in C or C++, you can write an extension to do it!
 
-Extensions are written in C or C++, using the @dfn{Application Programming
-Interface} (API) defined for this purpose by the @command{gawk}
+Extensions are written in C or C++, using the @dfn{application programming
+interface} (API) defined for this purpose by the @command{gawk}
 developers.  The rest of this @value{CHAPTER} explains
 the facilities that the API provides and how to use
-them, and presents a small sample extension.  In addition, it documents
-the sample extensions included in the @command{gawk} distribution,
+them, and presents a small example extension.  In addition, it documents
+the sample extensions included in the @command{gawk} distribution
 and describes the @code{gawkextlib} project.
 @ifclear FOR_PRINT
 @xref{Extension Design}, for a discussion of the extension mechanism
@@ -31026,10 +31467,14 @@ goals and design.
 @node Plugin License
 @section Extension Licensing
 
-Every dynamic extension should define the global symbol
-@code{plugin_is_GPL_compatible} to assert that it has been licensed under
-a GPL-compatible license.  If this symbol does not exist, @command{gawk}
-emits a fatal error and exits when it tries to load your extension.
+Every dynamic extension must be distributed under a license that is
+compatible with the GNU GPL (@pxref{Copying}).
+
+In order for the extension to tell @command{gawk} that it is
+properly licensed, the extension must define the global symbol
+@code{plugin_is_GPL_compatible}.  If this symbol does not exist,
+@command{gawk} emits a fatal error and exits when it tries to load
+your extension.
 
 The declared type of the symbol should be @code{int}.  It does not need
 to be in any allocated section, though.  The code merely asserts that
@@ -31040,11 +31485,11 @@ int plugin_is_GPL_compatible;
 @end example
 
 @node Extension Mechanism Outline
-@section At A High Level How It Works
+@section How It Works at a High Level
 
 Communication between
 @command{gawk} and an extension is two-way.  First, when an extension
-is loaded, it is passed a pointer to a @code{struct} whose fields are
+is loaded, @command{gawk} passes it a pointer to a @code{struct} whose fields are
 function pointers.
 @ifnotdocbook
 This is shown in @ref{figure-load-extension}.
@@ -31055,22 +31500,22 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-load-extension"/>}.
 
 @ifnotdocbook
 @float Figure,figure-load-extension
-@caption{Loading The Extension}
+@caption{Loading the extension}
 @c FIXME: One day, it should not be necessary to have two cases,
 @c but rather just the one without the "txt" final argument.
 @c This applies to the other figures as well.
 @ifinfo
-@center @image{api-figure1, , , Loading The Extension, txt}
+@center @image{api-figure1, , , Loading the extension, txt}
 @end ifinfo
 @ifnotinfo
-@center @image{api-figure1, , , Loading The Extension}
+@center @image{api-figure1, , , Loading the extension}
 @end ifnotinfo
 @end float
 @end ifnotdocbook
 
 @docbook
 <figure id="figure-load-extension" float="0">
-<title>Loading The Extension</title>
+<title>Loading the extension</title>
 <mediaobject>
 <imageobject role="web"><imagedata fileref="api-figure1.png" format="PNG"/></imageobject>
 </mediaobject>
@@ -31080,29 +31525,29 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-load-extension"/>}.
 The extension can call functions inside @command{gawk} through these
 function pointers, at runtime, without needing (link-time) access
 to @command{gawk}'s symbols.  One of these function pointers is to a
-function for ``registering'' new built-in functions.
+function for ``registering'' new functions.
 @ifnotdocbook
-This is shown in @ref{figure-load-new-function}.
+This is shown in @ref{figure-register-new-function}.
 @end ifnotdocbook
 @ifdocbook
-This is shown in @inlineraw{docbook, <xref linkend="figure-load-new-function"/>}.
+This is shown in @inlineraw{docbook, <xref linkend="figure-register-new-function"/>}.
 @end ifdocbook
 
 @ifnotdocbook
-@float Figure,figure-load-new-function
-@caption{Loading The New Function}
+@float Figure,figure-register-new-function
+@caption{Registering a new function}
 @ifinfo
-@center @image{api-figure2, , , Loading The New Function, txt}
+@center @image{api-figure2, , , Registering a new Function, txt}
 @end ifinfo
 @ifnotinfo
-@center @image{api-figure2, , , Loading The New Function}
+@center @image{api-figure2, , , Registering a new Function}
 @end ifnotinfo
 @end float
 @end ifnotdocbook
 
 @docbook
-<figure id="figure-load-new-function" float="0">
-<title>Loading The New Function</title>
+<figure id="figure-register-new-function" float="0">
+<title>Registering a new function</title>
 <mediaobject>
 <imageobject role="web"><imagedata fileref="api-figure2.png" format="PNG"/></imageobject>
 </mediaobject>
@@ -31123,7 +31568,7 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-call-new-function"/>}
 
 @ifnotdocbook
 @float Figure,figure-call-new-function
-@caption{Calling The New Function}
+@caption{Calling the new function}
 @ifinfo
 @center @image{api-figure3, , , Calling the new function, txt}
 @end ifinfo
@@ -31135,7 +31580,7 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-call-new-function"/>}
 
 @docbook
 <figure id="figure-call-new-function" float="0">
-<title>Calling The New Function</title>
+<title>Calling the new function</title>
 <mediaobject>
 <imageobject role="web"><imagedata fileref="api-figure3.png" format="PNG"/></imageobject>
 </mediaobject>
@@ -31152,15 +31597,15 @@ and understandable.
 
 Although all of this sounds somewhat complicated, the result is that
 extension code is quite straightforward to write and to read. You can
-see this in the sample extensions @file{filefuncs.c} (@pxref{Extension
-Example}) and also the @file{testext.c} code for testing the APIs.
+see this in the sample extension @file{filefuncs.c} (@pxref{Extension
+Example}) and also in the @file{testext.c} code for testing the APIs.
 
 Some other bits and pieces:
 
 @itemize @value{BULLET}
 @item
 The API provides access to @command{gawk}'s @code{do_@var{xxx}} values,
-reflecting command-line options, like @code{do_lint}, @code{do_profiling}
+reflecting command-line options, like @code{do_lint}, @code{do_profiling},
 and so on (@pxref{Extension API Variables}).
 These are informational: an extension cannot affect their values
 inside @command{gawk}.  In addition, attempting to assign to them
@@ -31171,10 +31616,9 @@ The API also provides major and minor version numbers, so that an
 extension can check if the @command{gawk} it is loaded with supports the
 facilities it was compiled with.  (Version mismatches ``shouldn't''
 happen, but we all know how @emph{that} goes.)
-@xref{Extension Versioning}, for details.
+@DBXREF{Extension Versioning} for details.
 @end itemize
 
-
 @node Extension API Description
 @section API Description
 @cindex extension API
@@ -31187,17 +31631,18 @@ This (rather large) @value{SECTION} describes the API in detail.
 @menu
 * Extension API Functions Introduction:: Introduction to the API functions.
 * General Data Types::                   The data types.
-* Requesting Values::                    How to get a value.
 * Memory Allocation Functions::          Functions for allocating memory.
 * Constructor Functions::                Functions for creating values.
 * Registration Functions::               Functions to register things with
                                          @command{gawk}.
 * Printing Messages::                    Functions for printing messages.
 * Updating @code{ERRNO}::                Functions for updating @code{ERRNO}.
+* Requesting Values::                    How to get a value.
 * Accessing Parameters::                 Functions for accessing parameters.
 * Symbol Table Access::                  Functions for accessing global
                                          variables.
 * Array Manipulation::                   Functions for working with arrays.
+* Redirection API::                      How to access and manipulate redirections.
 * Extension API Variables::              Variables provided by the API.
 * Extension API Boilerplate::            Boilerplate code for using the API.
 @end menu
@@ -31205,29 +31650,35 @@ This (rather large) @value{SECTION} describes the API in detail.
 @node Extension API Functions Introduction
 @subsection Introduction
 
-Access to facilities within @command{gawk} are made available
+Access to facilities within @command{gawk} is achieved
 by calling through function pointers passed into your extension.
 
 API function pointers are provided for the following kinds of operations:
 
 @itemize @value{BULLET}
 @item
+Allocating, reallocating, and releasing memory.
+
+@item
 Registration functions. You may register:
+
+@c nested list
 @itemize @value{MINUS}
 @item
-extension functions,
+Extension functions
 @item
-exit callbacks,
+Exit callbacks
 @item
-a version string,
+A version string
 @item
-input parsers,
+Input parsers
 @item
-output wrappers,
+Output wrappers
 @item
-and two-way processors.
+Two-way processors
 @end itemize
-All of these are discussed in detail, later in this @value{CHAPTER}.
+
+All of these are discussed in detail later in this @value{CHAPTER}.
 
 @item
 Printing fatal, warning, and ``lint'' warning messages.
@@ -31244,9 +31695,6 @@ Symbol table access: retrieving a global variable, creating one,
 or changing one.
 
 @item
-Allocating, reallocating, and releasing memory.
-
-@item
 Creating and releasing cached values; this provides an
 efficient way to use values for multiple variables and
 can be a big performance win.
@@ -31268,20 +31716,25 @@ Creating a new array
 Clearing an array
 
 @item
-Flattening an array for easy C style looping over all its indices and elements
+Flattening an array for easy C-style looping over all its indices and elements
 @end itemize
+
+@item
+Accessing and manipulating redirections.
+
 @end itemize
 
 Some points about using the API:
 
 @itemize @value{BULLET}
 @item
-The following types and/or macros and/or functions are referenced
+The following types, macros, and/or functions are referenced
 in @file{gawkapi.h}.  For correct use, you must therefore include the
 corresponding standard header file @emph{before} including @file{gawkapi.h}:
 
+@c FIXME: Make this is a float at some point.
 @multitable {@code{memset()}, @code{memcpy()}} {@code{<sys/types.h>}}
-@headitem C Entity @tab Header File
+@headitem C entity @tab Header file
 @item @code{EOF} @tab @code{<stdio.h>}
 @item Values for @code{errno} @tab @code{<errno.h>}
 @item @code{FILE} @tab @code{<stdio.h>}
@@ -31290,7 +31743,7 @@ corresponding standard header file @emph{before} including @file{gawkapi.h}:
 @item @code{memset()} @tab @code{<string.h>}
 @item @code{size_t} @tab @code{<sys/types.h>}
 @item @code{struct stat} @tab @code{<sys/stat.h>}
-@end multitable 
+@end multitable
 
 Due to portability concerns, especially to systems that are not
 fully standards-compliant, it is your responsibility
@@ -31307,35 +31760,35 @@ Doing so, however, is poor coding practice.
 Although the API only uses ISO C 90 features, there is an exception; the
 ``constructor'' functions use the @code{inline} keyword. If your compiler
 does not support this keyword, you should either place
-@samp{-Dinline=''} on your command line, or use the GNU Autotools and include a
+@samp{-Dinline=''} on your command line or use the GNU Autotools and include a
 @file{config.h} file in your extensions.
 
 @item
 All pointers filled in by @command{gawk} point to memory
 managed by @command{gawk} and should be treated by the extension as
 read-only.  Memory for @emph{all} strings passed into @command{gawk}
-from the extension @emph{must} come from calling the API-provided function
-pointers @code{api_malloc()}, @code{api_calloc()} or @code{api_realloc()},
+from the extension @emph{must} come from calling one of
+@code{gawk_malloc()}, @code{gawk_calloc()}, or @code{gawk_realloc()},
 and is managed by @command{gawk} from then on.
 
 @item
 The API defines several simple @code{struct}s that map values as seen
 from @command{awk}.  A value can be a @code{double}, a string, or an
 array (as in multidimensional arrays, or when creating a new array).
-String values maintain both pointer and length since embedded @value{NUL}
+String values maintain both pointer and length, because embedded @sc{nul}
 characters are allowed.
 
 @quotation NOTE
 By intent, strings are maintained using the current multibyte encoding (as
 defined by @env{LC_@var{xxx}} environment variables) and not using wide
 characters.  This matches how @command{gawk} stores strings internally
-and also how characters are likely to be input and output from files.
+and also how characters are likely to be input into and output from files.
 @end quotation
 
 @item
 When retrieving a value (such as a parameter or that of a global variable
 or array element), the extension requests a specific type (number, string,
-scalars, value cookie, array, or ``undefined'').  When the request is
+scalar, value cookie, array, or ``undefined'').  When the request is
 ``undefined,'' the returned value will have the real underlying type.
 
 However, if the request and actual type don't match, the access function
@@ -31347,14 +31800,14 @@ so that the extension can, e.g., print an error message
 @c The table there should be presented here
 @end itemize
 
-While you may call the API functions by using the function pointers
-directly, the interface is not so pretty. To make extension code look
+You may call the API functions by using the function pointers
+directly, but the interface is not so pretty. To make extension code look
 more like regular code, the @file{gawkapi.h} header file defines several
 macros that you should use in your code.  This @value{SECTION} presents
 the macros as if they were functions.
 
 @node General Data Types
-@subsection General Purpose Data Types
+@subsection General-Purpose Data Types
 
 @cindex Robbins, Arnold
 @cindex Ramey, Chet
@@ -31369,9 +31822,12 @@ can accommodate both love and hate.}
 @author Chet Ramey
 @end quotation
 
-The extension API defines a number of simple types and structures for general
-purpose use. Additional, more specialized, data structures are introduced
-in subsequent @value{SECTION}s, together with the functions that use them.
+The extension API defines a number of simple types and structures for
+general-purpose use. Additional, more specialized, data structures are
+introduced in subsequent @value{SECTION}s, together with the functions
+that use them.
+
+The general-purpose types and structures are as follows:
 
 @table @code
 @item typedef void *awk_ext_id_t;
@@ -31389,7 +31845,7 @@ while allowing @command{gawk} to use them as it needs to.
 @itemx @ @ @ @ awk_false = 0,
 @itemx @ @ @ @ awk_true
 @itemx @} awk_bool_t;
-A simple boolean type.
+A simple Boolean type.
 
 @item typedef struct awk_string @{
 @itemx @ @ @ @ char *str;@ @ @ @ @ @ /* data */
@@ -31398,8 +31854,9 @@ A simple boolean type.
 This represents a mutable string. @command{gawk}
 owns the memory pointed to if it supplied
 the value. Otherwise, it takes ownership of the memory pointed to.
-@strong{Such memory must come from calling the API-provided function
-pointers @code{api_malloc()}, @code{api_calloc()}, or @code{api_realloc()}!}
+@emph{Such memory must come from calling one of the
+@code{gawk_malloc()}, @code{gawk_calloc()}, or
+@code{gawk_realloc()} functions!}
 
 As mentioned earlier, strings are maintained using the current
 multibyte encoding.
@@ -31425,7 +31882,7 @@ It is used in the following @code{struct}.
 @itemx @ @ @ @ @ @ @ @ awk_value_cookie_t@ vc;
 @itemx @ @ @ @ @} u;
 @itemx @} awk_value_t;
-An ``@command{awk} value.''  
+An ``@command{awk} value.''
 The @code{val_type} member indicates what kind of value the
 @code{union} holds, and each member is of the appropriate type.
 
@@ -31434,17 +31891,18 @@ The @code{val_type} member indicates what kind of value the
 @itemx #define array_cookie@ @ @ u.a
 @itemx #define scalar_cookie@ @ u.scl
 @itemx #define value_cookie@ @ @ u.vc
-These macros make accessing the fields of the @code{awk_value_t} more
+Using these macros makes accessing the fields of the @code{awk_value_t} more
 readable.
 
 @item typedef void *awk_scalar_t;
-Scalars can be represented as an opaque type. These values are obtained from
-@command{gawk} and then passed back into it. This is discussed in a general fashion below,
-and in more detail in @ref{Symbol table by cookie}.
+Scalars can be represented as an opaque type. These values are obtained
+from @command{gawk} and then passed back into it. This is discussed
+in a general fashion in the text following this list, and in more detail in
+@ref{Symbol table by cookie}.
 
 @item typedef void *awk_value_cookie_t;
 A ``value cookie'' is an opaque type representing a cached value.
-This is also discussed in a general fashion below,
+This is also discussed in a general fashion in the text following this list,
 and in more detail in @ref{Cached values}.
 
 @end table
@@ -31454,9 +31912,9 @@ Scalar values in @command{awk} are either numbers or strings. The
 indicates what is in the @code{union}.
 
 Representing numbers is easy---the API uses a C @code{double}.  Strings
-require more work. Since @command{gawk} allows embedded @value{NUL} bytes
+require more work. Because @command{gawk} allows embedded @sc{nul} bytes
 in string values, a string must be represented as a pair containing a
-data-pointer and length. This is the @code{awk_string_t} type.
+data pointer and length. This is the @code{awk_string_t} type.
 
 Identifiers (i.e., the names of global variables) can be associated
 with either scalar values or with arrays.  In addition, @command{gawk}
@@ -31467,14 +31925,14 @@ itself be an array.  Discussion of arrays is delayed until
 The various macros listed earlier make it easier to use the elements
 of the @code{union} as if they were fields in a @code{struct}; this
 is a common coding practice in C.  Such code is easier to write and to
-read, however it remains @emph{your} responsibility to make sure that
+read, but it remains @emph{your} responsibility to make sure that
 the @code{val_type} member correctly reflects the type of the value in
-the @code{awk_value_t}.
+the @code{awk_value_t} struct.
 
 Conceptually, the first three members of the @code{union} (number, string,
 and array) are all that is needed for working with @command{awk} values.
-However, since the API provides routines for accessing and changing
-the value of global scalar variables only by using the variable's name,
+However, because the API provides routines for accessing and changing
+the value of a global scalar variable only by using the variable's name,
 there is a performance penalty: @command{gawk} must find the variable
 each time it is accessed and changed.  This turns out to be a real issue,
 not just a theoretical one.
@@ -31492,160 +31950,19 @@ See also the entry for ``Cookie'' in the @ref{Glossary}.
 object for that variable, and then use
 the cookie for getting the variable's value or for changing the variable's
 value.
-This is the @code{awk_scalar_t} type and @code{scalar_cookie} macro.
+The @code{awk_scalar_t} type holds a scalar cookie, and the
+@code{scalar_cookie} macro provides access to the value of that type
+in the @code{awk_value_t} struct.
 Given a scalar cookie, @command{gawk} can directly retrieve or
-modify the value, as required, without having to first find it.
+modify the value, as required, without having to find it first.
 
 The @code{awk_value_cookie_t} type and @code{value_cookie} macro are similar.
 If you know that you wish to
 use the same numeric or string @emph{value} for one or more variables,
 you can create the value once, retaining a @dfn{value cookie} for it,
 and then pass in that value cookie whenever you wish to set the value of a
-variable.  This saves both storage space within the running @command{gawk}
-process as well as the time needed to create the value.
-
-@node Requesting Values
-@subsection Requesting Values
-
-All of the functions that return values from @command{gawk}
-work in the same way. You pass in an @code{awk_valtype_t} value
-to indicate what kind of value you expect.  If the actual value
-matches what you requested, the function returns true and fills
-in the @code{awk_value_t} result.
-Otherwise, the function returns false, and the @code{val_type}
-member indicates the type of the actual value.  You may then
-print an error message, or reissue the request for the actual
-value type, as appropriate.  This behavior is summarized in
-@ref{table-value-types-returned}.
-
-@c FIXME: Try to do this with spans...
-
-@float Table,table-value-types-returned
-@caption{API Value Types Returned}
-@docbook
-<informaltable>
-<tgroup cols="2">
-  <colspec colwidth="50*"/><colspec colwidth="50*"/>
-  <thead>
-    <row><entry></entry><entry><para>Type of Actual Value:</para></entry></row>
-  </thead>
-  <tbody>
-    <row><entry></entry><entry></entry></row>
-  </tbody>
-</tgroup>
-<tgroup cols="6">
-  <colspec colwidth="16.6*"/>
-  <colspec colwidth="16.6*"/>
-  <colspec colwidth="19.8*"/>
-  <colspec colwidth="15*"/>
-  <colspec colwidth="15*"/>
-  <colspec colwidth="16.6*"/>
-  <thead>
-    <row>
-      <entry></entry>
-      <entry></entry>
-      <entry><para>String</para></entry>
-      <entry><para>Number</para></entry>
-      <entry><para>Array</para></entry>
-      <entry><para>Undefined</para></entry>
-    </row>
-  </thead>
-  <tbody>
-    <row>
-      <entry></entry>
-      <entry><para><emphasis role="bold">String</emphasis></para></entry>
-      <entry><para>String</para></entry>
-      <entry><para>String</para></entry>
-      <entry><para>false</para></entry>
-      <entry><para>false</para></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry><para><emphasis role="bold">Number</emphasis></para></entry>
-      <entry><para>Number if can be converted, else false</para></entry>
-      <entry><para>Number</para></entry>
-      <entry><para>false</para></entry>
-      <entry><para>false</para></entry>
-    </row>
-    <row>
-      <entry><para><emphasis role="bold">Type</emphasis></para></entry>
-      <entry><para><emphasis role="bold">Array</emphasis></para></entry>
-      <entry><para>false</para></entry>
-      <entry><para>false</para></entry>
-      <entry><para>Array</para></entry>
-      <entry><para>false</para></entry>
-    </row>
-    <row>
-      <entry><para><emphasis role="bold">Requested:</emphasis></para></entry>
-      <entry><para><emphasis role="bold">Scalar</emphasis></para></entry>
-      <entry><para>Scalar</para></entry>
-      <entry><para>Scalar</para></entry>
-      <entry><para>false</para></entry>
-      <entry><para>false</para></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry><para><emphasis role="bold">Undefined</emphasis></para></entry>
-      <entry><para>String</para></entry>
-      <entry><para>Number</para></entry>
-      <entry><para>Array</para></entry>
-      <entry><para>Undefined</para></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry><para><emphasis role="bold">Value Cookie</emphasis></para></entry>
-      <entry><para>false</para></entry>
-      <entry><para>false</para></entry>
-      <entry><para>false</para>
-      </entry><entry><para>false</para></entry>
-    </row>
-  </tbody>
-</tgroup>
-</informaltable>
-@end docbook
-
-@ifnotplaintext
-@ifnotdocbook
-@multitable @columnfractions .50 .50
-@headitem @tab Type of Actual Value:
-@end multitable
-@multitable @columnfractions .166 .166 .198 .15 .15 .166
-@headitem @tab @tab String @tab Number @tab Array @tab Undefined
-@item @tab @b{String} @tab String @tab String @tab false @tab false
-@item @tab @b{Number} @tab Number if can be converted, else false @tab Number @tab false @tab false
-@item @b{Type} @tab @b{Array} @tab false @tab false @tab Array @tab false
-@item @b{Requested:} @tab @b{Scalar} @tab Scalar @tab Scalar @tab false @tab false
-@item @tab @b{Undefined} @tab String @tab Number @tab Array @tab Undefined
-@item @tab @b{Value Cookie} @tab false @tab false @tab false @tab false
-@end multitable
-@end ifnotdocbook
-@end ifnotplaintext
-@ifplaintext
-@example
-                        +-------------------------------------------------+
-                        |                Type of Actual Value:            |
-                        +------------+------------+-----------+-----------+
-                        |   String   |   Number   | Array     | Undefined |
-+-----------+-----------+------------+------------+-----------+-----------+
-|           | String    |   String   |   String   | false     | false     |
-|           |-----------+------------+------------+-----------+-----------+
-|           | Number    | Number if  |   Number   | false     | false     |
-|           |           | can be     |            |           |           |
-|           |           | converted, |            |           |           |
-|           |           | else false |            |           |           |
-|           |-----------+------------+------------+-----------+-----------+
-|   Type    | Array     |   false    |   false    | Array     | false     |
-| Requested |-----------+------------+------------+-----------+-----------+
-|           | Scalar    |   Scalar   |   Scalar   | false     | false     |
-|           |-----------+------------+------------+-----------+-----------+
-|           | Undefined |  String    |   Number   | Array     | Undefined |
-|           |-----------+------------+------------+-----------+-----------+
-|           | Value     |   false    |   false    | false     | false     |
-|           | Cookie    |            |            |           |           |
-+-----------+-----------+------------+------------+-----------+-----------+
-@end example
-@end ifplaintext
-@end float
+variable.  This saves storage space within the running @command{gawk}
+process and reduces the time needed to create the value.
 
 @node Memory Allocation Functions
 @subsection Memory Allocation Functions and Convenience Macros
@@ -31655,39 +31972,41 @@ value type, as appropriate.  This behavior is summarized in
 The API provides a number of @dfn{memory allocation} functions for
 allocating memory that can be passed to @command{gawk}, as well as a number of
 convenience macros.
+This @value{SUBSECTION} presents them all as function prototypes, in
+the way that extension code would use them:
 
 @table @code
 @item void *gawk_malloc(size_t size);
-Call @command{gawk}-provided @code{api_malloc()} to allocate storage that may
+Call the correct version of @code{malloc()} to allocate storage that may
 be passed to @command{gawk}.
 
 @item void *gawk_calloc(size_t nmemb, size_t size);
-Call @command{gawk}-provided @code{api_calloc()} to allocate storage that may
+Call the correct version of @code{calloc()} to allocate storage that may
 be passed to @command{gawk}.
 
 @item void *gawk_realloc(void *ptr, size_t size);
-Call @command{gawk}-provided @code{api_realloc()} to allocate storage that may
+Call the correct version of @code{realloc()} to allocate storage that may
 be passed to @command{gawk}.
 
 @item void gawk_free(void *ptr);
-Call @command{gawk}-provided @code{api_free()} to release storage that was
-allocated with @code{gawk_malloc()}, @code{gawk_calloc()} or @code{gawk_realloc()}.
+Call the correct version of @code{free()} to release storage that was
+allocated with @code{gawk_malloc()}, @code{gawk_calloc()}, or @code{gawk_realloc()}.
 @end table
 
 The API has to provide these functions because it is possible
 for an extension to be compiled and linked against a different
 version of the C library than was used for the @command{gawk}
-executable.@footnote{This is more common on MS-Windows systems, but
+executable.@footnote{This is more common on MS-Windows systems, but it
 can happen on Unix-like systems as well.} If @command{gawk} were
 to use its version of @code{free()} when the memory came from an
 unrelated version of @code{malloc()}, unexpected behavior would
 likely result.
 
 Two convenience macros may be used for allocating storage
-from the API-provided function pointers @code{api_malloc()} and
-@code{api_realloc()}. If the allocation fails, they cause @command{gawk}
+from @code{gawk_malloc()} and
+@code{gawk_realloc()}. If the allocation fails, they cause @command{gawk}
 to exit with a fatal error message.  They should be used as if they were
-procedure calls that do not return a value.
+procedure calls that do not return a value:
 
 @table @code
 @item #define emalloc(pointer, type, size, message) @dots{}
@@ -31699,7 +32018,8 @@ The arguments to this macro are as follows:
 The pointer variable to point at the allocated storage.
 
 @item type
-The type of the pointer variable, used to create a cast for the call to @code{api_malloc()}.
+The type of the pointer variable.  This is used to create a cast for
+the call to @code{gawk_malloc()}.
 
 @item size
 The total number of bytes to be allocated.
@@ -31723,8 +32043,8 @@ make_malloced_string(message, strlen(message), & result);
 @end example
 
 @item #define erealloc(pointer, type, size, message) @dots{}
-This is like @code{emalloc()}, but it calls @code{api_realloc()},
-instead of @code{api_malloc()}.
+This is like @code{emalloc()}, but it calls @code{gawk_realloc()}
+instead of @code{gawk_malloc()}.
 The arguments are the same as for the @code{emalloc()} macro.
 @end table
 
@@ -31734,32 +32054,32 @@ The arguments are the same as for the @code{emalloc()} macro.
 The API provides a number of @dfn{constructor} functions for creating
 string and numeric values, as well as a number of convenience macros.
 This @value{SUBSECTION} presents them all as function prototypes, in
-the way that extension code would use them.
+the way that extension code would use them:
 
 @table @code
 @item static inline awk_value_t *
-@itemx make_const_string(const char *string, size_t length, awk_value_t *result)
+@itemx make_const_string(const char *string, size_t length, awk_value_t *result);
 This function creates a string value in the @code{awk_value_t} variable
 pointed to by @code{result}. It expects @code{string} to be a C string constant
 (or other string data), and automatically creates a @emph{copy} of the data
 for storage in @code{result}. It returns @code{result}.
 
 @item static inline awk_value_t *
-@itemx make_malloced_string(const char *string, size_t length, awk_value_t *result)
+@itemx make_malloced_string(const char *string, size_t length, awk_value_t *result);
 This function creates a string value in the @code{awk_value_t} variable
 pointed to by @code{result}. It expects @code{string} to be a @samp{char *}
-value pointing to data previously obtained from the api-provided functions @code{api_malloc()}, @code{api_calloc()} or @code{api_realloc()}. The idea here
+value pointing to data previously obtained from @code{gawk_malloc()}, @code{gawk_calloc()}, or @code{gawk_realloc()}. The idea here
 is that the data is passed directly to @command{gawk}, which assumes
 responsibility for it. It returns @code{result}.
 
 @item static inline awk_value_t *
-@itemx make_null_string(awk_value_t *result)
+@itemx make_null_string(awk_value_t *result);
 This specialized function creates a null string (the ``undefined'' value)
 in the @code{awk_value_t} variable pointed to by @code{result}.
 It returns @code{result}.
 
 @item static inline awk_value_t *
-@itemx make_number(double num, awk_value_t *result)
+@itemx make_number(double num, awk_value_t *result);
 This function simply creates a numeric value in the @code{awk_value_t} variable
 pointed to by @code{result}.
 @end table
@@ -31799,21 +32119,22 @@ The fields are:
 @table @code
 @item const char *name;
 The name of the new function.
-@command{awk} level code calls the function by this name.
+@command{awk}-level code calls the function by this name.
 This is a regular C string.
 
 Function names must obey the rules for @command{awk}
-identifiers. That is, they must begin with either a letter
+identifiers. That is, they must begin with either an English letter
 or an underscore, which may be followed by any number of
 letters, digits, and underscores.
 Letter case in function names is significant.
 
 @item awk_value_t *(*function)(int num_actual_args, awk_value_t *result);
-This is a pointer to the C function that provides the desired
+This is a pointer to the C function that provides the extension's
 functionality.
-The function must fill in the result with either a number
+The function must fill in @code{*result} with either a number
 or a string. @command{gawk} takes ownership of any string memory.
-As mentioned earlier, string memory @strong{must} come from the api-provided functions @code{api_malloc()}, @code{api_calloc()} or @code{api_realloc()}.
+As mentioned earlier, string memory @emph{must} come from one of
+@code{gawk_malloc()}, @code{gawk_calloc()}, or @code{gawk_realloc()}.
 
 The @code{num_actual_args} argument tells the C function how many
 actual parameters were passed from the calling @command{awk} code.
@@ -31824,7 +32145,7 @@ This is for the convenience of the calling code inside @command{gawk}.
 @item size_t num_expected_args;
 This is the number of arguments the function expects to receive.
 Each extension function may decide what to do if the number of
-arguments isn't what it expected.  Following @command{awk} functions, it
+arguments isn't what it expected.  As with real @command{awk} functions, it
 is likely OK to ignore extra arguments.
 @end table
 
@@ -31848,7 +32169,7 @@ Such functions are useful if you have general ``cleanup'' tasks
 that should be performed in your extension (such as closing database
 connections or other resource deallocations).
 You can register such
-a function with @command{gawk} using the following function.
+a function with @command{gawk} using the following function:
 
 @table @code
 @item void awk_atexit(void (*funcp)(void *data, int exit_status),
@@ -31864,24 +32185,25 @@ The @code{exit_status} parameter is the exit status value that
 @command{gawk} intends to pass to the @code{exit()} system call.
 
 @item arg0
-A pointer to private data which @command{gawk} saves in order to pass to
+A pointer to private data that @command{gawk} saves in order to pass to
 the function pointed to by @code{funcp}.
 @end table
 @end table
 
-Exit callback functions are called in Last-In-First-Out (LIFO) order---that is, in
-the reverse order in which they are registered with @command{gawk}.
+Exit callback functions are called in last-in, first-out (LIFO)
+order---that is, in the reverse order in which they are registered with
+@command{gawk}.
 
 @node Extension Version String
 @subsubsection Registering An Extension Version String
 
-You can register a version string which indicates the name and
-version of your extension, with @command{gawk}, as follows:
+You can register a version string that indicates the name and
+version of your extension with @command{gawk}, as follows:
 
 @table @code
 @item void register_ext_version(const char *version);
 Register the string pointed to by @code{version} with @command{gawk}.
-@command{gawk} does @emph{not} copy the @code{version} string, so
+Note that @command{gawk} does @emph{not} copy the @code{version} string, so
 it should not be changed.
 @end table
 
@@ -31898,7 +32220,7 @@ of @code{RS} to find the end of the record, and then uses @code{FS}
 Additionally, it sets the value of @code{RT} (@pxref{Built-in Variables}).
 
 If you want, you can provide your own custom input parser.  An input
-parser's job is to return a record to the @command{gawk} record processing
+parser's job is to return a record to the @command{gawk} record-processing
 code, along with indicators for the value and length of the data to be
 used for @code{RT}, if any.
 
@@ -31906,19 +32228,19 @@ To provide an input parser, you must first provide two functions
 (where @var{XXX} is a prefix name for your extension):
 
 @table @code
-@item awk_bool_t @var{XXX}_can_take_file(const awk_input_buf_t *iobuf)
+@item awk_bool_t @var{XXX}_can_take_file(const awk_input_buf_t *iobuf);
 This function examines the information available in @code{iobuf}
 (which we discuss shortly).  Based on the information there, it
 decides if the input parser should be used for this file.
 If so, it should return true. Otherwise, it should return false.
 It should not change any state (variable values, etc.) within @command{gawk}.
 
-@item awk_bool_t @var{XXX}_take_control_of(awk_input_buf_t *iobuf)
+@item awk_bool_t @var{XXX}_take_control_of(awk_input_buf_t *iobuf);
 When @command{gawk} decides to hand control of the file over to the
 input parser, it calls this function.  This function in turn must fill
-in certain fields in the @code{awk_input_buf_t} structure, and ensure
+in certain fields in the @code{awk_input_buf_t} structure and ensure
 that certain conditions are true.  It should then return true. If an
-error of some kind occurs, it should not fill in any fields, and should
+error of some kind occurs, it should not fill in any fields and should
 return false; then @command{gawk} will not use the input parser.
 The details are presented shortly.
 @end table
@@ -31963,7 +32285,7 @@ appropriately.
 @item
 When your extension is loaded, register your input parser with
 @command{gawk} using the @code{register_input_parser()} API function
-(described below).
+(described next).
 @end enumerate
 
 An @code{awk_input_buf_t} looks like this:
@@ -31993,7 +32315,7 @@ The name of the file.
 
 @item int fd;
 A file descriptor for the file.  If @command{gawk} was able to
-open the file, then @code{fd} will @emph{not} be equal to 
+open the file, then @code{fd} will @emph{not} be equal to
 @code{INVALID_HANDLE}. Otherwise, it will.
 
 @item struct stat sbuf;
@@ -32007,15 +32329,15 @@ The decision can be made based upon @command{gawk} state (the value
 of a variable defined previously by the extension and set by
 @command{awk} code), the name of the
 file, whether or not the file descriptor is valid, the information
-in the @code{struct stat}, or any combination of the above.
+in the @code{struct stat}, or any combination of these factors.
 
 Once @code{@var{XXX}_can_take_file()} has returned true, and
 @command{gawk} has decided to use your input parser, it calls
-@code{@var{XXX}_take_control_of()}.  That function then fills one of
+@code{@var{XXX}_take_control_of()}.  That function then fills
 either the @code{get_record} field or the @code{read_func} field in
 the @code{awk_input_buf_t}.  It must also ensure that @code{fd} is @emph{not}
-set to @code{INVALID_HANDLE}.  All of the fields that may be filled by
-@code{@var{XXX}_take_control_of()} are as follows:
+set to @code{INVALID_HANDLE}.  The following list describes the fields that
+may be filled by @code{@var{XXX}_take_control_of()}:
 
 @table @code
 @item void *opaque;
@@ -32030,24 +32352,24 @@ is not required to use this pointer.
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ size_t *rt_len);
 This function pointer should point to a function that creates the input
 records.  Said function is the core of the input parser.  Its behavior
-is described below.
+is described in the text following this list.
 
 @item ssize_t (*read_func)();
-This function pointer should point to function that has the
+This function pointer should point to a function that has the
 same behavior as the standard POSIX @code{read()} system call.
 It is an alternative to the @code{get_record} pointer.  Its behavior
-is also described below.
+is also described in the text following this list.
 
 @item void (*close_func)(struct awk_input *iobuf);
 This function pointer should point to a function that does
-the ``tear down.'' It should release any resources allocated by
+the ``teardown.'' It should release any resources allocated by
 @code{@var{XXX}_take_control_of()}.  It may also close the file. If it
 does so, it should set the @code{fd} field to @code{INVALID_HANDLE}.
 
 If @code{fd} is still not @code{INVALID_HANDLE} after the call to this
 function, @command{gawk} calls the regular @code{close()} system call.
 
-Having a ``tear down'' function is optional. If your input parser does
+Having a ``teardown'' function is optional. If your input parser does
 not need it, do not set this field.  Then, @command{gawk} calls the
 regular @code{close()} system call on the file descriptor, so it should
 be valid.
@@ -32058,7 +32380,7 @@ input records.  The parameters are as follows:
 
 @table @code
 @item char **out
-This is a pointer to a @code{char *} variable which is set to point
+This is a pointer to a @code{char *} variable that is set to point
 to the record.  @command{gawk} makes its own copy of the data, so
 the extension must manage this storage.
 
@@ -32077,8 +32399,8 @@ If the concept of a ``record terminator'' makes sense, then
 @code{*rt_start} should be set to point to the data to be used for
 @code{RT}, and @code{*rt_len} should be set to the length of the
 data. Otherwise, @code{*rt_len} should be set to zero.
-@code{gawk} makes its own copy of this data, so the
-extension must manage the storage.
+@command{gawk} makes its own copy of this data, so the
+extension must manage this storage.
 @end table
 
 The return value is the length of the buffer pointed to by
@@ -32111,19 +32433,19 @@ set this field explicitly.
 You must choose one method or the other: either a function that
 returns a record, or one that returns raw data.  In particular,
 if you supply a function to get a record, @command{gawk} will
-call it, and never call the raw read function.
+call it, and will never call the raw read function.
 @end quotation
 
 @command{gawk} ships with a sample extension that reads directories,
-returning records for each entry in the directory (@pxref{Extension
+returning records for each entry in a directory (@pxref{Extension
 Sample Readdir}).  You may wish to use that code as a guide for writing
 your own input parser.
 
 When writing an input parser, you should think about (and document)
 how it is expected to interact with @command{awk} code.  You may want
-it to always be called, and take effect as appropriate (as the
+it to always be called, and to take effect as appropriate (as the
 @code{readdir} extension does).  Or you may want it to take effect
-based upon the value of an @code{awk} variable, as the XML extension
+based upon the value of an @command{awk} variable, as the XML extension
 from the @code{gawkextlib} project does (@pxref{gawkextlib}).
 In the latter case, code in a @code{BEGINFILE} section
 can look at @code{FILENAME} and @code{ERRNO} to decide whether or
@@ -32174,7 +32496,7 @@ values, etc.) within @command{gawk}.
 The function pointed to by this field is called when @command{gawk}
 decides to let the output wrapper take control of the file. It should
 fill in appropriate members of the @code{awk_output_buf_t} structure,
-as described below, and return true if successful, false otherwise.
+as described next, and return true if successful, false otherwise.
 
 @item awk_const struct output_wrapper *awk_const next;
 This is for use by @command{gawk};
@@ -32231,7 +32553,7 @@ a pointer to any private data associated with the file.
 These pointers should be set to point to functions that perform
 the equivalent function as the @code{<stdio.h>} functions do, if appropriate.
 @command{gawk} uses these function pointers for all output.
-@command{gawk} initializes the pointers to point to internal, ``pass through''
+@command{gawk} initializes the pointers to point to internal ``pass-through''
 functions that just call the regular @code{<stdio.h>} functions, so an
 extension only needs to redefine those functions that are appropriate for
 what it does.
@@ -32242,7 +32564,7 @@ upon the @code{name} and @code{mode} fields, and any additional state
 (such as @command{awk} variable values) that is appropriate.
 
 When @command{gawk} calls @code{@var{XXX}_take_control_of()}, that function should fill
-in the other fields, as appropriate, except for @code{fp}, which it should just
+in the other fields as appropriate, except for @code{fp}, which it should just
 use normally.
 
 You register your output wrapper with the following function:
@@ -32282,14 +32604,14 @@ The fields are as follows:
 The name of the two-way processor.
 
 @item awk_bool_t (*can_take_two_way)(const char *name);
-This function returns true if it wants to take over two-way I/O for this @value{FN}.
+The function pointed to by this field should return true if it wants to take over two-way I/O for this @value{FN}.
 It should not change any state (variable
 values, etc.) within @command{gawk}.
 
 @item awk_bool_t (*take_control_of)(const char *name,
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ awk_input_buf_t *inbuf,
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ awk_output_buf_t *outbuf);
-This function should fill in the @code{awk_input_buf_t} and
+The function pointed to by this field should fill in the @code{awk_input_buf_t} and
 @code{awk_outut_buf_t} structures pointed to by @code{inbuf} and
 @code{outbuf}, respectively.  These structures were described earlier.
 
@@ -32317,9 +32639,9 @@ Register the two-way processor pointed to by @code{two_way_processor} with
 @cindex messages from extensions
 
 You can print different kinds of warning messages from your
-extension, as described below.  Note that for these functions,
-you must pass in the extension id received from @command{gawk}
-when the extension was loaded.@footnote{Because the API uses only ISO C 90
+extension, as described here.  Note that for these functions,
+you must pass in the extension ID received from @command{gawk}
+when the extension was loaded:@footnote{Because the API uses only ISO C 90
 features, it cannot make use of the ISO C 99 variadic macro feature to hide
 that parameter. More's the pity.}
 
@@ -32357,10 +32679,148 @@ into a (possibly translated) string using the C @code{strerror()} function.
 Set @code{ERRNO} directly to the string value of @code{ERRNO}.
 @command{gawk} makes a copy of the value of @code{string}.
 
-@item void unset_ERRNO();
+@item void unset_ERRNO(void);
 Unset @code{ERRNO}.
 @end table
 
+@node Requesting Values
+@subsection Requesting Values
+
+All of the functions that return values from @command{gawk}
+work in the same way. You pass in an @code{awk_valtype_t} value
+to indicate what kind of value you expect.  If the actual value
+matches what you requested, the function returns true and fills
+in the @code{awk_value_t} result.
+Otherwise, the function returns false, and the @code{val_type}
+member indicates the type of the actual value.  You may then
+print an error message or reissue the request for the actual
+value type, as appropriate.  This behavior is summarized in
+@ref{table-value-types-returned}.
+
+@float Table,table-value-types-returned
+@caption{API value types returned}
+@docbook
+<informaltable>
+<tgroup cols="6">
+  <colspec colwidth="16.6*"/>
+  <colspec colwidth="16.6*"/>
+  <colspec colwidth="19.8*" colname="c3"/>
+  <colspec colwidth="15*" colname="c4"/>
+  <colspec colwidth="15*" colname="c5"/>
+  <colspec colwidth="16.6*" colname="c6"/>
+  <spanspec spanname="hspan" namest="c3" nameend="c6" align="center"/>
+  <thead>
+    <row><entry></entry><entry spanname="hspan"><para>Type of Actual Value</para></entry></row>
+    <row>
+      <entry></entry>
+      <entry></entry>
+      <entry><para>String</para></entry>
+      <entry><para>Number</para></entry>
+      <entry><para>Array</para></entry>
+      <entry><para>Undefined</para></entry>
+    </row>
+  </thead>
+  <tbody>
+    <row>
+      <entry></entry>
+      <entry><para><emphasis role="bold">String</emphasis></para></entry>
+      <entry><para>String</para></entry>
+      <entry><para>String</para></entry>
+      <entry><para>False</para></entry>
+      <entry><para>False</para></entry>
+    </row>
+    <row>
+      <entry></entry>
+      <entry><para><emphasis role="bold">Number</emphasis></para></entry>
+      <entry><para>Number if can be converted, else false</para></entry>
+      <entry><para>Number</para></entry>
+      <entry><para>False</para></entry>
+      <entry><para>False</para></entry>
+    </row>
+    <row>
+      <entry><para><emphasis role="bold">Type</emphasis></para></entry>
+      <entry><para><emphasis role="bold">Array</emphasis></para></entry>
+      <entry><para>False</para></entry>
+      <entry><para>False</para></entry>
+      <entry><para>Array</para></entry>
+      <entry><para>False</para></entry>
+    </row>
+    <row>
+      <entry><para><emphasis role="bold">Requested</emphasis></para></entry>
+      <entry><para><emphasis role="bold">Scalar</emphasis></para></entry>
+      <entry><para>Scalar</para></entry>
+      <entry><para>Scalar</para></entry>
+      <entry><para>False</para></entry>
+      <entry><para>False</para></entry>
+    </row>
+    <row>
+      <entry></entry>
+      <entry><para><emphasis role="bold">Undefined</emphasis></para></entry>
+      <entry><para>String</para></entry>
+      <entry><para>Number</para></entry>
+      <entry><para>Array</para></entry>
+      <entry><para>Undefined</para></entry>
+    </row>
+    <row>
+      <entry></entry>
+      <entry><para><emphasis role="bold">Value cookie</emphasis></para></entry>
+      <entry><para>False</para></entry>
+      <entry><para>False</para></entry>
+      <entry><para>False</para>
+      </entry><entry><para>False</para></entry>
+    </row>
+  </tbody>
+</tgroup>
+</informaltable>
+@end docbook
+
+@ifnotplaintext
+@ifnotdocbook
+@multitable @columnfractions .50 .50
+@headitem @tab Type of Actual Value
+@end multitable
+@c 10/2014: Thanks to Karl Berry for this bit to reduce the space:
+@tex
+\vglue-1.1\baselineskip
+@end tex
+@multitable @columnfractions .166 .166 .198 .15 .15 .166
+@headitem @tab @tab String @tab Number @tab Array @tab Undefined
+@item @tab @b{String} @tab String @tab String @tab False @tab False
+@item @tab @b{Number} @tab Number if can be converted, else false @tab Number @tab False @tab False
+@item @b{Type} @tab @b{Array} @tab False @tab False @tab Array @tab False
+@item @b{Requested} @tab @b{Scalar} @tab Scalar @tab Scalar @tab False @tab False
+@item @tab @b{Undefined} @tab String @tab Number @tab Array @tab Undefined
+@item @tab @b{Value cookie} @tab False @tab False @tab False @tab False
+@end multitable
+@end ifnotdocbook
+@end ifnotplaintext
+@ifplaintext
+@example
+                        +-------------------------------------------------+
+                        |                Type of Actual Value:            |
+                        +------------+------------+-----------+-----------+
+                        |   String   |   Number   | Array     | Undefined |
++-----------+-----------+------------+------------+-----------+-----------+
+|           | String    |   String   |   String   | False     | False     |
+|           |-----------+------------+------------+-----------+-----------+
+|           | Number    | Number if  |   Number   | False     | False     |
+|           |           | can be     |            |           |           |
+|           |           | converted, |            |           |           |
+|           |           | else false |            |           |           |
+|           |-----------+------------+------------+-----------+-----------+
+|   Type    | Array     |   False    |   False    | Array     | False     |
+| Requested |-----------+------------+------------+-----------+-----------+
+|           | Scalar    |   Scalar   |   Scalar   | False     | False     |
+|           |-----------+------------+------------+-----------+-----------+
+|           | Undefined |  String    |   Number   | Array     | Undefined |
+|           |-----------+------------+------------+-----------+-----------+
+|           | Value     |   False    |   False    | False     | False     |
+|           | cookie    |            |            |           |           |
++-----------+-----------+------------+------------+-----------+-----------+
+@end example
+@end ifplaintext
+@end float
+
 @node Accessing Parameters
 @subsection Accessing and Updating Parameters
 
@@ -32372,17 +32832,17 @@ passed to your extension function. They are:
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ awk_valtype_t wanted,
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ awk_value_t *result);
 Fill in the @code{awk_value_t} structure pointed to by @code{result}
-with the @code{count}'th argument.  Return true if the actual
-type matches @code{wanted}, false otherwise.  In the latter
+with the @code{count}th argument.  Return true if the actual
+type matches @code{wanted}, and false otherwise.  In the latter
 case, @code{result@w{->}val_type} indicates the actual type
-(@pxref{table-value-types-returned}).  Counts are zero based---the first
+(@pxref{table-value-types-returned}).  Counts are zero-based---the first
 argument is numbered zero, the second one, and so on. @code{wanted}
 indicates the type of value expected.
 
 @item awk_bool_t set_argument(size_t count, awk_array_t array);
 Convert a parameter that was undefined into an array; this provides
-call-by-reference for arrays.  Return false if @code{count} is too big,
-or if the argument's type is not undefined.  @xref{Array Manipulation},
+call by reference for arrays.  Return false if @code{count} is too big,
+or if the argument's type is not undefined.  @DBXREF{Array Manipulation}
 for more information on creating arrays.
 @end table
 
@@ -32405,8 +32865,9 @@ allows you to create and release cached values.
 The following routines provide the ability to access and update
 global @command{awk}-level variables by name.  In compiler terminology,
 identifiers of different kinds are termed @dfn{symbols}, thus the ``sym''
-in the routines' names.  The data structure which stores information
+in the routines' names.  The data structure that stores information
 about symbols is termed a @dfn{symbol table}.
+The functions are as follows:
 
 @table @code
 @item awk_bool_t sym_lookup(const char *name,
@@ -32415,14 +32876,14 @@ about symbols is termed a @dfn{symbol table}.
 Fill in the @code{awk_value_t} structure pointed to by @code{result}
 with the value of the variable named by the string @code{name}, which is
 a regular C string.  @code{wanted} indicates the type of value expected.
-Return true if the actual type matches @code{wanted}, false otherwise
+Return true if the actual type matches @code{wanted}, and false otherwise.
 In the latter case, @code{result->val_type} indicates the actual type
 (@pxref{table-value-types-returned}).
 
 @item awk_bool_t sym_update(const char *name, awk_value_t *value);
 Update the variable named by the string @code{name}, which is a regular
 C string.  The variable is added to @command{gawk}'s symbol table
-if it is not there.  Return true if everything worked, false otherwise.
+if it is not there.  Return true if everything worked, and false otherwise.
 
 Changing types (scalar to array or vice versa) of an existing variable
 is @emph{not} allowed, nor may this routine be used to update an array.
@@ -32434,10 +32895,10 @@ An extension can look up the value of @command{gawk}'s special variables.
 However, with the exception of the @code{PROCINFO} array, an extension
 cannot change any of those variables.
 
-@quotation NOTE
+@quotation CAUTION
 It is possible for the lookup of @code{PROCINFO} to fail. This happens if
 the @command{awk} program being run does not reference @code{PROCINFO};
-in this case @command{gawk} doesn't bother to create the array and
+in this case, @command{gawk} doesn't bother to create the array and
 populate it.
 @end quotation
 
@@ -32449,21 +32910,21 @@ to a global variable or array. It is an optimization that
 avoids looking up variables in @command{gawk}'s symbol table every time
 access is needed. This was discussed earlier, in @ref{General Data Types}.
 
-The following functions let you work with scalar cookies.
+The following functions let you work with scalar cookies:
 
 @table @code
 @item awk_bool_t sym_lookup_scalar(awk_scalar_t cookie,
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ awk_valtype_t wanted,
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ awk_value_t *result);
 Retrieve the current value of a scalar cookie.
-Once you have obtained a scalar_cookie using @code{sym_lookup()}, you can
+Once you have obtained a scalar cookie using @code{sym_lookup()}, you can
 use this function to get its value more efficiently.
 Return false if the value cannot be retrieved.
 
 @item awk_bool_t sym_update_scalar(awk_scalar_t cookie, awk_value_t *value);
 Update the value associated with a scalar cookie.  Return false if
 the new value is not of type @code{AWK_STRING} or @code{AWK_NUMBER}.
-Here too, the built-in variables may not be updated.
+Here too, the predefined variables may not be updated.
 @end table
 
 It is not obvious at first glance how to work with scalar cookies or
@@ -32494,18 +32955,21 @@ do_magic(int nargs, awk_value_t *result)
 @noindent
 This code looks (and is) simple and straightforward. So what's the problem?
 
-Consider what happens if @command{awk}-level code associated with your
-extension calls the @code{magic()} function (implemented in C by @code{do_magic()}),
-once per record, while processing hundreds of thousands or millions of records.
-The @code{MAGIC_VAR} variable is looked up in the symbol table once or twice per function call!
+Well, consider what happens if @command{awk}-level code associated
+with your extension calls the @code{magic()} function (implemented in
+C by @code{do_magic()}), once per record, while processing hundreds
+of thousands or millions of records.  The @code{MAGIC_VAR} variable is
+looked up in the symbol table once or twice per function call!
 
-The symbol table lookup is really pure overhead; it is considerably more efficient
-to get a cookie that represents the variable, and use that to get the variable's
-value and update it as needed.@footnote{The difference is measurable and quite real. Trust us.}
+The symbol table lookup is really pure overhead; it is considerably
+more efficient to get a cookie that represents the variable, and use
+that to get the variable's value and update it as needed.@footnote{The
+difference is measurable and quite real. Trust us.}
 
-Thus, the way to use cookies is as follows.  First, install your extension's variable
-in @command{gawk}'s symbol table using @code{sym_update()}, as usual. Then get a
-scalar cookie for the variable using @code{sym_lookup()}:
+Thus, the way to use cookies is as follows.  First, install
+your extension's variable in @command{gawk}'s symbol table using
+@code{sym_update()}, as usual. Then get a scalar cookie for the variable
+using @code{sym_lookup()}:
 
 @example
 static awk_scalar_t magic_var_cookie;    /* cookie for MAGIC_VAR */
@@ -32518,7 +32982,7 @@ my_extension_init()
     /* install initial value */
     sym_update("MAGIC_VAR", make_number(42.0, & value));
 
-    /* get cookie */
+    /* get the cookie */
     sym_lookup("MAGIC_VAR", AWK_SCALAR, & value);
 
     /* save the cookie */
@@ -32560,14 +33024,15 @@ and carefully check the return values from the API functions.
 @subsubsection Creating and Using Cached Values
 
 The routines in this section allow you to create and release
-cached values.  As with scalar cookies, in theory, cached values
+cached values.  Like scalar cookies, in theory, cached values
 are not necessary. You can create numbers and strings using
 the functions in @ref{Constructor Functions}. You can then
 assign those values to variables using @code{sym_update()}
 or @code{sym_update_scalar()}, as you like.
 
 However, you can understand the point of cached values if you remember that
-@emph{every} string value's storage @emph{must} come from @code{api_malloc()}, @code{api_calloc()} or @code{api_realloc()}.
+@emph{every} string value's storage @emph{must} come from @code{gawk_malloc()},
+@code{gawk_calloc()}, or @code{gawk_realloc()}.
 If you have 20 variables, all of which have the same string value, you
 must create 20 identical copies of the string.@footnote{Numeric values
 are clearly less problematic, requiring only a C @code{double} to store.}
@@ -32578,11 +33043,11 @@ is what the routines in this section let you do.  The functions are as follows:
 
 @table @code
 @item awk_bool_t create_value(awk_value_t *value, awk_value_cookie_t *result);
-Create a cached string or numeric value from @code{value} for efficient later
-assignment.
-Only values of type @code{AWK_NUMBER} and @code{AWK_STRING} are allowed.  Any other type
-is rejected.  While @code{AWK_UNDEFINED} could be allowed, doing so would
-result in inferior performance.
+Create a cached string or numeric value from @code{value} for
+efficient later assignment.  Only values of type @code{AWK_NUMBER}
+and @code{AWK_STRING} are allowed.  Any other type is rejected.
+@code{AWK_UNDEFINED} could be allowed, but doing so would result in
+inferior performance.
 
 @item awk_bool_t release_value(awk_value_cookie_t vc);
 Release the memory associated with a value cookie obtained
@@ -32603,7 +33068,7 @@ my_extension_init()
     size_t long_string_len;
 
     /* code from earlier */
-    @dots{} 
+    @dots{}
     /* @dots{} fill in long_string and long_string_len @dots{} */
     make_malloced_string(long_string, long_string_len, & value);
     create_value(& value, & answer_cookie);    /* create cookie */
@@ -32633,12 +33098,12 @@ do_magic(int nargs, awk_value_t *result)
 @end example
 
 @noindent
-Using value cookies in this way saves considerable storage, since all of
+Using value cookies in this way saves considerable storage, as all of
 @code{VAR1} through @code{VAR100} share the same value.
 
 You might be wondering, ``Is this sharing problematic?
-What happens if @command{awk} code assigns a new value to @code{VAR1},
-are all the others be changed too?''
+What happens if @command{awk} code assigns a new value to @code{VAR1};
+are all the others changed too?''
 
 That's a great question. The answer is that no, it's not a problem.
 Internally, @command{gawk} uses @dfn{reference-counted strings}. This means
@@ -32655,7 +33120,7 @@ you should release any cached values that you created, using
 @subsection Array Manipulation
 @cindex array manipulation in extensions
 
-The primary data structure@footnote{Okay, the only data structure.} in @command{awk}
+The primary data structure@footnote{OK, the only data structure.} in @command{awk}
 is the associative array (@pxref{Arrays}).
 Extensions need to be able to manipulate @command{awk} arrays.
 The API provides a number of data structures for working with arrays,
@@ -32676,7 +33141,7 @@ both work with and create true arrays of arrays (@pxref{General Data Types}).
 @node Array Data Types
 @subsubsection Array Data Types
 
-The data types associated with arrays are listed below.
+The data types associated with arrays are as follows:
 
 @table @code
 @item typedef void *awk_array_t;
@@ -32693,7 +33158,7 @@ with the @code{<stdio.h>} library routines.
 @itemx @ @ @ @ struct awk_element *next;
 @itemx @ @ @ @ enum @{
 @itemx @ @ @ @ @ @ @ @ AWK_ELEMENT_DEFAULT = 0,@ @ /* set by gawk */
-@itemx @ @ @ @ @ @ @ @ AWK_ELEMENT_DELETE = 1@ @ @ @ /* set by extension if should be deleted */
+@itemx @ @ @ @ @ @ @ @ AWK_ELEMENT_DELETE = 1@ @ @ @ /* set by extension */
 @itemx @ @ @ @ @} flags;
 @itemx @ @ @ @ awk_value_t    index;
 @itemx @ @ @ @ awk_value_t    value;
@@ -32713,8 +33178,8 @@ an extension to create a linked list of new elements that can then be
 added to an array in a loop that traverses the list.
 
 @item enum @{ @dots{} @} flags;
-A set of flag values that convey information between @command{gawk}
-and the extension. Currently there is only one: @code{AWK_ELEMENT_DELETE}.
+A set of flag values that convey information between the extension
+and @command{gawk}.  Currently there is only one: @code{AWK_ELEMENT_DELETE}.
 Setting it causes @command{gawk} to delete the
 element from the original array upon release of the flattened array.
 
@@ -32725,8 +33190,8 @@ The index and value of the element, respectively.
 @end table
 
 @item typedef struct awk_flat_array @{
-@itemx @ @ @ @ awk_const void *awk_const opaque1;@ @ @ @ /* private data for use by gawk */
-@itemx @ @ @ @ awk_const void *awk_const opaque2;@ @ @ @ /* private data for use by gawk */
+@itemx @ @ @ @ awk_const void *awk_const opaque1;@ @ @ @ /* for use by gawk */
+@itemx @ @ @ @ awk_const void *awk_const opaque2;@ @ @ @ /* for use by gawk */
 @itemx @ @ @ @ awk_const size_t count;@ @ @ @ @ /* how many elements */
 @itemx @ @ @ @ awk_element_t elements[1];@ @ /* will be extended */
 @itemx @} awk_flat_array_t;
@@ -32741,11 +33206,11 @@ modify them.
 @node Array Functions
 @subsubsection Array Functions
 
-The following functions relate to individual array elements.
+The following functions relate to individual array elements:
 
 @table @code
 @item awk_bool_t get_element_count(awk_array_t a_cookie, size_t *count);
-For the array represented by @code{a_cookie}, return in @code{*count}
+For the array represented by @code{a_cookie}, place in @code{*count}
 the number of elements it contains. A subarray counts as a single element.
 Return false if there is an error.
 
@@ -32760,12 +33225,13 @@ Return false if @code{wanted} does not match the actual type or if
 @code{index} is not in the array (@pxref{table-value-types-returned}).
 
 The value for @code{index} can be numeric, in which case @command{gawk}
-converts it to a string. Using non-integral values is possible, but
+converts it to a string. Using nonintegral values is possible, but
 requires that you understand how such values are converted to strings
-(@pxref{Conversion}); thus using integral values is safest.
+(@pxref{Conversion}); thus, using integral values is safest.
 
-As with @emph{all} strings passed into @code{gawk} from an extension,
-the string value of @code{index} must come from the API-provided functions @code{api_malloc()}, @code{api_calloc()} or @code{api_realloc()} and
+As with @emph{all} strings passed into @command{gawk} from an extension,
+the string value of @code{index} must come from @code{gawk_malloc()},
+@code{gawk_calloc()}, or @code{gawk_realloc()}, and
 @command{gawk} releases the storage.
 
 @item awk_bool_t set_array_element(awk_array_t a_cookie,
@@ -32792,9 +33258,9 @@ not exist in the array.
 The following functions relate to arrays as a whole:
 
 @table @code
-@item awk_array_t create_array();
+@item awk_array_t create_array(void);
 Create a new array to which elements may be added.
-@xref{Creating Arrays}, for a discussion of how to
+@DBXREF{Creating Arrays} for a discussion of how to
 create a new array and add elements to it.
 
 @item awk_bool_t clear_array(awk_array_t a_cookie);
@@ -32809,13 +33275,19 @@ For the array represented by @code{a_cookie}, create an @code{awk_flat_array_t}
 structure and fill it in. Set the pointer whose address is passed as @code{data}
 to point to this structure.
 Return true upon success, or false otherwise.
-@xref{Flattening Arrays}, for a discussion of how to
+@ifset FOR_PRINT
+See the next section
+@end ifset
+@ifclear FOR_PRINT
+@xref{Flattening Arrays},
+@end ifclear
+for a discussion of how to
 flatten an array and work with it.
 
 @item awk_bool_t release_flattened_array(awk_array_t a_cookie,
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ awk_flat_array_t *data);
 When done with a flattened array, release the storage using this function.
-You must pass in both the original array cookie, and the address of
+You must pass in both the original array cookie and the address of
 the created @code{awk_flat_array_t} structure.
 The function returns true upon success, false otherwise.
 @end table
@@ -32823,12 +33295,13 @@ The function returns true upon success, false otherwise.
 @node Flattening Arrays
 @subsubsection Working With All The Elements of an Array
 
-To @dfn{flatten} an array is create a structure that
+To @dfn{flatten} an array is to create a structure that
 represents the full array in a fashion that makes it easy
-for C code to traverse the entire array.  Test code
+for C code to traverse the entire array.  Some of the code
 in @file{extension/testext.c} does this, and also serves
 as a nice example showing how to use the APIs.
 
+We walk through that part of the code one step at a time.
 First, the @command{gawk} script that drives the test extension:
 
 @example
@@ -32881,9 +33354,9 @@ dump_array_and_delete(int nargs, awk_value_t *result)
 @end example
 
 The function then proceeds in steps, as follows. First, retrieve
-the name of the array, passed as the first argument. Then
-retrieve the array itself. If either operation fails, print
-error messages and return:
+the name of the array, passed as the first argument, followed by
+the array itself. If either operation fails, print an
+error message and return:
 
 @example
     /* get argument named array as flat array and print it */
@@ -32919,7 +33392,7 @@ and print it:
 @end example
 
 The third step is to actually flatten the array, and then
-to double check that the count in the @code{awk_flat_array_t}
+to double-check that the count in the @code{awk_flat_array_t}
 is the same as the count just retrieved:
 
 @example
@@ -32940,7 +33413,7 @@ is the same as the count just retrieved:
 The fourth step is to retrieve the index of the element
 to be deleted, which was passed as the second argument.
 Remember that argument counts passed to @code{get_argument()}
-are zero-based, thus the second argument is numbered one:
+are zero-based, and thus the second argument is numbered one:
 
 @example
     if (! get_argument(1, AWK_STRING, & value3)) @{
@@ -32955,7 +33428,7 @@ element values. In addition, upon finding the element with the
 index that is supposed to be deleted, the function sets the
 @code{AWK_ELEMENT_DELETE} bit in the @code{flags} field
 of the element.  When the array is released, @command{gawk}
-traverses the flattened array, and deletes any elements which
+traverses the flattened array, and deletes any elements that
 have this flag bit set:
 
 @example
@@ -32967,8 +33440,7 @@ have this flag bit set:
             valrep2str(& flat_array->elements[i].value));
 
         if (strcmp(value3.str_value.str,
-                   flat_array->elements[i].index.str_value.str)
-                   == 0) @{
+                   flat_array->elements[i].index.str_value.str) == 0) @{
             flat_array->elements[i].flags |= AWK_ELEMENT_DELETE;
             printf("dump_array_and_delete: marking element \"%s\" "
                    "for deletion\n",
@@ -32991,7 +33463,7 @@ code) once you have called @code{release_flattened_array()}:
     @}
 @end example
 
-Finally, since everything was successful, the function sets the
+Finally, because everything was successful, the function sets the
 return value to success, and returns:
 
 @example
@@ -33026,7 +33498,7 @@ code can access them and manipulate them.
 
 There are two important points about creating arrays from extension code:
 
-@enumerate 1
+@itemize @value{BULLET}
 @item
 You must install a new array into @command{gawk}'s symbol
 table immediately upon creating it.  Once you have done so,
@@ -33048,7 +33520,7 @@ using @code{sym_update()}, or install it as an element in a previously
 existing array using @code{set_array_element()}.  We show example code shortly.
 
 @item
-Due to gawk internals, after using @code{sym_update()} to install an array
+Due to @command{gawk} internals, after using @code{sym_update()} to install an array
 into @command{gawk}, you have to retrieve the array cookie from the value
 passed in to @command{sym_update()} before doing anything else with it, like so:
 
@@ -33068,11 +33540,13 @@ new_array = val.array_cookie;    /* YOU MUST DO THIS */
 
 If installing an array as a subarray, you must also retrieve the value
 of the array cookie after the call to @code{set_element()}.
-@end enumerate
+@end itemize
 
 The following C code is a simple test extension to create an array
 with two regular elements and with a subarray. The leading @code{#include}
-directives and boilerplate variable declarations are omitted for brevity.
+directives and boilerplate variable declarations
+(@pxref{Extension API Boilerplate})
+are omitted for brevity.
 The first step is to create a new array and then install it
 in the symbol table:
 
@@ -33185,7 +33659,7 @@ dl_load_func(func_table, testarray, "")
 @end ignore
 @end example
 
-Here is sample script that loads the extension
+Here is a sample script that loads the extension
 and then dumps the array:
 
 @example
@@ -33215,9 +33689,78 @@ $ @kbd{AWKLIBPATH=$PWD ./gawk -f subarray.awk}
 @end example
 
 @noindent
-(@xref{Finding Extensions}, for more information on the
+(@DBXREF{Finding Extensions} for more information on the
 @env{AWKLIBPATH} environment variable.)
 
+@node Redirection API
+@subsection Accessing and Manipulating Redirections
+
+The following function allows extensions to access and manipulate redirections.
+
+@table @code
+@item awk_bool_t get_file(const char *name,
+@itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ size_t name_len,
+@itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ const char *filetype,
+@itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ int fd,
+@itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ const awk_input_buf_t **ibufp,
+@itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ const awk_output_buf_t **obufp);
+Look up a file in @command{gawk}'s internal redirection table.
+If @code{name} is @code{NULL} or @code{name_len} is zero, return
+data for the currently open input file corresponding to @code{FILENAME}.
+(This does not access the @code{filetype} argument, so that may be undefined).  
+If the file is not already open, attempt to open it.
+The @code{filetype} argument must be zero-terminated and should be one of:
+
+@table @code
+@item ">"
+A file opened for output.
+
+@item ">>"
+A file opened for append.
+
+@item "<"
+A file opened for input.
+
+@item "|>"
+A pipe opened for output.
+
+@item "|<"
+A pipe opened for input.
+
+@item "|&"
+A two-way coprocess.
+@end table
+
+On error, return a @code{false} value.  Otherwise, return
+@code{true}, and return additional information about the redirection
+in the @code{ibufp} and @code{obufp} pointers.  For input
+redirections, the @code{*ibufp} value should be non-@code{NULL},
+and @code{*obufp} should be @code{NULL}.  For output redirections,
+the @code{*obufp} value should be non-@code{NULL}, and @code{*ibufp}
+should be @code{NULL}.  For two-way coprocesses, both values should
+be non-@code{NULL}.
+
+In the usual case, the extension is interested in @code{(*ibufp)->fd}
+and/or @code{fileno((*obufp)->fp)}.  If the file is not already
+open, and the @code{fd} argument is non-negative, @command{gawk}
+will use that file descriptor instead of opening the file in the
+usual way.  If @code{fd} is non-negative, but the file exists already,
+@command{gawk} ignores @code{fd} and returns the existing file.  It is
+the caller's responsibility to notice that neither the @code{fd} in
+the returned @code{awk_input_buf_t} nor the @code{fd} in the returned
+@code{awk_output_buf_t} matches the requested value.
+
+Note that supplying a file descriptor is currently @emph{not} supported
+for pipes.  However, supplying a file descriptor should work for input,
+output, append, and two-way (coprocess) sockets.  If @code{filetype}
+is two-way, @command{gawk} assumes that it is a socket!  Note that in
+the two-way case, the input and output file descriptors may differ.
+To check for success, you must check whether either matches.
+@end table
+
+It is anticipated that this API function will be used to implement I/O
+multiplexing and a socket library.
+
 @node Extension API Variables
 @subsection API Variables
 
@@ -33242,10 +33785,10 @@ The API versions are available at compile time as constants:
 
 @table @code
 @item GAWK_API_MAJOR_VERSION
-The major version of the API.
+The major version of the API
 
 @item GAWK_API_MINOR_VERSION
-The minor version of the API.
+The minor version of the API
 @end table
 
 The minor version increases when new functions are added to the API. Such
@@ -33263,14 +33806,14 @@ constant integers:
 
 @table @code
 @item api->major_version
-The major version of the running @command{gawk}.
+The major version of the running @command{gawk}
 
 @item api->minor_version
-The minor version of the running @command{gawk}.
+The minor version of the running @command{gawk}
 @end table
 
 It is up to the extension to decide if there are API incompatibilities.
-Typically a check like this is enough:
+Typically, a check like this is enough:
 
 @example
 if (api->major_version != GAWK_API_MAJOR_VERSION
@@ -33284,7 +33827,7 @@ if (api->major_version != GAWK_API_MAJOR_VERSION
 @end example
 
 Such code is included in the boilerplate @code{dl_load_func()} macro
-provided in @file{gawkapi.h} (discussed later, in
+provided in @file{gawkapi.h} (discussed in
 @ref{Extension API Boilerplate}).
 
 @node Extension API Informational Variables
@@ -33301,8 +33844,7 @@ whether the corresponding command-line options were enabled when
 This variable is true if @command{gawk} was invoked with @option{--debug} option.
 
 @item do_lint
-This variable is true if @command{gawk} was invoked with @option{--lint} option
-(@pxref{Options}).
+This variable is true if @command{gawk} was invoked with @option{--lint} option.
 
 @item do_mpfr
 This variable is true if @command{gawk} was invoked with @option{--bignum} option.
@@ -33318,7 +33860,7 @@ This variable is true if @command{gawk} was invoked with @option{--traditional}
 @end table
 
 The value of @code{do_lint} can change if @command{awk} code
-modifies the @code{LINT} built-in variable (@pxref{Built-in Variables}).
+modifies the @code{LINT} predefined variable (@pxref{Built-in Variables}).
 The others should not change during execution.
 
 @node Extension API Boilerplate
@@ -33327,12 +33869,12 @@ The others should not change during execution.
 As mentioned earlier (@pxref{Extension Mechanism Outline}), the function
 definitions as presented are really macros. To use these macros, your
 extension must provide a small amount of boilerplate code (variables and
-functions) towards the top of your source file, using pre-defined names
-as described below.  The boilerplate needed is also provided in comments
+functions) toward the top of your source file, using predefined names
+as described here.  The boilerplate needed is also provided in comments
 in the @file{gawkapi.h} header file:
 
 @example
-/* Boiler plate code: */
+/* Boilerplate code: */
 int plugin_is_GPL_compatible;
 
 static gawk_api_t *const api;
@@ -33351,12 +33893,12 @@ static awk_bool_t (*init_func)(void) = NULL;
 /* OR: */
 
 static awk_bool_t
-init_my_module(void)
+init_my_extension(void)
 @{
     @dots{}
 @}
 
-static awk_bool_t (*init_func)(void) = init_my_module;
+static awk_bool_t (*init_func)(void) = init_my_extension;
 
 dl_load_func(func_table, some_name, "name_space_in_quotes")
 @end example
@@ -33391,7 +33933,7 @@ to @code{NULL}, or to point to a string giving the name and version of
 your extension.
 
 @item static awk_ext_func_t func_table[] = @{ @dots{} @};
-This is an array of one or more @code{awk_ext_func_t} structures
+This is an array of one or more @code{awk_ext_func_t} structures,
 as described earlier (@pxref{Extension Functions}).
 It can then be looped over for multiple calls to
 @code{add_ext_func()}.
@@ -33399,8 +33941,8 @@ It can then be looped over for multiple calls to
 @c Use @var{OR} for docbook
 @item static awk_bool_t (*init_func)(void) = NULL;
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @var{OR}
-@itemx static awk_bool_t init_my_module(void) @{ @dots{} @}
-@itemx static awk_bool_t (*init_func)(void) = init_my_module;
+@itemx static awk_bool_t init_my_extension(void) @{ @dots{} @}
+@itemx static awk_bool_t (*init_func)(void) = init_my_extension;
 If you need to do some initialization work, you should define a
 function that does it (creates variables, opens files, etc.)
 and then define the @code{init_func} pointer to point to your
@@ -33416,7 +33958,7 @@ This macro expands to a @code{dl_load()} function that performs
 all the necessary initializations.
 @end table
 
-The point of the all the variables and arrays is to let the
+The point of all the variables and arrays is to let the
 @code{dl_load()} function (from the @code{dl_load_func()}
 macro) do all the standard work. It does the following:
 
@@ -33451,7 +33993,7 @@ Compiled extensions have to be installed in a directory where
 built in the default fashion, the directory in which to find
 extensions is @file{/usr/local/lib/gawk}.  You can also specify a search
 path with a list of directories to search for compiled extensions.
-@xref{AWKLIBPATH Variable}, for more information.
+@DBXREF{AWKLIBPATH Variable} for more information.
 
 @node Extension Example
 @section Example: Some File Functions
@@ -33459,7 +34001,7 @@ path with a list of directories to search for compiled extensions.
 
 @quotation
 @i{No matter where you go, there you are.}
-@author Buckaroo Bonzai
+@author Buckaroo Banzai
 @end quotation
 
 @c It's enough to show chdir and stat, no need for fts
@@ -33467,8 +34009,8 @@ path with a list of directories to search for compiled extensions.
 Two useful functions that are not in @command{awk} are @code{chdir()} (so
 that an @command{awk} program can change its directory) and @code{stat()}
 (so that an @command{awk} program can gather information about a file).
-This @value{SECTION} implements these functions for @command{gawk}
-in an extension.
+In order to illustrate the API in action, this @value{SECTION} implements
+these functions for @command{gawk} in an extension.
 
 @menu
 * Internal File Description::   What the new functions will do.
@@ -33490,8 +34032,7 @@ straightforward. It takes one argument, the new directory to change to:
 newdir = "/home/arnold/funstuff"
 ret = chdir(newdir)
 if (ret < 0) @{
-    printf("could not change to %s: %s\n",
-                   newdir, ERRNO) > "/dev/stderr"
+    printf("could not change to %s: %s\n", newdir, ERRNO) > "/dev/stderr"
     exit 1
 @}
 @dots{}
@@ -33523,7 +34064,7 @@ the @code{stat()} fails.  It fills in the following elements:
 
 @table @code
 @item "name"
-The name of the file that was @code{stat()}'ed.
+The name of the file that was @code{stat()}ed.
 
 @item "dev"
 @itemx "ino"
@@ -33579,7 +34120,7 @@ interprocess communications).
 The file is a directory.
 
 @item "fifo"
-The file is a named-pipe (also known as a FIFO).
+The file is a named pipe (also known as a FIFO).
 
 @item "file"
 The file is just a regular file.
@@ -33602,7 +34143,7 @@ For some other systems, @dfn{a priori} knowledge is used to provide
 a value. Where no value can be determined, it defaults to 512.
 @end table
 
-Several additional elements may be present depending upon the operating
+Several additional elements may be present, depending upon the operating
 system and the type of the file.  You can test for them in your @command{awk}
 program by using the @code{in} operator
 (@pxref{Reference to Elements}):
@@ -33632,10 +34173,10 @@ edited slightly for presentation.  See @file{extension/filefuncs.c}
 in the @command{gawk} distribution for the complete version.}
 
 The file includes a number of standard header files, and then includes
-the @file{gawkapi.h} header file which provides the API definitions.
-Those are followed by the necessary variable declarations 
+the @file{gawkapi.h} header file, which provides the API definitions.
+Those are followed by the necessary variable declarations
 to make use of the API macros and boilerplate code
-(@pxref{Extension API Boilerplate}).
+(@pxref{Extension API Boilerplate}):
 
 @example
 #ifdef HAVE_CONFIG_H
@@ -33673,13 +34214,13 @@ int plugin_is_GPL_compatible;
 @cindex programming conventions, @command{gawk} extensions
 By convention, for an @command{awk} function @code{foo()}, the C function
 that implements it is called @code{do_foo()}.  The function should have
-two arguments: the first is an @code{int} usually called @code{nargs},
+two arguments. The first is an @code{int}, usually called @code{nargs},
 that represents the number of actual arguments for the function.
-The second is a pointer to an @code{awk_value_t}, usually named
-@code{result}.
+The second is a pointer to an @code{awk_value_t} structure, usually named
+@code{result}:
 
 @example
-/*  do_chdir --- provide dynamically loaded chdir() builtin for gawk */
+/*  do_chdir --- provide dynamically loaded chdir() function for gawk */
 
 static awk_value_t *
 do_chdir(int nargs, awk_value_t *result)
@@ -33696,13 +34237,13 @@ do_chdir(int nargs, awk_value_t *result)
 @end example
 
 The @code{newdir}
-variable represents the new directory to change to, retrieved
+variable represents the new directory to change to, which is retrieved
 with @code{get_argument()}.  Note that the first argument is
 numbered zero.
 
 If the argument is retrieved successfully, the function calls the
 @code{chdir()} system call. If the @code{chdir()} fails, @code{ERRNO}
-is updated.
+is updated:
 
 @example
     if (get_argument(0, AWK_STRING, & newdir)) @{
@@ -33721,7 +34262,7 @@ Finally, the function returns the return value to the @command{awk} level:
 
 The @code{stat()} extension is more involved.  First comes a function
 that turns a numeric mode into a printable representation
-(e.g., 644 becomes @samp{-rw-r--r--}). This is omitted here for brevity:
+(e.g., octal @code{0644} becomes @samp{-rw-r--r--}). This is omitted here for brevity:
 
 @example
 /* format_mode --- turn a stat mode field into something readable */
@@ -33777,9 +34318,9 @@ array_set_numeric(awk_array_t array, const char *sub, double num)
 
 The following function does most of the work to fill in
 the @code{awk_array_t} result array with values obtained
-from a valid @code{struct stat}. It is done in a separate function
+from a valid @code{struct stat}. This work is done in a separate function
 to support the @code{stat()} function for @command{gawk} and also
-to support the @code{fts()} extension which is included in
+to support the @code{fts()} extension, which is included in
 the same file but whose code is not shown here
 (@pxref{Extension Sample File Functions}).
 
@@ -33888,13 +34429,22 @@ for success:
         @}
     @}
 
-    array_set(array, "type", make_const_string(type, strlen(type), &tmp));
+    array_set(array, "type", make_const_string(type, strlen(type), & tmp));
 
     return 0;
 @}
 @end example
 
-Finally, here is the @code{do_stat()} function. It starts with
+The third argument to @code{stat()} was not discussed previously. This
+argument is optional. If present, it causes @code{do_stat()} to use
+the @code{stat()} system call instead of the @code{lstat()} system
+call.  This is done by using a function pointer: @code{statfunc}.
+@code{statfunc} is initialized to point to @code{lstat()} (instead
+of @code{stat()}) to get the file information, in case the file is a
+symbolic link. However, if the third argument is included, @code{statfunc}
+is set to point to @code{stat()}, instead.
+
+Here is the @code{do_stat()} function, which starts with
 variable declarations and argument checking:
 
 @ignore
@@ -33925,16 +34475,10 @@ do_stat(int nargs, awk_value_t *result)
     @}
 @end example
 
-The third argument to @code{stat()} was not discussed previously. This argument
-is optional. If present, it causes @code{stat()} to use the @code{stat()}
-system call instead of the @code{lstat()} system call.
-
 Then comes the actual work. First, the function gets the arguments.
-Next, it gets the information for the file.
-The code use @code{lstat()} (instead of @code{stat()})
-to get the file information,
-in case the file is a symbolic link.
-If there's an error, it sets @code{ERRNO} and returns:
+Next, it gets the information for the file.  If the called function
+(@code{lstat()} or @code{stat()}) returns an error, the code sets
+@code{ERRNO} and returns:
 
 @example
     /* file is first arg, array to hold results is second */
@@ -33954,7 +34498,7 @@ If there's an error, it sets @code{ERRNO} and returns:
     /* always empty out the array */
     clear_array(array);
 
-    /* stat the file, if error, set ERRNO and return */
+    /* stat the file; if error, set ERRNO and return */
     ret = statfunc(name, & sbuf);
     if (ret < 0) @{
         update_ERRNO_int(errno);
@@ -33963,7 +34507,7 @@ If there's an error, it sets @code{ERRNO} and returns:
 @end example
 
 The tedious work is done by @code{fill_stat_array()}, shown
-earlier.  When done, return the result from @code{fill_stat_array()}:
+earlier.  When done, the function returns the result from @code{fill_stat_array()}:
 
 @example
     ret = fill_stat_array(name, array, & sbuf);
@@ -33976,7 +34520,9 @@ Finally, it's necessary to provide the ``glue'' that loads the
 new function(s) into @command{gawk}.
 
 The @code{filefuncs} extension also provides an @code{fts()}
-function, which we omit here. For its sake there is an initialization
+function, which we omit here
+(@pxref{Extension Sample File Functions}).
+For its sake, there is an initialization
 function:
 
 @example
@@ -34015,7 +34561,7 @@ dl_load_func(func_table, filefuncs, "")
 And that's it!
 
 @node Using Internal File Ops
-@subsection Integrating The Extensions
+@subsection Integrating the Extensions
 
 @cindex @command{gawk}, interpreter@comma{} adding code to
 Now that the code is written, it must be possible to add it at
@@ -34024,9 +34570,9 @@ code must be compiled.  Assuming that the functions are in
 a file named @file{filefuncs.c}, and @var{idir} is the location
 of the @file{gawkapi.h} header file,
 the following steps@footnote{In practice, you would probably want to
-use the GNU Autotools---Automake, Autoconf, Libtool, and @command{gettext}---to
+use the GNU Autotools (Automake, Autoconf, Libtool, and @command{gettext}) to
 configure and build your libraries. Instructions for doing so are beyond
-the scope of this @value{DOCUMENT}. @xref{gawkextlib}, for WWW links to
+the scope of this @value{DOCUMENT}. @DBXREF{gawkextlib} for Internet links to
 the tools.} create a GNU/Linux shared library:
 
 @example
@@ -34034,7 +34580,7 @@ $ @kbd{gcc -fPIC -shared -DHAVE_CONFIG_H -c -O -g -I@var{idir} filefuncs.c}
 $ @kbd{gcc -o filefuncs.so -shared filefuncs.o}
 @end example
 
-Once the library exists, it is loaded by using the @code{@@load} keyword.
+Once the library exists, it is loaded by using the @code{@@load} keyword:
 
 @example
 # file testff.awk
@@ -34054,14 +34600,14 @@ BEGIN @{
     for (i in data)
         printf "data[\"%s\"] = %s\n", i, data[i]
     print "testff.awk modified:",
-        strftime("%m %d %y %H:%M:%S", data["mtime"])
+        strftime("%m %d %Y %H:%M:%S", data["mtime"])
 
     print "\nInfo for JUNK"
     ret = stat("JUNK", data)
     print "ret =", ret
     for (i in data)
         printf "data[\"%s\"] = %s\n", i, data[i]
-    print "JUNK modified:", strftime("%m %d %y %H:%M:%S", data["mtime"])
+    print "JUNK modified:", strftime("%m %d %Y %H:%M:%S", data["mtime"])
 @}
 @end example
 
@@ -34075,35 +34621,37 @@ $ @kbd{AWKLIBPATH=$PWD gawk -f testff.awk}
 @print{} Info for testff.awk
 @print{} ret = 0
 @print{} data["blksize"] = 4096
-@print{} data["mtime"] = 1350838628
+@print{} data["devbsize"] = 512
+@print{} data["mtime"] = 1412004710
 @print{} data["mode"] = 33204
 @print{} data["type"] = file
 @print{} data["dev"] = 2053
 @print{} data["gid"] = 1000
-@print{} data["ino"] = 1719496
-@print{} data["ctime"] = 1350838628
+@print{} data["ino"] = 10358899
+@print{} data["ctime"] = 1412004710
 @print{} data["blocks"] = 8
 @print{} data["nlink"] = 1
 @print{} data["name"] = testff.awk
-@print{} data["atime"] = 1350838632
+@print{} data["atime"] = 1412004716
 @print{} data["pmode"] = -rw-rw-r--
-@print{} data["size"] = 662
+@print{} data["size"] = 666
 @print{} data["uid"] = 1000
-@print{} testff.awk modified: 10 21 12 18:57:08
-@print{} 
+@print{} testff.awk modified: 09 29 2014 18:31:50
+@print{}
 @print{} Info for JUNK
 @print{} ret = -1
-@print{} JUNK modified: 01 01 70 02:00:00
+@print{} JUNK modified: 01 01 1970 02:00:00
 @end example
 
 @node Extension Samples
-@section The Sample Extensions In The @command{gawk} Distribution
+@section The Sample Extensions in the @command{gawk} Distribution
 @cindex extensions distributed with @command{gawk}
 
-This @value{SECTION} provides brief overviews of the sample extensions
+This @value{SECTION} provides a brief overview of the sample extensions
 that come in the @command{gawk} distribution. Some of them are intended
-for production use, such the @code{filefuncs}, @code{readdir} and @code{inplace} extensions.
-Others mainly provide example code that shows how to use the extension API.
+for production use (e.g., the @code{filefuncs}, @code{readdir}, and
+@code{inplace} extensions).  Others mainly provide example code that
+shows how to use the extension API.
 
 @menu
 * Extension Sample File Functions::   The file functions sample.
@@ -34118,34 +34666,34 @@ Others mainly provide example code that shows how to use the extension API.
 * Extension Sample Rev2way::          Reversing data sample two-way processor.
 * Extension Sample Read write array:: Serializing an array to a file.
 * Extension Sample Readfile::         Reading an entire file into a string.
-* Extension Sample API Tests::        Tests for the API.
 * Extension Sample Time::             An interface to @code{gettimeofday()}
                                       and @code{sleep()}.
+* Extension Sample API Tests::        Tests for the API.
 @end menu
 
 @node Extension Sample File Functions
-@subsection File Related Functions
+@subsection File-Related Functions
 
-The @code{filefuncs} extension provides three different functions, as follows:
+The @code{filefuncs} extension provides three different functions, as follows.
 The usage is:
 
 @table @asis
-@item @@load "filefuncs"
+@item @code{@@load "filefuncs"}
 This is how you load the extension.
 
 @cindex @code{chdir()} extension function
 @item @code{result = chdir("/some/directory")}
 The @code{chdir()} function is a direct hook to the @code{chdir()}
 system call to change the current directory.  It returns zero
-upon success or less than zero upon error.  In the latter case it updates
-@code{ERRNO}.
+upon success or a value less than zero upon error.
+In the latter case, it updates @code{ERRNO}.
 
 @cindex @code{stat()} extension function
 @item @code{result = stat("/some/path", statdata} [@code{, follow}]@code{)}
 The @code{stat()} function provides a hook into the
 @code{stat()} system call.
-It returns zero upon success or less than zero upon error.
-In the latter case it updates @code{ERRNO}.
+It returns zero upon success or a value less than zero upon error.
+In the latter case, it updates @code{ERRNO}.
 
 By default, it uses the @code{lstat()} system call.  However, if passed
 a third argument, it uses @code{stat()} instead.
@@ -34171,10 +34719,10 @@ array with information retrieved from the filesystem, as follows:
 @item @code{"major"} @tab @code{st_major} @tab Device files
 @item @code{"minor"} @tab @code{st_minor} @tab Device files
 @item @code{"blksize"} @tab @code{st_blksize} @tab All
-@item @code{"pmode"} @tab A human-readable version of the mode value, such as printed by
-@command{ls}.  For example, @code{"-rwxr-xr-x"} @tab All
+@item @code{"pmode"} @tab A human-readable version of the mode value, like that printed by
+@command{ls} (for example, @code{"-rwxr-xr-x"}) @tab All
 @item @code{"linkval"} @tab The value of the symbolic link @tab Symbolic links
-@item @code{"type"} @tab The type of the file as a string. One of
+@item @code{"type"} @tab The type of the file as a string---one of
 @code{"file"},
 @code{"blockdev"},
 @code{"chardev"},
@@ -34184,16 +34732,16 @@ array with information retrieved from the filesystem, as follows:
 @code{"symlink"},
 @code{"door"},
 or
-@code{"unknown"}.
-Not all systems support all file types. @tab All
+@code{"unknown"}
+(not all systems support all file types) @tab All
 @end multitable
 
 @cindex @code{fts()} extension function
 @item @code{flags = or(FTS_PHYSICAL, ...)}
 @itemx @code{result = fts(pathlist, flags, filedata)}
 Walk the file trees provided in @code{pathlist} and fill in the
-@code{filedata} array as described below.  @code{flags} is the bitwise
-OR of several predefined constant values, also described below.
+@code{filedata} array, as described next.  @code{flags} is the bitwise
+OR of several predefined values, also described in a moment.
 Return zero if there were no errors, otherwise return @minus{}1.
 @end table
 
@@ -34238,20 +34786,21 @@ Immediately follow a symbolic link named in @code{pathlist},
 whether or not @code{FTS_LOGICAL} is set.
 
 @item FTS_SEEDOT
-By default, the @code{fts()} routines do not return entries for @file{.} (dot)
-and @file{..} (dot-dot).  This option causes entries for dot-dot to also
-be included.  (The extension always includes an entry for dot,
-see below.)
+By default, the C library @code{fts()} routines do not return entries for
+@file{.} (dot) and @file{..} (dot-dot).  This option causes entries for
+dot-dot to also be included.  (The extension always includes an entry
+for dot; more on this in a moment.)
 
 @item FTS_XDEV
 During a traversal, do not cross onto a different mounted filesystem.
 @end table
 
 @item filedata
-The @code{filedata} array is first cleared.  Then, @code{fts()} creates
+The @code{filedata} array holds the results.
+@code{fts()} first clears it.  Then it creates
 an element in @code{filedata} for every element in @code{pathlist}.
 The index is the name of the directory or file given in @code{pathlist}.
-The element for this index is itself an array.  There are two cases.
+The element for this index is itself an array.  There are two cases:
 
 @c nested table
 @table @emph
@@ -34277,8 +34826,8 @@ contain an element named @code{"error"}, which is a string describing the error.
 
 @item The path is a directory
 In this case, the array contains one element for each entry in the
-directory.  If an entry is a file, that element is as for files, just
-described.  If the entry is a directory, that element is (recursively),
+directory.  If an entry is a file, that element is the same as for files, just
+described.  If the entry is a directory, that element is (recursively)
 an array describing the subdirectory.  If @code{FTS_SEEDOT} was provided
 in the flags, then there will also be an element named @code{".."}.  This
 element will be an array containing the data as provided by @code{stat()}.
@@ -34290,24 +34839,25 @@ for a file: @code{"path"}, @code{"stat"}, and @code{"error"}.
 @end table
 
 The @code{fts()} function returns zero if there were no errors.
-Otherwise it returns @minus{}1.
+Otherwise, it returns @minus{}1.
 
 @quotation NOTE
 The @code{fts()} extension does not exactly mimic the
 interface of the C library @code{fts()} routines, choosing instead to
-provide an interface that is based on associative arrays, which should
-be more comfortable to use from an @command{awk} program.  This includes the
-lack of a comparison function, since @command{gawk} already provides
-powerful array sorting facilities.  While an @code{fts_read()}-like
+provide an interface that is based on associative arrays, which is
+more comfortable to use from an @command{awk} program.  This includes the
+lack of a comparison function, because @command{gawk} already provides
+powerful array sorting facilities.  Although an @code{fts_read()}-like
 interface could have been provided, this felt less natural than simply
 creating a multidimensional array to represent the file hierarchy and
 its information.
 @end quotation
 
-See @file{test/fts.awk} in the @command{gawk} distribution for an example.
+See @file{test/fts.awk} in the @command{gawk} distribution for an example
+use of the @code{fts()} extension function.
 
 @node Extension Sample Fnmatch
-@subsection Interface To @code{fnmatch()}
+@subsection Interface to @code{fnmatch()}
 
 This extension provides an interface to the C library
 @code{fnmatch()} function.  The usage is:
@@ -34320,10 +34870,10 @@ This is how you load the extension.
 @item result = fnmatch(pattern, string, flags)
 The return value is zero on success, @code{FNM_NOMATCH}
 if the string did not match the pattern, or
-a different non-zero value if an error occurred.
+a different nonzero value if an error occurred.
 @end table
 
-Besides the @code{fnmatch()} function, the @code{fnmatch} extension
+In addition to the @code{fnmatch()} function, the @code{fnmatch} extension
 adds one constant (@code{FNM_NOMATCH}), and an array of flag values
 named @code{FNM}.
 
@@ -34331,17 +34881,17 @@ The arguments to @code{fnmatch()} are:
 
 @table @code
 @item pattern
-The @value{FN} wildcard to match.
+The @value{FN} wildcard to match
 
 @item string
-The @value{FN} string.
+The @value{FN} string
 
 @item flag
 Either zero, or the bitwise OR of one or more of the
-flags in the @code{FNM} array.
+flags in the @code{FNM} array
 @end table
 
-The flags are follows:
+The flags are as follows:
 
 @multitable @columnfractions .25 .75
 @headitem Array element @tab Corresponding flag defined by @code{fnmatch()}
@@ -34364,9 +34914,9 @@ if (fnmatch("*.a", "foo.c", flags) == FNM_NOMATCH)
 @end example
 
 @node Extension Sample Fork
-@subsection Interface To @code{fork()}, @code{wait()} and @code{waitpid()}
+@subsection Interface to @code{fork()}, @code{wait()}, and @code{waitpid()}
 
-The @code{fork} extension adds three functions, as follows.
+The @code{fork} extension adds three functions, as follows:
 
 @table @code
 @item @@load "fork"
@@ -34375,14 +34925,14 @@ This is how you load the extension.
 @cindex @code{fork()} extension function
 @item pid = fork()
 This function creates a new process. The return value is zero in the
-child and the process-ID number of the child in the parent, or @minus{}1
+child and the process ID number of the child in the parent, or @minus{}1
 upon error. In the latter case, @code{ERRNO} indicates the problem.
 In the child, @code{PROCINFO["pid"]} and @code{PROCINFO["ppid"]} are
 updated to reflect the correct values.
 
 @cindex @code{waitpid()} extension function
 @item ret = waitpid(pid)
-This function takes a numeric argument, which is the process-ID to
+This function takes a numeric argument, which is the process ID to
 wait for. The return value is that of the
 @code{waitpid()} system call.
 
@@ -34410,8 +34960,8 @@ else
 @subsection Enabling In-Place File Editing
 
 @cindex @code{inplace} extension
-The @code{inplace} extension emulates GNU @command{sed}'s @option{-i} option
-which performs ``in place'' editing of each input file.
+The @code{inplace} extension emulates GNU @command{sed}'s @option{-i} option,
+which performs ``in-place'' editing of each input file.
 It uses the bundled @file{inplace.awk} include file to invoke the extension
 properly:
 
@@ -34425,11 +34975,16 @@ properly:
 # Please set INPLACE_SUFFIX to make a backup copy.  For example, you may
 # want to set INPLACE_SUFFIX to .bak on the command line or in a BEGIN rule.
 
+# N.B. We call inplace_end() in the BEGINFILE and END rules so that any
+# actions in an ENDFILE rule will be redirected as expected.
+
 BEGINFILE @{
-    inplace_begin(FILENAME, INPLACE_SUFFIX)
+    if (_inplace_filename != "")
+        inplace_end(_inplace_filename, INPLACE_SUFFIX)
+    inplace_begin(_inplace_filename = FILENAME, INPLACE_SUFFIX)
 @}
 
-ENDFILE @{
+END @{
     inplace_end(FILENAME, INPLACE_SUFFIX)
 @}
 @end group
@@ -34444,6 +34999,10 @@ If @code{INPLACE_SUFFIX} is not an empty string, the original file is
 linked to a backup @value{FN} created by appending that suffix.  Finally,
 the temporary file is renamed to the original @value{FN}.
 
+The @code{_inplace_filename} variable serves to keep track of the
+current filename so as to not invoke @code{inplace_end()} before
+processing the first file.
+
 If any error occurs, the extension issues a fatal error to terminate
 processing immediately without damaging the original file.
 
@@ -34464,7 +35023,7 @@ $ @kbd{gawk -i inplace -v INPLACE_SUFFIX=.bak '@{ gsub(/foo/, "bar") @}}
 @subsection Character and Numeric values: @code{ord()} and @code{chr()}
 
 The @code{ordchr} extension adds two functions, named
-@code{ord()} and @code{chr()}, as follows.
+@code{ord()} and @code{chr()}, as follows:
 
 @table @code
 @item @@load "ordchr"
@@ -34507,14 +35066,14 @@ they are read, with each entry returned as a record.
 The record consists of three fields. The first two are the inode number and the
 @value{FN}, separated by a forward slash character.
 On systems where the directory entry contains the file type, the record
-has a third field (also separated by a slash) which is a single letter
-indicating the type of the file. The letters are file types are shown
-in @ref{table-readdir-file-types}.
+has a third field (also separated by a slash), which is a single letter
+indicating the type of the file. The letters and their corresponding file
+types are shown in @ref{table-readdir-file-types}.
 
 @float Table,table-readdir-file-types
-@caption{File Types Returned By @code{readdir()}}
+@caption{File types returned by the @code{readdir} extension}
 @multitable @columnfractions .1 .9
-@headitem Letter @tab File Type
+@headitem Letter @tab File type
 @item @code{b} @tab Block device
 @item @code{c} @tab Character device
 @item @code{d} @tab Directory
@@ -34542,14 +35101,14 @@ Here is an example:
 @@load "readdir"
 @dots{}
 BEGIN @{ FS = "/" @}
-@{ print "file name is", $2 @}
+@{ print "@value{FN} is", $2 @}
 @end example
 
 @node Extension Sample Revout
 @subsection Reversing Output
 
 The @code{revoutput} extension adds a simple output wrapper that reverses
-the characters in each output line.  It's main purpose is to show how to
+the characters in each output line.  Its main purpose is to show how to
 write an output wrapper, although it may be mildly amusing for the unwary.
 Here is an example:
 
@@ -34563,15 +35122,14 @@ BEGIN @{
 @}
 @end example
 
-The output from this program is:
-@samp{cinap t'nod}.
+The output from this program is @samp{cinap t'nod}.
 
 @node Extension Sample Rev2way
 @subsection Two-Way I/O Example
 
 The @code{revtwoway} extension adds a simple two-way processor that
 reverses the characters in each line sent to it for reading back by
-the @command{awk} program.  It's main purpose is to show how to write
+the @command{awk} program.  Its main purpose is to show how to write
 a two-way processor, although it may also be mildly amusing.
 The following example shows how to use it:
 
@@ -34598,12 +35156,15 @@ is:
 @samp{cinap t'nod}.
 
 @node Extension Sample Read write array
-@subsection Dumping and Restoring An Array
+@subsection Dumping and Restoring an Array
 
 The @code{rwarray} extension adds two functions,
 named @code{writea()} and @code{reada()}, as follows:
 
 @table @code
+@item @@load "rwarray"
+This is how you load the extension.
+
 @cindex @code{writea()} extension function
 @item ret = writea(file, array)
 This function takes a string argument, which is the name of the file
@@ -34616,12 +35177,12 @@ success, or zero upon failure.
 @code{reada()} is the inverse of @code{writea()};
 it reads the file named as its first argument, filling in
 the array named as the second argument. It clears the array first.
-Here too, the return value is one on success and zero upon failure.
+Here too, the return value is one on success, or zero upon failure.
 @end table
 
 The array created by @code{reada()} is identical to that written by
 @code{writea()} in the sense that the contents are the same. However,
-due to implementation issues, the array traversal order of the recreated
+due to implementation issues, the array traversal order of the re-created
 array is likely to be different from that of the original array.  As array
 traversal order in @command{awk} is by default undefined, this is (technically)
 not a problem.  If you need to guarantee a particular traversal
@@ -34629,7 +35190,7 @@ order, use the array sorting features in @command{gawk} to do so
 (@pxref{Array Sorting}).
 
 The file contains binary data.  All integral values are written in network
-byte order.  However, double precision floating-point values are written
+byte order.  However, double-precision floating-point values are written
 as native binary data.  Thus, arrays containing only string data can
 theoretically be dumped on systems with one byte order and restored on
 systems with a different one, but this has not been tried.
@@ -34645,7 +35206,7 @@ ret = reada("arraydump.bin", array)
 @end example
 
 @node Extension Sample Readfile
-@subsection Reading An Entire File
+@subsection Reading an Entire File
 
 The @code{readfile} extension adds a single function
 named @code{readfile()}, and an input parser:
@@ -34679,17 +35240,6 @@ if (contents == "" && ERRNO != "") @{
 @}
 @end example
 
-@node Extension Sample API Tests
-@subsection API Tests
-@cindex @code{testext} extension
-
-The @code{testext} extension exercises parts of the extension API that
-are not tested by the other samples.  The @file{extension/testext.c}
-file contains both the C code for the extension and @command{awk}
-test code inside C comments that run the tests. The testing framework
-extracts the @command{awk} code and runs the tests.  See the source file
-for more information.
-
 @node Extension Sample Time
 @subsection Extension Time Functions
 
@@ -34703,7 +35253,7 @@ This is how you load the extension.
 @cindex @code{gettimeofday()} extension function
 @item the_time = gettimeofday()
 Return the time in seconds that has elapsed since 1970-01-01 UTC as a
-floating point value.  If the time is unavailable on this platform, return
+floating-point value.  If the time is unavailable on this platform, return
 @minus{}1 and set @code{ERRNO}.  The returned time should have sub-second
 precision, but the actual precision may vary based on the platform.
 If the standard C @code{gettimeofday()} system call is available on this
@@ -34715,11 +35265,22 @@ it tries to use @code{GetSystemTimeAsFileTime()}.
 Attempt to sleep for @var{seconds} seconds.  If @var{seconds} is negative,
 or the attempt to sleep fails, return @minus{}1 and set @code{ERRNO}.
 Otherwise, return zero after sleeping for the indicated amount of time.
-Note that @var{seconds} may be a floating-point (non-integral) value.
+Note that @var{seconds} may be a floating-point (nonintegral) value.
 Implementation details: depending on platform availability, this function
 tries to use @code{nanosleep()} or @code{select()} to implement the delay.
 @end table
 
+@node Extension Sample API Tests
+@subsection API Tests
+@cindex @code{testext} extension
+
+The @code{testext} extension exercises parts of the extension API that
+are not tested by the other samples.  The @file{extension/testext.c}
+file contains both the C code for the extension and @command{awk}
+test code inside C comments that run the tests. The testing framework
+extracts the @command{awk} code and runs the tests.  See the source file
+for more information.
+
 @node gawkextlib
 @section The @code{gawkextlib} Project
 @cindex @code{gawkextlib}
@@ -34731,31 +35292,36 @@ project provides a number of @command{gawk} extensions, including one for
 processing XML files.  This is the evolution of the original @command{xgawk}
 (XML @command{gawk}) project.
 
-As of this writing, there are five extensions:
+As of this writing, there are seven extensions:
 
 @itemize @value{BULLET}
 @item
-XML parser extension, using the @uref{http://expat.sourceforge.net, Expat}
-XML parsing library.
+@code{errno} extension
 
 @item
-PDF extension.
+GD graphics library extension
 
 @item
-PostgreSQL extension.
+MPFR library extension
+(this provides access to a number of MPFR functions that @command{gawk}'s
+native MPFR support does not)
 
 @item
-GD graphics library extension.
+PDF extension
 
 @item
-MPFR library extension.
-This provides access to a number of MPFR functions which @command{gawk}'s
-native MPFR support does not.
-@end itemize
+PostgreSQL extension
+
+@item
+Redis extension
 
-The @code{time} extension described earlier (@pxref{Extension Sample
-Time}) was originally from this project but has been moved in to the
-main @command{gawk} distribution.
+@item
+Select extension
+
+@item
+XML parser extension, using the @uref{http://expat.sourceforge.net, Expat}
+XML parsing library
+@end itemize
 
 @cindex @command{git} utility
 You can check out the code for the @code{gawkextlib} project
@@ -34800,14 +35366,14 @@ make install                          @ii{Install the extensions}
 
 If you have installed @command{gawk} in the standard way, then you
 will likely not need the @option{--with-gawk} option when configuring
-@code{gawkextlib}.  You may also need to use the @command{sudo} utility
+@code{gawkextlib}.  You may need to use the @command{sudo} utility
 to install both @command{gawk} and @code{gawkextlib}, depending upon
 how your system works.
 
 If you write an extension that you wish to share with other
-@command{gawk} users, please consider doing so through the
+@command{gawk} users, consider doing so through the
 @code{gawkextlib} project.
-See the project's web site for more information.
+See the project's website for more information.
 
 @node Extension summary
 @section Summary
@@ -34815,7 +35381,7 @@ See the project's web site for more information.
 @itemize @value{BULLET}
 @item
 You can write extensions (sometimes called plug-ins) for @command{gawk}
-in C or C++ using the Application Programming Interface (API) defined
+in C or C++ using the application programming interface (API) defined
 by the @command{gawk} developers.
 
 @item
@@ -34825,20 +35391,20 @@ named @code{plugin_is_GPL_compatible}.
 
 @item
 Communication between @command{gawk} and an extension is two-way.
-@command{gawk} passes a @code{struct} to the extension which contains
+@command{gawk} passes a @code{struct} to the extension that contains
 various data fields and function pointers.  The extension can then call
 into @command{gawk} via the supplied function pointers to accomplish
 certain tasks.
 
 @item
 One of these tasks is to ``register'' the name and implementation of
-a new @command{awk}-level function with @command{gawk}.  The implementation
+new @command{awk}-level functions with @command{gawk}.  The implementation
 takes the form of a C function pointer with a defined signature.
 By convention, implementation functions are named @code{do_@var{XXXX}()}
 for some @command{awk}-level function @code{@var{XXXX}()}.
 
 @item
-The API is defined in a header file named @file{gawkpi.h}. You must include
+The API is defined in a header file named @file{gawkapi.h}. You must include
 a number of standard header files @emph{before} including it in your source file.
 
 @item
@@ -34846,44 +35412,44 @@ API function pointers are provided for the following kinds of operations:
 
 @itemize @value{BULLET}
 @item
-Registration functions. You may register
+Allocating, reallocating, and releasing memory
+
+@item
+Registration functions (you may register
 extension functions,
 exit callbacks,
 a version string,
 input parsers,
 output wrappers,
-and two-way processors.
+and two-way processors)
 
 @item
-Printing fatal, warning, and ``lint'' warning messages.
+Printing fatal, warning, and ``lint'' warning messages
 
 @item
-Updating @code{ERRNO}, or unsetting it.
+Updating @code{ERRNO}, or unsetting it
 
 @item
 Accessing parameters, including converting an undefined parameter into
-an array.
+an array
 
 @item
-Symbol table access: retrieving a global variable, creating one,
-or changing one.
-
-@item
-Allocating, reallocating, and releasing memory.
+Symbol table access (retrieving a global variable, creating one,
+or changing one)
 
 @item
 Creating and releasing cached values; this provides an
 efficient way to use values for multiple variables and
-can be a big performance win.
+can be a big performance win
 
 @item
-Manipulating arrays:
-retrieving, adding, deleting, and modifying elements;
+Manipulating arrays
+(retrieving, adding, deleting, and modifying elements;
 getting the count of elements in an array;
 creating a new array;
 clearing an array;
 and
-flattening an array for easy C style looping over all its indices and elements
+flattening an array for easy C-style looping over all its indices and elements)
 @end itemize
 
 @item
@@ -34891,7 +35457,7 @@ The API defines a number of standard data types for representing
 @command{awk} values, array elements, and arrays.
 
 @item
-The API provide convenience functions for constructing values.
+The API provides convenience functions for constructing values.
 It also provides memory management functions to ensure compatibility
 between memory allocated by @command{gawk} and memory allocated by an
 extension.
@@ -34903,7 +35469,7 @@ treated as read-only by the extension.
 @item
 @emph{All} memory passed from an extension to @command{gawk} must come from
 the API's memory allocation functions. @command{gawk} takes responsibility for
-the memory and will release it when appropriate.
+the memory and releases it when appropriate.
 
 @item
 The API provides information about the running version of @command{gawk} so
@@ -34912,15 +35478,15 @@ that loaded it.
 
 @item
 It is easiest to start a new extension by copying the boilerplate code
-described in this @value{CHAPTER}.  Macros in the @file{gawkapi.h} make
-this easier to do.
+described in this @value{CHAPTER}.  Macros in the @file{gawkapi.h} header
+file make this easier to do.
 
 @item
 The @command{gawk} distribution includes a number of small but useful
-sample extensions. The @code{gawkextlib} project includes several more,
-larger, extensions.  If you wish to write an extension and contribute it
+sample extensions. The @code{gawkextlib} project includes several more
+(larger) extensions.  If you wish to write an extension and contribute it
 to the community of @command{gawk} users, the @code{gawkextlib} project
-should be the place to do so.
+is the place to do so.
 
 @end itemize
 
@@ -34934,6 +35500,24 @@ Add functions to implement system calls such as @code{chown()},
 @code{chmod()}, and @code{umask()} to the file operations extension
 presented in @ref{Internal File Ops}.
 
+@c Idea from comp.lang.awk, February 2015
+@item
+Write an input parser that prints a prompt if the input is
+a from a ``terminal'' device.  You can use the @code{isatty()}
+function to tell if the input file is a terminal. (Hint: this function
+is usually expensive to call; try to call it just once.)
+The content of the prompt should come from a variable settable
+by @command{awk}-level code.
+You can write the prompt to stanard error. However,
+for best results, open a new file descriptor (or file pointer)
+on @file{/dev/tty} and print the prompt there, in case standard
+error has been redirected.
+
+Why is standard error a better
+choice than standard output for writing the prompt?
+Which reading mechanism should you replace, the one to get
+a record, or the one to read raw bytes?
+
 @item
 (Hard.)
 How would you provide namespaces in @command{gawk}, so that the
@@ -34962,34 +35546,34 @@ and the Glossary:
 @end ifclear
 
 @ifset FOR_PRINT
-Part IV contains two appendices and the license that
+Part IV contains three appendices, the last of which is the license that
 covers the @command{gawk} source code:
 @end ifset
 
 @itemize @value{BULLET}
 @item
-@ref{Language History}.
+@ref{Language History}
 
 @item
-@ref{Installation}.
+@ref{Installation}
 
 @ifclear FOR_PRINT
 @item
-@ref{Notes}.
+@ref{Notes}
 
 @item
-@ref{Basic Concepts}.
+@ref{Basic Concepts}
 
 @item
-@ref{Glossary}.
+@ref{Glossary}
 @end ifclear
 
 @item
-@ref{Copying}.
+@ref{Copying}
 
 @ifclear FOR_PRINT
 @item
-@ref{GNU Free Documentation License}.
+@ref{GNU Free Documentation License}
 @end ifclear
 @end itemize
 @end ifdocbook
@@ -34998,11 +35582,11 @@ covers the @command{gawk} source code:
 @appendix The Evolution of the @command{awk} Language
 
 This @value{DOCUMENT} describes the GNU implementation of @command{awk},
-which follows the POSIX specification.  Many long-time @command{awk}
+which follows the POSIX specification.  Many longtime @command{awk}
 users learned @command{awk} programming with the original @command{awk}
 implementation in Version 7 Unix.  (This implementation was the basis for
 @command{awk} in Berkeley Unix, through 4.3-Reno.  Subsequent versions
-of Berkeley Unix, and some systems derived from 4.4BSD-Lite, used various
+of Berkeley Unix, and, for a while, some systems derived from 4.4BSD-Lite, used various
 versions of @command{gawk} for their @command{awk}.)  This @value{CHAPTER}
 briefly describes the evolution of the @command{awk} language, with
 cross-references to other parts of the @value{DOCUMENT} where you can
@@ -35035,9 +35619,7 @@ online documentation}.
 
 @node V7/SVR3.1
 @appendixsec Major Changes Between V7 and SVR3.1
-@c STARTOFRANGE gawkv
 @cindex @command{awk}, versions of
-@c STARTOFRANGE gawkv1
 @cindex @command{awk}, versions of, changes between V7 and SVR3.1
 
 The @command{awk} language evolved considerably between the release of
@@ -35048,86 +35630,82 @@ cross-references to further details:
 @itemize @value{BULLET}
 @item
 The requirement for @samp{;} to separate rules on a line
-(@pxref{Statements/Lines}).
+(@pxref{Statements/Lines})
 
 @item
 User-defined functions and the @code{return} statement
-(@pxref{User-defined}).
+(@pxref{User-defined})
 
 @item
 The @code{delete} statement (@pxref{Delete}).
 
 @item
 The @code{do}-@code{while} statement
-(@pxref{Do Statement}).
+(@pxref{Do Statement})
 
 @item
 The built-in functions @code{atan2()}, @code{cos()}, @code{sin()}, @code{rand()}, and
-@code{srand()} (@pxref{Numeric Functions}).
+@code{srand()} (@pxref{Numeric Functions})
 
 @item
 The built-in functions @code{gsub()}, @code{sub()}, and @code{match()}
-(@pxref{String Functions}).
+(@pxref{String Functions})
 
 @item
 The built-in functions @code{close()} and @code{system()}
-(@pxref{I/O Functions}).
+(@pxref{I/O Functions})
 
 @item
 The @code{ARGC}, @code{ARGV}, @code{FNR}, @code{RLENGTH}, @code{RSTART},
-and @code{SUBSEP} built-in variables (@pxref{Built-in Variables}).
+and @code{SUBSEP} predefined variables (@pxref{Built-in Variables})
 
 @item
-Assignable @code{$0} (@pxref{Changing Fields}).
+Assignable @code{$0} (@pxref{Changing Fields})
 
 @item
 The conditional expression using the ternary operator @samp{?:}
-(@pxref{Conditional Exp}).
+(@pxref{Conditional Exp})
 
 @item
-The expression @samp{@var{index-variable} in @var{array}} outside of @code{for}
-statements (@pxref{Reference to Elements}).
+The expression @samp{@var{indx} in @var{array}} outside of @code{for}
+statements (@pxref{Reference to Elements})
 
 @item
 The exponentiation operator @samp{^}
 (@pxref{Arithmetic Ops}) and its assignment operator
-form @samp{^=} (@pxref{Assignment Ops}).
+form @samp{^=} (@pxref{Assignment Ops})
 
 @item
 C-compatible operator precedence, which breaks some old @command{awk}
-programs (@pxref{Precedence}).
+programs (@pxref{Precedence})
 
 @item
 Regexps as the value of @code{FS}
 (@pxref{Field Separators}) and as the
 third argument to the @code{split()} function
 (@pxref{String Functions}), rather than using only the first character
-of @code{FS}.
+of @code{FS}
 
 @item
 Dynamic regexps as operands of the @samp{~} and @samp{!~} operators
-(@pxref{Regexp Usage}).
+(@pxref{Computed Regexps})
 
 @item
 The escape sequences @samp{\b}, @samp{\f}, and @samp{\r}
-(@pxref{Escape Sequences}).
-(Some vendors have updated their old versions of @command{awk} to
-recognize @samp{\b}, @samp{\f}, and @samp{\r}, but this is not
-something you can rely on.)
+(@pxref{Escape Sequences})
 
 @item
 Redirection of input for the @code{getline} function
-(@pxref{Getline}).
+(@pxref{Getline})
 
 @item
 Multiple @code{BEGIN} and @code{END} rules
-(@pxref{BEGIN/END}).
+(@pxref{BEGIN/END})
 
 @item
 Multidimensional arrays
-(@pxref{Multidimensional}).
+(@pxref{Multidimensional})
 @end itemize
-@c ENDOFRANGE gawkv1
 
 @node SVR4
 @appendixsec Changes Between SVR3.1 and SVR4
@@ -35138,54 +35716,54 @@ The System V Release 4 (1989) version of Unix @command{awk} added these features
 
 @itemize @value{BULLET}
 @item
-The @code{ENVIRON} array (@pxref{Built-in Variables}).
+The @code{ENVIRON} array (@pxref{Built-in Variables})
 @c gawk and MKS awk
 
 @item
 Multiple @option{-f} options on the command line
-(@pxref{Options}).
+(@pxref{Options})
 @c MKS awk
 
 @item
 The @option{-v} option for assigning variables before program execution begins
-(@pxref{Options}).
+(@pxref{Options})
 @c GNU, Bell Laboratories & MKS together
 
 @item
-The @option{--} option for terminating command-line options.
+The @option{--} signal for terminating command-line options
 
 @item
 The @samp{\a}, @samp{\v}, and @samp{\x} escape sequences
-(@pxref{Escape Sequences}).
+(@pxref{Escape Sequences})
 @c GNU, for ANSI C compat
 
 @item
 A defined return value for the @code{srand()} built-in function
-(@pxref{Numeric Functions}).
+(@pxref{Numeric Functions})
 
 @item
 The @code{toupper()} and @code{tolower()} built-in string functions
 for case translation
-(@pxref{String Functions}).
+(@pxref{String Functions})
 
 @item
 A cleaner specification for the @samp{%c} format-control letter in the
 @code{printf} function
-(@pxref{Control Letters}).
+(@pxref{Control Letters})
 
 @item
 The ability to dynamically pass the field width and precision (@code{"%*.*d"})
-in the argument list of the @code{printf} function
-(@pxref{Control Letters}).
+in the argument list of @code{printf} and @code{sprintf()}
+(@pxref{Control Letters})
 
 @item
 The use of regexp constants, such as @code{/foo/}, as expressions, where
 they are equivalent to using the matching operator, as in @samp{$0 ~ /foo/}
-(@pxref{Using Constant Regexps}).
+(@pxref{Using Constant Regexps})
 
 @item
 Processing of escape sequences inside command-line variable assignments
-(@pxref{Assignment Options}).
+(@pxref{Assignment Options})
 @end itemize
 
 @node POSIX
@@ -35199,23 +35777,23 @@ introduced the following changes into the language:
 @itemize @value{BULLET}
 @item
 The use of @option{-W} for implementation-specific options
-(@pxref{Options}).
+(@pxref{Options})
 
 @item
 The use of @code{CONVFMT} for controlling the conversion of numbers
-to strings (@pxref{Conversion}).
+to strings (@pxref{Conversion})
 
 @item
 The concept of a numeric string and tighter comparison rules to go
-with it (@pxref{Typing and Comparison}).
+with it (@pxref{Typing and Comparison})
 
 @item
-The use of built-in variables as function parameter names is forbidden
-(@pxref{Definition Syntax}.
+The use of predefined variables as function parameter names is forbidden
+(@pxref{Definition Syntax})
 
 @item
 More complete documentation of many of the previously undocumented
-features of the language.
+features of the language
 @end itemize
 
 In 2012, a number of extensions that had been commonly available for
@@ -35224,25 +35802,24 @@ many years were finally added to POSIX. They are:
 @itemize @value{BULLET}
 @item
 The @code{fflush()} built-in function for flushing buffered output
-(@pxref{I/O Functions}).
+(@pxref{I/O Functions})
 
 @item
 The @code{nextfile} statement
-(@pxref{Nextfile Statement}).
+(@pxref{Nextfile Statement})
 
 @item
 The ability to delete all of an array at once with @samp{delete @var{array}}
-(@pxref{Delete}).
+(@pxref{Delete})
 
 @end itemize
 
-@xref{Common Extensions}, for a list of common extensions
+@DBXREF{Common Extensions} for a list of common extensions
 not permitted by the POSIX standard.
 
 The 2008 POSIX standard can be found online at
 @url{http://www.opengroup.org/onlinepubs/9699919799/}.
 
-@c ENDOFRANGE gawkv
 
 @node BTL
 @appendixsec Extensions in Brian Kernighan's @command{awk}
@@ -35256,43 +35833,40 @@ has made his version available via his home page
 (@pxref{Other Versions}).
 
 This @value{SECTION} describes common extensions that
-originally appeared in his version of @command{awk}.
+originally appeared in his version of @command{awk}:
 
 @itemize @value{BULLET}
 @item
 The @samp{**} and @samp{**=} operators
 (@pxref{Arithmetic Ops}
 and
-@ref{Assignment Ops}).
+@ref{Assignment Ops})
 
 @item
 The use of @code{func} as an abbreviation for @code{function}
-(@pxref{Definition Syntax}).
+(@pxref{Definition Syntax})
 
 @item
 The @code{fflush()} built-in function for flushing buffered output
-(@pxref{I/O Functions}).
+(@pxref{I/O Functions})
 
 @ignore
 @item
 The @code{SYMTAB} array, that allows access to @command{awk}'s internal symbol
 table. This feature was never documented for his @command{awk}, largely because
 it is somewhat shakily implemented. For instance, you cannot access arrays
-or array elements through it.
+or array elements through it
 @end ignore
 @end itemize
 
-@xref{Common Extensions}, for a full list of the extensions
+@DBXREF{Common Extensions} for a full list of the extensions
 available in his @command{awk}.
 
 @node POSIX/GNU
 @appendixsec Extensions in @command{gawk} Not in POSIX @command{awk}
 
-@c STARTOFRANGE fripls
 @cindex compatibility mode (@command{gawk}), extensions
-@c STARTOFRANGE exgnot
 @cindex extensions, in @command{gawk}, not in POSIX @command{awk}
-@c STARTOFRANGE posnot
 @cindex POSIX, @command{gawk} extensions not included in
 The GNU implementation, @command{gawk}, adds a large number of features.
 They can all be disabled with either the @option{--traditional} or
@@ -35306,12 +35880,12 @@ in the current version of @command{gawk}.
 @itemize @value{BULLET}
 
 @item
-Additional built-in variables:
+Additional predefined variables:
 
 @itemize @value{MINUS}
 @item
 The
-@code{ARGIND}
+@code{ARGIND},
 @code{BINMODE},
 @code{ERRNO},
 @code{FIELDWIDTHS},
@@ -35323,7 +35897,7 @@ The
 and
 @code{TEXTDOMAIN}
 variables
-(@pxref{Built-in Variables}).
+(@pxref{Built-in Variables})
 @end itemize
 
 @item
@@ -35331,15 +35905,15 @@ Special files in I/O redirections:
 
 @itemize @value{MINUS}
 @item
-The @file{/dev/stdin}, @file{/dev/stdout}, @file{/dev/stderr} and
+The @file{/dev/stdin}, @file{/dev/stdout}, @file{/dev/stderr}, and
 @file{/dev/fd/@var{N}} special @value{FN}s
-(@pxref{Special Files}).
+(@pxref{Special Files})
 
 @item
 The @file{/inet}, @file{/inet4}, and @samp{/inet6} special files for
 TCP/IP networking using @samp{|&} to specify which version of the
-IP protocol to use.
-(@pxref{TCP/IP Networking}).
+IP protocol to use
+(@pxref{TCP/IP Networking})
 @end itemize
 
 @item
@@ -35348,37 +35922,41 @@ Changes and/or additions to the language:
 @itemize @value{MINUS}
 @item
 The @samp{\x} escape sequence
-(@pxref{Escape Sequences}).
+(@pxref{Escape Sequences})
 
 @item
 Full support for both POSIX and GNU regexps
-(@pxref{Regexp}).
+(@pxref{Regexp})
 
 @item
 The ability for @code{FS} and for the third
 argument to @code{split()} to be null strings
-(@pxref{Single Character Fields}).
+(@pxref{Single Character Fields})
 
 @item
 The ability for @code{RS} to be a regexp
-(@pxref{Records}).
+(@pxref{Records})
 
 @item
 The ability to use octal and hexadecimal constants in @command{awk}
 program source code
-(@pxref{Nondecimal-numbers}).
+(@pxref{Nondecimal-numbers})
 
 @item
 The @samp{|&} operator for two-way I/O to a coprocess
-(@pxref{Two-way I/O}).
+(@pxref{Two-way I/O})
 
 @item
 Indirect function calls
-(@pxref{Indirect Calls}).
+(@pxref{Indirect Calls})
 
 @item
 Directories on the command line produce a warning and are skipped
-(@pxref{Command-line directories}).
+(@pxref{Command-line directories})
+
+@item
+Output with @code{print} and @code{printf} need not be fatal
+(@pxref{Nonfatal})
 @end itemize
 
 @item
@@ -35386,20 +35964,12 @@ New keywords:
 
 @itemize @value{MINUS}
 @item
-The @code{BEGINFILE} and @code{ENDFILE} special patterns.
-(@pxref{BEGINFILE/ENDFILE}).
-
-@item
-The ability to delete all of an array at once with @samp{delete @var{array}}
-(@pxref{Delete}).
-
-@item
-The @code{nextfile} statement
-(@pxref{Nextfile Statement}).
+The @code{BEGINFILE} and @code{ENDFILE} special patterns
+(@pxref{BEGINFILE/ENDFILE})
 
 @item
 The @code{switch} statement
-(@pxref{Switch Statement}).
+(@pxref{Switch Statement})
 @end itemize
 
 @item
@@ -35409,30 +35979,30 @@ Changes to standard @command{awk} functions:
 @item
 The optional second argument to @code{close()} that allows closing one end
 of a two-way pipe to a coprocess
-(@pxref{Two-way I/O}).
+(@pxref{Two-way I/O})
 
 @item
-POSIX compliance for @code{gsub()} and @code{sub()}.
+POSIX compliance for @code{gsub()} and @code{sub()} with @option{--posix}
 
 @item
 The @code{length()} function accepts an array argument
 and returns the number of elements in the array
-(@pxref{String Functions}).
+(@pxref{String Functions})
 
 @item
 The optional third argument to the @code{match()} function
 for capturing text-matching subexpressions within a regexp
-(@pxref{String Functions}).
+(@pxref{String Functions})
 
 @item
 Positional specifiers in @code{printf} formats for
 making translations easier
-(@pxref{Printf Ordering}).
+(@pxref{Printf Ordering})
 
 @item
 The @code{split()} function's additional optional fourth
-argument which is an array to hold the text of the field separators.
-(@pxref{String Functions}).
+argument, which is an array to hold the text of the field separators
+(@pxref{String Functions})
 @end itemize
 
 @item
@@ -35440,6 +36010,20 @@ Additional functions only in @command{gawk}:
 
 @itemize @value{MINUS}
 @item
+The @code{gensub()}, @code{patsplit()}, and @code{strtonum()} functions
+for more powerful text manipulation
+(@pxref{String Functions})
+
+@item
+The @code{asort()} and @code{asorti()} functions for sorting arrays
+(@pxref{Array Sorting})
+
+@item
+The @code{mktime()}, @code{systime()}, and @code{strftime()}
+functions for working with timestamps
+(@pxref{Time Functions})
+
+@item
 The
 @code{and()},
 @code{compl()},
@@ -35449,34 +36033,24 @@ The
 and
 @code{xor()}
 functions for bit manipulation
-(@pxref{Bitwise Functions}).
+(@pxref{Bitwise Functions})
 @c In 4.1, and(), or() and xor() grew the ability to take > 2 arguments
 
 @item
-The @code{asort()} and @code{asorti()} functions for sorting arrays
-(@pxref{Array Sorting}).
+The @code{isarray()} function to check if a variable is an array or not
+(@pxref{Type Functions})
 
 @item
-The @code{bindtextdomain()}, @code{dcgettext()} and @code{dcngettext()}
+The @code{bindtextdomain()}, @code{dcgettext()}, and @code{dcngettext()}
 functions for internationalization
-(@pxref{Programmer i18n}).
+(@pxref{Programmer i18n})
 
 @item
-The @code{fflush()} function from BWK @command{awk}
-(@pxref{I/O Functions}).
-
-@item
-The @code{gensub()}, @code{patsplit()}, and @code{strtonum()} functions
-for more powerful text manipulation
-(@pxref{String Functions}).
-
-@item
-The @code{mktime()}, @code{systime()}, and @code{strftime()}
-functions for working with timestamps
-(@pxref{Time Functions}).
+The @code{intdiv()} function for doing integer
+division and remainder
+(@pxref{Numeric Functions})
 @end itemize
 
-
 @item
 Changes and/or additions in the command-line options:
 
@@ -35484,12 +36058,12 @@ Changes and/or additions in the command-line options:
 @item
 The @env{AWKPATH} environment variable for specifying a path search for
 the @option{-f} command-line option
-(@pxref{Options}).
+(@pxref{Options})
 
 @item
 The @env{AWKLIBPATH} environment variable for specifying a path search for
 the @option{-l} command-line option
-(@pxref{Options}).
+(@pxref{Options})
 
 @item
 The
@@ -35518,7 +36092,7 @@ The
 and
 @option{-V}
 short options. Also, the
-ability to use GNU-style long-named options that start with @option{--}
+ability to use GNU-style long-named options that start with @option{--},
 and the
 @option{--assign},
 @option{--bignum},
@@ -35598,8 +36172,8 @@ GCC for VAX and Alpha has not been tested for a while.
 @end itemize
 
 @item
-Support for the following obsolete systems was removed from the code
-and the documentation for @command{gawk} @value{PVERSION} 4.1:
+Support for the following obsolete system was removed from the code
+for @command{gawk} @value{PVERSION} 4.1:
 
 @c nested table
 @itemize @value{MINUS}
@@ -35608,16 +36182,19 @@ Ultrix
 @end itemize
 
 @item
-@c FIXME: Verify the version here.
-Support for MirBSD was removed at @command{gawk} @value{PVERSION} 4.2.
+Support for the following systems was removed from the code
+for @command{gawk} @value{PVERSION} 4.2:
+
+@c nested table
+@itemize @value{MINUS}
+@item
+MirBSD
+@end itemize
 
 @end itemize
 
 @c XXX ADD MORE STUFF HERE
 
-@c ENDOFRANGE fripls
-@c ENDOFRANGE exgnot
-@c ENDOFRANGE posnot
 
 @c This does not need to be in the formal book.
 @ifclear FOR_PRINT
@@ -36199,11 +36776,11 @@ load @command{awk} library files.
 @item
 The @option{-l} and @option{--load} options load compiled dynamic extensions.
 
-@item 
+@item
 The @option{-M} and @option{--bignum} options enable MPFR.
 
 @item
-The @option{-o} only does pretty-printing.
+The @option{-o} option only does pretty-printing.
 
 @item
 The @option{-p} option is used for profiling.
@@ -36226,6 +36803,44 @@ with a minimum of two
 The dynamic extension interface was completely redone
 (@pxref{Dynamic Extensions}).
 
+@item
+Support for Ultrix was removed.
+
+@end itemize
+
+Version 4.2 introduced the following changes:
+
+@itemize @bullet
+@item
+Changes to @code{ENVIRON} are reflected into @command{gawk}'s
+environment and that of programs that it runs.
+@xref{Auto-set}.
+
+@item
+The @option{--pretty-print} option no longer runs the @command{awk}
+program too.
+@xref{Options}.
+
+@item
+The @command{igawk} program and its manual page are no longer
+installed when @command{gawk} is built.
+@xref{Igawk Program}.
+
+@item
+The @code{intdiv()} function.
+@xref{Numeric Functions}.
+
+@item
+The maximum number of hexdecimal digits in @samp{\x} escapes
+is now two.
+@xref{Escape Sequences}.
+
+@item
+Nonfatal output with @code{print} and @code{printf}.
+@xref{Nonfatal}.
+
+@item
+Support for MirBSD was removed.
 @end itemize
 
 @c XXX ADD MORE STUFF HERE
@@ -36236,33 +36851,29 @@ The dynamic extension interface was completely redone
 
 @cindex extensions, Brian Kernighan's @command{awk}
 @cindex extensions, @command{mawk}
-This @value{SECTION} summarizes the common extensions supported
+The following table summarizes the common extensions supported
 by @command{gawk}, Brian Kernighan's @command{awk}, and @command{mawk},
-the three most widely-used freely available versions of @command{awk}
+the three most widely used freely available versions of @command{awk}
 (@pxref{Other Versions}).
 
-@multitable {@file{/dev/stderr} special file} {BWK Awk} {Mawk} {GNU Awk}
-@headitem Feature @tab BWK Awk @tab Mawk @tab GNU Awk
-@item @samp{\x} Escape sequence @tab X @tab X @tab X
-@item @code{FS} as null string @tab X @tab X @tab X
-@item @file{/dev/stdin} special file @tab X @tab X @tab X
-@item @file{/dev/stdout} special file @tab X @tab X @tab X
-@item @file{/dev/stderr} special file @tab X @tab X @tab X
-@item @code{delete} without subscript @tab X @tab X @tab X
-@item @code{fflush()} function @tab X @tab X @tab X
-@item @code{length()} of an array @tab X @tab X @tab X
-@item @code{nextfile} statement @tab X @tab X @tab X
-@item @code{**} and @code{**=} operators @tab X @tab @tab X
-@item @code{func} keyword @tab X @tab @tab X
-@item @code{BINMODE} variable @tab @tab X @tab X
-@item @code{RS} as regexp @tab @tab X @tab X
-@item Time related functions @tab @tab X @tab X
+@multitable {@file{/dev/stderr} special file} {BWK @command{awk}} {@command{mawk}} {@command{gawk}} {Now standard}
+@headitem Feature @tab BWK @command{awk} @tab @command{mawk} @tab @command{gawk} @tab Now standard
+@item @samp{\x} escape sequence @tab X @tab X @tab X @tab
+@item @code{FS} as null string @tab X @tab X @tab X @tab
+@item @file{/dev/stdin} special file @tab X @tab X @tab X @tab
+@item @file{/dev/stdout} special file @tab X @tab X @tab X @tab
+@item @file{/dev/stderr} special file @tab X @tab X @tab X @tab
+@item @code{delete} without subscript @tab X @tab X @tab X @tab X
+@item @code{fflush()} function @tab X @tab X @tab X @tab X
+@item @code{length()} of an array @tab X @tab X @tab X @tab
+@item @code{nextfile} statement @tab X @tab X @tab X @tab X
+@item @code{**} and @code{**=} operators @tab X @tab @tab X @tab
+@item @code{func} keyword @tab X @tab @tab X @tab
+@item @code{BINMODE} variable @tab @tab X @tab X @tab
+@item @code{RS} as regexp @tab @tab X @tab X @tab
+@item Time-related functions @tab @tab X @tab X @tab
 @end multitable
 
-(Technically speaking, as of late 2012, @code{fflush()}, @samp{delete @var{array}},
-and @code{nextfile} are no longer extensions, since they have been added
-to POSIX.)
-
 @node Ranges and Locales
 @appendixsec Regexp Ranges and Locales: A Long Sad Story
 
@@ -36276,9 +36887,9 @@ the first character in the range and the last character in the range,
 inclusive.  Ordering was based on the numeric value of each character
 in the machine's native character set.  Thus, on ASCII-based systems,
 @samp{[a-z]} matched all the lowercase letters, and only the lowercase
-letters, since the numeric values for the letters from @samp{a} through
+letters, as the numeric values for the letters from @samp{a} through
 @samp{z} were contiguous.  (On an EBCDIC system, the range @samp{[a-z]}
-includes additional, non-alphabetic characters as well.)
+includes additional nonalphabetic characters as well.)
 
 Almost all introductory Unix literature explained range expressions
 as working in this fashion, and in particular, would teach that the
@@ -36287,8 +36898,8 @@ that @samp{[A-Z]} was the ``correct'' way to match uppercase letters.
 And indeed, this was true.@footnote{And Life was good.}
 
 The 1992 POSIX standard introduced the idea of locales (@pxref{Locales}).
-Since many locales include other letters besides the plain twenty-six
-letters of the American English alphabet, the POSIX standard added
+Because many locales include other letters besides the plain 26
+letters of the English alphabet, the POSIX standard added
 character classes (@pxref{Bracket Expressions}) as a way to match
 different kinds of characters besides the traditional ones in the ASCII
 character set.
@@ -36299,14 +36910,15 @@ In the @code{"C"} and @code{"POSIX"} locales, a range expression like
 But outside those locales, the ordering was defined to be based on
 @dfn{collation order}.
 
+What does that mean?
 In many locales, @samp{A} and @samp{a} are both less than @samp{B}.
 In other words, these locales sort characters in dictionary order,
 and @samp{[a-dx-z]} is typically not equivalent to @samp{[abcdxyz]};
-instead it might be equivalent to @samp{[ABCXYabcdxyz]}, for example.
+instead, it might be equivalent to @samp{[ABCXYabcdxyz]}, for example.
 
-This point needs to be emphasized: Much literature teaches that you should
+This point needs to be emphasized: much literature teaches that you should
 use @samp{[a-z]} to match a lowercase character.  But on systems with
-non-ASCII locales, this also matched all of the uppercase characters
+non-ASCII locales, this also matches all of the uppercase characters
 except @samp{A} or @samp{Z}!  This was a continuous cause of confusion, even well
 into the twenty-first century.
 
@@ -36320,7 +36932,7 @@ $ @kbd{echo something1234abc | gawk-3.1.8 '@{ sub("[A-Z]*$", ""); print @}'}
 @end example
 
 @noindent
-This output is unexpected, since the @samp{bc} at the end of
+This output is unexpected, as the @samp{bc} at the end of
 @samp{something1234abc} should not normally match @samp{[A-Z]*}.
 This result is due to the locale setting (and thus you may not see
 it on your system).
@@ -36331,13 +36943,13 @@ is perfectly valid in ASCII, but is not valid in many Unicode locales,
 such as @code{en_US.UTF-8}.
 
 Early versions of @command{gawk} used regexp matching code that was not
-locale aware, so ranges had their traditional interpretation.
+locale-aware, so ranges had their traditional interpretation.
 
 When @command{gawk} switched to using locale-aware regexp matchers,
 the problems began; especially as both GNU/Linux and commercial Unix
 vendors started implementing non-ASCII locales, @emph{and making them
 the default}.  Perhaps the most frequently asked question became something
-like ``why does @samp{[A-Z]} match lowercase letters?!?''
+like, ``Why does @samp{[A-Z]} match lowercase letters?!?''
 
 @cindex Berry, Karl
 This situation existed for close to 10 years, if not more, and
@@ -36347,7 +36959,7 @@ was in the user's locale.  During the development of @value{PVERSION} 4.0,
 he modified @command{gawk} to always treat ranges in the original,
 pre-POSIX fashion, unless @option{--posix} was used (@pxref{Options}).@footnote{And
 thus was born the Campaign for Rational Range Interpretation (or
-RRI). A number of GNU tools have either implemented this change,
+RRI). A number of GNU tools have already implemented this change,
 or will soon.  Thanks to Karl Berry for coining the phrase ``Rational
 Range Interpretation.''}
 
@@ -36361,9 +36973,10 @@ and
 
 By using this lovely technical term, the standard gives license
 to implementors to implement ranges in whatever way they choose.
-The @command{gawk} maintainer chose to apply the pre-POSIX meaning in all
-cases: the default regexp matching; with @option{--traditional} and with
-@option{--posix}; in all cases, @command{gawk} remains POSIX compliant.
+The @command{gawk} maintainer chose to apply the pre-POSIX meaning
+both with the default regexp matching and when @option{--traditional} or
+@option{--posix} are used.
+In all cases @command{gawk} remains POSIX-compliant.
 
 @node Contributors
 @appendixsec Major Contributors to @command{gawk}
@@ -36409,7 +37022,7 @@ to around 90 pages.
 Richard Stallman
 helped finish the implementation and the initial draft of this
 @value{DOCUMENT}.
-He is also the founder of the FSF and the GNU project.
+He is also the founder of the FSF and the GNU Project.
 
 @item
 @cindex Woods, John
@@ -36496,7 +37109,7 @@ the various PC platforms.
 @cindex Zoulas, Christos
 Christos Zoulas
 provided the @code{extension()}
-built-in function for dynamically adding new modules.
+built-in function for dynamically adding new functions.
 (This was obsoleted at @command{gawk} 4.1.)
 
 @item
@@ -36555,7 +37168,7 @@ Michael Benzinger contributed the initial code for @code{switch} statements.
 @cindex McPhee, Patrick
 Patrick T.J.@: McPhee contributed the code for dynamic loading in Windows32
 environments.
-(This is no longer supported)
+(This is no longer supported.)
 
 @item
 @cindex Wallin, Anders
@@ -36573,28 +37186,28 @@ John Haque made the following contributions:
 @itemize @value{MINUS}
 @item
 The modifications to convert @command{gawk}
-into a byte-code interpreter, including the debugger.
+into a byte-code interpreter, including the debugger
 
 @item
-The addition of true arrays of arrays.
+The addition of true arrays of arrays
 
 @item
-The additional modifications for support of arbitrary precision arithmetic.
+The additional modifications for support of arbitrary-precision arithmetic
 
 @item
 The initial text of
-@ref{Arbitrary Precision Arithmetic}.
+@ref{Arbitrary Precision Arithmetic}
 
 @item
 The work to merge the three versions of @command{gawk}
-into one, for the 4.1 release.
+into one, for the 4.1 release
 
 @item
-Improved array internals for arrays indexed by integers.
+Improved array internals for arrays indexed by integers
 
 @item
-The improved array sorting features were driven by John together
-with Pat Rankin.
+The improved array sorting features were also driven by John, together
+with Pat Rankin
 @end itemize
 
 @cindex Papadopoulos, Panos
@@ -36612,6 +37225,11 @@ The development of the extension API first released with
 Arnold Robbins and Andrew Schorr, with notable contributions from
 the rest of the development team.
 
+@cindex Malmberg, John E.
+@item
+John Malmberg contributed significant improvements to the
+OpenVMS port and the related documentation.
+
 @item
 @cindex Colombo, Antonio
 Antonio Giovanni Colombo rewrote a number of examples in the early
@@ -36630,10 +37248,10 @@ helping David Trueman, and as the primary maintainer since around 1994.
 @itemize @value{BULLET}
 @item
 The @command{awk} language has evolved over time. The first release
-was with V7 Unix circa 1978.  In 1987 for System V Release 3.1,
+was with V7 Unix, circa 1978.  In 1987, for System V Release 3.1,
 major additions, including user-defined functions, were made to the language.
 Additional changes were made for System V Release 4, in 1989.
-Since then, further minor changes happen under the auspices of the
+Since then, further minor changes have happened under the auspices of the
 POSIX standard.
 
 @item
@@ -36649,7 +37267,7 @@ options.
 The interaction of POSIX locales and regexp matching in @command{gawk} has been confusing over
 the years. Today, @command{gawk} implements Rational Range Interpretation, where
 ranges of the form @samp{[a-z]} match @emph{only} the characters numerically between
-@samp{a} through @samp{z} in the machine's native character set.  Usually this is ASCII
+@samp{a} through @samp{z} in the machine's native character set.  Usually this is ASCII,
 but it can be EBCDIC on IBM S/390 systems.
 
 @item
@@ -36664,16 +37282,14 @@ the appropriate credit where credit is due.
 
 @c last two commas are part of see also
 @cindex operating systems, See Also GNU/Linux@comma{} PC operating systems@comma{} Unix
-@c STARTOFRANGE gligawk
 @cindex @command{gawk}, installing
-@c STARTOFRANGE ingawk
 @cindex installing @command{gawk}
 This appendix provides instructions for installing @command{gawk} on the
 various platforms that are supported by the developers.  The primary
 developer supports GNU/Linux (and Unix), whereas the other ports are
 contributed.
-@xref{Bugs},
-for the electronic mail addresses of the people who did
+@DBXREF{Bugs}
+for the email addresses of the people who maintain
 the respective ports.
 
 @menu
@@ -36727,7 +37343,7 @@ wget http://ftp.gnu.org/gnu/gawk/gawk-@value{VERSION}.@value{PATCHLEVEL}.tar.gz
 
 The GNU software archive is mirrored around the world.
 The up-to-date list of mirror sites is available from
-@uref{http://www.gnu.org/order/ftp.html, the main FSF web site}.
+@uref{http://www.gnu.org/order/ftp.html, the main FSF website}.
 Try to use one of the mirrors; they
 will be less busy, and you can usually find one closer to your site.
 
@@ -36736,9 +37352,9 @@ will be less busy, and you can usually find one closer to your site.
 @command{gawk} is distributed as several @code{tar} files compressed with
 different compression programs: @command{gzip}, @command{bzip2},
 and @command{xz}. For simplicity, the rest of these instructions assume
-you are using the one compressed with the GNU Zip program, @code{gzip}.
+you are using the one compressed with the GNU Gzip program (@command{gzip}).
 
-Once you have the distribution (for example,
+Once you have the distribution (e.g.,
 @file{gawk-@value{VERSION}.@value{PATCHLEVEL}.tar.gz}),
 use @code{gzip} to expand the
 file and then use @code{tar} to extract it.  You can use the following
@@ -36776,7 +37392,6 @@ a local expert.
 
 @node Distribution contents
 @appendixsubsec Contents of the @command{gawk} Distribution
-@c STARTOFRANGE gawdis
 @cindex @command{gawk}, distribution
 
 The @command{gawk} distribution has a number of C source files,
@@ -36788,12 +37403,12 @@ operating systems:
 
 @table @asis
 @item Various @samp{.c}, @samp{.y}, and @samp{.h} files
-The actual @command{gawk} source code.
+These files contain the actual @command{gawk} source code.
 @end table
 
 @table @file
 @item ABOUT-NLS
-Information about GNU @command{gettext} and translations.
+A file containing information about GNU @command{gettext} and translations.
 
 @item AUTHORS
 A file with some information about the authorship of @command{gawk}.
@@ -36823,7 +37438,7 @@ An older list of changes to @command{gawk}.
 The GNU General Public License.
 
 @item POSIX.STD
-A description of behaviors in the POSIX standard for @command{awk} which
+A description of behaviors in the POSIX standard for @command{awk} that
 are left undefined, or where @command{gawk} may not comply fully, as well
 as a list of things that the POSIX standard should describe but does not.
 
@@ -36831,7 +37446,7 @@ as a list of things that the POSIX standard should describe but does not.
 @item doc/awkforai.txt
 Pointers to the original draft of
 a short article describing why @command{gawk} is a good language for
-Artificial Intelligence (AI) programming.
+artificial intelligence (AI) programming.
 
 @item doc/bc_notes
 A brief description of @command{gawk}'s ``byte code'' internals.
@@ -36874,10 +37489,10 @@ The generated Info file for this @value{DOCUMENT}.
 @item doc/gawkinet.texi
 The Texinfo source file for
 @ifinfo
-@inforef{Top, , General Introduction, gawkinet, TCP/IP Internetworking with @command{gawk}}.
+@inforef{Top, , General Introduction, gawkinet, @value{GAWKINETTITLE}}.
 @end ifinfo
 @ifnotinfo
-@cite{TCP/IP Internetworking with @command{gawk}}.
+@cite{@value{GAWKINETTITLE}}.
 @end ifnotinfo
 It should be processed with @TeX{}
 (via @command{texi2dvi} or @command{texi2pdf})
@@ -36886,7 +37501,7 @@ with @command{makeinfo} to produce an Info or HTML file.
 
 @item doc/gawkinet.info
 The generated Info file for
-@cite{TCP/IP Internetworking with @command{gawk}}.
+@cite{@value{GAWKINETTITLE}}.
 
 @item doc/igawk.1
 The @command{troff} source for a manual page describing the @command{igawk}
@@ -36948,6 +37563,12 @@ The source code, manual pages, and infrastructure files for
 the sample extensions included with @command{gawk}.
 @xref{Dynamic Extensions}, for more information.
 
+@item extras/*
+Additional non-essential files.  Currently, this directory contains some shell
+startup files to be installed in @file{/etc/profile.d} to aid in manipulating
+the @env{AWKPATH} and @env{AWKLIBPATH} environment variables.
+@xref{Shell Startup Files}, for more information.
+
 @item posix/*
 Files needed for building @command{gawk} on POSIX-compliant systems.
 
@@ -36956,11 +37577,11 @@ Files needed for building @command{gawk} under MS-Windows
 @ifclear FOR_PRINT
 and OS/2
 @end ifclear
-(@pxref{PC Installation}, for details).
+(@DBPXREF{PC Installation} for details).
 
 @item vms/*
 Files needed for building @command{gawk} under Vax/VMS and OpenVMS
-(@pxref{VMS Installation}, for details).
+(@DBPXREF{VMS Installation} for details).
 
 @item test/*
 A test suite for
@@ -36969,10 +37590,9 @@ directory to run your version of @command{gawk} against the test suite.
 If @command{gawk} successfully passes @samp{make check}, then you can
 be confident of a successful port.
 @end table
-@c ENDOFRANGE gawdis
 
 @node Unix Installation
-@appendixsec Compiling and Installing @command{gawk} on Unix-like Systems
+@appendixsec Compiling and Installing @command{gawk} on Unix-Like Systems
 
 Usually, you can compile and install @command{gawk} by typing only two
 commands.  However, if you use an unusual system, you may need
@@ -36980,30 +37600,30 @@ to configure @command{gawk} for your system yourself.
 
 @menu
 * Quick Installation::               Compiling @command{gawk} under Unix.
+* Shell Startup Files::              Shell convenience functions.
 * Additional Configuration Options:: Other compile-time options.
 * Configuration Philosophy::         How it's all supposed to work.
 @end menu
 
 @node Quick Installation
-@appendixsubsec Compiling @command{gawk} for Unix-like Systems
+@appendixsubsec Compiling @command{gawk} for Unix-Like Systems
 
 The normal installation steps should work on all modern commercial
 Unix-derived systems, GNU/Linux, BSD-based systems, and the Cygwin
 environment for MS-Windows.
 
 After you have extracted the @command{gawk} distribution, @command{cd}
-to @file{gawk-@value{VERSION}.@value{PATCHLEVEL}}.  Like most GNU software,
-@command{gawk} is configured
-automatically for your system by running the @command{configure} program.
-This program is a Bourne shell script that is generated automatically using
-GNU Autoconf.
+to @file{gawk-@value{VERSION}.@value{PATCHLEVEL}}.  As with most GNU
+software, you configure @command{gawk} for your system by running the
+@command{configure} program.  This program is a Bourne shell script that
+is generated automatically using GNU Autoconf.
 @ifnotinfo
 (The Autoconf software is
 described fully in
 @cite{Autoconf---Generating Automatic Configuration Scripts},
 which can be found online at
 @uref{http://www.gnu.org/software/autoconf/manual/index.html,
-the Free Software Foundation's web site}.)
+the Free Software Foundation's website}.)
 @end ifnotinfo
 @ifinfo
 (The Autoconf software is described fully starting with
@@ -37050,7 +37670,7 @@ run @samp{make check}.  All of the tests should succeed.
 If these steps do not work, or if any of the tests fail,
 check the files in the @file{README_d} directory to see if you've
 found a known problem.  If the failure is not described there,
-please send in a bug report (@pxref{Bugs}).
+send in a bug report (@pxref{Bugs}).
 
 Of course, once you've built @command{gawk}, it is likely that you will
 wish to install it.  To do so, you need to run the command @samp{make
@@ -37061,6 +37681,44 @@ is likely that you will be asked for your password, and you will have
 to have been set up previously as a user who is allowed to run the
 @command{sudo} command.
 
+@node Shell Startup Files
+@appendixsubsec Shell Startup Files
+
+The distribution contains shell startup files @file{gawk.sh} and
+@file{gawk.csh} containing functions to aid in manipulating
+the @env{AWKPATH} and @env{AWKLIBPATH} environment variables.
+On a Fedora system, these files should be installed in @file{/etc/profile.d};
+on other platforms, the appropriate location may be different.
+
+@table @command
+
+@cindex @command{gawkpath_default} shell function
+@item gawkpath_default
+Reset the @env{AWKPATH} environment variable to its default value.
+
+@cindex @command{gawkpath_prepend} shell function
+@item gawkpath_prepend
+Add the argument to the front of the @env{AWKPATH} environment variable.
+
+@cindex @command{gawkpath_append} shell function
+@item gawkpath_append
+Add the argument to the end of the @env{AWKPATH} environment variable.
+
+@cindex @command{gawklibpath_default} shell function
+@item gawklibpath_default
+Reset the @env{AWKLIBPATH} environment variable to its default value.
+
+@cindex @command{gawklibpath_prepend} shell function
+@item gawklibpath_prepend
+Add the argument to the front of the @env{AWKLIBPATH} environment variable.
+
+@cindex @command{gawklibpath_append} shell function
+@item gawklibpath_append
+Add the argument to the end of the @env{AWKLIBPATH} environment variable.
+
+@end table
+
+
 @node Additional Configuration Options
 @appendixsubsec Additional Configuration Options
 @cindex @command{gawk}, configuring, options
@@ -37082,7 +37740,7 @@ can be configured and compiled.
 @cindex @option{--disable-lint} configuration option
 @cindex configuration option, @code{--disable-lint}
 @item --disable-lint
-Disable all lint checking within @code{gawk}.  The
+Disable all lint checking within @command{gawk}.  The
 @option{--lint} and @option{--lint-old} options
 (@pxref{Options})
 are accepted, but silently do nothing.
@@ -37090,14 +37748,17 @@ Similarly, setting the @code{LINT} variable
 (@pxref{User-modified})
 has no effect on the running @command{awk} program.
 
-When used with GCC's automatic dead-code-elimination, this option
-cuts almost 200K bytes off the size of the @command{gawk}
-executable on GNU/Linux x86 systems.  Results on other systems and
+When used with the GNU Compiler Collection's (GCC's)
+automatic dead-code-elimination, this option
+cuts almost 23K bytes off the size of the @command{gawk}
+executable on GNU/Linux x86_64 systems.  Results on other systems and
 with other compilers are likely to vary.
 Using this option may bring you some slight performance improvement.
 
+@quotation CAUTION
 Using this option will cause some of the tests in the test suite
 to fail.  This option may be removed at a later date.
+@end quotation
 
 @cindex @option{--disable-nls} configuration option
 @cindex configuration option, @code{--disable-nls}
@@ -37114,7 +37775,7 @@ function for deficient systems.
 @end table
 
 Use the command @samp{./configure --help} to see the full list of
-options that @command{configure} supplies.
+options supplied by @command{configure}.
 
 @node Configuration Philosophy
 @appendixsubsec The Configuration Process
@@ -37148,19 +37809,19 @@ facts about your operating system.  For example, there may not be an
 @cindex @code{custom.h} file
 It is possible for your C compiler to lie to @command{configure}. It may
 do so by not exiting with an error when a library function is not
-available.  To get around this, edit the file @file{custom.h}.
+available.  To get around this, edit the @file{custom.h} file.
 Use an @samp{#ifdef} that is appropriate for your system, and either
 @code{#define} any constants that @command{configure} should have defined but
 didn't, or @code{#undef} any constants that @command{configure} defined and
-should not have.  @file{custom.h} is automatically included by
-@file{config.h}.
+should not have.  The @file{custom.h} file is automatically included by
+the @file{config.h} file.
 
 It is also possible that the @command{configure} program generated by
 Autoconf will not work on your system in some other fashion.
-If you do have a problem, the file @file{configure.ac} is the input for
+If you do have a problem, the @file{configure.ac} file is the input for
 Autoconf.  You may be able to change this file and generate a
 new version of @command{configure} that works on your system
-(@pxref{Bugs},
+(@DBPXREF{Bugs}
 for information on how to report problems in configuring @command{gawk}).
 The same mechanism may be used to send in updates to @file{configure.ac}
 and/or @file{custom.h}.
@@ -37185,7 +37846,8 @@ various non-Unix systems.
 
 @cindex PC operating systems@comma{} @command{gawk} on, installing
 @cindex operating systems, PC@comma{} @command{gawk} on, installing
-This @value{SECTION} covers installation and usage of @command{gawk} on x86 machines
+This @value{SECTION} covers installation and usage of @command{gawk}
+on Intel architecture machines
 @ifclear FOR_PRINT
 running MS-DOS, any version of MS-Windows, or OS/2.
 @end ifclear
@@ -37193,13 +37855,13 @@ running MS-DOS, any version of MS-Windows, or OS/2.
 running MS-DOS and any version of MS-Windows.
 @end ifset
 In this @value{SECTION}, the term ``Windows32''
-refers to any of Microsoft Windows-95/98/ME/NT/2000/XP/Vista/7/8.
+refers to any of Microsoft Windows 95/98/ME/NT/2000/XP/Vista/7/8.
 
 The limitations of MS-DOS (and MS-DOS shells under the other operating
-systems) has meant that various ``DOS extenders'' are often used with
+systems) have meant that various ``DOS extenders'' are often used with
 programs such as @command{gawk}.  The varying capabilities of Microsoft
 Windows 3.1 and Windows32 can add to the confusion.  For an overview
-of the considerations, please refer to @file{README_d/README.pc} in
+of the considerations, refer to @file{README_d/README.pc} in
 the distribution.
 
 @menu
@@ -37287,7 +37949,8 @@ MS-DOS and Windows32 versions.  A list of targets is printed if the
 build @command{gawk} using the DJGPP tools, enter @samp{make djgpp}.
 (The DJGPP tools needed for the build may be found at
 @uref{ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/}.)  To build a
-native MS-Windows binary of @command{gawk}, type @samp{make mingw32}.
+native MS-Windows binary of @command{gawk} using the MinGW tools,
+type @samp{make mingw32}.
 
 @ifclear FOR_PRINT
 @cindex compiling @command{gawk} with EMX for OS/2
@@ -37361,7 +38024,7 @@ Ancient OS/2 ports of GNU @command{make} are not able to handle
 the Makefiles of this package.  If you encounter any problems with
 @command{make}, try GNU Make 3.79.1 or later versions.  You should
 find the latest version on
-@uref{ftp://hobbes.nmsu.edu/pub/os2/}.@footnote{As of May, 2014,
+@uref{ftp://hobbes.nmsu.edu/pub/os2/}.@footnote{As of November 2014,
 this site is still there, but the author could not find a package
 for GNU Make.}
 @end quotation
@@ -37394,9 +38057,7 @@ multibyte functionality is not available.
 
 @node PC Using
 @appendixsubsubsec Using @command{gawk} on PC Operating Systems
-@c STARTOFRANGE opgawx
 @cindex operating systems, PC, @command{gawk} on
-@c STARTOFRANGE pcgawon
 @cindex PC operating systems, @command{gawk} on
 
 Under MS-DOS and MS-Windows, the Cygwin and MinGW environments support
@@ -37410,15 +38071,14 @@ EMX (OS/2 only) supports at least the @samp{|&} operator.
 @cindex search paths, for source files
 @cindex @command{gawk}, MS-DOS version of
 @cindex @command{gawk}, MS-Windows version of
-@cindex @code{;} (semicolon), @code{AWKPATH} variable and
-@cindex semicolon (@code{;}), @code{AWKPATH} variable and
+@cindex @code{;} (semicolon), @env{AWKPATH} variable and
+@cindex semicolon (@code{;}), @env{AWKPATH} variable and
 @cindex @env{AWKPATH} environment variable
 The MS-DOS and MS-Windows versions of @command{gawk} search for
 program files as described in @ref{AWKPATH Variable}.  However,
 semicolons (rather than colons) separate elements in the @env{AWKPATH}
 variable.  If @env{AWKPATH} is not set or is empty, then the default
-search path for MS-Windows and MS-DOS versions is
-@samp{@w{.;c:/lib/awk;c:/gnu/lib/awk}}.
+search path is @samp{@w{.;c:/lib/awk;c:/gnu/lib/awk}}.
 
 @ifclear FOR_PRINT
 @cindex @command{gawk}, OS/2 version of
@@ -37457,18 +38117,18 @@ Under MS-Windows, OS/2 and MS-DOS,
 Under MS-Windows and MS-DOS,
 @end ifset
 @command{gawk} (and many other text programs) silently
-translate end-of-line @samp{\r\n} to @samp{\n} on input and @samp{\n}
+translates end-of-line @samp{\r\n} to @samp{\n} on input and @samp{\n}
 to @samp{\r\n} on output.  A special @code{BINMODE} variable @value{COMMONEXT}
 allows control over these translations and is interpreted as follows:
 
 @itemize @value{BULLET}
 @item
-If @code{BINMODE} is @code{"r"}, or one,
+If @code{BINMODE} is @code{"r"} or one,
 then
 binary mode is set on read (i.e., no translations on reads).
 
 @item
-If @code{BINMODE} is @code{"w"}, or two,
+If @code{BINMODE} is @code{"w"} or two,
 then
 binary mode is set on write (i.e., no translations on writes).
 
@@ -37491,7 +38151,7 @@ Setting @code{BINMODE} for standard input or
 standard output is accomplished by using an
 appropriate @samp{-v BINMODE=@var{N}} option on the command line.
 @code{BINMODE} is set at the time a file or pipe is opened and cannot be
-changed mid-stream.
+changed midstream.
 
 The name @code{BINMODE} was chosen to match @command{mawk}
 (@pxref{Other Versions}).
@@ -37547,8 +38207,8 @@ moved into the @code{BEGIN} rule.
 
 @command{gawk} can be built and used ``out of the box'' under MS-Windows
 if you are using the @uref{http://www.cygwin.com, Cygwin environment}.
-This environment provides an excellent simulation of GNU/Linux, using the
-GNU tools, such as Bash, the GNU Compiler Collection (GCC), GNU Make,
+This environment provides an excellent simulation of GNU/Linux, using
+Bash, GCC, GNU Make,
 and other GNU programs.  Compilation and installation for Cygwin is the
 same as for a Unix system:
 
@@ -37556,7 +38216,7 @@ same as for a Unix system:
 tar -xvpzf gawk-@value{VERSION}.@value{PATCHLEVEL}.tar.gz
 cd gawk-@value{VERSION}.@value{PATCHLEVEL}
 ./configure
-make
+make && make check
 @end example
 
 When compared to GNU/Linux on the same system, the @samp{configure}
@@ -37567,15 +38227,15 @@ and then the @samp{make} proceeds as usual.
 @appendixsubsubsec Using @command{gawk} In The MSYS Environment
 
 In the MSYS environment under MS-Windows, @command{gawk} automatically
-uses binary mode for reading and writing files.  Thus there is no
+uses binary mode for reading and writing files.  Thus, there is no
 need to use the @code{BINMODE} variable.
 
 This can cause problems with other Unix-like components that have
 been ported to MS-Windows that expect @command{gawk} to do automatic
-translation of @code{"\r\n"}, since it won't.  Caveat Emptor!
+translation of @code{"\r\n"}, because it won't.
 
 @node VMS Installation
-@appendixsubsec How to Compile and Install @command{gawk} on Vax/VMS and OpenVMS
+@appendixsubsec Compiling and Installing @command{gawk} on Vax/VMS and OpenVMS
 
 @c based on material from Pat Rankin <rankin@eql.caltech.edu>
 @c now rankin@pactechdata.com
@@ -37631,19 +38291,19 @@ With ODS-5 volumes and extended parsing enabled, the case of the target
 parameter may need to be exact.
 
 @command{gawk} has been tested under VAX/VMS 7.3 and Alpha/VMS 7.3-1
-using Compaq C V6.4, and Alpha/VMS 7.3, Alpha/VMS 7.3-2, and IA64/VMS 8.3.
+using Compaq C V6.4, and under Alpha/VMS 7.3, Alpha/VMS 7.3-2, and IA64/VMS 8.3.
 The most recent builds used HP C V7.3 on Alpha VMS 8.3 and both
 Alpha and IA64 VMS 8.4 used HP C 7.3.@footnote{The IA64 architecture
 is also known as ``Itanium.''}
 
-@xref{VMS GNV}, for information on building
+@DBXREF{VMS GNV} for information on building
 @command{gawk} as a PCSI kit that is compatible with the GNV product.
 
 @node VMS Dynamic Extensions
 @appendixsubsubsec Compiling @command{gawk} Dynamic Extensions on VMS
 
 The extensions that have been ported to VMS can be built using one of
-the following commands.
+the following commands:
 
 @example
 $ @kbd{MMS/DESCRIPTION=[.vms]descrip.mms extensions}
@@ -37660,7 +38320,7 @@ $ @kbd{MMK/DESCRIPTION=[.vms]descrip.mms extensions}
 or a logical name to find the dynamic extensions.
 
 Dynamic extensions need to be compiled with the same compiler options for
-floating point, pointer size, and symbol name handling as were used
+floating-point, pointer size, and symbol name handling as were used
 to compile @command{gawk} itself.
 Alpha and Itanium should use IEEE floating point.  The pointer size is 32 bits,
 and the symbol name handling should be exact case with CRC shortening for
@@ -37679,8 +38339,8 @@ For VAX:
 /name=(as_is,short)
 @end example
 
-Compile time macros need to be defined before the first VMS-supplied
-header file is included.
+Compile-time macros need to be defined before the first VMS-supplied
+header file is included, as follows:
 
 @example
 #if (__CRTL_VER >= 70200000) && !defined (__VAX)
@@ -37696,6 +38356,11 @@ header file is included.
 #endif
 @end example
 
+If you are writing your own extensions to run on VMS, you must supply these
+definitions yourself. The @file{config.h} file created when building @command{gawk}
+on VMS does this for you; if instead you use that file or a similar one, then you
+must remember to include it before any VMS-supplied header files.
+
 @node VMS Installation Details
 @appendixsubsubsec Installing @command{gawk} on VMS
 
@@ -37721,7 +38386,7 @@ If your @command{gawk} was installed by a PCSI kit into the
 @file{GNV$GNU:[vms_help]gawk.hlp}.
 
 The PCSI kit also installs a @file{GNV$GNU:[vms_bin]gawk_verb.cld} file
-which can be used to add @command{gawk} and @command{awk} as DCL commands.
+that can be used to add @command{gawk} and @command{awk} as DCL commands.
 
 For just the current process you can use:
 
@@ -37730,7 +38395,7 @@ $ @kbd{set command gnv$gnu:[vms_bin]gawk_verb.cld}
 @end example
 
 Or the system manager can use @file{GNV$GNU:[vms_bin]gawk_verb.cld} to
-add the @command{gawk} and @command{awk} to the system wide @samp{DCLTABLES}.
+add the @command{gawk} and @command{awk} to the system-wide @samp{DCLTABLES}.
 
 The DCL syntax is documented in the @file{gawk.hlp} file.
 
@@ -37785,25 +38450,25 @@ Note that uppercase and mixed-case text must be quoted.
 The VMS port of @command{gawk} includes a @code{DCL}-style interface in addition
 to the original shell-style interface (see the help entry for details).
 One side effect of dual command-line parsing is that if there is only a
-single parameter (as in the quoted string program above), the command
+single parameter (as in the quoted string program), the command
 becomes ambiguous.  To work around this, the normally optional @option{--}
 flag is required to force Unix-style parsing rather than @code{DCL} parsing.  If any
 other dash-type options (or multiple parameters such as @value{DF}s to
 process) are present, there is no ambiguity and @option{--} can be omitted.
 
 @cindex exit status, of VMS
-The @code{exit} value is a Unix-style value and is encoded to a VMS exit
+The @code{exit} value is a Unix-style value and is encoded into a VMS exit
 status value when the program exits.
 
 The VMS severity bits will be set based on the @code{exit} value.
-A failure is indicated by 1 and VMS sets the @code{ERROR} status.
-A fatal error is indicated by 2 and VMS will set the @code{FATAL} status.
+A failure is indicated by 1, and VMS sets the @code{ERROR} status.
+A fatal error is indicated by 2, and VMS sets the @code{FATAL} status.
 All other values will have the @code{SUCCESS} status.  The exit value is
 encoded to comply with VMS coding standards and will have the
 @code{C_FACILITY_NO} of @code{0x350000} with the constant @code{0xA000}
 added to the number shifted over by 3 bits to make room for the severity codes.
 
-To extract the actual @command{gawk} exit code from the VMS status use:
+To extract the actual @command{gawk} exit code from the VMS status, use:
 
 @example
 unix_status = (vms_status .and. &x7f8) / 8
@@ -37813,7 +38478,7 @@ unix_status = (vms_status .and. &x7f8) / 8
 A C program that uses @code{exec()} to call @command{gawk} will get the original
 Unix-style exit value.
 
-Older versions of @command{gawk} treated a Unix exit code 0 as 1, a failure
+Older versions of @command{gawk} for VMS treated a Unix exit code 0 as 1, a failure
 as 2, a fatal error as 4, and passed all the other numbers through.
 This violated the VMS exit status coding requirements.
 
@@ -37822,7 +38487,7 @@ VAX/VMS floating point uses unbiased rounding. @xref{Round Function}.
 
 VMS reports time values in GMT unless one of the @code{SYS$TIMEZONE_RULE}
 or @code{TZ} logical names is set.  Older versions of VMS, such as VAX/VMS
-7.3 do not set these logical names.
+7.3, do not set these logical names.
 
 @c @cindex directory search
 @c @cindex path, search
@@ -37840,15 +38505,15 @@ translation and not a multitranslation @code{RMS} searchlist.
 
 The VMS GNV package provides a build environment similar to POSIX with ports
 of a collection of open source tools.  The @command{gawk} found in the GNV
-base kit is an older port.  Currently the GNV project is being reorganized
+base kit is an older port.  Currently, the GNV project is being reorganized
 to supply individual PCSI packages for each component.
 See @w{@uref{https://sourceforge.net/p/gnv/wiki/InstallingGNVPackages/}.}
 
 The normal build procedure for @command{gawk} produces a program that
 is suitable for use with GNV.
 
-The @file{vms/gawk_build_steps.txt} in the source documents the procedure
-for building a VMS PCSI kit that is compatible with GNV.
+The file @file{vms/gawk_build_steps.txt} in the distribution documents
+the procedure for building a VMS PCSI kit that is compatible with GNV.
 
 @ignore
 @c The VMS POSIX product, also known as POSIX for OpenVMS, is long defunct
@@ -37900,128 +38565,116 @@ $ @kbd{gawk :== $sys$common:[syshlp.examples.tcpip.snmp]gawk.exe}
 This is apparently @value{PVERSION} 2.15.6, which is extremely old. We
 recommend compiling and using the current version.
 
-@c ENDOFRANGE opgawx
-@c ENDOFRANGE pcgawon
 
 @node Bugs
 @appendixsec Reporting Problems and Bugs
-@cindex archeologists
+@cindex archaeologists
 @quotation
-@i{There is nothing more dangerous than a bored archeologist.}
-@author The Hitchhiker's Guide to the Galaxy
+@i{There is nothing more dangerous than a bored archaeologist.}
+@author Douglas Adams, @cite{The Hitchhiker's Guide to the Galaxy}
 @end quotation
 @c the radio show, not the book. :-)
 
-@c STARTOFRANGE dbugg
 @cindex debugging @command{gawk}, bug reports
-@c STARTOFRANGE tblgawb
 @cindex troubleshooting, @command{gawk}, bug reports
 If you have problems with @command{gawk} or think that you have found a bug,
-please report it to the developers; we cannot promise to do anything
+report it to the developers; we cannot promise to do anything,
 but we might well want to fix it.
 
-Before reporting a bug, make sure you have actually found a real bug.
-Carefully reread the documentation and see if it really says you can do
+Before reporting a bug, make sure you have really found a genuine bug.
+Carefully reread the documentation and see if it says you can do
 what you're trying to do.  If it's not clear whether you should be able
 to do something or not, report that too; it's a bug in the documentation!
 
 Before reporting a bug or trying to fix it yourself, try to isolate it
 to the smallest possible @command{awk} program and input @value{DF} that
-reproduces the problem.  Then send us the program and @value{DF},
+reproduce the problem.  Then send us the program and @value{DF},
 some idea of what kind of Unix system you're using,
 the compiler you used to compile @command{gawk}, and the exact results
 @command{gawk} gave you.  Also say what you expected to occur; this helps
 us decide whether the problem is really in the documentation.
 
-Please include the version number of @command{gawk} you are using.
+Make sure to include the version number of @command{gawk} you are using.
 You can get this information with the command @samp{gawk --version}.
 
 @cindex @code{bug-gawk@@gnu.org} bug reporting address
 @cindex email address for bug reports, @code{bug-gawk@@gnu.org}
 @cindex bug reports, email address, @code{bug-gawk@@gnu.org}
-Once you have a precise problem, send email to
+Once you have a precise problem description, send email to
 @EMAIL{bug-gawk@@gnu.org,bug-gawk at gnu dot org}.
 
-@cindex Robbins, Arnold
-The @command{gawk} maintainers subscribe to this address and
+The @command{gawk} maintainers subscribe to this address, and
 thus they will receive your bug report.
-If necessary, the primary maintainer can be reached directly at
-@EMAIL{arnold@@skeeve.com,arnold at skeeve dot com}.
-The bug reporting address is preferred since the
+Although you can send mail to the maintainers directly,
+the bug reporting address is preferred because the
 email list is archived at the GNU Project.
-@emph{All email should be in English. This is the only language
+@emph{All email must be in English. This is the only language
 understood in common by all the maintainers.}
 
 @cindex @code{comp.lang.awk} newsgroup
 @quotation CAUTION
 Do @emph{not} try to report bugs in @command{gawk} by
 posting to the Usenet/Internet newsgroup @code{comp.lang.awk}.
-While the @command{gawk} developers do occasionally read this newsgroup,
-there is no guarantee that we will see your posting.  The steps described
-above are the official recognized ways for reporting bugs.
+The @command{gawk} developers do occasionally read this newsgroup,
+but there is no guarantee that we will see your posting.  The steps described
+here are the only officially recognized way for reporting bugs.
 Really.
 @end quotation
 
 @quotation NOTE
 Many distributions of GNU/Linux and the various BSD-based operating systems
 have their own bug reporting systems.  If you report a bug using your distribution's
-bug reporting system, @emph{please} also send a copy to
+bug reporting system, you should also send a copy to
 @EMAIL{bug-gawk@@gnu.org,bug-gawk at gnu dot org}.
 
-This is for two reasons.  First, while some distributions forward
+This is for two reasons.  First, although some distributions forward
 bug reports ``upstream'' to the GNU mailing list, many don't, so there is a good
-chance that the @command{gawk}  maintainer won't even see the bug report!  Second,
-mail to the GNU list is archived, and having everything at the GNU project
-keeps things self-contained and not dependant on other web sites.
+chance that the @command{gawk}  maintainers won't even see the bug report!  Second,
+mail to the GNU list is archived, and having everything at the GNU Project
+keeps things self-contained and not dependent on other organizations.
 @end quotation
 
 Non-bug suggestions are always welcome as well.  If you have questions
 about things that are unclear in the documentation or are just obscure
-features, ask me; I will try to help you out, although I
-may not have the time to fix the problem.  You can send me electronic
-mail at the Internet address noted previously.
-
-If you find bugs in one of the non-Unix ports of @command{gawk}, please send
-an electronic mail message to the person who maintains that port.  They
-are named in the following list, as well as in the @file{README} file
-in the @command{gawk} distribution.  Information in the @file{README}
-file should be considered authoritative if it conflicts with this
-@value{DOCUMENT}.
+features, ask on the bug list; we will try to help you out if we can.
 
-The people maintaining the non-Unix ports of @command{gawk} are
-as follows:
+If you find bugs in one of the non-Unix ports of @command{gawk},
+send an email to the bug list, with a copy to the
+person who maintains that port.  The maintainers are named in the following list,
+as well as in the @file{README} file in the @command{gawk} distribution.
+Information in the @file{README} file should be considered authoritative
+if it conflicts with this @value{DOCUMENT}.
+
+The people maintaining the various @command{gawk} ports are:
 
 @c put the index entries outside the table, for docbook
-@cindex Deifik, Scott
-@cindex Zaretskii, Eli
 @cindex Buening, Andreas
-@cindex Rankin, Pat
+@cindex Deifik, Scott
 @cindex Malmberg, John
 @cindex Pitts, Dave
+@cindex Robbins, Arnold
+@cindex Zaretskii, Eli
 @multitable {MS-Windows with MinGW} {123456789012345678901234567890123456789001234567890}
-@item MS-DOS with DJGPP @tab Scott Deifik, @EMAIL{scottd.mail@@sbcglobal.net,scottd dot mail at sbcglobal dot net}.
+@item Unix and POSIX systems @tab Arnold Robbins, @EMAIL{arnold@@skeeve.com,arnold at skeeve dot com}
+
+@item MS-DOS with DJGPP @tab Scott Deifik, @EMAIL{scottd.mail@@sbcglobal.net,scottd dot mail at sbcglobal dot net}
 
-@item MS-Windows with MinGW @tab Eli Zaretskii, @EMAIL{eliz@@gnu.org,eliz at gnu dot org}.
+@item MS-Windows with MinGW @tab Eli Zaretskii, @EMAIL{eliz@@gnu.org,eliz at gnu dot org}
 
 @c Leave this in the print version on purpose.
 @c OS/2 is not mentioned anywhere else in the print version though.
-@item OS/2 @tab Andreas Buening, @EMAIL{andreas.buening@@nexgo.de,andreas dot buening at nexgo dot de}.
+@item OS/2 @tab Andreas Buening, @EMAIL{andreas.buening@@nexgo.de,andreas dot buening at nexgo dot de}
 
-@item VMS @tab Pat Rankin, @EMAIL{r.pat.rankin@@gmail.com,r.pat.rankin at gmail.com}, and
-John Malmberg, @EMAIL{wb8tyw@@qsl.net,wb8tyw at qsl.net}.
+@item VMS @tab John Malmberg, @EMAIL{wb8tyw@@qsl.net,wb8tyw at qsl.net}
 
-@item z/OS (OS/390) @tab Dave Pitts, @EMAIL{dpitts@@cozx.com,dpitts at cozx dot com}.
+@item z/OS (OS/390) @tab Dave Pitts, @EMAIL{dpitts@@cozx.com,dpitts at cozx dot com}
 @end multitable
 
-If your bug is also reproducible under Unix, please send a copy of your
-report to the @EMAIL{bug-gawk@@gnu.org,bug-gawk at gnu dot org} email
-list as well.
-@c ENDOFRANGE dbugg
-@c ENDOFRANGE tblgawb
+If your bug is also reproducible under Unix, send a copy of your
+report to the @EMAIL{bug-gawk@@gnu.org,bug-gawk at gnu dot org} email list as well.
 
 @node Other Versions
 @appendixsec Other Freely Available @command{awk} Implementations
-@c STARTOFRANGE awkim
 @cindex @command{awk}, implementations
 @ignore
 From: emory!amc.com!brennan (Michael Brennan)
@@ -38033,7 +38686,7 @@ Date: Wed, 4 Sep 1996 08:11:48 -0700 (PDT)
 @cindex Brennan, Michael
 @ifnotdocbook
 @quotation
-@i{It's kind of fun to put comments like this in your awk code.}@*
+@i{It's kind of fun to put comments like this in your awk code:}@*
 @ @ @ @ @ @ @code{// Do C++ comments work? answer: yes! of course}
 @author Michael Brennan
 @end quotation
@@ -38041,15 +38694,11 @@ Date: Wed, 4 Sep 1996 08:11:48 -0700 (PDT)
 
 @docbook
 <blockquote><attribution>Michael Brennan</attribution>
-<literallayout>
-<emphasis>It's kind of fun to put comments like this in your awk code.</emphasis>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<literal>// Do C++ comments work? answer: yes! of course</literal>
-</literallayout>
+<literallayout><emphasis>It's kind of fun to put comments like this in your awk code.</emphasis>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<literal>// Do C++ comments work? answer: yes! of course</literal></literallayout>
 </blockquote>
 @end docbook
 
-
-
 There are a number of other freely available @command{awk} implementations.
 This @value{SECTION} briefly describes where to get them:
 
@@ -38062,7 +38711,7 @@ This @value{SECTION} briefly describes where to get them:
 Brian Kernighan, one of the original designers of Unix @command{awk},
 has made his implementation of
 @command{awk} freely available.
-You can retrieve this version via the World Wide Web from
+You can retrieve this version via
 @uref{http://www.cs.princeton.edu/~bwk, his home page}.
 It is available in several archive formats:
 
@@ -38078,14 +38727,14 @@ It is available in several archive formats:
 @end table
 
 @cindex @command{git} utility
-You can also retrieve it from Git Hub:
+You can also retrieve it from GitHub:
 
 @example
 git clone git://github.com/onetrueawk/awk bwkawk
 @end example
 
 @noindent
-The above command creates a copy of the @uref{http://www.git-scm.com, Git}
+This command creates a copy of the @uref{http://git-scm.com, Git}
 repository in a directory named @file{bwkawk}.  If you leave that argument
 off the @command{git} command line, the repository copy is created in a
 directory named @file{awk}.
@@ -38093,9 +38742,13 @@ directory named @file{awk}.
 This version requires an ISO C (1990 standard) compiler; the C compiler
 from GCC (the GNU Compiler Collection) works quite nicely.
 
-@xref{Common Extensions},
+@DBXREF{Common Extensions}
 for a list of extensions in this @command{awk} that are not in POSIX @command{awk}.
 
+As a side note, Dan Bornstein has created a Git repository tracking
+all the versions of BWK @command{awk} that he could find. It's
+available at @uref{git://github.com/danfuzz/one-true-awk}.
+
 @cindex Brennan, Michael
 @cindex @command{mawk} utility
 @cindex source code, @command{mawk}
@@ -38125,7 +38778,7 @@ Once you have it,
 is similar to @command{gawk}'s
 (@pxref{Unix Installation}).
 
-@xref{Common Extensions},
+@DBXREF{Common Extensions}
 for a list of extensions in @command{mawk} that are not in POSIX @command{awk}.
 
 @cindex Sumner, Andrew
@@ -38134,7 +38787,7 @@ for a list of extensions in @command{mawk} that are not in POSIX @command{awk}.
 @item @command{awka}
 Written by Andrew Sumner,
 @command{awka} translates @command{awk} programs into C, compiles them,
-and links them with a library of functions that provides the core
+and links them with a library of functions that provide the core
 @command{awk} functionality.
 It also has a number of extensions.
 
@@ -38146,7 +38799,7 @@ To get @command{awka}, go to @url{http://sourceforge.net/projects/awka}.
 @c andrewsumner@@yahoo.net
 
 The project seems to be frozen; no new code changes have been made
-since approximately 2003.
+since approximately 2001.
 
 @cindex Beebe, Nelson H.F.@:
 @cindex @command{pawk} (profiling version of Brian Kernighan's @command{awk})
@@ -38154,18 +38807,18 @@ since approximately 2003.
 @item @command{pawk}
 Nelson H.F.@: Beebe at the University of Utah has modified
 BWK @command{awk} to provide timing and profiling information.
-It is different from @command{gawk} with the @option{--profile} option.
-(@pxref{Profiling}),
+It is different from @command{gawk} with the @option{--profile} option
+(@pxref{Profiling})
 in that it uses CPU-based profiling, not line-count
 profiling.  You may find it at either
 @uref{ftp://ftp.math.utah.edu/pub/pawk/pawk-20030606.tar.gz}
 or
 @uref{http://www.math.utah.edu/pub/pawk/pawk-20030606.tar.gz}.
 
-@item Busybox Awk
-@cindex Busybox Awk
-@cindex source code, Busybox Awk
-Busybox is a GPL-licensed program providing small versions of many
+@item BusyBox @command{awk}
+@cindex BusyBox Awk
+@cindex source code, BusyBox Awk
+BusyBox is a GPL-licensed program providing small versions of many
 applications within a single executable. It is aimed at embedded systems.
 It includes a full implementation of POSIX @command{awk}.  When building
 it, be careful not to do @samp{make install} as it will overwrite
@@ -38177,9 +38830,9 @@ information, see the @uref{http://busybox.net, project's home page}.
 @cindex source code, Solaris @command{awk}
 @item The OpenSolaris POSIX @command{awk}
 The versions of @command{awk} in @file{/usr/xpg4/bin} and
-@file{/usr/xpg6/bin} on Solaris are more-or-less POSIX-compliant.
+@file{/usr/xpg6/bin} on Solaris are more or less POSIX-compliant.
 They are based on the @command{awk} from Mortice Kern Systems for PCs.
-This author was able to make this code compile and work under GNU/Linux
+We were able to make this code compile and work under GNU/Linux
 with 1--2 hours of work.  Making it more generally portable (using
 GNU Autoconf and/or Automake) would take more work, and this
 has not been done, at least to our knowledge.
@@ -38187,8 +38840,8 @@ has not been done, at least to our knowledge.
 @cindex Illumos
 @cindex Illumos, POSIX-compliant @command{awk}
 @cindex source code, Illumos @command{awk}
-The source code used to be available from the OpenSolaris web site.
-However, that project was ended and the web site shut down.  Fortunately, the
+The source code used to be available from the OpenSolaris website.
+However, that project was ended and the website shut down.  Fortunately, the
 @uref{http://wiki.illumos.org/display/illumos/illumos+Home, Illumos project}
 makes this implementation available.  You can view the files one at a time from
 @uref{https://github.com/joyent/illumos-joyent/blob/master/usr/src/cmd/awk_xpg4}.
@@ -38207,7 +38860,7 @@ from POSIX @command{awk}.  More information is available on the
 @cindex libmawk
 @cindex source code, libmawk
 This is an embeddable @command{awk} interpreter derived from
-@command{mawk}. For more information see
+@command{mawk}. For more information, see
 @uref{http://repo.hu/projects/libmawk/}.
 
 @item @code{pawk}
@@ -38218,10 +38871,10 @@ features to Python. See @uref{https://github.com/alecthomas/pawk}
 for more information. (This is not related to Nelson Beebe's
 modified version of BWK @command{awk}, described earlier.)
 
-@item @w{QSE Awk}
-@cindex QSE Awk
-@cindex source code, QSE Awk
-This is an embeddable @command{awk} interpreter. For more information
+@item @w{QSE @command{awk}}
+@cindex QSE @command{awk}
+@cindex source code, QSE @command{awk}
+This is an embeddable @command{awk} interpreter. For more information,
 see @uref{http://code.google.com/p/qse/} and @uref{http://awk.info/?tools/qse}.
 
 @item @command{QTawk}
@@ -38236,19 +38889,19 @@ including the manual and a download link.
 The project may also be frozen; no new code changes have been made
 since approximately 2008.
 
-@item Other Versions
-See also the @uref{http://en.wikipedia.org/wiki/Awk_language#Versions_and_implementations,
-Wikipedia article}, for information on additional versions.
+@item Other versions
+See also the ``Versions and implementations'' section of the
+@uref{http://en.wikipedia.org/wiki/Awk_language#Versions_and_implementations,
+Wikipedia article} on @command{awk} for information on additional versions.
 
 @end table
-@c ENDOFRANGE awkim
 
 @node Installation summary
 @appendixsec Summary
 
 @itemize @value{BULLET}
 @item
-The @command{gawk} distribution is available from GNU project's main
+The @command{gawk} distribution is available from the GNU Project's main
 distribution site, @code{ftp.gnu.org}.  The canonical build recipe is:
 
 @example
@@ -38260,34 +38913,30 @@ cd gawk-@value{VERSION}.@value{PATCHLEVEL}
 
 @item
 @command{gawk} may be built on non-POSIX systems as well. The currently
-supported systems are MS-Windows using DJGPP, MSYS, MinGW and Cygwin,
+supported systems are MS-Windows using DJGPP, MSYS, MinGW, and Cygwin,
 @ifclear FOR_PRINT
 OS/2 using EMX,
 @end ifclear
 and both Vax/VMS and OpenVMS.
-Instructions for each system are included in this @value{CHAPTER}.
+Instructions for each system are included in this @value{APPENDIX}.
 
 @item
 Bug reports should be sent via email to @email{bug-gawk@@gnu.org}.
-Bug reports should be in English, and should include the version of @command{gawk},
-how it was compiled, and a short program and @value{DF} which demonstrate
+Bug reports should be in English and should include the version of @command{gawk},
+how it was compiled, and a short program and @value{DF} that demonstrate
 the problem.
 
 @item
 There are a number of other freely available @command{awk}
-implementations.  Many are POSIX compliant; others are less so.
+implementations.  Many are POSIX-compliant; others are less so.
 
 @end itemize
 
-@c ENDOFRANGE gligawk
-@c ENDOFRANGE ingawk
 
 @ifclear FOR_PRINT
 @node Notes
 @appendix Implementation Notes
-@c STARTOFRANGE gawii
 @cindex @command{gawk}, implementation issues
-@c STARTOFRANGE impis
 @cindex implementation issues, @command{gawk}
 
 This appendix contains information mainly of interest to implementers and
@@ -38363,7 +39012,7 @@ However, if you want to modify @command{gawk} and contribute back your
 changes, you will probably wish to work with the development version.
 To do so, you will need to access the @command{gawk} source code
 repository.  The code is maintained using the
-@uref{http://git-scm.com/, Git distributed version control system}.
+@uref{http://git-scm.com, Git distributed version control system}.
 You will need to install it if your system doesn't have it.
 Once you have done so, use the command:
 
@@ -38392,11 +39041,8 @@ that has a Git plug-in for working with Git repositories.
 @node Adding Code
 @appendixsubsec Adding New Features
 
-@c STARTOFRANGE adfgaw
 @cindex adding, features to @command{gawk}
-@c STARTOFRANGE fadgaw
 @cindex features, adding to @command{gawk}
-@c STARTOFRANGE gawadf
 @cindex @command{gawk}, features, adding
 You are free to add any new features you like to @command{gawk}.
 However, if you want your changes to be incorporated into the @command{gawk}
@@ -38406,7 +39052,7 @@ make it possible to include them:
 @enumerate 1
 @item
 Before building the new feature into @command{gawk} itself,
-consider writing it as an extension module
+consider writing it as an extension
 (@pxref{Dynamic Extensions}).
 If that's not possible, continue with the rest of the steps in this list.
 
@@ -38431,7 +39077,7 @@ for information on getting the latest version of @command{gawk}.)
 
 @item
 @ifnotinfo
-Follow the @uref{http://www.gnu.org/prep/standards/, @cite{GNU Coding Standards}}.
+Follow the @cite{GNU Coding Standards}.
 @end ifnotinfo
 @ifinfo
 See @inforef{Top, , Version, standards, GNU Coding Standards}.
@@ -38440,7 +39086,7 @@ This document describes how GNU software should be written. If you haven't
 read it, please do so, preferably @emph{before} starting to modify @command{gawk}.
 (The @cite{GNU Coding Standards} are available from
 the GNU Project's
-@uref{http://www.gnu.org/prep/standards_toc.html, web site}.
+@uref{http://www.gnu.org/prep/standards/, website}.
 Texinfo, Info, and DVI versions are also available.)
 
 @cindex @command{gawk}, coding style in
@@ -38563,9 +39209,6 @@ Although this sounds like a lot of work, please remember that while you
 may write the new code, I have to maintain it and support it. If it
 isn't possible for me to do that with a minimum of extra work, then I
 probably will not.
-@c ENDOFRANGE adfgaw
-@c ENDOFRANGE gawadf
-@c ENDOFRANGE fadgaw
 
 @node New Ports
 @appendixsubsec Porting @command{gawk} to a New Operating System
@@ -38651,7 +39294,7 @@ and
 @item
 Be willing to continue to maintain the port.
 Non-Unix operating systems are supported by volunteers who maintain
-the code needed to compile and run @command{gawk} on their systems. If noone
+the code needed to compile and run @command{gawk} on their systems. If no-one
 volunteers to maintain a port, it becomes unsupported and it may
 be necessary to remove it from the distribution.
 
@@ -38699,7 +39342,6 @@ coding style and brace layout that suits your taste.
 @node Derived Files
 @appendixsubsec Why Generated Files Are Kept In Git
 
-@c STARTOFRANGE gawkgit
 @cindex Git, use of for @command{gawk} source code
 @c From emails written March 22, 2012, to the gawk developers list.
 
@@ -38888,7 +39530,6 @@ wget http://git.savannah.gnu.org/cgit/gawk.git/snapshot/gawk-@var{branchname}.ta
 
 @noindent
 to retrieve a snapshot of the given branch.
-@c ENDOFRANGE gawkgit
 
 @node Future Extensions
 @appendixsec Probable Future Extensions
@@ -39137,7 +39778,7 @@ Pat Rankin suggested the solution that was adopted.
 @appendixsubsec Other Design Decisions
 
 As an arbitrary design decision, extensions can read the values of
-built-in variables and arrays (such as @code{ARGV} and @code{FS}), but cannot
+predefined variables and arrays (such as @code{ARGV} and @code{FS}), but cannot
 change them, with the exception of @code{PROCINFO}.
 
 The reason for this is to prevent an extension function from affecting
@@ -39269,13 +39910,10 @@ of @command{gawk}, but it @emph{will} be removed in the next major release.
 
 @end itemize
 
-@c ENDOFRANGE impis
-@c ENDOFRANGE gawii
 
 @node Basic Concepts
 @appendix Basic Programming Concepts
 @cindex programming, concepts
-@c STARTOFRANGE procon
 @cindex programming, concepts
 
 This @value{APPENDIX} attempts to define some of the basic concepts
@@ -39513,7 +40151,6 @@ standard for C.  This standard became an ISO standard in 1990.
 In 1999, a revised ISO C standard was approved and released.
 Where it makes sense, POSIX @command{awk} is compatible with 1999 ISO C.
 
-@c ENDOFRANGE procon
 
 @node Glossary
 @unnumbered Glossary
@@ -39525,6 +40162,13 @@ pattern matches an input record, @command{awk} executes the
 rule's action.  Actions are always enclosed in braces.
 (@xref{Action Overview}.)
 
+@cindex Ada programming language
+@cindex programming languages, Ada
+@item Ada
+A programming language originally defined by the U.S.@: Department of
+Defense for embedded programming. It was designed to enforce good
+Software Engineering practices.
+
 @cindex Spencer, Henry
 @cindex @command{sed} utility
 @cindex amazing @command{awk} assembler (@command{aaa})
@@ -39536,13 +40180,6 @@ microcomputers.  It is a good example of a program that would have been
 better written in another language.
 You can get it from @uref{http://awk.info/?awk100/aaa}.
 
-@cindex Ada programming language
-@cindex programming languages, Ada
-@item Ada
-A programming language originally defined by the U.S.@: Department of
-Defense for embedded programming. It was designed to enforce good
-Software Engineering practices.
-
 @cindex amazingly workable formatter (@command{awf})
 @cindex @command{awf} (amazingly workable formatter) program
 @item Amazingly Workable Formatter (@command{awf})
@@ -39564,6 +40201,21 @@ languages.
 These standards often become international standards as well. See also
 ``ISO.''
 
+@item Argument
+An argument can be two different things.  It can be an option or a
+@value{FN} passed to a command while invoking it from the command line, or
+it can be something passed to a @dfn{function} inside a program, e.g.
+inside @command{awk}.
+
+In the latter case, an argument can be passed to a function in two ways.
+Either it is given to the called function by value, i.e., a copy of the
+value of the variable is made available to the called function, but the
+original variable cannot be modified by the function itself; or it is
+given by reference, i.e., a pointer to the interested variable is passed to
+the function, which can then directly modify it. In @command{awk}
+scalars are passed by value, and arrays are passed by reference.
+See ``Pass By Value/Reference.''
+
 @item Array
 A grouping of multiple values under the same name.
 Most languages just provide sequential arrays.
@@ -39605,6 +40257,25 @@ The GNU version of the standard shell
 @end ifinfo
 See also ``Bourne Shell.''
 
+@item Binary
+Base-two notation, where the digits are @code{0}--@code{1}. Since
+electronic circuitry works ``naturally'' in base 2 (just think of Off/On),
+everything inside a computer is calculated using base 2. Each digit
+represents the presence (or absence) of a power of 2 and is called a
+@dfn{bit}. So, for example, the base-two number @code{10101} is
+the same as decimal 21, ((1 x 16) + (1 x 4) + (1 x 1)).
+
+Since base-two numbers quickly become
+very long to read and write, they are usually grouped by 3 (i.e., they are
+read as octal numbers), or by 4 (i.e., they are read as hexadecimal
+numbers). There is no direct way to insert base 2 numbers in a C program.
+If need arises, such numbers are usually inserted as octal or hexadecimal
+numbers. The number of base-two digits that fit into registers used for
+representing integer numbers in computers is a rough indication of the
+computing power of the computer itself.  Most computers nowadays use 64
+bits for representing integer numbers in their registers, but 32-bit,
+16-bit and 8-bit registers have been widely used in the past.
+@xref{Nondecimal-numbers}.
 @item Bit
 Short for ``Binary Digit.''
 All values in computer memory ultimately reduce to binary digits: values
@@ -39631,6 +40302,24 @@ originally written by Steven R.@: Bourne at Bell Laboratories.
 Many shells (Bash, @command{ksh}, @command{pdksh}, @command{zsh}) are
 generally upwardly compatible with the Bourne shell.
 
+@item Braces
+The characters @samp{@{} and @samp{@}}.  Braces are used in
+@command{awk} for delimiting actions, compound statements, and function
+bodies.
+
+@item Bracket Expression
+Inside a @dfn{regular expression}, an expression included in square
+brackets, meant to designate a single character as belonging to a
+specified character class. A bracket expression can contain a list of one
+or more characters, like @samp{[abc]}, a range of characters, like
+@samp{[A-Z]}, or a name, delimited by @samp{:}, that designates a known set
+of characters, like @samp{[:digit:]}. The form of bracket expression
+enclosed between @samp{:} is independent of the underlying representation
+of the character themselves, which could utilize the ASCII, ECBDIC, or
+Unicode codesets, depending on the architecture of the computer system, and on
+localization.
+See also ``Regular Expression.''
+
 @item Built-in Function
 The @command{awk} language provides built-in functions that perform various
 numerical, I/O-related, and string computations.  Examples are
@@ -39676,11 +40365,6 @@ are the variables that have special meaning to @command{gawk}.
 Changing some of them affects @command{awk}'s running environment.
 (@xref{Built-in Variables}.)
 
-@item Braces
-The characters @samp{@{} and @samp{@}}.  Braces are used in
-@command{awk} for delimiting actions, compound statements, and function
-bodies.
-
 @item C
 The system programming language that most GNU software is written in.  The
 @command{awk} programming language has C-like syntax, and this @value{DOCUMENT}
@@ -39689,9 +40373,25 @@ points out similarities between @command{awk} and C when appropriate.
 In general, @command{gawk} attempts to be as similar to the 1990 version
 of ISO C as makes sense.
 
+@item C Shell
+The C Shell (@command{csh} or its improved version, @command{tcsh}) is a Unix shell that was
+created by Bill Joy in the late 1970s. The C shell was differentiated from
+other shells by its interactive features and overall style, which
+looks more like C. The C Shell is not backward compatible with the Bourne
+Shell, so special attention is required when converting scripts
+written for other Unix shells to the C shell, especially with regard to the management of
+shell variables.
+See also ``Bourne Shell.''
+
 @item C++
 A popular object-oriented programming language derived from C.
 
+@item Character Class
+See ``Bracket Expression.''
+
+@item Character List
+See ``Bracket Expression.''
+
 @cindex ASCII
 @cindex ISO 8859-1
 @cindex ISO Latin-1
@@ -39715,7 +40415,59 @@ A preprocessor for @command{pic} that reads descriptions of molecules
 and produces @command{pic} input for drawing them.
 It was written in @command{awk}
 by Brian Kernighan and Jon Bentley, and is available from
-@uref{http://netlib.sandia.gov/netlib/typesetting/chem.gz}.
+@uref{http://netlib.org/typesetting/chem}.
+
+@item Comparison Expression
+A relation that is either true or false, such as @samp{a < b}.
+Comparison expressions are used in @code{if}, @code{while}, @code{do},
+and @code{for}
+statements, and in patterns to select which input records to process.
+(@xref{Typing and Comparison}.)
+
+@cindex compiled programs
+@item Compiler
+A program that translates human-readable source code into
+machine-executable object code.  The object code is then executed
+directly by the computer.
+See also ``Interpreter.''
+
+@item Complemented Bracket Expression
+The negation of a @dfn{bracket expression}.  All that is @emph{not}
+described by a given bracket expression. The symbol @samp{^} precedes
+the negated bracket expression.  E.g.: @samp{[[^:digit:]}
+designates whatever character is not a digit. @samp{[^bad]}
+designates whatever character is not one of the letters @samp{b}, @samp{a},
+or @samp{d}.
+See ``Bracket Expression.''
+
+@item Compound Statement
+A series of @command{awk} statements, enclosed in curly braces.  Compound
+statements may be nested.
+(@xref{Statements}.)
+
+@item Computed Regexps
+See ``Dynamic Regular Expressions.''
+
+@item Concatenation
+Concatenating two strings means sticking them together, one after another,
+producing a new string.  For example, the string @samp{foo} concatenated with
+the string @samp{bar} gives the string @samp{foobar}.
+(@xref{Concatenation}.)
+
+@item Conditional Expression
+An expression using the @samp{?:} ternary operator, such as
+@samp{@var{expr1} ? @var{expr2} : @var{expr3}}.  The expression
+@var{expr1} is evaluated; if the result is true, the value of the whole
+expression is the value of @var{expr2}; otherwise the value is
+@var{expr3}.  In either case, only one of @var{expr2} and @var{expr3}
+is evaluated. (@xref{Conditional Exp}.)
+
+@item Control Statement
+A control statement is an instruction to perform a given operation or a set
+of operations inside an @command{awk} program, if a given condition is
+true. Control statements are: @code{if}, @code{for}, @code{while}, and
+@code{do}
+(@pxref{Statements}).
 
 @cindex McIlroy, Doug
 @cindex cookie
@@ -39765,39 +40517,6 @@ Doug
 @item Coprocess
 A subordinate program with which two-way communications is possible.
 
-@cindex compiled programs
-@item Compiler
-A program that translates human-readable source code into
-machine-executable object code.  The object code is then executed
-directly by the computer.
-See also ``Interpreter.''
-
-@item Compound Statement
-A series of @command{awk} statements, enclosed in curly braces.  Compound
-statements may be nested.
-(@xref{Statements}.)
-
-@item Concatenation
-Concatenating two strings means sticking them together, one after another,
-producing a new string.  For example, the string @samp{foo} concatenated with
-the string @samp{bar} gives the string @samp{foobar}.
-(@xref{Concatenation}.)
-
-@item Conditional Expression
-An expression using the @samp{?:} ternary operator, such as
-@samp{@var{expr1} ? @var{expr2} : @var{expr3}}.  The expression
-@var{expr1} is evaluated; if the result is true, the value of the whole
-expression is the value of @var{expr2}; otherwise the value is
-@var{expr3}.  In either case, only one of @var{expr2} and @var{expr3}
-is evaluated. (@xref{Conditional Exp}.)
-
-@item Comparison Expression
-A relation that is either true or false, such as @samp{a < b}.
-Comparison expressions are used in @code{if}, @code{while}, @code{do},
-and @code{for}
-statements, and in patterns to select which input records to process.
-(@xref{Typing and Comparison}.)
-
 @item Curly Braces
 See ``Braces.''
 
@@ -39843,15 +40562,15 @@ ordinary expression.  It could be a string constant, such as
 @code{"foo"}, but it may also be an expression whose value can vary.
 (@xref{Computed Regexps}.)
 
+@item Empty String
+See ``Null String.''
+
 @item Environment
 A collection of strings, of the form @samp{@var{name}=@var{val}}, that each
 program has available to it. Users generally place values into the
 environment in order to provide information to various programs. Typical
 examples are the environment variables @env{HOME} and @env{PATH}.
 
-@item Empty String
-See ``Null String.''
-
 @cindex epoch, definition of
 @item Epoch
 The date used as the ``beginning of time'' for timestamps.
@@ -39878,11 +40597,11 @@ See ``Free Documentation License.''
 @item Field
 When @command{awk} reads an input record, it splits the record into pieces
 separated by whitespace (or by a separator regexp that you can
-change by setting the built-in variable @code{FS}).  Such pieces are
+change by setting the predefined variable @code{FS}).  Such pieces are
 called fields.  If the pieces are of fixed length, you can use the built-in
 variable @code{FIELDWIDTHS} to describe their lengths.
 If you wish to specify the contents of fields instead of the field
-separator, you can use the built-in variable @code{FPAT} to do so.
+separator, you can use the predefined variable @code{FPAT} to do so.
 (@xref{Field Separators},
 @ref{Constant Size},
 and
@@ -39901,22 +40620,18 @@ See also ``Double Precision'' and ``Single Precision.''
 Format strings control the appearance of output in the
 @code{strftime()} and @code{sprintf()} functions, and in the
 @code{printf} statement as well.  Also, data conversions from numbers to strings
-are controlled by the format strings contained in the built-in variables
+are controlled by the format strings contained in the predefined variables
 @code{CONVFMT} and @code{OFMT}. (@xref{Control Letters}.)
 
+@item Fortran
+Shorthand for FORmula TRANslator, one of the first programming languages
+available for scientific calculations. It was created by John Backus,
+and has been available since 1957. It is still in use today.
+
 @item Free Documentation License
 This document describes the terms under which this @value{DOCUMENT}
 is published and may be copied. (@xref{GNU Free Documentation License}.)
 
-@item Function
-A specialized group of statements used to encapsulate general
-or program-specific tasks.  @command{awk} has a number of built-in
-functions, and also allows you to define your own.
-(@xref{Functions}.)
-
-@item FSF
-See ``Free Software Foundation.''
-
 @cindex FSF (Free Software Foundation)
 @cindex Free Software Foundation (FSF)
 @cindex Stallman, Richard
@@ -39926,6 +40641,26 @@ to the production and distribution of freely distributable software.
 It was founded by Richard M.@: Stallman, the author of the original
 Emacs editor.  GNU Emacs is the most widely used version of Emacs today.
 
+@item FSF
+See ``Free Software Foundation.''
+
+@item Function
+A part of an @command{awk} program that can be invoked from every point of
+the program, to perform a task.  @command{awk} has several built-in
+functions.
+Users can define their own functions in every part of the program.
+Function can be recursive, i.e., they may invoke themselves.
+@xref{Functions}.
+In @command{gawk} it is also possible to have functions shared
+among different programs, and included where required using the
+@code{@@include} directive
+(@pxref{Include Files}).
+In @command{gawk} the name of the function that should be invoked
+can be generated at run time, i.e., dynamically.
+The @command{gawk} extension API provides constructor functions
+(@pxref{Constructor Functions}).
+
+
 @item @command{gawk}
 The GNU implementation of @command{awk}.
 
@@ -40048,6 +40783,12 @@ meaning.  Keywords are reserved and may not be used as variable names.
 and
 @code{while}.
 
+@item Korn Shell
+The Korn Shell (@command{ksh}) is a Unix shell which was developed by David Korn at Bell
+Laboratories in the early 1980s. The Korn Shell is backward-compatible with the Bourne
+shell and includes many features of the C shell.
+See also ``Bourne Shell.''
+
 @cindex LGPL (Lesser General Public License)
 @cindex Lesser General Public License (LGPL)
 @cindex GNU Lesser General Public License
@@ -40056,12 +40797,12 @@ This document describes the terms under which binary library archives
 or shared objects,
 and their source code may be distributed.
 
-@item Linux
-See ``GNU/Linux.''
-
 @item LGPL
 See ``Lesser General Public License.''
 
+@item Linux
+See ``GNU/Linux.''
+
 @item Localization
 The process of providing the data necessary for an
 internationalized program to work in a particular language.
@@ -40087,6 +40828,14 @@ Characters used within a regexp that do not stand for themselves.
 Instead, they denote regular expression operations, such as repetition,
 grouping, or alternation.
 
+@item Nesting
+Nesting is where information is organized in layers, or where objects
+contain other similar objects.
+In @command{gawk} the @code{@@include}
+directive can be nested. The ``natural'' nesting of arithmetic and
+logical operations can be changed using parentheses
+(@pxref{Precedence}).
+
 @item No-op
 An operation that does nothing.
 
@@ -40107,6 +40856,11 @@ Octal numbers are written in C using a leading @samp{0},
 to indicate their base.  Thus, @code{013} is 11 ((1 x 8) + 3).
 @xref{Nondecimal-numbers}.
 
+@item Output Record
+A single chunk of data that is written out by @command{awk}.  Usually, an
+@command{awk} output record consists of one or more lines of text.
+@xref{Records}.
+
 @item Pattern
 Patterns tell @command{awk} which input records are interesting to which
 rules.
@@ -40121,6 +40875,9 @@ An acronym describing what is possibly the most frequent
 source of computer usage problems. (Problem Exists Between
 Keyboard And Chair.)
 
+@item Plug-in
+See ``Extensions.''
+
 @item POSIX
 The name for a series of standards
 that specify a Portable Operating System interface.  The ``IX'' denotes
@@ -40145,6 +40902,9 @@ A sequence of consecutive lines from the input file(s).  A pattern
 can specify ranges of input lines for @command{awk} to process or it can
 specify single lines. (@xref{Pattern Overview}.)
 
+@item Record
+See ``Input record'' and ``Output record.''
+
 @item Recursion
 When a function calls itself, either directly or indirectly.
 If this is clear, stop, and proceed to the next entry.
@@ -40162,6 +40922,15 @@ operators.
 (@xref{Getline},
 and @ref{Redirection}.)
 
+@item Reference Counts
+An internal mechanism in @command{gawk} to minimize the amount of memory
+needed to store the value of string variables. If the value assumed by
+a variable is used in more than one place, only one copy of the value
+itself is kept, and the associated reference count is increased when the
+same value is used by an additional variable, and decresed when the related
+variable is no longer in use. When the reference count goes to zero,
+the memory space used to store the value of the variable is freed.
+
 @item Regexp
 See ``Regular Expression.''
 
@@ -40179,6 +40948,15 @@ slashes, such as @code{/foo/}.  This regular expression is chosen
 when you write the @command{awk} program and cannot be changed during
 its execution. (@xref{Regexp Usage}.)
 
+@item Regular Expression Operators
+See ``Metacharacters.''
+
+@item Rounding
+Rounding the result of an arithmetic operation can be tricky.
+More than one way of rounding exists, and in @command{gawk}
+it is possible to choose which method should be used in a program.
+@xref{Setting the rounding mode}.
+
 @item Rule
 A segment of an @command{awk} program that specifies how to process single
 input records.  A rule consists of a @dfn{pattern} and an @dfn{action}.
@@ -40199,12 +40977,12 @@ Regular variables are scalars; arrays and functions are not.
 In @command{gawk}, a list of directories to search for @command{awk} program source files.
 In the shell, a list of directories to search for executable programs.
 
-@item Seed
-The initial value, or starting point, for a sequence of random numbers.
-
 @item @command{sed}
 See ``Stream Editor.''
 
+@item Seed
+The initial value, or starting point, for a sequence of random numbers.
+
 @item Shell
 The command interpreter for Unix and POSIX-compliant systems.
 The shell works both interactively, and as a programming language
@@ -40238,6 +41016,12 @@ A @value{FN} interpreted internally by @command{gawk}, instead of being handed
 directly to the underlying operating system---for example, @file{/dev/stderr}.
 (@xref{Special Files}.)
 
+@item Statement
+An expression inside an @command{awk} program in the action part
+of a pattern--action rule, or inside an
+@command{awk} function. A statement can be a variable assignment,
+an array operation, a loop, etc.
+
 @item Stream Editor
 A program that reads records from an input stream and processes them one
 or more at a time.  This is in contrast with batch programs, which may
@@ -40288,9 +41072,14 @@ This is standard time in Greenwich, England, which is used as a
 reference time for day and date calculations.
 See also ``Epoch'' and ``GMT.''
 
+@item Variable
+A name for a value. In @command{awk}, variables may be either scalars
+or arrays.
+
 @item Whitespace
 A sequence of space, TAB, or newline characters occurring inside an input
 record or a string.
+
 @end table
 
 @end ifclear
@@ -40306,7 +41095,7 @@ record or a string.
 @end docbook
 
 @c This file is intended to be included within another document,
-@c hence no sectioning command or @node.  
+@c hence no sectioning command or @node.
 
 @display
 Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/}
@@ -40528,7 +41317,7 @@ terms of section 4, provided that you also meet all of these
 conditions:
 
 @enumerate a
-@item 
+@item
 The work must carry prominent notices stating that you modified it,
 and giving a relevant date.
 
@@ -40978,7 +41767,7 @@ state the exclusion of warranty; and each file should have at least
 the ``copyright'' line and a pointer to where the full notice is found.
 
 @smallexample
-@var{one line to give the program's name and a brief idea of what it does.}  
+@var{one line to give the program's name and a brief idea of what it does.}
 Copyright (C) @var{year} @var{name of author}
 
 This program is free software: you can redistribute it and/or modify
@@ -41001,7 +41790,7 @@ If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
 @smallexample
-@var{program} Copyright (C) @var{year} @var{name of author} 
+@var{program} Copyright (C) @var{year} @var{name of author}
 This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
 This is free software, and you are welcome to redistribute it
 under certain conditions; type @samp{show c} for details.
@@ -41580,6 +42369,7 @@ Consistency issues:
 	Use --foo, not -Wfoo when describing long options
 	Use "Bell Laboratories", but not "Bell Labs".
 	Use "behavior" instead of "behaviour".
+	Use "coprocess" instead of "co-process".
 	Use "zeros" instead of "zeroes".
 	Use "nonzero" not "non-zero".
 	Use "runtime" not "run time" or "run-time".
@@ -41684,4 +42474,4 @@ But to use it you have to say
 which sorta sucks.
 
 TODO:
------
+Check that all dark corners are indexed properly.
diff --git a/doc/gawkinet.info b/doc/gawkinet.info
index 0a0d69d8..d726be0b 100644
--- a/doc/gawkinet.info
+++ b/doc/gawkinet.info
@@ -6,7 +6,7 @@ START-INFO-DIR-ENTRY
 * Gawkinet: (gawkinet).         TCP/IP Internetworking With `gawk'.
 END-INFO-DIR-ENTRY
 
-   This is Edition 1.3 of `TCP/IP Internetworking With `gawk'', for the
+   This is Edition 1.3 of `TCP/IP Internetworking with `gawk'', for the
 4.0.0 (or later) version of the GNU implementation of AWK.
 
 
@@ -30,7 +30,7 @@ texts being (a) (see below), and with the Back-Cover Texts being (b)
 
    This file documents the networking features in GNU `awk'.
 
-   This is Edition 1.3 of `TCP/IP Internetworking With `gawk'', for the
+   This is Edition 1.3 of `TCP/IP Internetworking with `gawk'', for the
 4.0.0 (or later) version of the GNU implementation of AWK.
 
 
@@ -61,7 +61,7 @@ General Introduction
 This file documents the networking features in GNU Awk (`gawk') version
 4.0 and later.
 
-   This is Edition 1.3 of `TCP/IP Internetworking With `gawk'', for the
+   This is Edition 1.3 of `TCP/IP Internetworking with `gawk'', for the
 4.0.0 (or later) version of the GNU implementation of AWK.
 
 
diff --git a/doc/gawkinet.texi b/doc/gawkinet.texi
index 40198e1d..10223239 100644
--- a/doc/gawkinet.texi
+++ b/doc/gawkinet.texi
@@ -60,7 +60,7 @@
 @c fit into that chapter, thus this separate document. At over 50
 @c pages, I think this is the right decision.  ADR.
 
-@set TITLE TCP/IP Internetworking With @command{gawk}
+@set TITLE TCP/IP Internetworking with @command{gawk}
 @set EDITION 1.3
 @set UPDATE-MONTH December, 2010
 @c gawk versions:
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index 004157f0..4cd04763 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -32,13 +32,11 @@
 @ifnotdocbook
 @set BULLET @bullet{}
 @set MINUS @minus{}
-@set NUL @sc{nul}
 @end ifnotdocbook
 
 @ifdocbook
 @set BULLET
 @set MINUS
-@set NUL NUL
 @end ifdocbook
 
 @set xref-automatic-section-title
@@ -48,11 +46,17 @@
 @c applies to and all the info about who's publishing this edition
 
 @c These apply across the board.
-@set UPDATE-MONTH August, 2014
+@set UPDATE-MONTH February, 2015
 @set VERSION 4.1
-@set PATCHLEVEL 1
+@set PATCHLEVEL 2
 
+@set GAWKINETTITLE TCP/IP Internetworking with @command{gawk}
+@ifset FOR_PRINT
+@set TITLE Effective awk Programming
+@end ifset
+@ifclear FOR_PRINT
 @set TITLE GAWK: Effective AWK Programming
+@end ifclear
 @set SUBTITLE A User's Guide for GNU Awk
 @set EDITION 4.1
 
@@ -167,19 +171,31 @@
 @macro DBREF{text}
 @ref{\text\}
 @end macro
+@macro DBXREF{text}
+@xref{\text\}
+@end macro
+@macro DBPXREF{text}
+@pxref{\text\}
+@end macro
 @end ifdocbook
 
 @ifnotdocbook
 @macro DBREF{text}
 @ref{\text\},
 @end macro
+@macro DBXREF{text}
+@xref{\text\},
+@end macro
+@macro DBPXREF{text}
+@pxref{\text\},
+@end macro
 @end ifnotdocbook
 
 @ifclear FOR_PRINT
 @set FN file name
-@set FFN File Name
+@set FFN File name
 @set DF data file
-@set DDF Data File
+@set DDF Data file
 @set PVERSION version
 @end ifclear
 @ifset FOR_PRINT
@@ -187,7 +203,7 @@
 @set FFN Filename
 @set DF datafile
 @set DDF Datafile
-@set PVERSION Version
+@set PVERSION version
 @end ifset
 
 @c For HTML, spell out email addresses, to avoid problems with
@@ -278,13 +294,13 @@ Fax: +1-617-542-2652
 Email: <email>gnu@@gnu.org</email>
 URL: <ulink url="http://www.gnu.org">http://www.gnu.org/</ulink></literallayout>
 
-<literallayout class="normal">Copyright &copy; 1989, 1991, 1992, 1993, 1996&ndash;2005, 2007, 2009&ndash;2014
+<literallayout class="normal">Copyright &copy; 1989, 1991, 1992, 1993, 1996&ndash;2005, 2007, 2009&ndash;2015
 Free Software Foundation, Inc.
 All Rights Reserved.</literallayout>
 @end docbook
 
 @ifnotdocbook
-Copyright @copyright{} 1989, 1991, 1992, 1993, 1996--2005, 2007, 2009--2014 @*
+Copyright @copyright{} 1989, 1991, 1992, 1993, 1996--2005, 2007, 2009--2015 @*
 Free Software Foundation, Inc.
 @end ifnotdocbook
 @sp 2
@@ -307,7 +323,7 @@ A copy of the license is included in the section entitled
 A copy of the license
 may be found on the Internet at
 @uref{http://www.gnu.org/software/gawk/manual/html_node/GNU-Free-Documentation-License.html,
-the GNU Project's web site}.
+the GNU Project's website}.
 @end ifset
 
 @enumerate a
@@ -375,10 +391,10 @@ ISBN 1-882114-28-0 @*
 @sp 9
 @center @i{To my parents, for their love, and for the wonderful example they set for me.}
 @sp 1
-@center @i{To my wife Miriam, for making me complete.
+@center @i{To my wife, Miriam, for making me complete.
 Thank you for building your life together with me.}
 @sp 1
-@center @i{To our children Chana, Rivka, Nachum and Malka, for enrichening our lives in innumerable ways.}
+@center @i{To our children, Chana, Rivka, Nachum, and Malka, for enrichening our lives in innumerable ways.}
 @sp 1
 @w{ }
 @page
@@ -423,8 +439,9 @@ particular records in a file and perform operations upon them.
 @end ifnottex
 
 @menu
-* Foreword::                       Some nice words about this
+* Foreword3::                      Some nice words about this
                                    @value{DOCUMENT}.
+* Foreword4::                      More nice words.
 * Preface::                        What this @value{DOCUMENT} is about; brief
                                    history and acknowledgments.
 * Getting Started::                A basic introduction to using
@@ -451,7 +468,7 @@ particular records in a file and perform operations upon them.
                                    @command{gawk}.
 * Internationalization::           Getting @command{gawk} to speak your
                                    language.
-* Debugger::                       The @code{gawk} debugger.
+* Debugger::                       The @command{gawk} debugger.
 * Arbitrary Precision Arithmetic:: Arbitrary precision arithmetic with
                                    @command{gawk}.
 * Dynamic Extensions::             Adding new built-in functions to
@@ -555,8 +572,8 @@ particular records in a file and perform operations upon them.
 * Regexp Field Splitting::              Using regexps as the field separator.
 * Single Character Fields::             Making each character a separate
                                         field.
-* Command Line Field Separator::        Setting @code{FS} from the
-                                        command line.
+* Command Line Field Separator::        Setting @code{FS} from the command
+                                        line.
 * Full Line Fields::                    Making the full line be a single
                                         field.
 * Field Splitting Summary::             Some final points and a summary table.
@@ -582,6 +599,7 @@ particular records in a file and perform operations upon them.
                                         @code{getline}.
 * Getline Summary::                     Summary of @code{getline} Variants.
 * Read Timeout::                        Reading input with a timeout.
+* Retrying Input::                      Retrying input after certain errors.
 * Command-line directories::            What happens if you put a directory on
                                         the command line.
 * Input Summary::                       Input summary.
@@ -600,15 +618,18 @@ particular records in a file and perform operations upon them.
 * Printf Examples::                     Several examples.
 * Redirection::                         How to redirect output to multiple
                                         files and pipes.
+* Special FD::                          Special files for I/O.
 * Special Files::                       File name interpretation in
                                         @command{gawk}. @command{gawk} allows
                                         access to inherited file descriptors.
-* Special FD::                          Special files for I/O.
+* Other Inherited Files::               Accessing other open files with
+                                        @command{gawk}.
 * Special Network::                     Special files for network
                                         communications.
 * Special Caveats::                     Things to watch out for.
 * Close Files And Pipes::               Closing Input and Output Files and
                                         Pipes.
+* Nonfatal::                            Enabling Nonfatal Output.
 * Output Summary::                      Output summary.
 * Output Exercises::                    Exercises.
 * Values::                              Constants, Variables, and Regular
@@ -696,7 +717,7 @@ particular records in a file and perform operations upon them.
                                         record.
 * Nextfile Statement::                  Stop processing the current file.
 * Exit Statement::                      Stop execution of @command{awk}.
-* Built-in Variables::                  Summarizes the built-in variables.
+* Built-in Variables::                  Summarizes the predefined variables.
 * User-modified::                       Built-in variables that you change to
                                         control @command{awk}.
 * Auto-set::                            Built-in variables where @command{awk}
@@ -716,12 +737,12 @@ particular records in a file and perform operations upon them.
                                         elements.
 * Controlling Scanning::                Controlling the order in which arrays
                                         are scanned.
-* Delete::                              The @code{delete} statement removes an
-                                        element from an array.
 * Numeric Array Subscripts::            How to use numbers as subscripts in
                                         @command{awk}.
 * Uninitialized Subscripts::            Using Uninitialized variables as
                                         subscripts.
+* Delete::                              The @code{delete} statement removes an
+                                        element from an array.
 * Multidimensional::                    Emulating multidimensional arrays in
                                         @command{awk}.
 * Multiscanning::                       Scanning multidimensional arrays.
@@ -780,6 +801,8 @@ particular records in a file and perform operations upon them.
 * Getlocaltime Function::               A function to get formatted times.
 * Readfile Function::                   A function to read an entire file at
                                         once.
+* Shell Quoting::                       A function to quote strings for the
+                                        shell.
 * Data File Management::                Functions for managing command-line
                                         data files.
 * Filetrans Function::                  A function for handling data file
@@ -894,7 +917,6 @@ particular records in a file and perform operations upon them.
 * Extension API Description::           A full description of the API.
 * Extension API Functions Introduction:: Introduction to the API functions.
 * General Data Types::                  The data types.
-* Requesting Values::                   How to get a value.
 * Memory Allocation Functions::         Functions for allocating memory.
 * Constructor Functions::               Functions for creating values.
 * Registration Functions::              Functions to register things with
@@ -907,6 +929,7 @@ particular records in a file and perform operations upon them.
 * Two-way processors::                  Registering a two-way processor.
 * Printing Messages::                   Functions for printing messages.
 * Updating @code{ERRNO}::               Functions for updating @code{ERRNO}.
+* Requesting Values::                   How to get a value.
 * Accessing Parameters::                Functions for accessing parameters.
 * Symbol Table Access::                 Functions for accessing global
                                         variables.
@@ -918,6 +941,7 @@ particular records in a file and perform operations upon them.
 * Array Functions::                     Functions for working with arrays.
 * Flattening Arrays::                   How to flatten arrays.
 * Creating Arrays::                     How to create and populate arrays.
+* Redirection API::                     How to access and manipulate redirections.
 * Extension API Variables::             Variables provided by the API.
 * Extension Versioning::                API Version information.
 * Extension API Informational Variables:: Variables providing information about
@@ -930,7 +954,7 @@ particular records in a file and perform operations upon them.
 * Internal File Ops::                   The code for internal file operations.
 * Using Internal File Ops::             How to use an external extension.
 * Extension Samples::                   The sample extensions that ship with
-                                        @code{gawk}.
+                                        @command{gawk}.
 * Extension Sample File Functions::     The file functions sample.
 * Extension Sample Fnmatch::            An interface to @code{fnmatch()}.
 * Extension Sample Fork::               An interface to @code{fork()} and
@@ -945,9 +969,9 @@ particular records in a file and perform operations upon them.
                                         processor.
 * Extension Sample Read write array::   Serializing an array to a file.
 * Extension Sample Readfile::           Reading an entire file into a string.
-* Extension Sample API Tests::          Tests for the API.
 * Extension Sample Time::               An interface to @code{gettimeofday()}
                                         and @code{sleep()}.
+* Extension Sample API Tests::          Tests for the API.
 * gawkextlib::                          The @code{gawkextlib} project.
 * Extension summary::                   Extension summary.
 * Extension Exercises::                 Exercises.
@@ -976,6 +1000,7 @@ particular records in a file and perform operations upon them.
 * Unix Installation::                   Installing @command{gawk} under
                                         various versions of Unix.
 * Quick Installation::                  Compiling @command{gawk} under Unix.
+* Shell Startup Files::                 Shell convenience functions.
 * Additional Configuration Options::    Other compile-time options.
 * Configuration Philosophy::            How it's all supposed to work.
 * Non-Unix Installation::               Installation on Other Operating
@@ -1048,8 +1073,8 @@ for enrichening our lives in innumerable ways.
 @summarycontents
 @contents
 
-@node Foreword
-@unnumbered Foreword
+@node Foreword3
+@unnumbered Foreword to the Third Edition
 
 @c This bit is post-processed by a script which turns the chapter
 @c tag into a preface tag, and moves this stuff to before the title.
@@ -1062,7 +1087,7 @@ for enrichening our lives in innumerable ways.
       <!-- can't put mawk into command tags. sigh. -->
       <affiliation><jobtitle>Author of mawk</jobtitle></affiliation>
     </author>
-    <date>March, 2001</date>
+    <date>March 2001</date>
    </prefaceinfo>
 @end docbook
 
@@ -1074,21 +1099,23 @@ The circumstances started a couple of years
 earlier. I was working at a new job and noticed an unplugged
 Unix computer sitting in the corner.  No one knew how to use it,
 and neither did I.  However,
-a couple of days later it was running, and
+a couple of days later, it was running, and
 I was @code{root} and the one-and-only user.
 That day, I began the transition from statistician to Unix programmer.
 
 On one of many trips to the library or bookstore in search of
-books on Unix, I found the gray AWK book, a.k.a.@: Aho, Kernighan and
-Weinberger, @cite{The AWK Programming Language}, Addison-Wesley,
-1988.  AWK's simple programming paradigm---find a pattern in the
+books on Unix, I found the gray AWK book, a.k.a.@:
+Alfred V.@: Aho, Brian W.@: Kernighan, and
+Peter J.@: Weinberger's @cite{The AWK Programming Language} (Addison-Wesley,
+1988).  @command{awk}'s simple programming paradigm---find a pattern in the
 input and then perform an action---often reduced complex or tedious
-data manipulations to few lines of code.  I was excited to try my
+data manipulations to a few lines of code.  I was excited to try my
 hand at programming in AWK.
 
 Alas,  the @command{awk} on my computer was a limited version of the
-language described in the AWK book.  I discovered that my computer
-had ``old @command{awk}'' and the AWK book described ``new @command{awk}.''
+language described in the gray book.  I discovered that my computer
+had ``old @command{awk}'' and the book described
+``new @command{awk}.''
 I learned that this was typical; the old version refused to step
 aside or relinquish its name.  If a system had a new @command{awk}, it was
 invariably called @command{nawk}, and few systems had it.
@@ -1106,7 +1133,7 @@ My Unix system started out unplugged from the wall; it certainly was not
 plugged into a network.  So, oblivious to the existence of @command{gawk}
 and the Unix community in general, and desiring a new @command{awk}, I wrote
 my own, called @command{mawk}.
-Before I was finished I knew about @command{gawk},
+Before I was finished, I knew about @command{gawk},
 but it was too late to stop, so I eventually posted
 to a @code{comp.sources} newsgroup.
 
@@ -1115,7 +1142,7 @@ from Arnold introducing
 himself.   He suggested we share design and algorithms and
 attached a draft of the POSIX standard so
 that I could update @command{mawk} to support language extensions added
-after publication of the AWK book.
+after publication of @cite{The AWK Programming Language}.
 
 Frankly, if our roles had
 been reversed, I would not have been so open and we probably would
@@ -1134,7 +1161,7 @@ standard.
 On the other hand, the novice AWK programmer can study
 a wealth of practical programs that emphasize
 the power of AWK's basic idioms:
-data driven control-flow, pattern matching with regular expressions,
+data-driven control flow, pattern matching with regular expressions,
 and associative arrays.
 Those looking for something new can try out @command{gawk}'s
 interface to network protocols via special @file{/inet} files.
@@ -1142,7 +1169,7 @@ interface to network protocols via special @file{/inet} files.
 The programs in this book make clear that an AWK program is
 typically much smaller and faster to develop than
 a counterpart written in C.
-Consequently, there is often a payoff to prototype an
+Consequently, there is often a payoff to prototyping an
 algorithm or design in AWK to get it running quickly and expose
 problems early. Often, the interpreted performance is adequate
 and the AWK prototype becomes the product.
@@ -1195,7 +1222,62 @@ AWK or want to learn how, then read this book.
 @display
 Michael Brennan
 Author of @command{mawk}
-March, 2001
+March 2001
+@end display
+@end ifnotdocbook
+
+@node Foreword4
+@unnumbered Foreword to the Fourth Edition
+
+@c This bit is post-processed by a script which turns the chapter
+@c tag into a preface tag, and moves this stuff to before the title.
+@c Bleah.
+@docbook
+  <prefaceinfo>
+    <author>
+      <firstname>Michael</firstname>
+      <surname>Brennan</surname>
+      <!-- can't put mawk into command tags. sigh. -->
+      <affiliation><jobtitle>Author of mawk</jobtitle></affiliation>
+    </author>
+    <date>October 2014</date>
+   </prefaceinfo>
+@end docbook
+
+Some things don't change.  Thirteen years ago I wrote:
+``If you use AWK or want to learn how, then read this book.''
+True then, and still true today.
+
+Learning to use a programming language is about more than mastering the
+syntax.  One needs to acquire an understanding of how to use the
+features of the language to solve practical programming problems.
+A focus of this book is many examples that show how to use AWK.
+
+Some things do change. Our computers are much faster and have more memory.
+Consequently, speed and storage inefficiencies of a high-level language
+matter less.  Prototyping in AWK and then rewriting in C for performance
+reasons happens less, because more often the prototype is fast enough.
+
+Of course, there are computing operations that are best done in C or C++.
+With @command{gawk} 4.1 and later, you do not have to choose between writing
+your program in AWK or in C/C++.  You can write most of your
+program in AWK and the aspects that require C/C++ capabilities can be written
+in C/C++, and then the pieces glued together when the @command{gawk} module loads
+the C/C++ module as a dynamic plug-in.
+@c Chapter 16
+@ref{Dynamic Extensions},
+has all the
+details, and, as expected, many examples to help you learn the ins and outs.
+
+I enjoy programming in AWK and had fun (re)reading this book.
+I think you will too.
+
+@ifnotdocbook
+@cindex Brennan, Michael
+@display
+Michael Brennan
+Author of @command{mawk}
+October 2014
 @end display
 @end ifnotdocbook
 
@@ -1215,9 +1297,9 @@ March, 2001
       <firstname>Arnold</firstname>
       <surname>Robbins</surname>
       <affiliation><jobtitle>Nof Ayalon</jobtitle></affiliation>
-      <affiliation><jobtitle>ISRAEL</jobtitle></affiliation>
+      <affiliation><jobtitle>Israel</jobtitle></affiliation>
     </author>
-    <date>June, 2014</date>
+    <date>February 2015</date>
    </prefaceinfo>
 @end docbook
 
@@ -1229,9 +1311,8 @@ The @command{awk} utility interprets a special-purpose programming
 language that makes it easy to handle simple data-reformatting jobs.
 
 The GNU implementation of @command{awk} is called @command{gawk}; if you
-invoke it with the proper options or environment variables
-(@pxref{Options}), it is fully
-compatible with
+invoke it with the proper options or environment variables,
+it is fully compatible with
 the POSIX@footnote{The 2008 POSIX standard is accessible online at
 @w{@url{http://www.opengroup.org/onlinepubs/9699919799/}.}}
 specification of the @command{awk} language
@@ -1239,7 +1320,7 @@ and with the Unix version of @command{awk} maintained
 by Brian Kernighan.
 This means that all
 properly written @command{awk} programs should work with @command{gawk}.
-Thus, we usually don't distinguish between @command{gawk} and other
+So most of the time, we don't distinguish between @command{gawk} and other
 @command{awk} implementations.
 
 @cindex @command{awk}, POSIX and, See Also POSIX @command{awk}
@@ -1248,7 +1329,7 @@ Thus, we usually don't distinguish between @command{gawk} and other
 @cindex @command{gawk}, @command{awk} and
 @cindex @command{awk}, @command{gawk} and
 @cindex @command{awk}, uses for
-Using @command{awk} allows you to:
+Using @command{awk} you can:
 
 @itemize @value{BULLET}
 @item
@@ -1261,7 +1342,7 @@ Generate reports
 Validate data
 
 @item
-Produce indexes and perform other document preparation tasks
+Produce indexes and perform other document-preparation tasks
 
 @item
 Experiment with algorithms that you can adapt later to other computer
@@ -1286,15 +1367,15 @@ Sort data
 Perform simple network communications
 
 @item
-Profile and debug @command{awk} programs.
+Profile and debug @command{awk} programs
 
 @item
-Extend the language with functions written in C or C++.
+Extend the language with functions written in C or C++
 @end itemize
 
 This @value{DOCUMENT} teaches you about the @command{awk} language and
 how you can use it effectively.  You should already be familiar with basic
-system commands, such as @command{cat} and @command{ls},@footnote{These commands
+system commands, such as @command{cat} and @command{ls},@footnote{These utilities
 are available on POSIX-compliant systems, as well as on traditional
 Unix-based systems. If you are using some other operating system, you still need to
 be familiar with the ideas of I/O redirection and pipes.} as well as basic shell
@@ -1316,10 +1397,9 @@ Microsoft Windows
 @ifclear FOR_PRINT
 (all versions) and OS/2 PCs,
 @end ifclear
-and OpenVMS.
-(Some other, obsolete systems to which @command{gawk} was once ported
-are no longer supported and the code for those systems
-has been removed.)
+and OpenVMS.@footnote{Some other, obsolete systems to which @command{gawk}
+was once ported are no longer supported and the code for those systems
+has been removed.}
 
 @menu
 * History::                     The history of @command{gawk} and
@@ -1338,7 +1418,7 @@ has been removed.)
 @unnumberedsec History of @command{awk} and @command{gawk}
 @cindex recipe for a programming language
 @cindex programming language, recipe for
-@sidebar Recipe For A Programming Language
+@sidebar Recipe for a Programming Language
 
 @multitable {2 parts} {1 part  @code{egrep}} {1 part  @code{snobol}}
 @item @tab 1 part  @code{egrep} @tab 1 part  @code{snobol}
@@ -1357,7 +1437,7 @@ more parts C.  Document very well and release.
 @cindex Kernighan, Brian
 @cindex @command{awk}, history of
 The name @command{awk} comes from the initials of its designers: Alfred V.@:
-Aho, Peter J.@: Weinberger and Brian W.@: Kernighan.  The original version of
+Aho, Peter J.@: Weinberger, and Brian W.@: Kernighan.  The original version of
 @command{awk} was written in 1977 at AT&T Bell Laboratories.
 In 1985, a new version made the programming
 language more powerful, introducing user-defined functions, multiple input
@@ -1368,36 +1448,36 @@ The version in System V Release 4 (1989) added some new features and cleaned
 up the behavior in some of the ``dark corners'' of the language.
 The specification for @command{awk} in the POSIX Command Language
 and Utilities standard further clarified the language.
-Both the @command{gawk} designers and the original Bell Laboratories @command{awk}
-designers provided feedback for the POSIX specification.
+Both the @command{gawk} designers and the original @command{awk} designers at Bell Laboratories
+provided feedback for the POSIX specification.
 
 @cindex Rubin, Paul
 @cindex Fenlason, Jay
 @cindex Trueman, David
-Paul Rubin wrote the GNU implementation, @command{gawk}, in 1986.
+Paul Rubin wrote @command{gawk} in 1986.
 Jay Fenlason completed it, with advice from Richard Stallman.  John Woods
 contributed parts of the code as well.  In 1988 and 1989, David Trueman, with
 help from me, thoroughly reworked @command{gawk} for compatibility
 with the newer @command{awk}.
 Circa 1994, I became the primary maintainer.
 Current development focuses on bug fixes,
-performance improvements, standards compliance and, occasionally, new features.
+performance improvements, standards compliance, and, occasionally, new features.
 
-In May of 1997, J@"urgen Kahrs felt the need for network access
+In May 1997, J@"urgen Kahrs felt the need for network access
 from @command{awk}, and with a little help from me, set about adding
 features to do this for @command{gawk}.  At that time, he also
 wrote the bulk of
-@cite{TCP/IP Internetworking with @command{gawk}}
+@cite{@value{GAWKINETTITLE}}
 (a separate document, available as part of the @command{gawk} distribution).
 His code finally became part of the main @command{gawk} distribution
 with @command{gawk} @value{PVERSION} 3.1.
 
 John Haque rewrote the @command{gawk} internals, in the process providing
 an @command{awk}-level debugger. This version became available as
-@command{gawk} @value{PVERSION} 4.0, in 2011.
+@command{gawk} @value{PVERSION} 4.0 in 2011.
 
-@xref{Contributors},
-for a complete list of those who made important contributions to @command{gawk}.
+@DBXREF{Contributors}
+for a full list of those who have made important contributions to @command{gawk}.
 
 @node Names
 @unnumberedsec A Rose by Any Other Name
@@ -1406,11 +1486,11 @@ for a complete list of those who made important contributions to @command{gawk}.
 The @command{awk} language has evolved over the years. Full details are
 provided in @ref{Language History}.
 The language described in this @value{DOCUMENT}
-is often referred to as ``new @command{awk}''.
+is often referred to as ``new @command{awk}.''
 By analogy, the original version of @command{awk} is
 referred to as ``old @command{awk}.''
 
-Today, on most systems, when you run the @command{awk} utility,
+On most current systems, when you run the @command{awk} utility
 you get some version of new @command{awk}.@footnote{Only
 Solaris systems still use an old @command{awk} for the
 default @command{awk} utility. A more modern @command{awk} lives in
@@ -1463,14 +1543,16 @@ entry ``differences in @command{awk} and @command{gawk}.''}
 @ifset FOR_PRINT
 implementations.
 @end ifset
-Finally, any @command{gawk} features that are not in
-the POSIX standard for @command{awk} are noted.
+Finally, it notes any @command{gawk} features that are not in
+the POSIX standard for @command{awk}.
 
 @ifnotinfo
 This @value{DOCUMENT} has the difficult task of being both a tutorial and a reference.
 If you are a novice, feel free to skip over details that seem too complex.
 You should also ignore the many cross-references; they are for the
-expert user and for the online Info and HTML versions of the @value{DOCUMENT}.
+expert user and for the Info and
+@uref{http://www.gnu.org/software/gawk/manual/, HTML}
+versions of the @value{DOCUMENT}.
 @end ifnotinfo
 
 There are sidebars
@@ -1483,14 +1565,17 @@ All appear in the index, under the heading ``sidebar.''
 
 Most of the time, the examples use complete @command{awk} programs.
 Some of the more advanced sections show only the part of the @command{awk}
-program that illustrates the concept currently being described.
+program that illustrates the concept being described.
 
-While this @value{DOCUMENT} is aimed principally at people who have not been
+Although this @value{DOCUMENT} is aimed principally at people who have not been
 exposed
 to @command{awk}, there is a lot of information here that even the @command{awk}
 expert should find useful.  In particular, the description of POSIX
 @command{awk} and the example programs in
-@ref{Library Functions}, and in
+@ref{Library Functions}, and
+@ifnotdocbook
+in
+@end ifnotdocbook
 @ref{Sample Programs},
 should be of interest.
 
@@ -1498,22 +1583,30 @@ This @value{DOCUMENT} is split into several parts, as follows:
 
 @c FULLXREF ON
 
-Part I describes the @command{awk} language and @command{gawk} program in detail.
+@itemize @value{BULLET}
+@item
+Part I describes the @command{awk} language and the @command{gawk} program in detail.
 It starts with the basics, and continues through all of the features of @command{awk}.
 It contains the following chapters:
 
+@c nested
+@itemize @value{MINUS}
+@item
 @ref{Getting Started},
 provides the essentials you need to know to begin using @command{awk}.
 
+@item
 @ref{Invoking Gawk},
 describes how to run @command{gawk}, the meaning of its
 command-line options, and how it finds @command{awk}
 program source files.
 
+@item
 @ref{Regexp},
 introduces regular expressions in general, and in particular the flavors
 supported by POSIX @command{awk} and @command{gawk}.
 
+@item
 @ref{Reading Files},
 describes how @command{awk} reads your data.
 It introduces the concepts of records and fields, as well
@@ -1521,66 +1614,88 @@ as the @code{getline} command.
 I/O redirection is first described here.
 Network I/O is also briefly introduced here.
 
+@item
 @ref{Printing},
 describes how @command{awk} programs can produce output with
 @code{print} and @code{printf}.
 
+@item
 @ref{Expressions},
 describes expressions, which are the basic building blocks
 for getting most things done in a program.
 
+@item
 @ref{Patterns and Actions},
 describes how to write patterns for matching records, actions for
-doing something when a record is matched, and the built-in variables
+doing something when a record is matched, and the predefined variables
 @command{awk} and @command{gawk} use.
 
+@item
 @ref{Arrays},
-covers @command{awk}'s one-and-only data structure: associative arrays.
-Deleting array elements and whole arrays is also described, as well as
-sorting arrays in @command{gawk}.  It also describes how @command{gawk}
-provides arrays of arrays.
+covers @command{awk}'s one-and-only data structure: the associative array.
+Deleting array elements and whole arrays is described, as well as
+sorting arrays in @command{gawk}.  The @value{CHAPTER} also describes how
+@command{gawk} provides arrays of arrays.
 
+@item
 @ref{Functions},
-describes the built-in functions @command{awk} and
-@command{gawk} provide, as well as how to define
-your own functions.
+describes the built-in functions @command{awk} and @command{gawk} provide,
+as well as how to define your own functions.  It also discusses how
+@command{gawk} lets you call functions indirectly.
+@end itemize
 
+@item
 Part II shows how to use @command{awk} and @command{gawk} for problem solving.
 There is lots of code here for you to read and learn from.
-It contains the following chapters:
+This part contains the following chapters:
 
-@ref{Library Functions}, which provides a number of functions meant to
+@c nested
+@itemize @value{MINUS}
+@item
+@ref{Library Functions}, provides a number of functions meant to
 be used from main @command{awk} programs.
 
+@item
 @ref{Sample Programs},
-which provides many sample @command{awk} programs.
+provides many sample @command{awk} programs.
+@end itemize
 
 Reading these two chapters allows you to see @command{awk}
 solving real problems.
 
+@item
 Part III focuses on features specific to @command{gawk}.
 It contains the following chapters:
 
+@c nested
+@itemize @value{MINUS}
+@item
 @ref{Advanced Features},
-describes a number of @command{gawk}-specific advanced features.
+describes a number of advanced features.
 Of particular note
-are the abilities to have two-way communications with another process,
+are the abilities to control the order of array traversal,
+have two-way communications with another process,
 perform TCP/IP networking, and
 profile your @command{awk} programs.
 
+@item
 @ref{Internationalization},
-describes special features in @command{gawk} for translating program
+describes special features for translating program
 messages into different languages at runtime.
 
-@ref{Debugger}, describes the @command{awk} debugger.
+@item
+@ref{Debugger}, describes the @command{gawk} debugger.
 
+@item
 @ref{Arbitrary Precision Arithmetic},
-describes advanced arithmetic facilities provided by
-@command{gawk}.
+describes advanced arithmetic facilities.
 
+@item
 @ref{Dynamic Extensions}, describes how to add new variables and
 functions to @command{gawk} by writing extensions in C or C++.
+@end itemize
 
+@item
 @ifclear FOR_PRINT
 Part IV provides the appendices, the Glossary, and two licenses that cover
 the @command{gawk} source code and this @value{DOCUMENT}, respectively.
@@ -1591,11 +1706,14 @@ Part IV provides the following appendices,
 including the GNU General Public License:
 @end ifset
 
+@itemize @value{MINUS}
+@item
 @ref{Language History},
 describes how the @command{awk} language has evolved since
-its first release to present.  It also describes how @command{gawk}
+its first release to the present.  It also describes how @command{gawk}
 has acquired features over time.
 
+@item
 @ref{Installation},
 describes how to get @command{gawk}, how to compile it
 on POSIX-compatible systems,
@@ -1605,60 +1723,74 @@ in @command{gawk} and where to get other freely
 available @command{awk} implementations.
 
 @ifset FOR_PRINT
-
+@item
 @ref{Copying},
 presents the license that covers the @command{gawk} source code.
+@end ifset
 
+@ifclear FOR_PRINT
+@item
+@ref{Notes},
+describes how to disable @command{gawk}'s extensions, as
+well as how to contribute new code to @command{gawk},
+and some possible future directions for @command{gawk} development.
+
+@item
+@ref{Basic Concepts},
+provides some very cursory background material for those who
+are completely unfamiliar with computer programming.
+
+The @ref{Glossary}, defines most, if not all, of the significant terms used
+throughout the @value{DOCUMENT}.  If you find terms that you aren't familiar with,
+try looking them up here.
+
+@item
+@ref{Copying}, and
+@ref{GNU Free Documentation License},
+present the licenses that cover the @command{gawk} source code
+and this @value{DOCUMENT}, respectively.
+@end ifclear
+@end itemize
+@end itemize
+
+@ifset FOR_PRINT
 The version of this @value{DOCUMENT} distributed with @command{gawk}
 contains additional appendices and other end material.
 To save space, we have omitted them from the
 printed edition. You may find them online, as follows:
 
+@itemize @value{BULLET}
+@item
 @uref{http://www.gnu.org/software/gawk/manual/html_node/Notes.html,
 The appendix on implementation notes}
-describes how to disable @command{gawk}'s extensions, as
-well as how to contribute new code to @command{gawk},
-and some possible future directions for @command{gawk} development.
+describes how to disable @command{gawk}'s extensions, how to contribute
+new code to @command{gawk}, where to find information on some possible
+future directions for @command{gawk} development, and the design decisions
+behind the extension API.
 
+@item
 @uref{http://www.gnu.org/software/gawk/manual/html_node/Basic-Concepts.html,
 The appendix on basic concepts}
 provides some very cursory background material for those who
 are completely unfamiliar with computer programming.
 
+@item
 @uref{http://www.gnu.org/software/gawk/manual/html_node/Glossary.html,
 The Glossary}
-defines most, if not all, the significant terms used
+defines most, if not all, of the significant terms used
 throughout the @value{DOCUMENT}.  If you find terms that you aren't familiar with,
 try looking them up here.
 
+@item
 @uref{http://www.gnu.org/software/gawk/manual/html_node/GNU-Free-Documentation-License.html,
 The GNU FDL}
 is the license that covers this @value{DOCUMENT}.
+@end itemize
 
 Some of the chapters have exercise sections; these have also been
-omitted from the print edition.
+omitted from the print edition but are available online.
 @end ifset
 
-@ifclear FOR_PRINT
-@ref{Notes},
-describes how to disable @command{gawk}'s extensions, as
-well as how to contribute new code to @command{gawk},
-and some possible future directions for @command{gawk} development.
-
-@ref{Basic Concepts},
-provides some very cursory background material for those who
-are completely unfamiliar with computer programming.
-
-The @ref{Glossary}, defines most, if not all, the significant terms used
-throughout the @value{DOCUMENT}.  If you find terms that you aren't familiar with,
-try looking them up here.
-
-@ref{Copying}, and
-@ref{GNU Free Documentation License},
-present the licenses that cover the @command{gawk} source code
-and this @value{DOCUMENT}, respectively.
-@end ifclear
-
 @c FULLXREF OFF
 
 @node Conventions
@@ -1689,7 +1821,7 @@ This typically represents the command's standard output.
 Output from the command, usually its standard output, appears
 @code{like this}.
 @end ifset
-Error messages, and other output on the command's standard error, are preceded
+Error messages and other output on the command's standard error are preceded
 by the glyph ``@error{}''.  For example:
 
 @example
@@ -1700,15 +1832,23 @@ $ @kbd{echo hello on stderr 1>&2}
 @end example
 
 @ifnotinfo
-In the text, command names appear in @code{this font}, while code segments
+In the text, almost anything related to programming, such as
+command names,
+variable and function names, and string, numeric and regexp constants
+appear in @code{this font}. Code fragments
 appear in the same font and quoted, @samp{like this}.
+Things that are replaced by the user or programmer
+appear in @var{this font}.
 Options look like this: @option{-f}.
+@value{FFN}s are indicated like this: @file{/path/to/ourfile}.
+@ifclear FOR_PRINT
 Some things are
 emphasized @emph{like this}, and if a point needs to be made
-strongly, it is done @strong{like this}.  The first occurrence of
+strongly, it is done @strong{like this}.
+@end ifclear
+The first occurrence of
 a new term is usually its @dfn{definition} and appears in the same
 font as the previous occurrence of ``definition'' in this sentence.
-Finally, @value{FN}s are indicated like this: @file{/path/to/ourfile}.
 @end ifnotinfo
 
 Characters that you type at the keyboard look @kbd{like this}.  In particular,
@@ -1716,11 +1856,11 @@ there are special characters called ``control characters.''  These are
 characters that you type by holding down both the @kbd{CONTROL} key and
 another key, at the same time.  For example, a @kbd{Ctrl-d} is typed
 by first pressing and holding the @kbd{CONTROL} key, next
-pressing the @kbd{d} key and finally releasing both keys.
+pressing the @kbd{d} key, and finally releasing both keys.
 
 For the sake of brevity, throughout this @value{DOCUMENT}, we refer to
 Brian Kernighan's version of @command{awk} as ``BWK @command{awk}.''
-(@xref{Other Versions}, for information on his and other versions.)
+(@DBXREF{Other Versions} for information on his and other versions.)
 
 @ifset FOR_PRINT
 @quotation NOTE
@@ -1736,7 +1876,7 @@ Cautionary or warning notes look like this.
 @unnumberedsubsec Dark Corners
 @cindex Kernighan, Brian
 @quotation
-@i{Dark corners are basically fractal --- no matter how much
+@i{Dark corners are basically fractal---no matter how much
 you illuminate, there's always a smaller but darker one.}
 @author Brian Kernighan
 @end quotation
@@ -1752,14 +1892,14 @@ the picture of a flashlight in the margin, as shown here.
 @value{DARKCORNER}
 @end iftex
 @ifnottex
-``(d.c.)''.
+``(d.c.).''
 @end ifnottex
 @ifclear FOR_PRINT
 They also appear in the index under the heading ``dark corner.''
 @end ifclear
 
-As noted by the opening quote, though, any coverage of dark corners is,
-by definition, incomplete.
+But, as noted by the opening quote, any coverage of dark
+corners is by definition incomplete.
 
 @cindex c.e., See common extensions
 Extensions to the standard @command{awk} language that are supported by
@@ -1787,12 +1927,12 @@ Emacs editor.  GNU Emacs is the most widely used version of Emacs today.
 @cindex GPL (General Public License)
 @cindex General Public License, See GPL
 @cindex documentation, online
-The GNU@footnote{GNU stands for ``GNU's not Unix.''}
+The GNU@footnote{GNU stands for ``GNU's Not Unix.''}
 Project is an ongoing effort on the part of the Free Software
 Foundation to create a complete, freely distributable, POSIX-compliant
 computing environment.
-The FSF uses the ``GNU General Public License'' (GPL) to ensure that
-their software's
+The FSF uses the GNU General Public License (GPL) to ensure that
+its software's
 source code is always available to the end user.
 @ifclear FOR_PRINT
 A copy of the GPL is included
@@ -1806,7 +1946,7 @@ The GPL applies to the C language source code for @command{gawk}.
 To find out more about the FSF and the GNU Project online,
 see @uref{http://www.gnu.org, the GNU Project's home page}.
 This @value{DOCUMENT} may also be read from
-@uref{http://www.gnu.org/software/gawk/manual/, their web site}.
+@uref{http://www.gnu.org/software/gawk/manual/, GNU's website}.
 
 @ifclear FOR_PRINT
 A shell, an editor (Emacs), highly portable optimizing C, C++, and
@@ -1833,9 +1973,7 @@ available for download from the Internet.
 @ifnotinfo
 The @value{DOCUMENT} you are reading is actually free---at least, the
 information in it is free to anyone.  The machine-readable
-source code for the @value{DOCUMENT} comes with @command{gawk}; anyone
-may take this @value{DOCUMENT} to a copying machine and make as many
-copies as they like.
+source code for the @value{DOCUMENT} comes with @command{gawk}.
 @ifclear FOR_PRINT
 (Take a moment to check the Free Documentation
 License in @ref{GNU Free Documentation License}.)
@@ -1843,31 +1981,30 @@ License in @ref{GNU Free Documentation License}.)
 @end ifnotinfo
 
 @cindex Close, Diane
-The @value{DOCUMENT} itself has gone through a number of previous editions.
+The @value{DOCUMENT} itself has gone through multiple previous editions.
 Paul Rubin wrote the very first draft of @cite{The GAWK Manual};
-it was around 40 pages in size.
+it was around 40 pages long.
 Diane Close and Richard Stallman improved it, yielding a
 version that was
-around 90 pages long and barely described the original, ``old''
+around 90 pages and barely described the original, ``old''
 version of @command{awk}.
 
 I started working with that version in the fall of 1988.
 As work on it progressed,
 the FSF published several preliminary versions (numbered 0.@var{x}).
-In 1996, Edition 1.0 was released with @command{gawk} 3.0.0.
+In 1996, edition 1.0 was released with @command{gawk} 3.0.0.
 The FSF published the first two editions under
 the title @cite{The GNU Awk User's Guide}.
 @ifset FOR_PRINT
 SSC published two editions of the @value{DOCUMENT} under the
-title @cite{Effective awk Programming}, and in O'Reilly published
+title @cite{Effective awk Programming}, and O'Reilly published
 the third edition in 2001.
 @end ifset
 
 This edition maintains the basic structure of the previous editions.
-For FSF edition 4.0, the content has been thoroughly reviewed
-and updated. All references to @command{gawk} versions prior to 4.0 have been
-removed.
-Of significant note for this edition was @ref{Debugger}.
+For FSF edition 4.0, the content was thoroughly reviewed and updated. All
+references to @command{gawk} versions prior to 4.0 were removed.
+Of significant note for that edition was the addition of @ref{Debugger}.
 
 For FSF edition
 @ifclear FOR_PRINT
@@ -1881,19 +2018,18 @@ the content has been reorganized into parts,
 and the major new additions are @ref{Arbitrary Precision Arithmetic},
 and @ref{Dynamic Extensions}.
 
-This @value{DOCUMENT} will undoubtedly continue to evolve.  An electronic
-version comes with the @command{gawk} distribution from the FSF.  If you
-find an error in this @value{DOCUMENT}, please report it!  @xref{Bugs},
+This @value{DOCUMENT} will undoubtedly continue to evolve.  If you
+find an error in the @value{DOCUMENT}, please report it!  @DBXREF{Bugs}
 for information on submitting problem reports electronically.
 
 @ifset FOR_PRINT
 @c fakenode --- for prepinfo
 @unnumberedsec How to Stay Current
 
-It may be you have a version of @command{gawk} which is newer than the
-one described in this @value{DOCUMENT}.  To find out what has changed,
+You may have a newer version of @command{gawk} than the
+one described here.  To find out what has changed,
 you should first look at the @file{NEWS} file in the @command{gawk}
-distribution, which provides a high level summary of what changed in
+distribution, which provides a high-level summary of the changes in
 each release.
 
 You can then look at the @uref{http://www.gnu.org/software/gawk/manual/,
@@ -1918,16 +2054,18 @@ contributed code: the archive did not grow and the domain went unused
 for several years.
 
 Late in 2008, a volunteer took on the task of setting up
-an @command{awk}-related web site---@uref{http://awk.info}---and did a very
+an @command{awk}-related website---@uref{http://awk.info}---and did a very
 nice job.
 
 If you have written an interesting @command{awk} program, or have written
 a @command{gawk} extension that you would like to share with the rest
 of the world, please see @uref{http://awk.info/?contribute} for how to
-contribute it to the web site.
+contribute it to the website.
 
+@ignore
 As of this writing, this website is in search of a maintainer; please
 contact me if you are interested.
+@end ignore
 
 @ignore
 Other links:
@@ -1945,7 +2083,7 @@ The initial draft of @cite{The GAWK Manual} had the following acknowledgments:
 Many people need to be thanked for their assistance in producing this
 manual.  Jay Fenlason contributed many ideas and sample programs.  Richard
 Mlynarik and Robert Chassell gave helpful comments on drafts of this
-manual.  The paper @cite{A Supplemental Document for @command{awk}} by John W.@:
+manual.  The paper @cite{A Supplemental Document for AWK} by John W.@:
 Pierce of the Chemistry Department at UC San Diego, pinpointed several
 issues relevant both to @command{awk} implementation and to this manual, that
 would otherwise have escaped us.
@@ -1956,12 +2094,18 @@ I would like to acknowledge Richard M.@: Stallman, for his vision of a
 better world and for his courage in founding the FSF and starting the
 GNU Project.
 
+@ifclear FOR_PRINT
 Earlier editions of this @value{DOCUMENT} had the following acknowledgements:
+@end ifclear
+@ifset FOR_PRINT
+The previous edition of this @value{DOCUMENT} had
+the following acknowledgements:
+@end ifset
 
 @quotation
 The following people (in alphabetical order)
 provided helpful comments on various
-versions of this book,
+versions of this book:
 Rick Adams,
 Dr.@: Nelson H.F. Beebe,
 Karl Berry,
@@ -1989,7 +2133,7 @@ Robert J.@: Chassell provided much valuable advice on
 the use of Texinfo.
 He also deserves special thanks for
 convincing me @emph{not} to title this @value{DOCUMENT}
-@cite{How To Gawk Politely}.
+@cite{How to Gawk Politely}.
 Karl Berry helped significantly with the @TeX{} part of Texinfo.
 
 @cindex Hartholz, Marshall
@@ -2063,35 +2207,45 @@ Andrew Schorr,
 Corinna Vinschen,
 and Eli Zaretskii
 (in alphabetical order)
-make up the current
-@command{gawk} ``crack portability team.''  Without their hard work and
-help, @command{gawk} would not be nearly the fine program it is today.  It
-has been and continues to be a pleasure working with this team of fine
-people.
+make up the current @command{gawk} ``crack portability team.''  Without
+their hard work and help, @command{gawk} would not be nearly the robust,
+portable program it is today.  It has been and continues to be a pleasure
+working with this team of fine people.
 
 Notable code and documentation contributions were made by
-a number of people. @xref{Contributors}, for the full list.
+a number of people. @DBXREF{Contributors} for the full list.
+
+@ifset FOR_PRINT
+@cindex Oram, Andy
+Thanks to Andy Oram of O'Reilly Media for initiating
+the fourth edition and for his support during the work.
+Thanks to Jasmine Kwityn for her copyediting work.
+@end ifset
 
+Thanks to Michael Brennan for the Forewords.
+
+@cindex Duman, Patrice
+@cindex Berry, Karl
 Thanks to Patrice Dumas for the new @command{makeinfo} program.
-Thanks to Karl Berry who continues to work to keep
+Thanks to Karl Berry, who continues to work to keep
 the Texinfo markup language sane.
 
 @cindex Kernighan, Brian
 @cindex Brennan, Michael
 @cindex Day, Robert P.J.@:
-Robert P.J.@: Day, Michael Brennan and Brian Kernighan kindly acted as
+Robert P.J.@: Day, Michael Brennan, and Brian Kernighan kindly acted as
 reviewers for the 2015 edition of this @value{DOCUMENT}. Their feedback
 helped improve the final work.
 
-I would like to thank Brian Kernighan for invaluable assistance during the
-testing and debugging of @command{gawk}, and for ongoing
+I would also like to thank Brian Kernighan for his invaluable assistance during the
+testing and debugging of @command{gawk}, and for his ongoing
 help and advice in clarifying numerous points about the language.
 We could not have done nearly as good a job on either @command{gawk}
 or its documentation without his help.
 
 Brian is in a class by himself as a programmer and technical
 author.  I have to thank him (yet again) for his ongoing friendship
-and the role model he has been for me for close to 30 years!
+and for being a role model to me for close to 30 years!
 Having him as a reviewer is an exciting privilege. It has also
 been extremely humbling@enddots{}
 
@@ -2107,14 +2261,14 @@ which they raised and educated me.
 Finally, I also must acknowledge my gratitude to G-d, for the many opportunities
 He has sent my way, as well as for the gifts He has given me with which to
 take advantage of those opportunities.
-@iftex
+@ifnotdocbook
 @sp 2
 @noindent
 Arnold Robbins @*
 Nof Ayalon @*
-ISRAEL @*
-May, 2014
-@end iftex
+Israel @*
+February 2015
+@end ifnotdocbook
 
 @ifnotinfo
 @part @value{PART1}The @command{awk} Language
@@ -2130,31 +2284,31 @@ following chapters:
 
 @itemize @value{BULLET}
 @item
-@ref{Getting Started}.
+@ref{Getting Started}
 
 @item
-@ref{Invoking Gawk}.
+@ref{Invoking Gawk}
 
 @item
-@ref{Regexp}.
+@ref{Regexp}
 
 @item
-@ref{Reading Files}.
+@ref{Reading Files}
 
 @item
-@ref{Printing}.
+@ref{Printing}
 
 @item
-@ref{Expressions}.
+@ref{Expressions}
 
 @item
-@ref{Patterns and Actions}.
+@ref{Patterns and Actions}
 
 @item
-@ref{Arrays}.
+@ref{Arrays}
 
 @item
-@ref{Functions}.
+@ref{Functions}
 @end itemize
 @end ifdocbook
 
@@ -2169,17 +2323,17 @@ following chapters:
 The basic function of @command{awk} is to search files for lines (or other
 units of text) that contain certain patterns.  When a line matches one
 of the patterns, @command{awk} performs specified actions on that line.
-@command{awk} keeps processing input lines in this way until it reaches
+@command{awk} continues to process input lines in this way until it reaches
 the end of the input files.
 
 @cindex @command{awk}, uses for
 @cindex programming languages@comma{} data-driven vs.@: procedural
 @cindex @command{awk} programs
 Programs in @command{awk} are different from programs in most other languages,
-because @command{awk} programs are @dfn{data-driven}; that is, you describe
-the data you want to work with and then what to do when you find it.
+because @command{awk} programs are @dfn{data driven} (i.e., you describe
+the data you want to work with and then what to do when you find it).
 Most other languages are @dfn{procedural}; you have to describe, in great
-detail, every step the program is to take.  When working with procedural
+detail, every step the program should take.  When working with procedural
 languages, it is usually much
 harder to clearly describe the data your program will process.
 For this reason, @command{awk} programs are often refreshingly easy to
@@ -2189,15 +2343,15 @@ read and write.
 @cindex rule, definition of
 When you run @command{awk}, you specify an @command{awk} @dfn{program} that
 tells @command{awk} what to do.  The program consists of a series of
-@dfn{rules}.  (It may also contain @dfn{function definitions},
-an advanced feature that we will ignore for now.
-@xref{User-defined}.)  Each rule specifies one
+@dfn{rules} (it may also contain @dfn{function definitions},
+an advanced feature that we will ignore for now;
+@pxref{User-defined}).  Each rule specifies one
 pattern to search for and one action to perform
 upon finding the pattern.
 
-Syntactically, a rule consists of a pattern followed by an action.  The
-action is enclosed in braces to separate it from the pattern.
-Newlines usually separate rules.  Therefore, an @command{awk}
+Syntactically, a rule consists of a @dfn{pattern} followed by an
+@dfn{action}.  The action is enclosed in braces to separate it from the
+pattern.  Newlines usually separate rules.  Therefore, an @command{awk}
 program looks like this:
 
 @example
@@ -2271,8 +2425,8 @@ awk '@var{program}' @var{input-file1} @var{input-file2} @dots{}
 @end example
 
 @noindent
-where @var{program} consists of a series of @var{patterns} and
-@var{actions}, as described earlier.
+where @var{program} consists of a series of patterns and
+actions, as described earlier.
 
 @cindex single quote (@code{'})
 @cindex @code{'} (single quote)
@@ -2291,11 +2445,12 @@ programs from shell scripts, because it avoids the need for a separate
 file for the @command{awk} program.  A self-contained shell script is more
 reliable because there are no other files to misplace.
 
+Later in this chapter, in
+@ifdocbook
+the section
+@end ifdocbook
 @ref{Very Simple},
-@ifnotinfo
-later in this @value{CHAPTER},
-@end ifnotinfo
-presents several short,
+we'll see examples of several short,
 self-contained programs.
 
 @node Read Terminal
@@ -2316,10 +2471,10 @@ awk '@var{program}'
 which usually means whatever you type on the keyboard.  This continues
 until you indicate end-of-file by typing @kbd{Ctrl-d}.
 @ifset FOR_PRINT
-(On other operating systems, the end-of-file character may be different.)
+(On non-POSIX operating systems, the end-of-file character may be different.)
 @end ifset
 @ifclear FOR_PRINT
-(On other operating systems, the end-of-file character may be different.
+(On non-POSIX operating systems, the end-of-file character may be different.
 For example, on OS/2, it is @kbd{Ctrl-z}.)
 @end ifclear
 
@@ -2332,7 +2487,7 @@ to keep you from worrying about the complexities of computer
 programming:
 
 @example
-$ @kbd{awk "BEGIN @{ print "Don\47t Panic!" @}"}
+$ @kbd{awk 'BEGIN @{ print "Don\47t Panic!" @}'}
 @print{} Don't Panic!
 @end example
 
@@ -2340,11 +2495,11 @@ $ @kbd{awk "BEGIN @{ print "Don\47t Panic!" @}"}
 reading any input.  If there are no other statements in your program,
 as is the case here, @command{awk} just stops, instead of trying to read
 input it doesn't know how to process.
-The @samp{\47} is a magic way of getting a single quote into
+The @samp{\47} is a magic way (explained later) of getting a single quote into
 the program, without having to engage in ugly shell quoting tricks.
 
 @quotation NOTE
-As a side note, if you use Bash as your shell, you should execute the
+If you use Bash as your shell, you should execute the
 command @samp{set +H} before running this program interactively, to
 disable the C shell-style command history, which treats @samp{!} as a
 special character. We recommend putting this command into your personal
@@ -2353,7 +2508,7 @@ startup file.
 
 This next simple @command{awk} program
 emulates the @command{cat} utility; it copies whatever you type on the
-keyboard to its standard output (why this works is explained shortly).
+keyboard to its standard output (why this works is explained shortly):
 
 @example
 $ @kbd{awk '@{ print @}'}
@@ -2374,7 +2529,7 @@ $ @kbd{awk '@{ print @}'}
 @cindex @command{awk} programs, running
 @cindex @command{awk} programs, lengthy
 @cindex files, @command{awk} programs in
-Sometimes your @command{awk} programs can be very long.  In this case, it is
+Sometimes @command{awk} programs are very long.  In these cases, it is
 more convenient to put the program into a separate file.  In order to tell
 @command{awk} to use that file for its program, you type:
 
@@ -2404,7 +2559,7 @@ awk -f advice
 does the same thing as this one:
 
 @example
-awk "BEGIN @{ print \"Don't Panic!\" @}"
+awk 'BEGIN @{ print "Don\47t Panic!" @}'
 @end example
 
 @cindex quoting in @command{gawk} command lines
@@ -2416,12 +2571,12 @@ specify with @option{-f}, because most @value{FN}s don't contain any of the shel
 special characters.  Notice that in @file{advice}, the @command{awk}
 program did not have single quotes around it.  The quotes are only needed
 for programs that are provided on the @command{awk} command line.
+(Also, placing the program in a file allows us to use a literal single quote in the program
+text, instead of the magic @samp{\47}.)
 
-@c STARTOFRANGE sq1x
 @cindex single quote (@code{'}) in @command{gawk} command lines
-@c STARTOFRANGE qs2x
 @cindex @code{'} (single quote) in @command{gawk} command lines
-If you want to clearly identify your @command{awk} program files as such,
+If you want to clearly identify an @command{awk} program file as such,
 you can add the extension @file{.awk} to the @value{FN}.  This doesn't
 affect the execution of the @command{awk} program but it does make
 ``housekeeping'' easier.
@@ -2436,7 +2591,7 @@ affect the execution of the @command{awk} program but it does make
 Once you have learned @command{awk}, you may want to write self-contained
 @command{awk} scripts, using the @samp{#!} script mechanism.  You can do
 this on many systems.@footnote{The @samp{#!} mechanism works on
-GNU/Linux systems, BSD-based systems and commercial Unix systems.}
+GNU/Linux systems, BSD-based systems, and commercial Unix systems.}
 For example, you could update the file @file{advice} to look like this:
 
 @example
@@ -2474,8 +2629,8 @@ written in @command{awk}.
 according to the instructions in your program. (This is different
 from a @dfn{compiled} language such as C, where your program is first
 compiled into machine code that is executed directly by your system's
-hardware.)  The @command{awk} utility is thus termed an @dfn{interpreter}.
-Many modern languages are interperted.
+processor.)  The @command{awk} utility is thus termed an @dfn{interpreter}.
+Many modern languages are interpreted.
 
 The line beginning with @samp{#!} lists the full @value{FN} of an
 interpreter to run and a single optional initial command-line argument
@@ -2483,9 +2638,9 @@ to pass to that interpreter.  The operating system then runs the
 interpreter with the given argument and the full argument list of the
 executed program.  The first argument in the list is the full @value{FN}
 of the @command{awk} program.  The rest of the argument list contains
-either options to @command{awk}, or @value{DF}s, or both. Note that on
+either options to @command{awk}, or @value{DF}s, or both. (Note that on
 many systems @command{awk} may be found in @file{/usr/bin} instead of
-in @file{/bin}. Caveat Emptor.
+in @file{/bin}.)
 
 Some systems limit the length of the interpreter name to 32 characters.
 Often, this can be dealt with by using a symbolic link.
@@ -2521,14 +2676,14 @@ can explain what the program does and how it works.  Nearly all
 programming languages have provisions for comments, as programs are
 typically hard to understand without them.
 
-In the @command{awk} language, a comment starts with the sharp sign
+In the @command{awk} language, a comment starts with the number sign
 character (@samp{#}) and continues to the end of the line.
 The @samp{#} does not have to be the first character on the line. The
-@command{awk} language ignores the rest of a line following a sharp sign.
+@command{awk} language ignores the rest of a line following a number sign.
 For example, we could have put the following into @file{advice}:
 
 @example
-# This program prints a nice friendly message.  It helps
+# This program prints a nice, friendly message.  It helps
 # keep novice users from being afraid of the computer.
 BEGIN    @{ print "Don't Panic!" @}
 @end example
@@ -2544,7 +2699,8 @@ when reading it at a later time.
 @quotation CAUTION
 As mentioned in
 @ref{One-shot},
-you can enclose small to medium programs in single quotes, in order to keep
+you can enclose short to medium-sized programs in single quotes,
+in order to keep
 your shell scripts self-contained.  When doing so, @emph{don't} put
 an apostrophe (i.e., a single quote) into a comment (or anywhere else
 in your program). The shell interprets the quote as the closing
@@ -2573,19 +2729,19 @@ $ @kbd{awk '@{ print "hello" @} # let's be cute'}
 @cindex @code{\} (backslash)
 @cindex backslash (@code{\})
 Putting a backslash before the single quote in @samp{let's} wouldn't help,
-since backslashes are not special inside single quotes.
+because backslashes are not special inside single quotes.
 The next @value{SUBSECTION} describes the shell's quoting rules.
 @end quotation
 
 @node Quoting
-@subsection Shell-Quoting Issues
+@subsection Shell Quoting Issues
 @cindex shell quoting, rules for
 
 @menu
 * DOS Quoting::                 Quoting in Windows Batch Files.
 @end menu
 
-For short to medium length @command{awk} programs, it is most convenient
+For short to medium-length @command{awk} programs, it is most convenient
 to enter the program on the @command{awk} command line.
 This is best done by enclosing the entire program in single quotes.
 This is true whether you are entering the program interactively at
@@ -2609,8 +2765,8 @@ or empty, string.
 The null string is character data that has no value.
 In other words, it is empty.  It is written in @command{awk} programs
 like this: @code{""}. In the shell, it can be written using single
-or double quotes: @code{""} or @code{''}. While the null string has
-no characters in it, it does exist. Consider this command:
+or double quotes: @code{""} or @code{''}. Although the null string has
+no characters in it, it does exist. For example, consider this command:
 
 @example
 $ @kbd{echo ""}
@@ -2620,8 +2776,7 @@ $ @kbd{echo ""}
 Here, the @command{echo} utility receives a single argument, even
 though that argument has no characters in it. In the rest of this
 @value{DOCUMENT}, we use the terms @dfn{null string} and @dfn{empty string}
-interchangeably.  Now, on to the quoting rules.
-
+interchangeably.  Now, on to the quoting rules:
 
 @itemize @value{BULLET}
 @item
@@ -2644,7 +2799,7 @@ The shell does no interpretation of the quoted text, passing it on verbatim
 to the command.
 It is @emph{impossible} to embed a single quote inside single-quoted text.
 Refer back to
-@ref{Comments},
+@DBREF{Comments}
 for an example of what happens if you try.
 
 @item
@@ -2654,7 +2809,7 @@ Double quotes protect most things between the opening and closing quotes.
 The shell does at least variable and command substitution on the quoted text.
 Different shells may do additional kinds of processing on double-quoted text.
 
-Since certain characters within double-quoted text are processed by the shell,
+Because certain characters within double-quoted text are processed by the shell,
 they must be @dfn{escaped} within the text.  Of note are the characters
 @samp{$}, @samp{`}, @samp{\}, and @samp{"}, all of which must be preceded by
 a backslash within double-quoted text if they are to be passed on literally
@@ -2663,8 +2818,14 @@ Thus, the example seen
 @ifnotinfo
 previously
 @end ifnotinfo
-in @ref{Read Terminal},
-is applicable:
+in @ref{Read Terminal}:
+
+@example
+awk 'BEGIN @{ print "Don\47t Panic!" @}'
+@end example
+
+@noindent
+could instead be written this way:
 
 @example
 $ @kbd{awk "BEGIN @{ print \"Don't Panic!\" @}"}
@@ -2694,7 +2855,7 @@ awk -F"" '@var{program}' @var{files}  # wrong!
 @end example
 
 @noindent
-In the second case, @command{awk} will attempt to use the text of the program
+In the second case, @command{awk} attempts to use the text of the program
 as the value of @code{FS}, and the first @value{FN} as the text of the program!
 This results in syntax errors at best, and confusing behavior at worst.
 @end itemize
@@ -2710,7 +2871,7 @@ $ @kbd{awk 'BEGIN @{ print "Here is a single quote <'"'"'>" @}'}
 
 @noindent
 This program consists of three concatenated quoted strings.  The first and the
-third are single-quoted, the second is double-quoted.
+third are single-quoted, and the second is double-quoted.
 
 This can be ``simplified'' to:
 
@@ -2731,8 +2892,6 @@ $ @kbd{awk "BEGIN @{ print \"Here is a single quote <'>\" @}"}
 @end example
 
 @noindent
-@c ENDOFRANGE sq1x
-@c ENDOFRANGE qs2x
 This option is also painful, because double quotes, backslashes, and dollar signs
 are very common in more advanced @command{awk} programs.
 
@@ -2749,19 +2908,22 @@ $ @kbd{awk 'BEGIN @{ print "Here is a double quote <\42>" @}'}
 @end example
 
 @noindent
-This works nicely, except that you should comment clearly what the
+This works nicely, but you should comment clearly what the
 escapes mean.
 
 A fourth option is to use command-line variable assignment, like this:
 
 @example
-$ awk -v sq="'" 'BEGIN @{ print "Here is a single quote <" sq ">" @}'
+$ @kbd{awk -v sq="'" 'BEGIN @{ print "Here is a single quote <" sq ">" @}'}
 @print{} Here is a single quote <'>
 @end example
 
+(Here, the two string constants and the value of @code{sq} are concatenated
+into a single string that is printed by @code{print}.)
+
 If you really need both single and double quotes in your @command{awk}
 program, it is probably best to move it into a separate file, where
-the shell won't be part of the picture, and you can say what you mean.
+the shell won't be part of the picture and you can say what you mean.
 
 @node DOS Quoting
 @subsubsection Quoting in MS-Windows Batch Files
@@ -2822,8 +2984,8 @@ The second @value{DF}, called @file{inventory-shipped}, contains
 information about monthly shipments.  In both files,
 each line is considered to be one @dfn{record}.
 
-In the @value{DF} @file{mail-list}, each record contains the name of a person,
-his/her phone number, his/her email-address, and a code for their relationship
+In @file{mail-list}, each record contains the name of a person,
+his/her phone number, his/her email address, and a code for his/her relationship
 with the author of the list.
 The columns are aligned using spaces.
 An @samp{A} in the last column
@@ -2860,7 +3022,7 @@ of green crates shipped, the number of red boxes shipped, the number of
 orange bags shipped, and the number of blue packages shipped,
 respectively.  There are 16 entries, covering the 12 months of last year
 and the first four months of the current year.
-An empty line separates the data for the two years.
+An empty line separates the data for the two years:
 
 @example
 @c file eg/data/inventory-shipped
@@ -2894,7 +3056,7 @@ The following command runs a simple @command{awk} program that searches the
 input file @file{mail-list} for the character string @samp{li} (a
 grouping of characters is usually called a @dfn{string};
 the term @dfn{string} is based on similar usage in English, such
-as ``a string of pearls,'' or ``a string of cars in a train''):
+as ``a string of pearls'' or ``a string of cars in a train''):
 
 @example
 awk '/li/ @{ print $0 @}' mail-list
@@ -2941,11 +3103,11 @@ omitting the @code{print} statement but retaining the braces makes an
 empty action that does nothing (i.e., no lines are printed).
 
 @cindex @command{awk} programs, one-line examples
-Many practical @command{awk} programs are just a line or two.  Following is a
+Many practical @command{awk} programs are just a line or two long.  Following is a
 collection of useful, short programs to get you started.  Some of these
 programs contain constructs that haven't been covered yet. (The description
-of the program will give you a good idea of what is going on, but please
-read the rest of the @value{DOCUMENT} to become an @command{awk} expert!)
+of the program will give you a good idea of what is going on, but you'll
+need to read the rest of the @value{DOCUMENT} to become an @command{awk} expert!)
 Most of the examples use a @value{DF} named @file{data}.  This is just a
 placeholder; if you use these programs yourself, substitute
 your own @value{FN}s for @file{data}.
@@ -2962,7 +3124,7 @@ Print every line that is longer than 80 characters:
 awk 'length($0) > 80' data
 @end example
 
-The sole rule has a relational expression as its pattern and it has no
+The sole rule has a relational expression as its pattern and has no
 action---so it uses the default action, printing the record.
 
 @item
@@ -2982,11 +3144,11 @@ Print the length of the longest line in @file{data}:
 
 @example
 expand data | awk '@{ if (x < length($0)) x = length($0) @}
-              END @{ print "maximum line length is " x @}'
+                   END @{ print "maximum line length is " x @}'
 @end example
 
 This example differs slightly from the previous one:
-The input is processed by the @command{expand} utility to change TABs
+the input is processed by the @command{expand} utility to change TABs
 into spaces, so the widths compared are actually the right-margin columns,
 as opposed to the number of input characters on each line.
 
@@ -3014,7 +3176,7 @@ Print the total number of bytes used by @var{files}:
 
 @example
 ls -l @var{files} | awk '@{ x += $5 @}
-                  END @{ print "total bytes: " x @}'
+                   END @{ print "total bytes: " x @}'
 @end example
 
 @item
@@ -3049,7 +3211,7 @@ Print the even-numbered lines in the @value{DF}:
 awk 'NR % 2 == 0' data
 @end example
 
-If you use the expression @samp{NR % 2 == 1} instead,
+If you used the expression @samp{NR % 2 == 1} instead,
 the program would print the odd-numbered lines.
 @end itemize
 
@@ -3058,15 +3220,20 @@ the program would print the odd-numbered lines.
 @cindex @command{awk} programs
 
 The @command{awk} utility reads the input files one line at a
-time.  For each line, @command{awk} tries the patterns of each of the rules.
+time.  For each line, @command{awk} tries the patterns of each rule.
 If several patterns match, then several actions execute in the order in
 which they appear in the @command{awk} program.  If no patterns match, then
 no actions run.
 
 After processing all the rules that match the line (and perhaps there are none),
 @command{awk} reads the next line.  (However,
-@pxref{Next Statement},
-and also @pxref{Nextfile Statement}).
+@DBPXREF{Next Statement}
+@ifdocbook
+and @DBREF{Nextfile Statement}.)
+@end ifdocbook
+@ifnotdocbook
+and also @pxref{Nextfile Statement}.)
+@end ifnotdocbook
 This continues until the program reaches the end of the file.
 For example, the following @command{awk} program contains two rules:
 
@@ -3140,13 +3307,12 @@ the file was last modified. Its output looks like this:
 @noindent
 @cindex line continuations, with C shell
 The first field contains read-write permissions, the second field contains
-the number of links to the file, and the third field identifies the owner of
-the file. The fourth field identifies the group of the file.
-The fifth field contains the size of the file in bytes.  The
+the number of links to the file, and the third field identifies the file's owner.
+The fourth field identifies the file's group.
+The fifth field contains the file's size in bytes.  The
 sixth, seventh, and eighth fields contain the month, day, and time,
 respectively, that the file was last modified.  Finally, the ninth field
-contains the @value{FN}.@footnote{The @samp{LC_ALL=C} is
-needed to produce this traditional-style output from @command{ls}.}
+contains the @value{FN}.
 
 @c @cindex automatic initialization
 @cindex initialization, automatic
@@ -3241,7 +3407,7 @@ lines in the middle of a regular expression or a string.
 with the C shell.}  It works for @command{awk} programs in files and
 for one-shot programs, @emph{provided} you are using a POSIX-compliant
 shell, such as the Unix Bourne shell or Bash.  But the C shell behaves
-differently!  There, you must use two backslashes in a row, followed by
+differently!  There you must use two backslashes in a row, followed by
 a newline.  Note also that when using the C shell, @emph{every} newline
 in your @command{awk} program must be escaped with a backslash. To illustrate:
 
@@ -3282,9 +3448,9 @@ starts a comment, it ignores @emph{everything} on the rest of the
 line. For example:
 
 @example
-$ gawk 'BEGIN @{ print "dont panic" # a friendly \
->                                    BEGIN rule
-> @}'
+$ @kbd{gawk 'BEGIN @{ print "dont panic" # a friendly \}
+> @kbd{                                   BEGIN rule}
+> @kbd{@}'}
 @error{} gawk: cmd. line:2:                BEGIN rule
 @error{} gawk: cmd. line:2:                ^ syntax error
 @end example
@@ -3332,9 +3498,9 @@ performing bit manipulation, for runtime string translation (internationalizatio
 determining the type of a variable,
 and array sorting.
 
-As we develop our presentation of the @command{awk} language, we introduce
+As we develop our presentation of the @command{awk} language, we will introduce
 most of the variables and many of the functions. They are described
-systematically in @ref{Built-in Variables}, and in
+systematically in @DBREF{Built-in Variables} and in
 @ref{Built-in}.
 
 @node When
@@ -3368,8 +3534,8 @@ eight-bit microprocessors,
 @end ifset
 and a microcode assembler for a special-purpose Prolog
 computer.
-While the original @command{awk}'s capabilities were strained by tasks
-of such complexity, modern versions are more capable.
+The original @command{awk}'s capabilities were strained by tasks
+of such complexity, but modern versions are more capable.
 
 @cindex @command{awk} programs, complex
 If you find yourself writing @command{awk} scripts of more than, say,
@@ -3386,7 +3552,7 @@ and Perl.}
 @c FIXME: Review this chapter for summary of builtin functions called.
 @itemize @value{BULLET}
 @item
-Programs in @command{awk} consist of @var{pattern}-@var{action} pairs.
+Programs in @command{awk} consist of @var{pattern}--@var{action} pairs.
 
 @item
 An @var{action} without a @var{pattern} always runs.  The default
@@ -3415,7 +3581,7 @@ part of a larger shell script (or MS-Windows batch file).
 You may use backslash continuation to continue a source line.
 Lines are automatically continued after
 a comma, open brace, question mark, colon,
-@samp{||}, @samp{&&}, @code{do} and @code{else}.
+@samp{||}, @samp{&&}, @code{do}, and @code{else}.
 @end itemize
 
 @node Invoking Gawk
@@ -3424,7 +3590,7 @@ a comma, open brace, question mark, colon,
 This @value{CHAPTER} covers how to run @command{awk}, both POSIX-standard
 and @command{gawk}-specific command-line options, and what
 @command{awk} and
-@command{gawk} do with non-option arguments.
+@command{gawk} do with nonoption arguments.
 It then proceeds to cover how @command{gawk} searches for source files,
 reading standard input along with other files, @command{gawk}'s
 environment variables, @command{gawk}'s exit status, using include files,
@@ -3468,7 +3634,7 @@ enclosed in [@dots{}] in these templates are optional:
 @cindex GNU long options
 @cindex long options
 @cindex options, long
-Besides traditional one-letter POSIX-style options, @command{gawk} also
+In addition to traditional one-letter POSIX-style options, @command{gawk} also
 supports GNU long options.
 
 @cindex dark corner, invoking @command{awk}
@@ -3490,20 +3656,16 @@ warning that the program is empty.
 
 @node Options
 @section Command-Line Options
-@c STARTOFRANGE ocl
 @cindex options, command-line
-@c STARTOFRANGE clo
 @cindex command line, options
-@c STARTOFRANGE gnulo
 @cindex GNU long options
-@c STARTOFRANGE longo
 @cindex options, long
 
 Options begin with a dash and consist of a single character.
 GNU-style long options consist of two dashes and a keyword.
 The keyword can be abbreviated, as long as the abbreviation allows the option
-to be uniquely identified.  If the option takes an argument, then the
-keyword is either immediately followed by an equals sign (@samp{=}) and the
+to be uniquely identified.  If the option takes an argument, either the
+keyword is immediately followed by an equals sign (@samp{=}) and the
 argument's value, or the keyword and the argument's value are separated
 by whitespace.
 If a particular option with a value is given more than once, it is the
@@ -3530,8 +3692,8 @@ Set the @code{FS} variable to @var{fs}
 @cindex @option{-f} option
 @cindex @option{--file} option
 @cindex @command{awk} programs, location of
-Read @command{awk} program source from @var{source-file}
-instead of in the first non-option argument.
+Read the @command{awk} program source from @var{source-file}
+instead of in the first nonoption argument.
 This option may be given multiple times; the @command{awk}
 program consists of the concatenation of the contents of
 each specified @var{source-file}.
@@ -3550,13 +3712,13 @@ The @option{-v} option can only set one variable, but it can be used
 more than once, setting another variable each time, like this:
 @samp{awk @w{-v foo=1} @w{-v bar=2} @dots{}}.
 
-@cindex built-in variables, @code{-v} option@comma{} setting with
-@cindex variables, built-in, @code{-v} option@comma{} setting with
+@cindex predefined variables, @code{-v} option@comma{} setting with
+@cindex variables, predefined @code{-v} option@comma{} setting with
 @quotation CAUTION
 Using @option{-v} to set the values of the built-in
 variables may lead to surprising results.  @command{awk} will reset the
 values of those variables as it needs to, possibly ignoring any
-predefined value you may have given.
+initial value you may have given.
 @end quotation
 
 @item -W @var{gawk-opt}
@@ -3585,8 +3747,6 @@ by the user that could start with @samp{-}.
 It is also useful for passing options on to the @command{awk}
 program; see @ref{Getopt Function}.
 @end table
-@c ENDOFRANGE gnulo
-@c ENDOFRANGE longo
 
 The following list describes @command{gawk}-specific options:
 
@@ -3598,14 +3758,14 @@ The following list describes @command{gawk}-specific options:
 @cindex @option{--characters-as-bytes} option
 Cause @command{gawk} to treat all input data as single-byte characters.
 In addition, all output written with @code{print} or @code{printf}
-are treated as single-byte characters.
+is treated as single-byte characters.
 
 Normally, @command{gawk} follows the POSIX standard and attempts to process
 its input data according to the current locale (@pxref{Locales}). This can often involve
 converting multibyte characters into wide characters (internally), and
 can lead to problems or confusion if the input data does not contain valid
-multibyte characters. This option is an easy way to tell @command{gawk}:
-``hands off my data!''.
+multibyte characters. This option is an easy way to tell @command{gawk},
+``Hands off my data!''
 
 @item @option{-c}
 @itemx @option{--traditional}
@@ -3639,7 +3799,7 @@ Print the short version of the General Public License and then exit.
 @cindex variables, global, printing list of
 Print a sorted list of global variables, their types, and final values
 to @var{file}.  If no @var{file} is provided, print this
-list to the file named @file{awkvars.out} in the current directory.
+list to a file named @file{awkvars.out} in the current directory.
 No space is allowed between the @option{-d} and @var{file}, if
 @var{file} is supplied.
 
@@ -3659,9 +3819,10 @@ names like @code{i}, @code{j}, etc.)
 @cindex @command{awk} debugging, enabling
 Enable debugging of @command{awk} programs
 (@pxref{Debugging}).
-By default, the debugger reads commands interactively from the keyboard.
+By default, the debugger reads commands interactively from the keyboard
+(standard input).
 The optional @var{file} argument allows you to specify a file with a list
-of commands for the debugger to execute non-interactively.
+of commands for the debugger to execute noninteractively.
 No space is allowed between the @option{-D} and @var{file}, if
 @var{file} is supplied.
 
@@ -3699,7 +3860,13 @@ Command-line variable assignments of the form
 This option is particularly necessary for World Wide Web CGI applications
 that pass arguments through the URL; using this option prevents a malicious
 (or other) user from passing in options, assignments, or @command{awk} source
-code (via @option{-e}) to the CGI application.  This option should be used
+code (via @option{-e}) to the CGI application.@footnote{For more detail,
+please see Section 4.4 of @uref{http://www.ietf.org/rfc/rfc3875,
+RFC 3875}. Also see the
+@uref{http://lists.gnu.org/archive/html/bug-gawk/2014-11/msg00022.html,
+explanatory note sent to the @command{gawk} bug
+mailing list}.}
+This option should be used
 with @samp{#!} scripts (@pxref{Executable Scripts}), like so:
 
 @example
@@ -3715,7 +3882,7 @@ with @samp{#!} scripts (@pxref{Executable Scripts}), like so:
 @cindex portable object files, generating
 @cindex files, portable object, generating
 Analyze the source program and
-generate a GNU @command{gettext} Portable Object Template file on standard
+generate a GNU @command{gettext} portable object template file on standard
 output for all string constants that have been marked for translation.
 @xref{Internationalization},
 for information about this option.
@@ -3727,7 +3894,7 @@ for information about this option.
 @cindex GNU long options, printing list of
 @cindex options, printing list of
 @cindex printing, list of options
-Print a ``usage'' message summarizing the short and long style options
+Print a ``usage'' message summarizing the short- and long-style options
 that @command{gawk} accepts and then exit.
 
 @item @option{-i} @var{source-file}
@@ -3735,9 +3902,9 @@ that @command{gawk} accepts and then exit.
 @cindex @option{-i} option
 @cindex @option{--include} option
 @cindex @command{awk} programs, location of
-Read @command{awk} source library from @var{source-file}.  This option
+Read an @command{awk} source library from @var{source-file}.  This option
 is completely equivalent to using the @code{@@include} directive inside
-your program.  This option is very similar to the @option{-f} option,
+your program.  It is very similar to the @option{-f} option,
 but there are two important differences.  First, when @option{-i} is
 used, the program source is not loaded if it has been previously
 loaded, whereas with @option{-f}, @command{gawk} always loads the file.
@@ -3759,7 +3926,7 @@ environment variable.  The correct library suffix for your platform will be
 supplied by default, so it need not be specified in the extension name.
 The extension initialization routine should be named @code{dl_load()}.
 An alternative is to use the @code{@@load} keyword inside the program to load
-a shared library.  This feature is described in detail in @ref{Dynamic Extensions}.
+a shared library.  This advanced feature is described in detail in @ref{Dynamic Extensions}.
 
 @item @option{-L}[@var{value}]
 @itemx @option{--lint}[@code{=}@var{value}]
@@ -3790,7 +3957,7 @@ care to search for all occurrences of each inappropriate construct. As
 @itemx @option{--bignum}
 @cindex @option{-M} option
 @cindex @option{--bignum} option
-Force arbitrary precision arithmetic on numbers. This option has no effect
+Force arbitrary-precision arithmetic on numbers. This option has no effect
 if @command{gawk} is not compiled to use the GNU MPFR and MP libraries
 (@pxref{Arbitrary Precision Arithmetic}).
 
@@ -3806,8 +3973,8 @@ values in input data
 (@pxref{Nondecimal Data}).
 
 @quotation CAUTION
-This option can severely break old programs.
-Use with care.
+This option can severely break old programs.  Use with care.  Also note
+that this option may disappear in a future version of @command{gawk}.
 @end quotation
 
 @item @option{-N}
@@ -3822,7 +3989,7 @@ when parsing numeric input data (@pxref{Locales}).
 @cindex @option{-o} option
 @cindex @option{--pretty-print} option
 Enable pretty-printing of @command{awk} programs.
-By default, output program is created in a file named @file{awkprof.out}
+By default, the output program is created in a file named @file{awkprof.out}
 (@pxref{Profiling}).
 The optional @var{file} argument allows you to specify a different
 @value{FN} for the output.
@@ -3839,7 +4006,7 @@ This is no longer the case.
 @cindex @option{--optimize} option
 @cindex @option{-O} option
 Enable some optimizations on the internal representation of the program.
-At the moment this includes just simple constant folding.
+At the moment, this includes just simple constant folding.
 
 @item @option{-p}[@var{file}]
 @itemx @option{--profile}[@code{=}@var{file}]
@@ -3866,7 +4033,7 @@ in the left margin, and function call counts for each function.
 Operate in strict POSIX mode.  This disables all @command{gawk}
 extensions (just like @option{--traditional}) and
 disables all extensions not allowed by POSIX.
-@xref{Common Extensions}, for a summary of the extensions
+@DBXREF{Common Extensions} for a summary of the extensions
 in @command{gawk} that are disabled by this option.
 Also,
 the following additional
@@ -3916,8 +4083,8 @@ Allow interval expressions
 (@pxref{Regexp Operators})
 in regexps.
 This is now @command{gawk}'s default behavior.
-Nevertheless, this option remains both for backward compatibility,
-and for use in combination with @option{--traditional}.
+Nevertheless, this option remains (both for backward compatibility
+and for use in combination with @option{--traditional}).
 
 @item @option{-S}
 @itemx @option{--sandbox}
@@ -3970,7 +4137,8 @@ If it is, @command{awk} reads its program source from all of the named files, as
 if they had been concatenated together into one big file.  This is
 useful for creating libraries of @command{awk} functions.  These functions
 can be written once and then retrieved from a standard place, instead
-of having to be included into each individual program.
+of having to be included in each individual program.
+The @option{-i} option is similar in this regard.
 (As mentioned in
 @ref{Definition Syntax},
 function names must be unique.)
@@ -3980,20 +4148,20 @@ if the program is entered at the keyboard,
 by specifying @samp{-f /dev/tty}.  After typing your program,
 type @kbd{Ctrl-d} (the end-of-file character) to terminate it.
 (You may also use @samp{-f -} to read program source from the standard
-input but then you will not be able to also use the standard input as a
+input, but then you will not be able to also use the standard input as a
 source of data.)
 
 Because it is clumsy using the standard @command{awk} mechanisms to mix
 source file and command-line @command{awk} programs, @command{gawk}
 provides the @option{-e} option.  This does not require you to
-pre-empt the standard input for your source code; it allows you to easily
+preempt the standard input for your source code; it allows you to easily
 mix command-line and library source code (@pxref{AWKPATH Variable}).
 As with @option{-f}, the @option{-e} and @option{-i}
 options may also be used multiple times on the command line.
 
 @cindex @option{-e} option
 If no @option{-f} or @option{-e} option is specified, then @command{gawk}
-uses the first non-option command-line argument as the text of the
+uses the first nonoption command-line argument as the text of the
 program source code.
 
 @cindex @env{POSIXLY_CORRECT} environment variable
@@ -4032,8 +4200,6 @@ setenv POSIXLY_CORRECT true
 Having @env{POSIXLY_CORRECT} set is not recommended for daily use,
 but it is good for testing the portability of your programs to other
 environments.
-@c ENDOFRANGE ocl
-@c ENDOFRANGE clo
 
 @node Other Arguments
 @section Other Command-Line Arguments
@@ -4044,20 +4210,23 @@ Any additional arguments on the command line are normally treated as
 input files to be processed in the order specified.   However, an
 argument that has the form @code{@var{var}=@var{value}}, assigns
 the value @var{value} to the variable @var{var}---it does not specify a
-file at all.
-(See
-@ref{Assignment Options}.)
+file at all.  (See @ref{Assignment Options}.) In the following example,
+@var{count=1} is a variable assignment, not a @value{FN}:
+
+@example
+awk -f program.awk file1 count=1 file2
+@end example
 
 @cindex @command{gawk}, @code{ARGIND} variable in
 @cindex @code{ARGIND} variable, command-line arguments
 @cindex @code{ARGV} array, indexing into
 @cindex @code{ARGC}/@code{ARGV} variables, command-line arguments
-All these arguments are made available to your @command{awk} program in the
+All the command-line arguments are made available to your @command{awk} program in the
 @code{ARGV} array (@pxref{Built-in Variables}).  Command-line options
 and the program text (if present) are omitted from @code{ARGV}.
 All other arguments, including variable assignments, are
 included.   As each element of @code{ARGV} is processed, @command{gawk}
-sets the variable @code{ARGIND} to the index in @code{ARGV} of the
+sets @code{ARGIND} to the index in @code{ARGV} of the
 current element.
 
 @c FIXME: One day, move the ARGC and ARGV node closer to here.
@@ -4162,74 +4331,82 @@ behaves.
 @cindex @env{AWKPATH} environment variable
 @cindex directories, searching for source files
 @cindex search paths, for source files
-@cindex differences in @command{awk} and @command{gawk}, @code{AWKPATH} environment variable
+@cindex differences in @command{awk} and @command{gawk}, @env{AWKPATH} environment variable
 @ifinfo
 The previous @value{SECTION} described how @command{awk} program files can be named
 on the command line with the @option{-f} option.
 @end ifinfo
 In most @command{awk}
-implementations, you must supply a precise path name for each program
+implementations, you must supply a precise pathname for each program
 file, unless the file is in the current directory.
-But in @command{gawk}, if the @value{FN} supplied to the @option{-f}
+But with @command{gawk}, if the @value{FN} supplied to the @option{-f}
 or @option{-i} options
 does not contain a directory separator @samp{/}, then @command{gawk} searches a list of
-directories (called the @dfn{search path}), one by one, looking for a
+directories (called the @dfn{search path}) one by one, looking for a
 file with the specified name.
 
 The search path is a string consisting of directory names
-separated by colons@footnote{Semicolons on MS-Windows and MS-DOS.}.  @command{gawk} gets its search path from the
+separated by colons.@footnote{Semicolons on MS-Windows and MS-DOS.}
+@command{gawk} gets its search path from the
 @env{AWKPATH} environment variable.  If that variable does not exist,
-@command{gawk} uses a default path,
-@samp{.:/usr/local/share/awk}.@footnote{Your version of @command{gawk}
-may use a different directory; it
-will depend upon how @command{gawk} was built and installed. The actual
-directory is the value of @samp{$(datadir)} generated when
-@command{gawk} was configured.  You probably don't need to worry about this,
-though.}
+or if it has an empty value,
+@command{gawk} uses a default path (described shortly).
 
 The search path feature is particularly helpful for building libraries
 of useful @command{awk} functions.  The library files can be placed in a
 standard directory in the default path and then specified on
-the command line with a short @value{FN}.  Otherwise, the full @value{FN}
-would have to be typed for each file.
+the command line with a short @value{FN}.  Otherwise, you would have to
+type the full @value{FN} for each file.
 
-By using the @option{-i} option, or the @option{-e} and @option{-f} options, your command-line
+By using the @option{-i} or @option{-f} options, your command-line
 @command{awk} programs can use facilities in @command{awk} library files
 (@pxref{Library Functions}).
 Path searching is not done if @command{gawk} is in compatibility mode.
 This is true for both @option{--traditional} and @option{--posix}.
 @xref{Options}.
 
-If the source code is not found after the initial search, the path is searched
-again after adding the default @samp{.awk} suffix to the @value{FN}.
+If the source code file is not found after the initial search, the path is searched
+again after adding the suffix @samp{.awk} to the @value{FN}.
 
-@quotation NOTE
-@c 4/2014:
-@c using @samp{.} to get quotes, since @file{} no longer supplies them.
-To include
-the current directory in the path, either place
-@samp{.} explicitly in the path or write a null entry in the
-path.  (A null entry is indicated by starting or ending the path with a
-colon or by placing two colons next to each other [@samp{::}].)
-This path search mechanism is similar
+@command{gawk}'s path search mechanism is similar
 to the shell's.
 (See @uref{http://www.gnu.org/software/bash/manual/,
-@cite{The Bourne-Again SHell manual}.})
+@cite{The Bourne-Again SHell manual}}.)
+It treats a null entry in the path as indicating the current
+directory.
+(A null entry is indicated by starting or ending the path with a
+colon or by placing two colons next to each other [@samp{::}].)
 
-However, @command{gawk} always looks in the current directory @emph{before}
-searching @env{AWKPATH}, so there is no real reason to include
-the current directory in the search path.
-@c Prior to 4.0, gawk searched the current directory after the
-@c path search, but it's not worth documenting it.
+@quotation NOTE
+To include the current directory in the path, either place @file{.}
+as an entry in the path or write a null entry in the path.
+
+Different past versions of @command{gawk} would also look explicitly in
+the current directory, either before or after the path search.  As of
+@value{PVERSION} 4.1.2, this no longer happens; if you wish to look
+in the current directory, you must include @file{.} either as a separate
+entry or as a null entry in the search path.
 @end quotation
 
-If @env{AWKPATH} is not defined in the
-environment, @command{gawk} places its default search path into
-@code{ENVIRON["AWKPATH"]}. This makes it easy to determine
-the actual search path that @command{gawk} used
-from within an @command{awk} program.
+The default value for @env{AWKPATH} is
+@samp{.:/usr/local/share/awk}.@footnote{Your version of @command{gawk}
+may use a different directory; it
+will depend upon how @command{gawk} was built and installed. The actual
+directory is the value of @code{$(datadir)} generated when
+@command{gawk} was configured.  You probably don't need to worry about this,
+though.}  Since @file{.} is included at the beginning, @command{gawk}
+searches first in the current directory and then in @file{/usr/local/share/awk}.
+In practice, this means that you will rarely need to change the
+value of @env{AWKPATH}.
+
+@xref{Shell Startup Files}, for information on functions that help to
+manipulate the @env{AWKPATH} variable.
 
-While you can change @code{ENVIRON["AWKPATH"]} within your @command{awk}
+@command{gawk} places the value of the search path that it used into
+@code{ENVIRON["AWKPATH"]}. This provides access to the actual search
+path value from within an @command{awk} program.
+
+Although you can change @code{ENVIRON["AWKPATH"]} within your @command{awk}
 program, this has no effect on the running program's behavior.  This makes
 sense: the @env{AWKPATH} environment variable is used to find the program
 source files.  Once your program is running, all the files have been
@@ -4251,24 +4428,26 @@ the platform.  For example, on GNU/Linux systems, the suffix @samp{.so}
 is used.  The search path specified is also used for extensions loaded
 via the @code{@@load} keyword (@pxref{Loading Shared Libraries}).
 
+If @env{AWKLIBPATH} does not exist in the environment, or if it has
+an empty value, @command{gawk} uses a default path; this
+is typically @samp{/usr/local/lib/gawk}, although it can vary depending
+upon how @command{gawk} was built.
+
+@xref{Shell Startup Files}, for information on functions that help to
+manipulate the @env{AWKLIBPATH} variable.
+
+@command{gawk} places the value of the search path that it used into
+@code{ENVIRON["AWKLIBPATH"]}. This provides access to the actual search
+path value from within an @command{awk} program.
+
 @node Other Environment Variables
 @subsection Other Environment Variables
 
 A number of other environment variables affect @command{gawk}'s
 behavior, but they are more specialized. Those in the following
-list are meant to be used by regular users.
+list are meant to be used by regular users:
 
 @table @env
-@item POSIXLY_CORRECT
-Causes @command{gawk} to switch to POSIX compatibility
-mode, disabling all traditional and GNU extensions.
-@xref{Options}.
-
-@item GAWK_SOCK_RETRIES
-Controls the number of times @command{gawk} attempts to
-retry a two-way TCP/IP (socket) connection before giving up.
-@xref{TCP/IP Networking}.
-
 @item GAWK_MSEC_SLEEP
 Specifies the interval between connection retries,
 in milliseconds. On systems that do not support
@@ -4279,6 +4458,18 @@ the value is rounded up to an integral number of seconds.
 Specifies the time, in milliseconds, for @command{gawk} to
 wait for input before returning with an error.
 @xref{Read Timeout}.
+
+@item GAWK_SOCK_RETRIES
+Controls the number of times @command{gawk} attempts to
+retry a two-way TCP/IP (socket) connection before giving up.
+@xref{TCP/IP Networking}.
+Note that when nonfatal I/O is enabled (@pxref{Nonfatal}),
+@command{gawk} only tries to open a TCP/IP socket once.
+
+@item POSIXLY_CORRECT
+Causes @command{gawk} to switch to POSIX-compatibility
+mode, disabling all traditional and GNU extensions.
+@xref{Options}.
 @end table
 
 The environment variables in the following list are meant
@@ -4293,7 +4484,7 @@ file as the size of the memory buffer to allocate for I/O. Otherwise,
 the value should be a number, and @command{gawk} uses that number as
 the size of the buffer to allocate.  (When this variable is not set,
 @command{gawk} uses the smaller of the file's size and the ``default''
-blocksize, which is usually the filesystems I/O blocksize.)
+blocksize, which is usually the filesystem's I/O blocksize.)
 
 @item AWK_HASH
 If this variable exists with a value of @samp{gst}, @command{gawk}
@@ -4308,10 +4499,11 @@ for debugging problems on filesystems on non-POSIX operating systems
 where I/O is performed in records, not in blocks.
 
 @item GAWK_MSG_SRC
-If this variable exists, @command{gawk} includes the source file
-name and line number from which warning and/or fatal messages
+If this variable exists, @command{gawk} includes the @value{FN}
+and line number within the @command{gawk} source code
+from which warning and/or fatal messages
 are generated.  Its purpose is to help isolate the source of a
-message, since there can be multiple places which produce the
+message, as there are multiple places that produce the
 same warning or error message.
 
 @item GAWK_NO_DFA
@@ -4327,16 +4519,16 @@ This specifies the amount by which @command{gawk} should grow its
 internal evaluation stack, when needed.
 
 @item INT_CHAIN_MAX
-The average number of items @command{gawk} will maintain on a
+This specifies intended maximum number of items @command{gawk} will maintain on a
 hash chain for managing arrays indexed by integers.
 
 @item STR_CHAIN_MAX
-The average number of items @command{gawk} will maintain on a
+This specifies intended maximum number of items @command{gawk} will maintain on a
 hash chain for managing arrays indexed by strings.
 
 @item TIDYMEM
 If this variable exists, @command{gawk} uses the @code{mtrace()} library
-calls from GNU LIBC to help track down possible memory leaks.
+calls from the GNU C library to help track down possible memory leaks.
 @end table
 
 @node Exit Status
@@ -4355,11 +4547,11 @@ If an error occurs, @command{gawk} exits with the value of
 the C constant @code{EXIT_FAILURE}.  This is usually one.
 
 If @command{gawk} exits because of a fatal error, the exit
-status is 2.  On non-POSIX systems, this value may be mapped
+status is two.  On non-POSIX systems, this value may be mapped
 to @code{EXIT_FAILURE}.
 
 @node Include Files
-@section Including Other Files Into Your Program
+@section Including Other Files into Your Program
 
 @c Panos Papadopoulos <panos1962@gmail.com> contributed the original
 @c text for this section.
@@ -4373,7 +4565,7 @@ The @code{@@include} keyword can be used to read external @command{awk} source
 files.  This gives you the ability to split large @command{awk} source files
 into smaller, more manageable pieces, and also lets you reuse common @command{awk}
 code from various @command{awk} scripts.  In other words, you can group
-together @command{awk} functions, used to carry out specific tasks,
+together @command{awk} functions used to carry out specific tasks
 into external files. These files can be used just like function libraries,
 using the @code{@@include} keyword in conjunction with the @env{AWKPATH}
 environment variable.  Note that source files may also be included
@@ -4404,13 +4596,13 @@ produces the following result:
 
 @example
 $ @kbd{gawk -f test2}
-@print{} This is file test1.
-@print{} This is file test2.
+@print{} This is script test1.
+@print{} This is script test2.
 @end example
 
-@code{gawk} runs the @file{test2} script which includes @file{test1}
+@command{gawk} runs the @file{test2} script, which includes @file{test1}
 using the @code{@@include}
-keyword.  So, to include external @command{awk} source files you just
+keyword.  So, to include external @command{awk} source files, you just
 use @code{@@include} followed by the name of the file to be included,
 enclosed in double quotes.
 
@@ -4435,9 +4627,9 @@ following results:
 
 @example
 $ @kbd{gawk -f test3}
-@print{} This is file test1.
-@print{} This is file test2.
-@print{} This is file test3.
+@print{} This is script test1.
+@print{} This is script test2.
+@print{} This is script test3.
 @end example
 
 The @value{FN} can, of course, be a pathname. For example:
@@ -4447,27 +4639,28 @@ The @value{FN} can, of course, be a pathname. For example:
 @end example
 
 @noindent
-or:
+and:
 
 @example
 @@include "/usr/awklib/network"
 @end example
 
 @noindent
-are valid. The @code{AWKPATH} environment variable can be of great
+are both valid. The @env{AWKPATH} environment variable can be of great
 value when using @code{@@include}. The same rules for the use
-of the @code{AWKPATH} variable in command-line file searches
+of the @env{AWKPATH} variable in command-line file searches
 (@pxref{AWKPATH Variable}) apply to
 @code{@@include} also.
 
 This is very helpful in constructing @command{gawk} function libraries.
-If you have a large script with useful, general purpose @command{awk}
+If you have a large script with useful, general-purpose @command{awk}
 functions, you can break it down into library files and put those files
-in a special directory.  You can then include those ``libraries,'' using
-either the full pathnames of the files, or by setting the @code{AWKPATH}
+in a special directory.  You can then include those ``libraries,''
+either by using the full pathnames of the files, or by setting the @env{AWKPATH}
 environment variable accordingly and then using @code{@@include} with
-just the file part of the full pathname. Of course you can have more
-than one directory to keep library files; the more complex the working
+just the file part of the full pathname. Of course,
+you can keep library files in more than one directory;
+the more complex the working
 environment is, the more directories you may need to organize the files
 to be included.
 
@@ -4480,11 +4673,11 @@ In particular, @code{@@include} is very useful for writing CGI scripts
 to be run from web pages.
 
 As mentioned in @ref{AWKPATH Variable}, the current directory is always
-searched first for source files, before searching in @env{AWKPATH},
-and this also applies to files named with @code{@@include}.
+searched first for source files, before searching in @env{AWKPATH};
+this also applies to files named with @code{@@include}.
 
 @node Loading Shared Libraries
-@section Loading Dynamic Extensions Into Your Program
+@section Loading Dynamic Extensions into Your Program
 
 This @value{SECTION} describes a feature that is specific to @command{gawk}.
 
@@ -4494,7 +4687,7 @@ This @value{SECTION} describes a feature that is specific to @command{gawk}.
 The @code{@@load} keyword can be used to read external @command{awk} extensions
 (stored as system shared libraries).
 This allows you to link in compiled code that may offer superior
-performance and/or give you access to extended capabilities not supported 
+performance and/or give you access to extended capabilities not supported
 by the @command{awk} language.  The @env{AWKLIBPATH} variable is used to
 search for the extension.  Using @code{@@load} is completely equivalent
 to using the @option{-l} command-line option.
@@ -4502,7 +4695,7 @@ to using the @option{-l} command-line option.
 If the extension is not initially found in @env{AWKLIBPATH}, another
 search is conducted after appending the platform's default shared library
 suffix to the @value{FN}.  For example, on GNU/Linux systems, the suffix
-@samp{.so} is used.
+@samp{.so} is used:
 
 @example
 $ @kbd{gawk '@@load "ordchr"; BEGIN @{print chr(65)@}'}
@@ -4524,6 +4717,7 @@ that requires access to an extension.
 
 @ref{Dynamic Extensions}, describes how to write extensions (in C or C++)
 that can be loaded with either @code{@@load} or the @option{-l} option.
+It also describes the @code{ordchr} extension.
 
 @node Obsolete
 @section Obsolete Options and/or Features
@@ -4534,8 +4728,8 @@ that can be loaded with either @code{@@load} or the @option{-l} option.
 @cindex features, deprecated
 @cindex obsolete features
 This @value{SECTION} describes features and/or command-line options from
-previous releases of @command{gawk} that are either not available in the
-current version or that are still supported but deprecated (meaning that
+previous releases of @command{gawk} that either are not available in the
+current version or are still supported but deprecated (meaning that
 they will @emph{not} be in the next release).
 
 The process-related special files @file{/dev/pid}, @file{/dev/ppid},
@@ -4592,15 +4786,15 @@ awk '@{ sum += $1 @} END @{ print sum @}'
 @end example
 
 @command{gawk} actually supports this but it is purposely undocumented
-because it is considered bad style.  The correct way to write such a program
-is either
+because it is bad style.  The correct way to write such a program
+is either:
 
 @example
 awk '@{ sum += $1 @} ; END @{ print sum @}'
 @end example
 
 @noindent
-or
+or:
 
 @example
 awk '@{ sum += $1 @}
@@ -4608,15 +4802,14 @@ awk '@{ sum += $1 @}
 @end example
 
 @noindent
-@xref{Statements/Lines}, for a fuller
-explanation.
+@xref{Statements/Lines}, for a fuller explanation.
 
 You can insert newlines after the @samp{;} in @code{for} loops.
 This seems to have been a long-undocumented feature in Unix @command{awk}.
 
 Similarly, you may use @code{print} or @code{printf} statements in the
 @var{init} and @var{increment} parts of a @code{for} loop.  This is another
-long-undocumented ``feature'' of Unix @code{awk}.
+long-undocumented ``feature'' of Unix @command{awk}.
 
 @end ignore
 
@@ -4633,23 +4826,24 @@ to run @command{awk}.
 
 @item
 The three standard options for all versions of @command{awk} are
-@option{-f}, @option{-F} and @option{-v}.  @command{gawk} supplies these
+@option{-f}, @option{-F}, and @option{-v}.  @command{gawk} supplies these
 and many others, as well as corresponding GNU-style long options.
 
 @item
-Non-option command-line arguments are usually treated as @value{FN}s,
+Nonoption command-line arguments are usually treated as @value{FN}s,
 unless they have the form @samp{@var{var}=@var{value}}, in which case
 they are taken as variable assignments to be performed at that point
 in processing the input.
 
 @item
-All non-option command-line arguments, excluding the program text,
+All nonoption command-line arguments, excluding the program text,
 are placed in the @code{ARGV} array.  Adjusting @code{ARGC} and @code{ARGV}
 affects how @command{awk} processes input.
 
 @item
 You can use a single minus sign (@samp{-}) to refer to standard input
-on the command line.
+on the command line. @command{gawk} also lets you use the special
+@value{FN} @file{/dev/stdin}.
 
 @item
 @command{gawk} pays attention to a number of environment variables.
@@ -4669,13 +4863,12 @@ and @option{-f} command-line options.
 @item
 @command{gawk} allows you to load additional functions written in C
 or C++ using the @code{@@load} statement and/or the @option{-l} option.
-(This advanced feature is described later on in @ref{Dynamic Extensions}.)
+(This advanced feature is described later, in @ref{Dynamic Extensions}.)
 @end itemize
 
 @node Regexp
 @chapter Regular Expressions
 @cindex regexp
-@c STARTOFRANGE regexp
 @cindex regular expressions
 
 A @dfn{regular expression}, or @dfn{regexp}, is a way of describing a
@@ -4691,7 +4884,7 @@ belongs to that set.
 The simplest regular expression is a sequence of letters, numbers, or
 both.  Such a regexp matches any string that contains that sequence.
 Thus, the regexp @samp{foo} matches any string containing @samp{foo}.
-Therefore, the pattern @code{/foo/} matches any input record containing
+Thus, the pattern @code{/foo/} matches any input record containing
 the three adjacent characters @samp{foo} @emph{anywhere} in the record.  Other
 kinds of regexps let you specify more complicated classes of strings.
 
@@ -4754,17 +4947,16 @@ and @samp{!~} perform regular expression comparisons.  Expressions
 using these operators can be used as patterns, or in @code{if},
 @code{while}, @code{for}, and @code{do} statements.
 (@xref{Statements}.)
-For example:
+For example, the following is true if the expression @var{exp} (taken
+as a string) matches @var{regexp}:
 
 @example
 @var{exp} ~ /@var{regexp}/
 @end example
 
 @noindent
-is true if the expression @var{exp} (taken as a string)
-matches @var{regexp}.  The following example matches, or selects,
-all input records with the uppercase letter @samp{J} somewhere in the
-first field:
+This example matches, or selects, all input records with the uppercase
+letter @samp{J} somewhere in the first field:
 
 @example
 $ @kbd{awk '$1 ~ /J/' inventory-shipped}
@@ -4834,11 +5026,11 @@ string or regexp.  Thus, the string whose contents are the two characters
 @samp{"} and @samp{\} must be written @code{"\"\\"}.
 
 Other escape sequences represent unprintable characters
-such as TAB or newline.  While there is nothing to stop you from entering most
+such as TAB or newline.  There is nothing to stop you from entering most
 unprintable characters directly in a string constant or regexp constant,
-they may look ugly.
+but they may look ugly.
 
-The following table lists
+The following list presents
 all the escape sequences used in @command{awk} and
 what they represent. Unless noted otherwise, all these escape
 sequences apply to both string constants and regexp constants:
@@ -4883,7 +5075,7 @@ Horizontal TAB, @kbd{Ctrl-i}, ASCII code 9 (HT).
 @cindex @code{\} (backslash), @code{\v} escape sequence
 @cindex backslash (@code{\}), @code{\v} escape sequence
 @item \v
-Vertical tab, @kbd{Ctrl-k}, ASCII code 11 (VT).
+Vertical TAB, @kbd{Ctrl-k}, ASCII code 11 (VT).
 
 @cindex @code{\} (backslash), @code{\}@var{nnn} escape sequence
 @cindex backslash (@code{\}), @code{\}@var{nnn} escape sequence
@@ -4904,15 +5096,18 @@ of hexadecimal digits (@samp{0}--@samp{9}, and either @samp{A}--@samp{F}
 or @samp{a}--@samp{f}).  A maximum of two digts are allowed after
 the @samp{\x}. Any further hexadecimal digits are treated as simple
 letters or numbers.  @value{COMMONEXT}
+(The @samp{\x} escape sequence is not allowed in POSIX awk.)
 
 @quotation CAUTION
 In ISO C, the escape sequence continues until the first nonhexadecimal
 digit is seen.
-@c FIXME: Add exact version here.
 For many years, @command{gawk} would continue incorporating
 hexadecimal digits into the value until a non-hexadecimal digit
 or the end of the string was encountered.
-However, using more than two hexadecimal digits produces
+However, using more than two hexadecimal digits produced
+undefined results.
+As of @value{PVERSION} 4.2, only two digits
+are processed.
 @end quotation
 
 @cindex @code{\} (backslash), @code{\/} escape sequence
@@ -4922,7 +5117,7 @@ A literal slash (necessary for regexp constants only).
 This sequence is used when you want to write a regexp
 constant that contains a slash
 (such as @code{/.*:\/home\/[[:alnum:]]+:.*/}; the @samp{[[:alnum:]]}
-notation is discussed shortly, in @ref{Bracket Expressions}).
+notation is discussed in @ref{Bracket Expressions}).
 Because the regexp is delimited by
 slashes, you need to escape any slash that is part of the pattern,
 in order to tell @command{awk} to keep processing the rest of the regexp.
@@ -4945,7 +5140,7 @@ with a backslash have special meaning in regexps.
 
 In a regexp, a backslash before any character that is not in the previous list
 and not listed in
-@ref{GNU Regexp Operators},
+@DBREF{GNU Regexp Operators}
 means that the next character should be taken literally, even if it would
 normally be a regexp operator.  For example, @code{/a\+b/} matches the three
 characters @samp{a+b}.
@@ -4954,27 +5149,9 @@ characters @samp{a+b}.
 @cindex @code{\} (backslash), in escape sequences
 @cindex portability
 For complete portability, do not use a backslash before any character not
-shown in the previous list.
-
-To summarize:
-
-@itemize @value{BULLET}
-@item
-The escape sequences in the table above are always processed first,
-for both string constants and regexp constants. This happens very early,
-as soon as @command{awk} reads your program.
-
-@item
-@command{gawk} processes both regexp constants and dynamic regexps
-(@pxref{Computed Regexps}),
-for the special operators listed in
-@ref{GNU Regexp Operators}.
-
-@item
-A backslash before any other character means to treat that character
-literally.
-@end itemize
+shown in the previous list or that is not an operator.
 
+@c 11/2014: Moved so as to not stack sidebars
 @sidebar Backslash Before Regular Characters
 @cindex portability, backslash in escape sequences
 @cindex POSIX @command{awk}, backslashes in string constants
@@ -5010,6 +5187,25 @@ In such implementations, typing @code{"a\qc"} is the same as typing
 @end table
 @end sidebar
 
+To summarize:
+
+@itemize @value{BULLET}
+@item
+The escape sequences in the preceding list are always processed first,
+for both string constants and regexp constants. This happens very early,
+as soon as @command{awk} reads your program.
+
+@item
+@command{gawk} processes both regexp constants and dynamic regexps
+(@pxref{Computed Regexps}),
+for the special operators listed in
+@ref{GNU Regexp Operators}.
+
+@item
+A backslash before any other character means to treat that character
+literally.
+@end itemize
+
 @sidebar Escape Sequences for Metacharacters
 @cindex metacharacters, escape sequences for
 
@@ -5032,7 +5228,6 @@ escape sequences literally when used in regexp constants. Thus,
 
 @node Regexp Operators
 @section Regular Expression Operators
-@c STARTOFRANGE regexpo
 @cindex regular expressions, operators
 @cindex metacharacters in regular expressions
 
@@ -5050,14 +5245,14 @@ are recognized and converted into corresponding real characters as
 the very first step in processing regexps.
 
 Here is a list of metacharacters.  All characters that are not escape
-sequences and that are not listed in the table stand for themselves:
+sequences and that are not listed here stand for themselves:
 
 @c Use @asis so the docbook comes out ok. Sigh.
 @table @asis
 @cindex backslash (@code{\}), regexp operator
 @cindex @code{\} (backslash), regexp operator
 @item @code{\}
-This is used to suppress the special meaning of a character when
+This suppresses the special meaning of a character when
 matching.  For example, @samp{\$}
 matches the character @samp{$}.
 
@@ -5066,8 +5261,9 @@ matches the character @samp{$}.
 @cindex @code{^} (caret), regexp operator
 @cindex caret (@code{^}), regexp operator
 @item @code{^}
-This matches the beginning of a string.  For example, @samp{^@@chapter}
-matches @samp{@@chapter} at the beginning of a string and can be used
+This matches the beginning of a string.  @samp{^@@chapter}
+matches @samp{@@chapter} at the beginning of a string,
+for example, and can be used
 to identify chapter beginnings in Texinfo source files.
 The @samp{^} is known as an @dfn{anchor}, because it anchors the pattern to
 match only at the beginning of the string.
@@ -5107,10 +5303,10 @@ with @samp{A}.
 
 @cindex POSIX @command{awk}, period (@code{.})@comma{} using
 In strict POSIX mode (@pxref{Options}),
-@samp{.} does not match the @value{NUL}
+@samp{.} does not match the @sc{nul}
 character, which is a character with all bits equal to zero.
-Otherwise, @value{NUL} is just another character. Other versions of @command{awk}
-may not be able to match the @value{NUL} character.
+Otherwise, @sc{nul} is just another character. Other versions of @command{awk}
+may not be able to match the @sc{nul} character.
 
 @cindex @code{[]} (square brackets), regexp operator
 @cindex square brackets (@code{[]}), regexp operator
@@ -5172,10 +5368,10 @@ just @samp{p} if no @samp{h}s are present.
 There are two subtle points to understand about how @samp{*} works.
 First, the @samp{*} applies only to the single preceding regular expression
 component (e.g., in @samp{ph*}, it applies just to the @samp{h}).
-To cause @samp{*} to apply to a larger sub-expression, use parentheses:
-@samp{(ph)*} matches @samp{ph}, @samp{phph}, @samp{phphph} and so on.
+To cause @samp{*} to apply to a larger subexpression, use parentheses:
+@samp{(ph)*} matches @samp{ph}, @samp{phph}, @samp{phphph}, and so on.
 
-Second, @samp{*} finds as many repetititons as possible. If the text
+Second, @samp{*} finds as many repetitions as possible. If the text
 to be matched is @samp{phhhhhhhhhhhhhhooey}, @samp{ph*} matches all of
 the @samp{h}s.
 
@@ -5211,10 +5407,10 @@ is repeated at least @var{n} times:
 Matches @samp{whhhy}, but not @samp{why} or @samp{whhhhy}.
 
 @item wh@{3,5@}y
-Matches @samp{whhhy}, @samp{whhhhy}, or @samp{whhhhhy}, only.
+Matches @samp{whhhy}, @samp{whhhhy}, or @samp{whhhhhy} only.
 
 @item wh@{2,@}y
-Matches @samp{whhy} or @samp{whhhy}, and so on.
+Matches @samp{whhy}, @samp{whhhy}, and so on.
 @end table
 
 @cindex POSIX @command{awk}, interval expressions in
@@ -5263,17 +5459,15 @@ usage as a syntax error.
 
 If @command{gawk} is in compatibility mode (@pxref{Options}), interval
 expressions are not available in regular expressions.
-@c ENDOFRANGE regexpo
 
 @node Bracket Expressions
 @section Using Bracket Expressions
-@c STARTOFRANGE charlist
 @cindex bracket expressions
 @cindex bracket expressions, range expressions
 @cindex range expressions (regexps)
 @cindex character lists in regular expression
 
-As mentioned earlier, a bracket expression matches any character amongst
+As mentioned earlier, a bracket expression matches any character among
 those listed between the opening and closing square brackets.
 
 Within a bracket expression, a @dfn{range expression} consists of two
@@ -5307,7 +5501,7 @@ characters to be matched.
 @cindex Extended Regular Expressions (EREs)
 @cindex EREs (Extended Regular Expressions)
 @cindex @command{egrep} utility
-This treatment of @samp{\} in bracket expressions
+The treatment of @samp{\} in bracket expressions
 is compatible with other @command{awk}
 implementations and is also mandated by POSIX.
 The regular expressions in @command{awk} are a superset
@@ -5331,23 +5525,23 @@ a keyword denoting the class, and @samp{:]}.
 POSIX standard.
 
 @float Table,table-char-classes
-@caption{POSIX Character Classes}
+@caption{POSIX character classes}
 @multitable @columnfractions .15 .85
 @headitem Class @tab Meaning
-@item @code{[:alnum:]} @tab Alphanumeric characters.
-@item @code{[:alpha:]} @tab Alphabetic characters.
-@item @code{[:blank:]} @tab Space and TAB characters.
-@item @code{[:cntrl:]} @tab Control characters.
-@item @code{[:digit:]} @tab Numeric characters.
-@item @code{[:graph:]} @tab Characters that are both printable and visible.
-(A space is printable but not visible, whereas an @samp{a} is both.)
-@item @code{[:lower:]} @tab Lowercase alphabetic characters.
-@item @code{[:print:]} @tab Printable characters (characters that are not control characters).
+@item @code{[:alnum:]} @tab Alphanumeric characters
+@item @code{[:alpha:]} @tab Alphabetic characters
+@item @code{[:blank:]} @tab Space and TAB characters
+@item @code{[:cntrl:]} @tab Control characters
+@item @code{[:digit:]} @tab Numeric characters
+@item @code{[:graph:]} @tab Characters that are both printable and visible
+(a space is printable but not visible, whereas an @samp{a} is both)
+@item @code{[:lower:]} @tab Lowercase alphabetic characters
+@item @code{[:print:]} @tab Printable characters (characters that are not control characters)
 @item @code{[:punct:]} @tab Punctuation characters (characters that are not letters, digits,
-control characters, or space characters).
-@item @code{[:space:]} @tab Space characters (such as space, TAB, and formfeed, to name a few).
-@item @code{[:upper:]} @tab Uppercase alphabetic characters.
-@item @code{[:xdigit:]} @tab Characters that are hexadecimal digits.
+control characters, or space characters)
+@item @code{[:space:]} @tab Space characters (such as space, TAB, and formfeed, to name a few)
+@item @code{[:upper:]} @tab Uppercase alphabetic characters
+@item @code{[:xdigit:]} @tab Characters that are hexadecimal digits
 @end multitable
 @end float
 
@@ -5362,12 +5556,12 @@ and numeric characters in your character set.
 @c Thanks to
 @c Date: Tue, 01 Jul 2014 07:39:51 +0200
 @c From: Hermann Peifer <peifer@gmx.eu>
-Some utilities that match regular expressions provide a non-standard
-@code{[:ascii:]} character class; @command{awk} does not. However, you
-can simulate such a construct using @code{[\x00-\x7F]}.  This matches
+Some utilities that match regular expressions provide a nonstandard
+@samp{[:ascii:]} character class; @command{awk} does not. However, you
+can simulate such a construct using @samp{[\x00-\x7F]}.  This matches
 all values numerically between zero and 127, which is the defined
 range of the ASCII character set.  Use a complemented character list
-(@code{[^\x00-\x7F]}) to match any single-byte characters that are not
+(@samp{[^\x00-\x7F]}) to match any single-byte characters that are not
 in the ASCII range.
 
 @cindex bracket expressions, collating elements
@@ -5396,8 +5590,8 @@ Locale-specific names for a list of
 characters that are equal. The name is enclosed between
 @samp{[=} and @samp{=]}.
 For example, the name @samp{e} might be used to represent all of
-``e,'' ``@`e,'' and ``@'e.'' In this case, @samp{[[=e=]]} is a regexp
-that matches any of @samp{e}, @samp{@'e}, or @samp{@`e}.
+``e,'' ``@^e,'' ``@`e,'' and ``@'e.'' In this case, @samp{[[=e=]]} is a regexp
+that matches any of @samp{e}, @samp{@^e}, @samp{@'e}, or @samp{@`e}.
 @end table
 
 These features are very valuable in non-English-speaking locales.
@@ -5411,7 +5605,6 @@ expression matching currently recognize only POSIX character classes;
 they do not recognize collating symbols or equivalence classes.
 @end quotation
 @c maybe one day ...
-@c ENDOFRANGE charlist
 
 @node Leftmost Longest
 @section How Much Text Matches?
@@ -5424,11 +5617,11 @@ Consider the following:
 echo aaaabcd | awk '@{ sub(/a+/, "<A>"); print @}'
 @end example
 
-This example uses the @code{sub()} function (which we haven't discussed yet;
-@pxref{String Functions})
-to make a change to the input record. Here, the regexp @code{/a+/}
-indicates ``one or more @samp{a} characters,'' and the replacement
-text is @samp{<A>}.
+This example uses the @code{sub()} function to make a change to the input
+record.  (@code{sub()} replaces the first instance of any text matched
+by the first argument with the string provided as the second argument;
+@pxref{String Functions}.)  Here, the regexp @code{/a+/} indicates ``one
+or more @samp{a} characters,'' and the replacement text is @samp{<A>}.
 
 The input contains four @samp{a} characters.
 @command{awk} (and POSIX) regular expressions always match
@@ -5455,9 +5648,7 @@ and also @pxref{Field Separators}).
 @node Computed Regexps
 @section Using Dynamic Regexps
 
-@c STARTOFRANGE dregexp
 @cindex regular expressions, computed
-@c STARTOFRANGE regexpd
 @cindex regular expressions, dynamic
 @cindex @code{~} (tilde), @code{~} operator
 @cindex tilde (@code{~}), @code{~} operator
@@ -5483,14 +5674,14 @@ and tests whether the input record matches this regexp.
 
 @quotation NOTE
 When using the @samp{~} and @samp{!~}
-operators, there is a difference between a regexp constant
+operators, be aware that there is a difference between a regexp constant
 enclosed in slashes and a string constant enclosed in double quotes.
 If you are going to use a string constant, you have to understand that
 the string is, in essence, scanned @emph{twice}: the first time when
 @command{awk} reads your program, and the second time when it goes to
 match the string on the lefthand side of the operator with the pattern
 on the right.  This is true of any string-valued expression (such as
-@code{digits_regexp}, shown previously), not just string constants.
+@code{digits_regexp}, shown in the previous example), not just string constants.
 @end quotation
 
 @cindex regexp constants, slashes vs.@: quotes
@@ -5539,7 +5730,7 @@ intend a regexp match.
 @cindex regular expressions, dynamic, with embedded newlines
 @cindex newlines, in dynamic regexps
 
-Some versions of @command{awk} do not allow the newline
+Some older versions of @command{awk} do not allow the newline
 character to be used inside a bracket expression for a dynamic regexp:
 
 @example
@@ -5548,7 +5739,7 @@ $ @kbd{awk '$0 ~ "[ \t\n]"'}
 @error{} ]...
 @error{}  source line number 1
 @error{}  context is
-@error{}          >>>  <<<
+@error{}        $0 ~ "[ >>>  \t\n]" <<<
 @end example
 
 @cindex newlines, in regexp constants
@@ -5564,17 +5755,13 @@ $ @kbd{awk '$0 ~ /[ \t\n]/'}
 @command{gawk} does not have this problem, and it isn't likely to
 occur often in practice, but it's worth noting for future reference.
 @end sidebar
-@c ENDOFRANGE dregexp
-@c ENDOFRANGE regexpd
 
 @node GNU Regexp Operators
 @section @command{gawk}-Specific Regexp Operators
 
 @c This section adapted (long ago) from the regex-0.12 manual
 
-@c STARTOFRANGE regexpg
 @cindex regular expressions, operators, @command{gawk}
-@c STARTOFRANGE gregexp
 @cindex @command{gawk}, regular expressions, operators
 @cindex operators, GNU-specific
 @cindex regular expressions, operators, for words
@@ -5650,7 +5837,7 @@ matches either @samp{ball} or @samp{balls}, as a separate word.
 @item \B
 Matches the empty string that occurs between two
 word-constituent characters. For example,
-@code{/\Brat\B/} matches @samp{crate} but it does not match @samp{dirty rat}.
+@code{/\Brat\B/} matches @samp{crate}, but it does not match @samp{dirty rat}.
 @samp{\B} is essentially the opposite of @samp{\y}.
 @end table
 
@@ -5658,9 +5845,9 @@ word-constituent characters. For example,
 @cindex regular expressions, operators, for buffers
 @cindex operators, string-matching, for buffers
 There are two other operators that work on buffers.  In Emacs, a
-@dfn{buffer} is, naturally, an Emacs buffer.  For other programs,
-@command{gawk}'s regexp library routines consider the entire
-string to match as the buffer.
+@dfn{buffer} is, naturally, an Emacs buffer.
+Other GNU programs, including @command{gawk},
+consider the entire string to match as the buffer.
 The operators are:
 
 @table @code
@@ -5669,14 +5856,14 @@ The operators are:
 @cindex backslash (@code{\}), @code{\`} operator (@command{gawk})
 @cindex @code{\} (backslash), @code{\`} operator (@command{gawk})
 Matches the empty string at the
-beginning of a buffer (string).
+beginning of a buffer (string)
 
 @c @cindex operators, @code{\'} (@command{gawk})
 @cindex backslash (@code{\}), @code{\'} operator (@command{gawk})
 @cindex @code{\} (backslash), @code{\'} operator (@command{gawk})
 @item \'
 Matches the empty string at the
-end of a buffer (string).
+end of a buffer (string)
 @end table
 
 @cindex @code{^} (caret), regexp operator
@@ -5721,16 +5908,16 @@ in @ref{Regexp Operators}.
 @end ifnottex
 
 @item @code{--posix}
-Only POSIX regexps are supported; the GNU operators are not special
+Match only POSIX regexps; the GNU operators are not special
 (e.g., @samp{\w} matches a literal @samp{w}).  Interval expressions
 are allowed.
 
 @cindex Brian Kernighan's @command{awk}
 @item @code{--traditional}
-Traditional Unix @command{awk} regexps are matched. The GNU operators
+Match traditional Unix @command{awk} regexps. The GNU operators
 are not special, and interval expressions are not available.
-The POSIX character classes (@samp{[[:alnum:]]}, etc.) are supported,
-as BWK @command{awk} does support them.
+Because BWK @command{awk} supports them,
+the POSIX character classes (@samp{[[:alnum:]]}, etc.) are available.
 Characters described by octal and hexadecimal escape sequences are
 treated literally, even if they represent regexp metacharacters.
 
@@ -5739,15 +5926,11 @@ Allow interval expressions in regexps, if @option{--traditional}
 has been provided.
 Otherwise, interval expressions are available by default.
 @end table
-@c ENDOFRANGE gregexp
-@c ENDOFRANGE regexpg
 
 @node Case-sensitivity
 @section Case Sensitivity in Matching
 
-@c STARTOFRANGE regexpcs
 @cindex regular expressions, case sensitivity
-@c STARTOFRANGE csregexp
 @cindex case sensitivity, regexps and
 Case is normally significant in regular expressions, both when matching
 ordinary characters (i.e., not metacharacters) and inside bracket
@@ -5790,7 +5973,7 @@ When @code{IGNORECASE} is not zero, @emph{all} regexp and string
 operations ignore case.
 
 Changing the value of @code{IGNORECASE} dynamically controls the
-case-sensitivity of the program as it runs.  Case is significant by
+case sensitivity of the program as it runs.  Case is significant by
 default because @code{IGNORECASE} (like most variables) is initialized
 to zero:
 
@@ -5803,7 +5986,7 @@ if (x ~ /ab/) @dots{}   # now it will succeed
 @end example
 
 In general, you cannot use @code{IGNORECASE} to make certain rules
-case-insensitive and other rules case-sensitive, because there is no
+case insensitive and other rules case sensitive, as there is no
 straightforward way
 to set @code{IGNORECASE} just for the pattern of
 a particular rule.@footnote{Experienced C and C++ programmers will note
@@ -5814,13 +5997,13 @@ and
 However, this is somewhat obscure and we don't recommend it.}
 To do this, use either bracket expressions or @code{tolower()}.  However, one
 thing you can do with @code{IGNORECASE} only is dynamically turn
-case-sensitivity on or off for all the rules at once.
+case sensitivity on or off for all the rules at once.
 
 @code{IGNORECASE} can be set on the command line or in a @code{BEGIN} rule
 (@pxref{Other Arguments}; also
 @pxref{Using BEGIN/END}).
 Setting @code{IGNORECASE} from the command line is a way to make
-a program case-insensitive without having to edit it.
+a program case insensitive without having to edit it.
 
 @c @cindex ISO 8859-1
 @c @cindex ISO Latin-1
@@ -5839,8 +6022,6 @@ the right thing.}
 The value of @code{IGNORECASE} has no effect if @command{gawk} is in
 compatibility mode (@pxref{Options}).
 Case is always significant in compatibility mode.
-@c ENDOFRANGE csregexp
-@c ENDOFRANGE regexpcs
 
 @node Regexp Summary
 @section Summary
@@ -5857,12 +6038,12 @@ in conditional expressions, or as part of matching expressions
 using the @samp{~} and @samp{!~} operators.
 
 @item
-Escape sequences let you represent non-printable characters and
+Escape sequences let you represent nonprintable characters and
 also let you represent regexp metacharacters as literal characters
 to be matched.
 
 @item
-Regexp operators provide grouping, alternation and repetition.
+Regexp operators provide grouping, alternation, and repetition.
 
 @item
 Bracket expressions give you a shorthand for specifying sets
@@ -5871,28 +6052,26 @@ Within bracket expressions, POSIX character classes let you specify
 certain groups of characters in a locale-independent fashion.
 
 @item
-@command{gawk}'s @code{IGNORECASE} variable lets you control the
-case sensitivity of regexp matching.  In other @command{awk}
-versions, use @code{tolower()} or @code{toupper()}.
-
-@item
 Regular expressions match the leftmost longest text in the string being
 matched.  This matters for cases where you need to know the extent of
 the match, such as for text substitution and when the record separator
 is a regexp.
 
 @item
-Matching expressions may use dynamic regexps, that is, string values
-treated as regular expressions.
+Matching expressions may use dynamic regexps (i.e., string values
+treated as regular expressions).
+
+@item
+@command{gawk}'s @code{IGNORECASE} variable lets you control the
+case sensitivity of regexp matching.  In other @command{awk}
+versions, use @code{tolower()} or @code{toupper()}.
 
 @end itemize
 
-@c ENDOFRANGE regexp
 
 @node Reading Files
 @chapter Reading Input Files
 
-@c STARTOFRANGE infir
 @cindex reading input files
 @cindex input files, reading
 @cindex input files
@@ -5903,7 +6082,7 @@ standard input (by default, this is the keyboard, but often it is a pipe from an
 command) or from files whose names you specify on the @command{awk}
 command line.  If you specify input files, @command{awk} reads them
 in order, processing all the data from one before going on to the next.
-The name of the current input file can be found in the built-in variable
+The name of the current input file can be found in the predefined variable
 @code{FILENAME}
 (@pxref{Built-in Variables}).
 
@@ -5917,7 +6096,7 @@ This makes it more convenient for programs to work on the parts of a record.
 
 @cindex @code{getline} command
 On rare occasions, you may need to use the @code{getline} command.
-The  @code{getline} command is valuable, both because it
+The  @code{getline} command is valuable both because it
 can do explicit input from any number of files, and because the files
 used with it do not have to be named on the @command{awk} command line
 (@pxref{Getline}).
@@ -5934,6 +6113,7 @@ used with it do not have to be named on the @command{awk} command line
 * Getline::                     Reading files under explicit program control
                                 using the @code{getline} function.
 * Read Timeout::                Reading input with a timeout.
+* Retrying Input::              Retrying input after certain errors.
 * Command-line directories::    What happens if you put a directory on the
                                 command line.
 * Input Summary::               Input summary.
@@ -5943,17 +6123,15 @@ used with it do not have to be named on the @command{awk} command line
 @node Records
 @section How Input Is Split into Records
 
-@c STARTOFRANGE inspl
 @cindex input, splitting into records
-@c STARTOFRANGE recspl
 @cindex records, splitting input into
 @cindex @code{NR} variable
 @cindex @code{FNR} variable
 @command{awk} divides the input for your program into records and fields.
 It keeps track of the number of records that have been read so far from
-the current input file.  This value is stored in a built-in variable
-called @code{FNR} which is reset to zero when a new file is started.
-Another built-in variable, @code{NR}, records the total number of input
+the current input file.  This value is stored in a predefined variable
+called @code{FNR}, which is reset to zero every time a new file is started.
+Another predefined variable, @code{NR}, records the total number of input
 records read so far from all @value{DF}s.  It starts at zero, but is
 never automatically reset to zero.
 
@@ -5963,15 +6141,15 @@ never automatically reset to zero.
 @end menu
 
 @node awk split records
-@subsection Record Splitting With Standard @command{awk}
+@subsection Record Splitting with Standard @command{awk}
 
 @cindex separators, for records
 @cindex record separators
 Records are separated by a character called the @dfn{record separator}.
 By default, the record separator is the newline character.
 This is why records are, by default, single lines.
-A different character can be used for the record separator by
-assigning the character to the built-in variable @code{RS}.
+To use a different character for the record separator,
+simply assign that character to the predefined variable @code{RS}.
 
 @cindex newlines, as record separators
 @cindex @code{RS} variable
@@ -5980,7 +6158,7 @@ the value of @code{RS} can be changed in the @command{awk} program
 with the assignment operator, @samp{=}
 (@pxref{Assignment Ops}).
 The new record-separator character should be enclosed in quotation marks,
-which indicate a string constant.  Often the right time to do this is
+which indicate a string constant.  Often, the right time to do this is
 at the beginning of execution, before any input is processed,
 so that the very first record is read with the proper separator.
 To do this, use the special @code{BEGIN} pattern
@@ -5994,8 +6172,8 @@ awk 'BEGIN @{ RS = "u" @}
 
 @noindent
 changes the value of @code{RS} to @samp{u}, before reading any input.
-This is a string whose first character is the letter ``u;'' as a result, records
-are separated by the letter ``u.''  Then the input file is read, and the second
+The new value is a string whose first character is the letter ``u''; as a result, records
+are separated by the letter ``u''.  Then the input file is read, and the second
 rule in the @command{awk} program (the action with no pattern) prints each
 record.  Because each @code{print} statement adds a newline at the end of
 its output, this @command{awk} program copies the input
@@ -6042,7 +6220,7 @@ $ @kbd{awk 'BEGIN @{ RS = "u" @}}
 @print{} m@@ny
 @print{} .ed
 @print{}      R
-@print{} 
+@print{}
 @end example
 
 @noindent
@@ -6056,8 +6234,8 @@ Bill         555-1675     bill.drowning@@hotmail.com       A
 @end example
 
 @noindent
-It contains no @samp{u} so there is no reason to split the record,
-unlike the others which have one or more occurrences of the @samp{u}.
+It contains no @samp{u}, so there is no reason to split the record,
+unlike the others, which each have one or more occurrences of the @samp{u}.
 In fact, this record is treated as part of the previous record;
 the newline separating them in the output
 is the original newline in the @value{DF}, not the one added by
@@ -6082,12 +6260,13 @@ Using an unusual character such as @samp{/} is more likely to
 produce correct behavior in the majority of cases, but there
 are no guarantees. The moral is: Know Your Data.
 
-There is one unusual case, that occurs when @command{gawk} is
+When using regular characters as the record separator,
+there is one unusual case that occurs when @command{gawk} is
 being fully POSIX-compliant (@pxref{Options}).
 Then, the following (extreme) pipeline prints a surprising @samp{1}:
 
 @example
-$ echo | gawk --posix 'BEGIN @{ RS = "a" @} ; @{ print NF @}'
+$ @kbd{echo | gawk --posix 'BEGIN @{ RS = "a" @} ; @{ print NF @}'}
 @print{} 1
 @end example
 
@@ -6109,7 +6288,7 @@ The empty string @code{""} (a string without any characters)
 has a special meaning
 as the value of @code{RS}. It means that records are separated
 by one or more blank lines and nothing else.
-@xref{Multiple Line}, for more details.
+@DBXREF{Multiple Line} for more details.
 
 If you change the value of @code{RS} in the middle of an @command{awk} run,
 the new value is used to delimit subsequent records, but the record
@@ -6129,7 +6308,7 @@ sets the variable @code{RT} to the text in the input that matched
 @code{RS}.
 
 @node gawk split records
-@subsection Record Splitting With @command{gawk}
+@subsection Record Splitting with @command{gawk}
 
 @cindex common extensions, @code{RS} as a regexp
 @cindex extensions, common@comma{} @code{RS} as a regexp
@@ -6151,7 +6330,7 @@ contains the same single character. However, when @code{RS} is a
 regular expression, @code{RT} contains
 the actual input text that matched the regular expression.
 
-If the input file ended without any text that matches @code{RS},
+If the input file ends without any text matching @code{RS},
 @command{gawk} sets @code{RT} to the null string.
 
 The following example illustrates both of these features.
@@ -6171,13 +6350,13 @@ $ @kbd{echo record 1 AAAA record 2 BBBB record 3 |}
 
 @noindent
 The square brackets delineate the contents of @code{RT}, letting you
-see the leading and trailing whitespace. The final value of @code{RT}
+see the leading and trailing whitespace. The final value of
 @code{RT} is a newline.
-@xref{Simple Sed}, for a more useful example
+@DBXREF{Simple Sed} for a more useful example
 of @code{RS} as a regexp and @code{RT}.
 
 If you set @code{RS} to a regular expression that allows optional
-trailing text, such as @samp{RS = "abc(XYZ)?"} it is possible, due
+trailing text, such as @samp{RS = "abc(XYZ)?"}, it is possible, due
 to implementation constraints, that @command{gawk} may match the leading
 part of the regular expression, but not the trailing part, particularly
 if the input text that could match the trailing part is fairly long.
@@ -6190,8 +6369,8 @@ metacharacters match the beginning and end of a @emph{string}, and not
 the beginning and end of a @emph{line}.  As a result, something like
 @samp{RS = "^[[:upper:]]"} can only match at the beginning of a file.
 This is because @command{gawk} views the input file as one long string
-that happens to contain newline characters in it.
-It is thus best to avoid anchor characters in the value of @code{RS}.
+that happens to contain newline characters.
+It is thus best to avoid anchor metacharacters in the value of @code{RS}.
 @end quotation
 
 @cindex differences in @command{awk} and @command{gawk}, @code{RS}/@code{RT} variables
@@ -6200,7 +6379,7 @@ variable are @command{gawk} extensions; they are not available in
 compatibility mode
 (@pxref{Options}).
 In compatibility mode, only the first character of the value of
-@code{RS} is used to determine the end of the record.
+@code{RS} determines the end of the record.
 
 @sidebar @code{RS = "\0"} Is Not Portable
 @cindex portability, data files as single record
@@ -6210,7 +6389,7 @@ a value that you know doesn't occur in the input file.  This is hard
 to do in a general way, such that a program always works for arbitrary
 input files.
 
-You might think that for text files, the @value{NUL} character, which
+You might think that for text files, the @sc{nul} character, which
 consists of a character with all bits equal to zero, is a good
 value to use for @code{RS} in this case:
 
@@ -6219,32 +6398,31 @@ BEGIN @{ RS = "\0" @}  # whole file becomes one record?
 @end example
 
 @cindex differences in @command{awk} and @command{gawk}, strings, storing
-@command{gawk} in fact accepts this, and uses the @value{NUL}
+@command{gawk} in fact accepts this, and uses the @sc{nul}
 character for the record separator.
 This works for certain special files, such as @file{/proc/environ} on
-GNU/Linux systems, where the @value{NUL} character is in fact the record separator.
+GNU/Linux systems, where the @sc{nul} character is in fact the record separator.
 However, this usage is @emph{not} portable
 to most other @command{awk} implementations.
 
 @cindex dark corner, strings, storing
 Almost all other @command{awk} implementations@footnote{At least that we know
 about.} store strings internally as C-style strings.  C strings use the
-@value{NUL} character as the string terminator.  In effect, this means that
+@sc{nul} character as the string terminator.  In effect, this means that
 @samp{RS = "\0"} is the same as @samp{RS = ""}.
 @value{DARKCORNER}
 
-It happens that recent versions of @command{mawk} can use the @value{NUL}
+It happens that recent versions of @command{mawk} can use the @sc{nul}
 character as a record separator. However, this is a special case:
-@command{mawk} does not allow embedded @value{NUL} characters in strings.
+@command{mawk} does not allow embedded @sc{nul} characters in strings.
+(This may change in a future version of @command{mawk}.)
 
 @cindex records, treating files as
 @cindex treating files, as single records
-@xref{Readfile Function}, for an interesting, portable way to read
-whole files.  If you are using @command{gawk}, see @ref{Extension Sample
-Readfile}, for another option.
+@DBXREF{Readfile Function} for an interesting way to read
+whole files.  If you are using @command{gawk}, see @DBREF{Extension Sample
+Readfile} for another option.
 @end sidebar
-@c ENDOFRANGE inspl
-@c ENDOFRANGE recspl
 
 @node Fields
 @section Examining Fields
@@ -6252,7 +6430,6 @@ Readfile}, for another option.
 @cindex examining fields
 @cindex fields
 @cindex accessing fields
-@c STARTOFRANGE fiex
 @cindex fields, examining
 @cindex POSIX @command{awk}, field separators and
 @cindex field separators, POSIX and
@@ -6263,9 +6440,9 @@ called @dfn{fields}.  By default, fields are separated by @dfn{whitespace},
 like words in a line.
 Whitespace in @command{awk} means any string of one or more spaces,
 TABs, or newlines;@footnote{In POSIX @command{awk}, newlines are not
-considered whitespace for separating fields.} other characters, such as
-formfeed, vertical tab, etc., that are
-considered whitespace by other languages, are @emph{not} considered
+considered whitespace for separating fields.} other characters
+that are considered whitespace by other languages
+(such as formfeed, vertical tab, etc.) are @emph{not} considered
 whitespace by @command{awk}.
 
 The purpose of fields is to make it more convenient for you to refer to
@@ -6277,12 +6454,12 @@ simple @command{awk} programs so powerful.
 @cindex @code{$} (dollar sign), @code{$} field operator
 @cindex dollar sign (@code{$}), @code{$} field operator
 @cindex field operators@comma{} dollar sign as
-You use a dollar-sign (@samp{$})
+You use a dollar sign (@samp{$})
 to refer to a field in an @command{awk} program,
 followed by the number of the field you want.  Thus, @code{$1}
 refers to the first field, @code{$2} to the second, and so on.
-(Unlike the Unix shells, the field numbers are not limited to single digits.
-@code{$127} is the one hundred twenty-seventh field in the record.)
+(Unlike in the Unix shells, the field numbers are not limited to single digits.
+@code{$127} is the 127th field in the record.)
 For example, suppose the following is a line of input:
 
 @example
@@ -6298,7 +6475,7 @@ field.
 
 @cindex @code{NF} variable
 @cindex fields, number of
-@code{NF} is a built-in variable whose value is the number of fields
+@code{NF} is a predefined variable whose value is the number of fields
 in the current record.  @command{awk} automatically updates the value
 of @code{NF} each time it reads a record.  No matter how many fields
 there are, the last field in a record can be represented by @code{$NF}.
@@ -6307,7 +6484,7 @@ If you try to reference a field beyond the last
 one (such as @code{$8} when the record has only seven fields), you get
 the empty string.  (If used in a numeric operation, you get zero.)
 
-The use of @code{$0}, which looks like a reference to the ``zero-th'' field, is
+The use of @code{$0}, which looks like a reference to the ``zeroth'' field, is
 a special case: it represents the whole input record. Use it
 when you are not interested in specific fields.
 Here are some more examples:
@@ -6320,15 +6497,11 @@ $ @kbd{awk '$1 ~ /li/ @{ print $0 @}' mail-list}
 
 @noindent
 This example prints each record in the file @file{mail-list} whose first
-field contains the string @samp{li}.  The operator @samp{~} is called a
-@dfn{matching operator}
-(@pxref{Regexp Usage});
-it tests whether a string (here, the field @code{$1}) matches a given regular
-expression.
+field contains the string @samp{li}.
 
-By contrast, the following example
-looks for @samp{li} in @emph{the entire record} and prints the first
-field and the last field for each matching input record:
+By contrast, the following example looks for @samp{li} in @emph{the
+entire record} and prints the first and last fields for each matching
+input record:
 
 @example
 $ @kbd{awk '/li/ @{ print $1, $NF @}' mail-list}
@@ -6337,7 +6510,6 @@ $ @kbd{awk '/li/ @{ print $1, $NF @}' mail-list}
 @print{} Julie F
 @print{} Samuel A
 @end example
-@c ENDOFRANGE fiex
 
 @node Nonconstant Fields
 @section Nonconstant Field Numbers
@@ -6356,7 +6528,7 @@ awk '@{ print $NR @}'
 
 @noindent
 Recall that @code{NR} is the number of records read so far: one in the
-first record, two in the second, etc.  So this example prints the first
+first record, two in the second, and so on.  So this example prints the first
 field of the first record, the second field of the second record, and so
 on.  For the twentieth record, field number 20 is printed; most likely,
 the record has fewer than 20 fields, so this prints a blank line.
@@ -6367,13 +6539,13 @@ awk '@{ print $(2*2) @}' mail-list
 @end example
 
 @command{awk} evaluates the expression @samp{(2*2)} and uses
-its value as the number of the field to print.  The @samp{*} sign
+its value as the number of the field to print.  The @samp{*}
 represents multiplication, so the expression @samp{2*2} evaluates to four.
 The parentheses are used so that the multiplication is done before the
 @samp{$} operation; they are necessary whenever there is a binary
 operator@footnote{A @dfn{binary operator}, such as @samp{*} for
 multiplication, is one that takes two operands. The distinction
-is required, since @command{awk} also has unary (one-operand)
+is required because @command{awk} also has unary (one-operand)
 and ternary (three-operand) operators.}
 in the field-number expression.  This example, then, prints the
 type of relationship (the fourth field) for every line of the file
@@ -6391,14 +6563,13 @@ implementations may behave differently.)
 
 As mentioned in @ref{Fields},
 @command{awk} stores the current record's number of fields in the built-in
-variable @code{NF} (also @pxref{Built-in Variables}).  The expression
+variable @code{NF} (also @pxref{Built-in Variables}).  Thus, the expression
 @code{$NF} is not a special feature---it is the direct consequence of
 evaluating @code{NF} and using its value as a field number.
 
 @node Changing Fields
 @section Changing the Contents of a Field
 
-@c STARTOFRANGE ficon
 @cindex fields, changing contents of
 The contents of a field, as seen by @command{awk}, can be changed within an
 @command{awk} program; this changes what @command{awk} perceives as the
@@ -6447,12 +6618,12 @@ $ @kbd{awk '@{ $2 = $2 - 10; print $0 @}' inventory-shipped}
 @dots{}
 @end example
 
-It is also possible to also assign contents to fields that are out
+It is also possible to assign contents to fields that are out
 of range.  For example:
 
 @example
-$ awk '@{ $6 = ($5 + $4 + $3 + $2)
->        print $6 @}' inventory-shipped
+$ @kbd{awk '@{ $6 = ($5 + $4 + $3 + $2)}
+> @kbd{       print $6 @}' inventory-shipped}
 @print{} 168
 @print{} 297
 @print{} 301
@@ -6498,9 +6669,9 @@ else
 
 @noindent
 should print @samp{everything is normal}, because @code{NF+1} is certain
-to be out of range.  (@xref{If Statement},
+to be out of range.  (@DBXREF{If Statement}
 for more information about @command{awk}'s @code{if-else} statements.
-@xref{Typing and Comparison},
+@DBXREF{Typing and Comparison}
 for more information about the @samp{!=} operator.)
 
 It is important to note that making an assignment to an existing field
@@ -6540,8 +6711,8 @@ after the new value of @code{NF} and recomputes @code{$0}.
 Here is an example:
 
 @example
-$ echo a b c d e f | awk '@{ print "NF =", NF;
->                            NF = 3; print $0 @}'
+$ @kbd{echo a b c d e f | awk '@{ print "NF =", NF;}
+> @kbd{                          NF = 3; print $0 @}'}
 @print{} NF = 6
 @print{} a b c
 @end example
@@ -6549,12 +6720,12 @@ $ echo a b c d e f | awk '@{ print "NF =", NF;
 @cindex portability, @code{NF} variable@comma{} decrementing
 @quotation CAUTION
 Some versions of @command{awk} don't
-rebuild @code{$0} when @code{NF} is decremented. Caveat emptor.
+rebuild @code{$0} when @code{NF} is decremented.
 @end quotation
 
 Finally, there are times when it is convenient to force
 @command{awk} to rebuild the entire record, using the current
-value of the fields and @code{OFS}.  To do this, use the
+values of the fields and @code{OFS}.  To do this, use the
 seemingly innocuous assignment:
 
 @example
@@ -6578,19 +6749,18 @@ such as @code{sub()} and @code{gsub()}
 It is important to remember that @code{$0} is the @emph{full}
 record, exactly as it was read from the input.  This includes
 any leading or trailing whitespace, and the exact whitespace (or other
-characters) that separate the fields.
+characters) that separates the fields.
 
-It is a not-uncommon error to try to change the field separators
+It is a common error to try to change the field separators
 in a record simply by setting @code{FS} and @code{OFS}, and then
 expecting a plain @samp{print} or @samp{print $0} to print the
 modified record.
 
-But this does not work, since nothing was done to change the record
+But this does not work, because nothing was done to change the record
 itself.  Instead, you must force the record to be rebuilt, typically
 with a statement such as @samp{$1 = $1}, as described earlier.
 @end sidebar
 
-@c ENDOFRANGE ficon
 
 @node Field Separators
 @section Specifying How Fields Are Separated
@@ -6606,9 +6776,7 @@ with a statement such as @samp{$1 = $1}, as described earlier.
 
 @cindex @code{FS} variable
 @cindex fields, separating
-@c STARTOFRANGE fisepr
 @cindex field separators
-@c STARTOFRANGE fisepg
 @cindex fields, separating
 The @dfn{field separator}, which is either a single character or a regular
 expression, controls the way @command{awk} splits an input record into fields.
@@ -6629,7 +6797,7 @@ is split into three fields: @samp{m}, @samp{@bullet{}g}, and
 Note the leading spaces in the values of the second and third fields.
 
 @cindex troubleshooting, @command{awk} uses @code{FS} not @code{IFS}
-The field separator is represented by the built-in variable @code{FS}.
+The field separator is represented by the predefined variable @code{FS}.
 Shell programmers take note:  @command{awk} does @emph{not} use the
 name @code{IFS} that is used by the POSIX-compliant shells (such as
 the Unix Bourne shell, @command{sh}, or Bash).
@@ -6637,7 +6805,7 @@ the Unix Bourne shell, @command{sh}, or Bash).
 @cindex @code{FS} variable, changing value of
 The value of @code{FS} can be changed in the @command{awk} program with the
 assignment operator, @samp{=} (@pxref{Assignment Ops}).
-Often the right time to do this is at the beginning of execution
+Often, the right time to do this is at the beginning of execution
 before any input has been processed, so that the very first record
 is read with the proper separator.  To do this, use the special
 @code{BEGIN} pattern
@@ -6674,7 +6842,7 @@ John Q. Smith, LXIX, 29 Oak St., Walamazoo, MI 42139
 @end example
 
 @noindent
-The same program would extract @samp{@bullet{}LXIX}, instead of
+The same program would extract @samp{@bullet{}LXIX} instead of
 @samp{@bullet{}29@bullet{}Oak@bullet{}St.}.
 If you were expecting the program to print the
 address, you would be surprised.  The moral is to choose your data layout and
@@ -6708,9 +6876,7 @@ rules.
 @node Regexp Field Splitting
 @subsection Using Regular Expressions to Separate Fields
 
-@c STARTOFRANGE regexpfs
 @cindex regular expressions, as field separators
-@c STARTOFRANGE fsregexp
 @cindex field separators, regular expressions as
 The previous @value{SUBSECTION}
 discussed the use of single characters or simple strings as the
@@ -6783,16 +6949,17 @@ $ @kbd{echo '   a b c d' | awk '@{ print; $2 = $2; print @}'}
 The first @code{print} statement prints the record as it was read,
 with leading whitespace intact.  The assignment to @code{$2} rebuilds
 @code{$0} by concatenating @code{$1} through @code{$NF} together,
-separated by the value of @code{OFS}.  Because the leading whitespace
-was ignored when finding @code{$1}, it is not part of the new @code{$0}.
-Finally, the last @code{print} statement prints the new @code{$0}.
+separated by the value of @code{OFS} (which is a space by default).
+Because the leading whitespace was ignored when finding @code{$1},
+it is not part of the new @code{$0}.  Finally, the last @code{print}
+statement prints the new @code{$0}.
 
 @cindex @code{FS}, containing @code{^}
 @cindex @code{^} (caret), in @code{FS}
 @cindex dark corner, @code{^}, in @code{FS}
 There is an additional subtlety to be aware of when using regular expressions
 for field splitting.
-It is not well-specified in the POSIX standard, or anywhere else, what @samp{^}
+It is not well specified in the POSIX standard, or anywhere else, what @samp{^}
 means when splitting fields.  Does the @samp{^}  match only at the beginning of
 the entire record? Or is each field separator a new string?  It turns out that
 different @command{awk} versions answer this question differently, and you
@@ -6807,14 +6974,12 @@ also works this way. For example:
 @example
 $ @kbd{echo 'xxAA  xxBxx  C' |}
 > @kbd{gawk -F '(^x+)|( +)' '@{ for (i = 1; i <= NF; i++)}
->                                   @kbd{printf "-->%s<--\n", $i @}'}
+> @kbd{                            printf "-->%s<--\n", $i @}'}
 @print{} --><--
 @print{} -->AA<--
 @print{} -->xxBxx<--
 @print{} -->C<--
 @end example
-@c ENDOFRANGE regexpfs
-@c ENDOFRANGE fsregexp
 
 @node Single Character Fields
 @subsection Making Each Character a Separate Field
@@ -6870,15 +7035,10 @@ awk -F, '@var{program}' @var{input-files}
 @noindent
 sets @code{FS} to the @samp{,} character.  Notice that the option uses
 an uppercase @samp{F} instead of a lowercase @samp{f}. The latter
-option (@option{-f}) specifies a file
-containing an @command{awk} program.  Case is significant in command-line
-options:
-the @option{-F} and @option{-f} options have nothing to do with each other.
-You can use both options at the same time to set the @code{FS} variable
-@emph{and} get an @command{awk} program from a file.
+option (@option{-f}) specifies a file containing an @command{awk} program.
 
 The value used for the argument to @option{-F} is processed in exactly the
-same way as assignments to the built-in variable @code{FS}.
+same way as assignments to the predefined variable @code{FS}.
 Any special characters in the field separator must be escaped
 appropriately.  For example, to use a @samp{\} as the field separator
 on the command line, you would have to type:
@@ -6943,7 +7103,7 @@ choosing your field and record separators.
 @cindex Unix @command{awk}, password files@comma{} field separators and
 Perhaps the most common use of a single character as the field separator
 occurs when processing the Unix system password file.  On many Unix
-systems, each user has a separate entry in the system password file, one
+systems, each user has a separate entry in the system password file, with one
 line per user.  The information in these lines is separated by colons.
 The first field is the user's login name and the second is the user's
 encrypted or shadow password.  (A shadow password is indicated by the
@@ -6963,11 +7123,11 @@ awk -F: '$5 == ""' /etc/passwd
 @end example
 
 @node Full Line Fields
-@subsection Making The Full Line Be A Single Field
+@subsection Making the Full Line Be a Single Field
 
 Occasionally, it's useful to treat the whole input line as a
 single field.  This can be done easily and portably simply by
-setting @code{FS} to @code{"\n"} (a newline).@footnote{Thanks to
+setting @code{FS} to @code{"\n"} (a newline):@footnote{Thanks to
 Andrew Schorr for this tip.}
 
 @example
@@ -6977,43 +7137,6 @@ awk -F'\n' '@var{program}' @var{files @dots{}}
 @noindent
 When you do this, @code{$1} is the same as @code{$0}.
 
-@node Field Splitting Summary
-@subsection Field-Splitting Summary
-
-It is important to remember that when you assign a string constant
-as the value of @code{FS}, it undergoes normal @command{awk} string
-processing.  For example, with Unix @command{awk} and @command{gawk},
-the assignment @samp{FS = "\.."} assigns the character string @code{".."}
-to @code{FS} (the backslash is stripped).  This creates a regexp meaning
-``fields are separated by occurrences of any two characters.''
-If instead you want fields to be separated by a literal period followed
-by any single character, use @samp{FS = "\\.."}.
-
-The following table summarizes how fields are split, based on the value
-of @code{FS} (@samp{==} means ``is equal to''):
-
-@table @code
-@item FS == " "
-Fields are separated by runs of whitespace.  Leading and trailing
-whitespace are ignored.  This is the default.
-
-@item FS == @var{any other single character}
-Fields are separated by each occurrence of the character.  Multiple
-successive occurrences delimit empty fields, as do leading and
-trailing occurrences.
-The character can even be a regexp metacharacter; it does not need
-to be escaped.
-
-@item FS == @var{regexp}
-Fields are separated by occurrences of characters that match @var{regexp}.
-Leading and trailing matches of @var{regexp} delimit empty fields.
-
-@item FS == ""
-Each individual character in the record becomes a separate field.
-(This is a @command{gawk} extension; it is not specified by the
-POSIX standard.)
-@end table
-
 @sidebar Changing @code{FS} Does Not Affect the Fields
 
 @cindex POSIX @command{awk}, field separators and
@@ -7021,7 +7144,7 @@ POSIX standard.)
 According to the POSIX standard, @command{awk} is supposed to behave
 as if each record is split into fields at the time it is read.
 In particular, this means that if you change the value of @code{FS}
-after a record is read, the value of the fields (i.e., how they were split)
+after a record is read, the values of the fields (i.e., how they were split)
 should reflect the old value of @code{FS}, not the new one.
 
 @cindex dark corner, field separators
@@ -7034,10 +7157,7 @@ using the @emph{current} value of @code{FS}!
 @value{DARKCORNER}
 This behavior can be difficult
 to diagnose. The following example illustrates the difference
-between the two methods.
-(The @command{sed}@footnote{The @command{sed} utility is a ``stream editor.''
-Its behavior is also defined by the POSIX standard.}
-command prints just the first line of @file{/etc/passwd}.)
+between the two methods:
 
 @example
 sed 1q /etc/passwd | awk '@{ FS = ":" ; print $1 @}'
@@ -7055,10 +7175,50 @@ on an incorrect implementation of @command{awk}, while @command{gawk}
 prints the full first line of the file, something like:
 
 @example
-root:nSijPlPhZZwgE:0:0:Root:/:
+root:x:0:0:Root:/:
 @end example
+
+(The @command{sed}@footnote{The @command{sed} utility is a ``stream editor.''
+Its behavior is also defined by the POSIX standard.}
+command prints just the first line of @file{/etc/passwd}.)
 @end sidebar
 
+@node Field Splitting Summary
+@subsection Field-Splitting Summary
+
+It is important to remember that when you assign a string constant
+as the value of @code{FS}, it undergoes normal @command{awk} string
+processing.  For example, with Unix @command{awk} and @command{gawk},
+the assignment @samp{FS = "\.."} assigns the character string @code{".."}
+to @code{FS} (the backslash is stripped).  This creates a regexp meaning
+``fields are separated by occurrences of any two characters.''
+If instead you want fields to be separated by a literal period followed
+by any single character, use @samp{FS = "\\.."}.
+
+The following list summarizes how fields are split, based on the value
+of @code{FS} (@samp{==} means ``is equal to''):
+
+@table @code
+@item FS == " "
+Fields are separated by runs of whitespace.  Leading and trailing
+whitespace are ignored.  This is the default.
+
+@item FS == @var{any other single character}
+Fields are separated by each occurrence of the character.  Multiple
+successive occurrences delimit empty fields, as do leading and
+trailing occurrences.
+The character can even be a regexp metacharacter; it does not need
+to be escaped.
+
+@item FS == @var{regexp}
+Fields are separated by occurrences of characters that match @var{regexp}.
+Leading and trailing matches of @var{regexp} delimit empty fields.
+
+@item FS == ""
+Each individual character in the record becomes a separate field.
+(This is a common extension; it is not specified by the POSIX standard.)
+@end table
+
 @sidebar @code{FS} and @code{IGNORECASE}
 
 The @code{IGNORECASE} variable
@@ -7077,30 +7237,28 @@ print $1
 @noindent
 The output is @samp{aCa}.  If you really want to split fields on an
 alphabetic character while ignoring case, use a regexp that will
-do it for you.  E.g., @samp{FS = "[c]"}.  In this case, @code{IGNORECASE}
+do it for you (e.g., @samp{FS = "[c]"}).  In this case, @code{IGNORECASE}
 will take effect.
 @end sidebar
 
-@c ENDOFRANGE fisepr
-@c ENDOFRANGE fisepg
 
 @node Constant Size
 @section Reading Fixed-Width Data
 
-@quotation NOTE
+@cindex data, fixed-width
+@cindex fixed-width data
+@cindex advanced features, fixed-width data
+
+@c O'Reilly doesn't like it as a note the first thing in the section.
 This @value{SECTION} discusses an advanced
 feature of @command{gawk}.  If you are a novice @command{awk} user,
 you might want to skip it on the first reading.
-@end quotation
 
-@cindex data, fixed-width
-@cindex fixed-width data
-@cindex advanced features, fixed-width data
-@command{gawk} provides a facility for dealing with
-fixed-width fields with no distinctive field separator.  For example,
-data of this nature arises in the input for old Fortran programs where
-numbers are run together, or in the output of programs that did not
-anticipate the use of their output as input for other programs.
+@command{gawk} provides a facility for dealing with fixed-width fields
+with no distinctive field separator.  For example, data of this nature
+arises in the input for old Fortran programs where numbers are run
+together, or in the output of programs that did not anticipate the use
+of their output as input for other programs.
 
 An example of the latter is a table where all the columns are lined up by
 the use of a variable number of spaces and @emph{empty fields are just
@@ -7120,7 +7278,7 @@ variable @code{FIELDWIDTHS}.  Each number specifies the width of the field,
 @emph{including} columns between fields.  If you want to ignore the columns
 between fields, you can specify the width as a separate field that is
 subsequently ignored.
-It is a fatal error to supply a field width that is not a positive number.
+It is a fatal error to supply a field width that has a negative value.
 The following data is the output of the Unix @command{w} utility.  It is useful
 to illustrate the use of @code{FIELDWIDTHS}:
 
@@ -7139,15 +7297,10 @@ dave     ttyq4    26Jun9115days     46     46  wnewmail
 @end group
 @end example
 
-The following program takes the above input, converts the idle time to
+The following program takes this input, converts the idle time to
 number of seconds, and prints out the first two fields and the calculated
 idle time:
 
-@quotation NOTE
-This program uses a number of @command{awk} features that
-haven't been introduced yet.
-@end quotation
-
 @example
 BEGIN  @{ FIELDWIDTHS = "9 6 10 6 7 7 35" @}
 NR > 2 @{
@@ -7166,6 +7319,11 @@ NR > 2 @{
 @}
 @end example
 
+@quotation NOTE
+The preceding program uses a number of @command{awk} features that
+haven't been introduced yet.
+@end quotation
+
 Running the program on the data produces the following results:
 
 @example
@@ -7197,7 +7355,7 @@ In order to tell which kind of field splitting is in effect,
 use @code{PROCINFO["FS"]}
 (@pxref{Auto-set}).
 The value is @code{"FS"} if regular field splitting is being used,
-or it is @code{"FIELDWIDTHS"} if fixed-width field splitting is being used:
+or @code{"FIELDWIDTHS"} if fixed-width field splitting is being used:
 
 @example
 if (PROCINFO["FS"] == "FS")
@@ -7211,17 +7369,16 @@ else
 This information is useful when writing a function
 that needs to temporarily change @code{FS} or @code{FIELDWIDTHS},
 read some records, and then restore the original settings
-(@pxref{Passwd Functions},
+(@DBPXREF{Passwd Functions}
 for an example of such a function).
 
 @node Splitting By Content
-@section Defining Fields By Content
+@section Defining Fields by Content
 
-@quotation NOTE
+@c O'Reilly doesn't like it as a note the first thing in the section.
 This @value{SECTION} discusses an advanced
 feature of @command{gawk}.  If you are a novice @command{awk} user,
 you might want to skip it on the first reading.
-@end quotation
 
 @cindex advanced features, specifying field content
 Normally, when using @code{FS}, @command{gawk} defines the fields as the
@@ -7232,14 +7389,16 @@ However, there are times when you really want to define the fields by
 what they are, and not by what they are not.
 
 The most notorious such case
-is so-called @dfn{comma separated value} (CSV) data. Many spreadsheet programs,
+is so-called @dfn{comma-separated values} (CSV) data. Many spreadsheet programs,
 for example, can export their data into text files, where each record is
-terminated with a newline, and fields are separated by commas. If only
-commas separated the data, there wouldn't be an issue. The problem comes when
-one of the fields contains an @emph{embedded} comma. While there is no
-formal standard specification for CSV data@footnote{At least, we don't know of one.},
-in such cases, most programs embed the field in double quotes. So we might
-have data like this:
+terminated with a newline, and fields are separated by commas. If
+commas only separated the data, there wouldn't be an issue. The problem comes when
+one of the fields contains an @emph{embedded} comma.
+In such cases, most programs embed the field in double quotes.@footnote{The
+CSV format lacked a formal standard definition for many years.
+@uref{http://www.ietf.org/rfc/rfc4180.txt, RFC 4180}
+standardizes the most common practices.}
+So, we might have data like this:
 
 @example
 @c file eg/misc/addresses.csv
@@ -7253,7 +7412,7 @@ The @code{FPAT} variable offers a solution for cases like this.
 The value of @code{FPAT} should be a string that provides a regular expression.
 This regular expression describes the contents of each field.
 
-In the case of CSV data as presented above, each field is either ``anything that
+In the case of CSV data as presented here, each field is either ``anything that
 is not a comma,'' or ``a double quote, anything that is not a double quote, and a
 closing double quote.''  If written as a regular expression constant
 (@pxref{Regexp}),
@@ -7318,15 +7477,15 @@ will be @code{"FPAT"} if content-based field splitting is being used.
 @quotation NOTE
 Some programs export CSV data that contains embedded newlines between
 the double quotes.  @command{gawk} provides no way to deal with this.
-Since there is no formal specification for CSV data, there isn't much
+Even though a formal specification for CSV data exists, there isn't much
 more to be done;
 the @code{FPAT} mechanism provides an elegant solution for the majority
-of cases, and the @command{gawk} developers are satisfied with that. 
+of cases, and the @command{gawk} developers are satisfied with that.
 @end quotation
 
 As written, the regexp used for @code{FPAT} requires that each field
-have a least one character.  A straightforward modification
-(changing changed the first @samp{+} to @samp{*}) allows fields to be empty:
+contain at least one character.  A straightforward modification
+(changing the first @samp{+} to @samp{*}) allows fields to be empty:
 
 @example
 FPAT = "([^,]*)|(\"[^\"]+\")"
@@ -7336,20 +7495,17 @@ Finally, the @code{patsplit()} function makes the same functionality
 available for splitting regular strings (@pxref{String Functions}).
 
 To recap, @command{gawk} provides three independent methods
-to split input records into fields. @command{gawk} uses whichever
-mechanism was last chosen based on which of the three
-variables---@code{FS}, @code{FIELDWIDTHS}, and @code{FPAT}---was
+to split input records into fields.
+The mechanism used is based on which of the three
+variables---@code{FS}, @code{FIELDWIDTHS}, or @code{FPAT}---was
 last assigned to.
 
 @node Multiple Line
 @section Multiple-Line Records
 
 @cindex multiple-line records
-@c STARTOFRANGE recm
 @cindex records, multiline
-@c STARTOFRANGE imr
 @cindex input, multiline records
-@c STARTOFRANGE frm
 @cindex files, reading, multiline records
 @cindex input, files, See input files
 In some databases, a single line cannot conveniently hold all the
@@ -7384,7 +7540,7 @@ at the end of the record and one or more blank lines after the record.
 In addition, a regular expression always matches the longest possible
 sequence when there is a choice
 (@pxref{Leftmost Longest}).
-So the next record doesn't start until
+So, the next record doesn't start until
 the first nonblank line that follows---no matter how many blank lines
 appear in a row, they are considered one record separator.
 
@@ -7399,10 +7555,10 @@ In the second case, this special processing is not done.
 @cindex field separator, in multiline records
 @cindex @code{FS}, in multiline records
 Now that the input is separated into records, the second step is to
-separate the fields in the record.  One way to do this is to divide each
+separate the fields in the records.  One way to do this is to divide each
 of the lines into fields in the normal manner.  This happens by default
 as the result of a special feature.  When @code{RS} is set to the empty
-string, @emph{and} @code{FS} is set to a single character,
+string @emph{and} @code{FS} is set to a single character,
 the newline character @emph{always} acts as a field separator.
 This is in addition to whatever field separations result from
 @code{FS}.@footnote{When @code{FS} is the null string (@code{""})
@@ -7417,7 +7573,7 @@ want the newline character to separate fields, because there is no way to
 prevent it.  However, you can work around this by using the @code{split()}
 function to break up the record manually
 (@pxref{String Functions}).
-If you have a single character field separator, you can work around
+If you have a single-character field separator, you can work around
 the special feature in a different way, by making @code{FS} into a
 regexp for that single character.  For example, if the field
 separator is a percent character, instead of
@@ -7425,10 +7581,10 @@ separator is a percent character, instead of
 
 Another way to separate fields is to
 put each field on a separate line: to do this, just set the
-variable @code{FS} to the string @code{"\n"}.  (This single
-character separator matches a single newline.)
+variable @code{FS} to the string @code{"\n"}.
+(This single-character separator matches a single newline.)
 A practical example of a @value{DF} organized this way might be a mailing
-list, where each entry is separated by blank lines.  Consider a mailing
+list, where blank lines separate the entries.  Consider a mailing
 list in a file named @file{addresses}, which looks like this:
 
 @example
@@ -7463,7 +7619,7 @@ BEGIN @{ RS = "" ; FS = "\n" @}
 Running the program produces the following output:
 
 @example
-$ awk -f addrs.awk addresses
+$ @kbd{awk -f addrs.awk addresses}
 @print{} Name is: Jane Doe
 @print{} Address is: 123 Main Street
 @print{} City and State are: Anywhere, SE 12345-6789
@@ -7475,12 +7631,9 @@ $ awk -f addrs.awk addresses
 @dots{}
 @end example
 
-@xref{Labels Program}, for a more realistic
-program that deals with address lists.
-The following
-table
-summarizes how records are split, based on the
-value of
+@DBXREF{Labels Program} for a more realistic program dealing with
+address lists.  The following list summarizes how records are split,
+based on the value of
 @ifinfo
 @code{RS}.
 (@samp{==} means ``is equal to.'')
@@ -7515,24 +7668,19 @@ POSIX standard.)
 
 @cindex @command{gawk}, @code{RT} variable in
 @cindex @code{RT} variable
-In all cases, @command{gawk} sets @code{RT} to the input text that matched the
-value specified by @code{RS}.
+If not in compatibility mode (@pxref{Options}), @command{gawk} sets
+@code{RT} to the input text that matched the value specified by @code{RS}.
 But if the input file ended without any text that matches @code{RS},
 then @command{gawk} sets @code{RT} to the null string.
-@c ENDOFRANGE recm
-@c ENDOFRANGE imr
-@c ENDOFRANGE frm
 
 @node Getline
 @section Explicit Input with @code{getline}
 
-@c STARTOFRANGE getl
 @cindex @code{getline} command, explicit input with
-@c STARTOFRANGE inex
 @cindex input, explicit
 So far we have been getting our input data from @command{awk}'s main
 input stream---either the standard input (usually your keyboard, sometimes
-the output from another program) or from the
+the output from another program) or the
 files specified on the command line.  The @command{awk} language has a
 special built-in command called @code{getline} that
 can be used to read input under your explicit control.
@@ -7568,12 +7716,19 @@ a record, such as a file that cannot be opened, then @code{getline}
 returns @minus{}1.  In this case, @command{gawk} sets the variable
 @code{ERRNO} to a string describing the error that occurred.
 
+If @code{ERRNO} indicates that the I/O operation may be
+retried, and @code{PROCINFO["@var{input}", "RETRY"]} is set,
+then @code{getline} returns @minus{}2
+instead of @minus{}1, and further calls to @code{getline}
+may be attemped.  @DBXREF{Retrying Input} for further information about
+this feature.
+
 In the following examples, @var{command} stands for a string value that
 represents a shell command.
 
 @quotation NOTE
 When @option{--sandbox} is specified (@pxref{Options}),
-reading lines from files, pipes and coprocesses is disabled.
+reading lines from files, pipes, and coprocesses is disabled.
 @end quotation
 
 @menu
@@ -7614,9 +7769,7 @@ processing on the next record @emph{right now}.  For example:
             while (j == 0) @{
                 # get more text
                 if (getline <= 0) @{
-                    m = "unexpected EOF or error"
-                    m = (m ": " ERRNO)
-                    print m > "/dev/stderr"
+                    print("unexpected EOF or error:", ERRNO) > "/dev/stderr"
                     exit
                 @}
                 # build up the line using string concatenation
@@ -7718,7 +7871,7 @@ free
 @end example
 
 The @code{getline} command used in this way sets only the variables
-@code{NR}, @code{FNR} and @code{RT} (and of course, @var{var}).
+@code{NR}, @code{FNR}, and @code{RT} (and, of course, @var{var}).
 The record is not
 split into fields, so the values of the fields (including @code{$0}) and
 the value of @code{NF} do not change.
@@ -7733,7 +7886,7 @@ the value of @code{NF} do not change.
 @cindex left angle bracket (@code{<}), @code{<} operator (I/O)
 @cindex operators, input/output
 Use @samp{getline < @var{file}} to read the next record from @var{file}.
-Here @var{file} is a string-valued expression that
+Here, @var{file} is a string-valued expression that
 specifies the @value{FN}.  @samp{< @var{file}} is called a @dfn{redirection}
 because it directs input to come from a different place.
 For example, the following
@@ -7772,10 +7925,10 @@ you want your program to be portable to all @command{awk} implementations.
 
 Use @samp{getline @var{var} < @var{file}} to read input
 from the file
-@var{file}, and put it in the variable @var{var}.  As above, @var{file}
+@var{file}, and put it in the variable @var{var}.  As earlier, @var{file}
 is a string-valued expression that specifies the file from which to read.
 
-In this version of @code{getline}, none of the built-in variables are
+In this version of @code{getline}, none of the predefined variables are
 changed and the record is not split into fields.  The only variable
 changed is @var{var}.@footnote{This is not quite true. @code{RT} could
 be changed if @code{RS} is a regular expression.}
@@ -7808,7 +7961,7 @@ One deficiency of this program is that it does not process nested
 @code{@@include} statements
 (i.e., @code{@@include} statements in included files)
 the way a true macro preprocessor would.
-@xref{Igawk Program}, for a program
+@DBXREF{Igawk Program} for a program
 that does handle nested @code{@@include} statements.
 
 @node Getline/Pipe
@@ -7885,7 +8038,7 @@ bletch
 @end example
 
 @noindent
-Notice that this program ran the command @command{who} and printed the previous result.
+Notice that this program ran the command @command{who} and printed the result.
 (If you try this program yourself, you will of course get different results,
 depending upon who is logged in on your system.)
 
@@ -7910,8 +8063,8 @@ Unfortunately, @command{gawk} has not been consistent in its treatment
 of a construct like @samp{@w{"echo "} "date" | getline}.
 Most versions, including the current version, treat it at as
 @samp{@w{("echo "} "date") | getline}.
-(This how BWK @command{awk} behaves.)
-Some versions changed and treated it as
+(This is also how BWK @command{awk} behaves.)
+Some versions instead treat it as
 @samp{@w{"echo "} ("date" | getline)}.
 (This is how @command{mawk} behaves.)
 In short, @emph{always} use explicit parentheses, and then you won't
@@ -7937,8 +8090,8 @@ BEGIN @{
 @}
 @end example
 
-In this version of @code{getline}, none of the built-in variables are
-changed and the record is not split into fields.
+In this version of @code{getline}, none of the predefined variables are
+changed and the record is not split into fields. However, @code{RT} is set.
 
 @ifinfo
 @c Thanks to Paul Eggert for initial wording here
@@ -7959,7 +8112,7 @@ program to be portable to other @command{awk} implementations.
 @cindex operators, input/output
 @cindex differences in @command{awk} and @command{gawk}, input/output operators
 
-Input into @code{getline} from a pipe is a one-way operation.
+Reading input into @code{getline} from a pipe is a one-way operation.
 The command that is started with @samp{@var{command} | getline} only
 sends data @emph{to} your @command{awk} program.
 
@@ -7969,7 +8122,7 @@ for processing and then read the results back.
 communications are possible.  This is done with the @samp{|&}
 operator.
 Typically, you write data to the coprocess first and then
-read results back, as shown in the following:
+read the results back, as shown in the following:
 
 @example
 print "@var{some query}" |& "db_server"
@@ -7999,7 +8152,7 @@ When you use @samp{@var{command} |& getline @var{var}}, the output from
 the coprocess @var{command} is sent through a two-way pipe to @code{getline}
 and into the variable @var{var}.
 
-In this version of @code{getline}, none of the built-in variables are
+In this version of @code{getline}, none of the predefined variables are
 changed and the record is not split into fields.  The only variable
 changed is @var{var}.
 However, @code{RT} is set.
@@ -8046,23 +8199,29 @@ causes @command{awk} to set the value of @code{FILENAME}. Normally,
 @code{FILENAME} does not have a value inside @code{BEGIN} rules, because you
 have not yet started to process the command-line @value{DF}s.
 @value{DARKCORNER}
-(@xref{BEGIN/END},
+(See @ref{BEGIN/END};
 also @pxref{Auto-set}.)
 
 @item
 Using @code{FILENAME} with @code{getline}
 (@samp{getline < FILENAME})
-is likely to be a source for
+is likely to be a source of
 confusion.  @command{awk} opens a separate input stream from the
 current input file.  However, by not using a variable, @code{$0}
-and @code{NR} are still updated.  If you're doing this, it's
+and @code{NF} are still updated.  If you're doing this, it's
 probably by accident, and you should reconsider what it is you're
 trying to accomplish.
 
 @item
-@DBREF{Getline Summary} presents a table summarizing the
+@ifdocbook
+The next section
+@end ifdocbook
+@ifnotdocbook
+@ref{Getline Summary},
+@end ifnotdocbook
+presents a table summarizing the
 @code{getline} variants and which variables they can affect.
-It is worth noting that those variants which do not use redirection
+It is worth noting that those variants that do not use redirection
 can cause @code{FILENAME} to be updated if they cause
 @command{awk} to start reading a new input file.
 
@@ -8071,7 +8230,7 @@ can cause @code{FILENAME} to be updated if they cause
 If the variable being assigned is an expression with side effects,
 different versions of @command{awk} behave differently upon encountering
 end-of-file.  Some versions don't evaluate the expression; many versions
-(including @command{gawk}) do.  Here is an example, due to Duncan Moore:
+(including @command{gawk}) do.  Here is an example, courtesy of Duncan Moore:
 
 @ignore
 Date: Sun, 01 Apr 2012 11:49:33 +0100
@@ -8088,12 +8247,12 @@ BEGIN @{
 
 @noindent
 Here, the side effect is the @samp{++c}.  Is @code{c} incremented if
-end of file is encountered, before the element in @code{a} is assigned?
+end-of-file is encountered before the element in @code{a} is assigned?
 
 @command{gawk} treats @code{getline} like a function call, and evaluates
 the expression @samp{a[++c]} before attempting to read from @file{f}.
 However, some versions of @command{awk} only evaluate the expression once they
-know that there is a string value to be assigned.  Caveat Emptor.
+know that there is a string value to be assigned.
 @end itemize
 
 @node Getline Summary
@@ -8102,30 +8261,27 @@ know that there is a string value to be assigned.  Caveat Emptor.
 
 @ref{table-getline-variants}
 summarizes the eight variants of @code{getline},
-listing which built-in variables are set by each one,
+listing which predefined variables are set by each one,
 and whether the variant is standard or a @command{gawk} extension.
-Note: for each variant, @command{gawk} sets the @code{RT} built-in variable.
+Note: for each variant, @command{gawk} sets the @code{RT} predefined variable.
 
 @float Table,table-getline-variants
-@caption{@code{getline} Variants and What They Set}
+@caption{@code{getline} variants and what they set}
 @multitable @columnfractions .33 .38 .27
-@headitem Variant @tab Effect @tab Standard / Extension
-@item @code{getline} @tab Sets @code{$0}, @code{NF}, @code{FNR}, @code{NR}, and @code{RT} @tab Standard
-@item @code{getline} @var{var} @tab Sets @var{var}, @code{FNR}, @code{NR}, and @code{RT} @tab Standard
-@item @code{getline <} @var{file} @tab Sets @code{$0}, @code{NF}, and @code{RT} @tab Standard
-@item @code{getline @var{var} < @var{file}} @tab Sets @var{var} and @code{RT} @tab Standard
-@item @var{command} @code{| getline} @tab Sets @code{$0}, @code{NF}, and @code{RT} @tab Standard
-@item @var{command} @code{| getline} @var{var} @tab Sets @var{var} and @code{RT} @tab Standard
-@item @var{command} @code{|& getline} @tab Sets @code{$0}, @code{NF}, and @code{RT} @tab Extension
-@item @var{command} @code{|& getline} @var{var} @tab Sets @var{var} and @code{RT} @tab Extension
+@headitem Variant @tab Effect @tab @command{awk} / @command{gawk}
+@item @code{getline} @tab Sets @code{$0}, @code{NF}, @code{FNR}, @code{NR}, and @code{RT} @tab @command{awk}
+@item @code{getline} @var{var} @tab Sets @var{var}, @code{FNR}, @code{NR}, and @code{RT} @tab @command{awk}
+@item @code{getline <} @var{file} @tab Sets @code{$0}, @code{NF}, and @code{RT} @tab @command{awk}
+@item @code{getline @var{var} < @var{file}} @tab Sets @var{var} and @code{RT} @tab @command{awk}
+@item @var{command} @code{| getline} @tab Sets @code{$0}, @code{NF}, and @code{RT} @tab @command{awk}
+@item @var{command} @code{| getline} @var{var} @tab Sets @var{var} and @code{RT} @tab @command{awk}
+@item @var{command} @code{|& getline} @tab Sets @code{$0}, @code{NF}, and @code{RT} @tab @command{gawk}
+@item @var{command} @code{|& getline} @var{var} @tab Sets @var{var} and @code{RT} @tab @command{gawk}
 @end multitable
 @end float
-@c ENDOFRANGE getl
-@c ENDOFRANGE inex
-@c ENDOFRANGE infir
 
 @node Read Timeout
-@section Reading Input With A Timeout
+@section Reading Input with a Timeout
 @cindex timeout, reading input
 
 @cindex differences in @command{awk} and @command{gawk}, read timeouts
@@ -8133,8 +8289,8 @@ This @value{SECTION} describes a feature that is specific to @command{gawk}.
 
 You may specify a timeout in milliseconds for reading input from the keyboard,
 a pipe, or two-way communication, including TCP/IP sockets. This can be done
-on a per input, command or connection basis, by setting a special element
-in the @code{PROCINFO} (@pxref{Auto-set}) array:
+on a per-input, per-command, or per-connection basis, by setting a special
+element in the @code{PROCINFO} array (@pxref{Auto-set}):
 
 @example
 PROCINFO["input_name", "READ_TIMEOUT"] = @var{timeout in milliseconds}
@@ -8165,8 +8321,8 @@ while ((getline < "/dev/stdin") > 0)
 @end example
 
 @command{gawk} terminates the read operation if input does not
-arrive after waiting for the timeout period, returns failure
-and sets the @code{ERRNO} variable to an appropriate string value.
+arrive after waiting for the timeout period, returns failure,
+and sets @code{ERRNO} to an appropriate string value.
 A negative or zero value for the timeout is the same as specifying
 no timeout at all.
 
@@ -8175,7 +8331,7 @@ loop that reads input records and matches them against patterns,
 like so:
 
 @example
-$ @kbd{ gawk 'BEGIN @{ PROCINFO["-", "READ_TIMEOUT"] = 5000 @}}
+$ @kbd{gawk 'BEGIN @{ PROCINFO["-", "READ_TIMEOUT"] = 5000 @}}
 > @kbd{@{ print "You entered: " $0 @}'}
 @kbd{gawk}
 @print{} You entered: gawk
@@ -8198,7 +8354,7 @@ for the input to arrive:
 PROCINFO[Service, "READ_TIMEOUT"] = 1000
 while ((Service |& getline) > 0) @{
     print $0
-    PROCINFO[S, "READ_TIMEOUT"] -= 100
+    PROCINFO[Service, "READ_TIMEOUT"] -= 100
 @}
 @end example
 
@@ -8207,21 +8363,22 @@ You should not assume that the read operation will block
 exactly after the tenth record has been printed. It is possible that
 @command{gawk} will read and buffer more than one record's
 worth of data the first time. Because of this, changing the value
-of timeout like in the above example is not very useful.
+of timeout like in the preceding example is not very useful.
 @end quotation
 
-If the @code{PROCINFO} element is not present and the environment
-variable @env{GAWK_READ_TIMEOUT} exists,
+If the @code{PROCINFO} element is not present and the
+@env{GAWK_READ_TIMEOUT} environment variable exists,
 @command{gawk} uses its value to initialize the timeout value.
 The exclusive use of the environment variable to specify timeout
 has the disadvantage of not being able to control it
-on a per command or connection basis.
+on a per-command or per-connection basis.
 
 @command{gawk} considers a timeout event to be an error even though
 the attempt to read from the underlying device may
 succeed in a later attempt. This is a limitation, and it also
 means that you cannot use this to multiplex input from
-two or more sources.
+two or more sources.  @DBXREF{Retrying Input} for a way to enable 
+later I/O attempts to succeed.
 
 Assigning a timeout value prevents read operations from
 blocking indefinitely. But bear in mind that there are other ways
@@ -8231,8 +8388,38 @@ a connection before it can start reading any data,
 or the attempt to open a FIFO special file for reading can block
 indefinitely until some other process opens it for writing.
 
+@node Retrying Input
+@section Retrying Reads After Certain Input Errors
+@cindex retrying input
+
+@cindex differences in @command{awk} and @command{gawk}, retrying input
+This @value{SECTION} describes a feature that is specific to @command{gawk}.
+
+When @command{gawk} encounters an error while reading input, by
+default @code{getline} returns @minus{}1, and subsequent attempts to
+read from that file result in an end-of-file indication.  However, you
+may optionally instruct @command{gawk} to allow I/O to be retried when
+certain errors are encountered by setting a special element in
+the @code{PROCINFO} array (@pxref{Auto-set}):
+
+@example
+PROCINFO["@var{input_name}", "RETRY"] = 1
+@end example
+
+When this element exists, @command{gawk} checks the value of the system
+(C language)
+@code{errno} variable when an I/O error occurs.  If @code{errno} indicates
+a subsequent I/O attempt may succeed, @code{getline} instead returns
+@minus{}2 and
+further calls to @code{getline} may succeed.  This applies to the @code{errno}
+values @code{EAGAIN}, @code{EWOULDBLOCK}, @code{EINTR}, or @code{ETIMEDOUT}.
+
+This feature is useful in conjunction with
+@code{PROCINFO["@var{input_name}", "READ_TIMEOUT"]} or situations where a file
+descriptor has been configured to behave in a non-blocking fashion.
+
 @node Command-line directories
-@section Directories On The Command Line
+@section Directories on the Command Line
 @cindex differences in @command{awk} and @command{gawk}, command-line directories
 @cindex directories, command-line
 @cindex command line, directories on
@@ -8247,14 +8434,14 @@ command line, but otherwise ignores it.  This makes it easier to use
 shell wildcards with your @command{awk} program:
 
 @example
-$ @kbd{gawk -f whizprog.awk *}        @ii{Directories could kill this progam}
+$ @kbd{gawk -f whizprog.awk *}        @ii{Directories could kill this program}
 @end example
 
 If either of the @option{--posix}
 or @option{--traditional} options is given, then @command{gawk} reverts
 to treating a directory on the command line as a fatal error.
 
-@xref{Extension Sample Readdir}, for a way to treat directories
+@DBXREF{Extension Sample Readdir} for a way to treat directories
 as usable data from an @command{awk} program.
 
 @node Input Summary
@@ -8266,24 +8453,28 @@ Input is split into records based on the value of @code{RS}.
 The possibilities are as follows:
 
 @multitable @columnfractions .25 .35 .40
-@headitem Value of @code{RS} @tab Records are split on @tab @command{awk} / @command{gawk}
+@headitem Value of @code{RS} @tab Records are split on @dots{} @tab @command{awk} / @command{gawk}
 @item Any single character @tab That character @tab @command{awk}
 @item The empty string (@code{""}) @tab Runs of two or more newlines @tab @command{awk}
 @item A regexp @tab Text that matches the regexp @tab @command{gawk}
 @end multitable
 
 @item
+@code{FNR} indicates how many records have been read from the current input file;
+@code{NR} indicates how many records have been read in total.
+
+@item
 @command{gawk} sets @code{RT} to the text matched by @code{RS}.
 
 @item
 After splitting the input into records, @command{awk} further splits
-the record into individual fields, named @code{$1}, @code{$2} and so
+the records into individual fields, named @code{$1}, @code{$2}, and so
 on. @code{$0} is the whole record, and @code{NF} indicates how many
 fields there are.  The default way to split fields is between whitespace
 characters.
 
 @item
-Fields may be referenced using a variable, as in @samp{$NF}.  Fields
+Fields may be referenced using a variable, as in @code{$NF}.  Fields
 may also be assigned values, which causes the value of @code{$0} to be
 recomputed when it is later referenced. Assigning to a field with a number
 greater than @code{NF} creates the field and rebuilds the record, using
@@ -8291,18 +8482,19 @@ greater than @code{NF} creates the field and rebuilds the record, using
 thing. Decrementing @code{NF} throws away fields and rebuilds the record.
 
 @item
-Field splitting is more complicated than record splitting.
+Field splitting is more complicated than record splitting:
 
 @multitable @columnfractions .40 .40 .20
 @headitem Field separator value @tab Fields are split @dots{} @tab @command{awk} / @command{gawk}
 @item @code{FS == " "} @tab On runs of whitespace @tab @command{awk}
 @item @code{FS == @var{any single character}} @tab On that character @tab @command{awk}
 @item @code{FS == @var{regexp}} @tab On text matching the regexp @tab @command{awk}
-@item @code{FS == ""}  @tab Each individual character is a separate field @tab @command{gawk}
+@item @code{FS == ""}  @tab Such that each individual character is a separate field @tab @command{gawk}
 @item @code{FIELDWIDTHS == @var{list of columns}} @tab Based on character position @tab @command{gawk}
-@item @code{FPAT == @var{regexp}} @tab On text around text matching the regexp @tab @command{gawk}
+@item @code{FPAT == @var{regexp}} @tab On the text surrounding text matching the regexp @tab @command{gawk}
 @end multitable
 
+@item
 Using @samp{FS = "\n"} causes the entire record to be a single field
 (assuming that newlines separate records).
 
@@ -8311,14 +8503,14 @@ Using @samp{FS = "\n"} causes the entire record to be a single field
 This can also be done using command-line variable assignment.
 
 @item
-@code{PROCINFO["FS"]} can be used to see how fields are being split.
+Use @code{PROCINFO["FS"]} to see how fields are being split.
 
 @item
-Use @code{getline} in its various forms to read additional records,
-from the default input stream, from a file, or from a pipe or co-process.
+Use @code{getline} in its various forms to read additional records
+from the default input stream, from a file, or from a pipe or coprocess.
 
 @item
-Use @code{PROCINFO[@var{file}, "READ_TIMEOUT"]} to cause reads to timeout
+Use @code{PROCINFO[@var{file}, "READ_TIMEOUT"]} to cause reads to time out
 for @var{file}.
 
 @item
@@ -8352,7 +8544,6 @@ That can be fixed by making one simple change. What is it?
 @node Printing
 @chapter Printing Output
 
-@c STARTOFRANGE prnt
 @cindex printing
 @cindex output, printing, See printing
 One of the most common programming actions is to @dfn{print}, or output,
@@ -8363,12 +8554,11 @@ The @code{print} statement is not limited when
 computing @emph{which} values to print. However, with two exceptions,
 you cannot specify @emph{how} to print them---how many
 columns, whether to use exponential notation or not, and so on.
-(For the exceptions, @pxref{Output Separators}, and
+(For the exceptions, @DBPXREF{Output Separators} and
 @ref{OFMT}.)
 For printing with specifications, you need the @code{printf} statement
 (@pxref{Printf}).
 
-@c STARTOFRANGE prnts
 @cindex @code{print} statement
 @cindex @code{printf} statement
 Besides basic and formatted printing, this @value{CHAPTER}
@@ -8384,10 +8574,12 @@ and discusses the @code{close()} built-in function.
 * Printf::                      The @code{printf} statement.
 * Redirection::                 How to redirect output to multiple files and
                                 pipes.
+* Special FD::                  Special files for I/O.
 * Special Files::               File name interpretation in @command{gawk}.
                                 @command{gawk} allows access to inherited file
                                 descriptors.
 * Close Files And Pipes::       Closing Input and Output Files and Pipes.
+* Nonfatal::                    Enabling Nonfatal Output.
 * Output Summary::              Output summary.
 * Output Exercises::            Exercises.
 @end menu
@@ -8395,7 +8587,7 @@ and discusses the @code{close()} built-in function.
 @node Print
 @section The @code{print} Statement
 
-The @code{print} statement is used for producing output with simple, standardized
+Use the @code{print} statement to produce output with simple, standardized
 formatting.  You specify only the strings or numbers to print, in a
 list separated by commas.  They are output, separated by single spaces,
 followed by a newline.  The statement looks like this:
@@ -8419,7 +8611,7 @@ expression.  Numeric values are converted to strings and then printed.
 @cindex text, printing
 The simple statement @samp{print} with no items is equivalent to
 @samp{print $0}: it prints the entire current record.  To print a blank
-line, use @samp{print ""}, where @code{""} is the empty string.
+line, use @samp{print ""}.
 To print a fixed piece of text, use a string constant, such as
 @w{@code{"Don't Panic"}}, as one item.  If you forget to use the
 double-quote characters, your text is taken as an @command{awk}
@@ -8427,8 +8619,8 @@ expression, and you will probably get an error.  Keep in mind that a
 space is printed between any two items.
 
 Note that the @code{print} statement is a statement and not an
-expression---you can't use it the pattern part of a pattern-action
-statement, for example.
+expression---you can't use it in the pattern part of a
+pattern--action statement, for example.
 
 @node Print Examples
 @section @code{print} Statement Examples
@@ -8439,9 +8631,22 @@ newline, the newline is output along with the rest of the string.  A
 single @code{print} statement can make any number of lines this way.
 
 @cindex newlines, printing
-The following is an example of printing a string that contains embedded newlines
+The following is an example of printing a string that contains embedded
+@ifinfo
+newlines
+(the @samp{\n} is an escape sequence, used to represent the newline
+character; @pxref{Escape Sequences}):
+@end ifinfo
+@ifhtml
+newlines
 (the @samp{\n} is an escape sequence, used to represent the newline
 character; @pxref{Escape Sequences}):
+@end ifhtml
+@ifnotinfo
+@ifnothtml
+newlines:
+@end ifnothtml
+@end ifnotinfo
 
 @example
 $ @kbd{awk 'BEGIN @{ print "line one\nline two\nline three" @}'}
@@ -8534,7 +8739,6 @@ You can continue either a @code{print} or
 @code{printf} statement simply by putting a newline after any comma
 (@pxref{Statements/Lines}).
 @end quotation
-@c ENDOFRANGE prnts
 
 @node Output Separators
 @section Output Separators
@@ -8545,15 +8749,15 @@ of items separated by commas.  In the output, the items are normally
 separated by single spaces.  However, this doesn't need to be the case;
 a single space is simply the default.  Any string of
 characters may be used as the @dfn{output field separator} by setting the
-built-in variable @code{OFS}.  The initial value of this variable
-is the string @w{@code{" "}}---that is, a single space.
+predefined variable @code{OFS}.  The initial value of this variable
+is the string @w{@code{" "}} (i.e., a single space).
 
-The output from an entire @code{print} statement is called an
-@dfn{output record}.  Each @code{print} statement outputs one output
-record, and then outputs a string called the @dfn{output record separator}
-(or @code{ORS}).  The initial
-value of @code{ORS} is the string @code{"\n"}; i.e., a newline
-character.  Thus, each @code{print} statement normally makes a separate line.
+The output from an entire @code{print} statement is called an @dfn{output
+record}.  Each @code{print} statement outputs one output record, and
+then outputs a string called the @dfn{output record separator} (or
+@code{ORS}).  The initial value of @code{ORS} is the string @code{"\n"}
+(i.e., a newline character).  Thus, each @code{print} statement normally
+makes a separate line.
 
 @cindex output, records
 @cindex output record separator, See @code{ORS} variable
@@ -8576,27 +8780,27 @@ newline:
 $ @kbd{awk 'BEGIN @{ OFS = ";"; ORS = "\n\n" @}}
 >            @kbd{@{ print $1, $2 @}' mail-list}
 @print{} Amelia;555-5553
-@print{} 
+@print{}
 @print{} Anthony;555-3412
-@print{} 
+@print{}
 @print{} Becky;555-7685
-@print{} 
+@print{}
 @print{} Bill;555-1675
-@print{} 
+@print{}
 @print{} Broderick;555-0542
-@print{} 
+@print{}
 @print{} Camilla;555-2912
-@print{} 
+@print{}
 @print{} Fabius;555-1234
-@print{} 
+@print{}
 @print{} Julie;555-6699
-@print{} 
+@print{}
 @print{} Martin;555-6480
-@print{} 
+@print{}
 @print{} Samuel;555-3430
-@print{} 
+@print{}
 @print{} Jean-Paul;555-2127
-@print{} 
+@print{}
 @end example
 
 If the value of @code{ORS} does not contain a newline, the program's output
@@ -8607,7 +8811,7 @@ runs together on a single line.
 @cindex numeric, output format
 @cindex formats@comma{} numeric output
 When printing numeric values with the @code{print} statement,
-@command{awk} internally converts the number to a string of characters
+@command{awk} internally converts each number to a string of characters
 and prints that string.  @command{awk} uses the @code{sprintf()} function
 to do this conversion
 (@pxref{String Functions}).
@@ -8621,13 +8825,13 @@ more fully in
 @cindexawkfunc{sprintf}
 @cindex @code{OFMT} variable
 @cindex output, format specifier@comma{} @code{OFMT}
-The built-in variable @code{OFMT} contains the default format specification
+The predefined variable @code{OFMT} contains the format specification
 that @code{print} uses with @code{sprintf()} when it wants to convert a
 number to a string for printing.
 The default value of @code{OFMT} is @code{"%.6g"}.
 The way @code{print} prints numbers can be changed
-by supplying different format specifications
-as the value of @code{OFMT}, as shown in the following example:
+by supplying a different format specification
+for the value of @code{OFMT}, as shown in the following example:
 
 @example
 $ @kbd{awk 'BEGIN @{}
@@ -8647,7 +8851,6 @@ if @code{OFMT} contains anything but a floating-point conversion specification.
 @node Printf
 @section Using @code{printf} Statements for Fancier Printing
 
-@c STARTOFRANGE printfs
 @cindex @code{printf} statement
 @cindex output, formatted
 @cindex formatting output
@@ -8657,9 +8860,7 @@ With @code{printf} you can
 specify the width to use for each item, as well as various
 formatting choices for numbers (such as what output base to use, whether to
 print an exponent, whether to print a sign, and how many digits to print
-after the decimal point).  You do this by supplying a string, called
-the @dfn{format string}, that controls how and where to print the other
-arguments.
+after the decimal point).
 
 @menu
 * Basic Printf::                Syntax of the @code{printf} statement.
@@ -8679,10 +8880,10 @@ printf @var{format}, @var{item1}, @var{item2}, @dots{}
 @end example
 
 @noindent
-The entire list of arguments may optionally be enclosed in parentheses.  The
-parentheses are necessary if any of the item expressions use the @samp{>}
-relational operator; otherwise, it can be confused with an output redirection
-(@pxref{Redirection}).
+As for @code{print}, the entire list of arguments may optionally be
+enclosed in parentheses. Here too, the parentheses are necessary if any
+of the item expressions uses the @samp{>} relational operator; otherwise,
+it can be confused with an output redirection (@pxref{Redirection}).
 
 @cindex format specifiers
 The difference between @code{printf} and @code{print} is the @var{format}
@@ -8705,14 +8906,14 @@ on @code{printf} statements. For example:
 @example
 $ @kbd{awk 'BEGIN @{}
 >    @kbd{ORS = "\nOUCH!\n"; OFS = "+"}
->    @kbd{msg = "Dont Panic!"}
+>    @kbd{msg = "Don\47t Panic!"}
 >    @kbd{printf "%s\n", msg}
 > @kbd{@}'}
-@print{} Dont Panic!
+@print{} Don't Panic!
 @end example
 
 @noindent
-Here, neither the @samp{+} nor the @samp{OUCH} appear in
+Here, neither the @samp{+} nor the @samp{OUCH!} appears in
 the output message.
 
 @node Control Letters
@@ -8730,7 +8931,7 @@ the field width.  Here is a list of the format-control letters:
 @c @asis for docbook to come out right
 @table @asis
 @item @code{%c}
-Print a number as an ASCII character; thus, @samp{printf "%c",
+Print a number as a character; thus, @samp{printf "%c",
 65} outputs the letter @samp{A}. The output for a string value is
 the first character of the string.
 
@@ -8759,8 +8960,8 @@ The two control letters are equivalent.
 (The @samp{%i} specification is for compatibility with ISO C.)
 
 @item @code{%e}, @code{%E}
-Print a number in scientific (exponential) notation;
-for example:
+Print a number in scientific (exponential) notation.
+For example:
 
 @example
 printf "%4.3e\n", 1950
@@ -8787,17 +8988,17 @@ which follow the decimal point.
 (The @samp{4.3} represents two modifiers,
 discussed in the next @value{SUBSECTION}.)
 
-On systems supporting IEEE 754 floating point format, values
+On systems supporting IEEE 754 floating-point format, values
 representing negative
 infinity are formatted as
 @samp{-inf} or @samp{-infinity},
 and positive infinity as
-@samp{inf} and @samp{infinity}.
+@samp{inf} or @samp{infinity}.
 The special ``not a number'' value formats as @samp{-nan} or @samp{nan}
 (@pxref{Math Definitions}).
 
 @item @code{%F}
-Like @samp{%f} but the infinity and ``not a number'' values are spelled
+Like @samp{%f}, but the infinity and ``not a number'' values are spelled
 using uppercase letters.
 
 The @samp{%F} format is a POSIX extension to ISO C; not all systems
@@ -8818,7 +9019,7 @@ Print a string.
 @item @code{%u}
 Print an unsigned decimal integer.
 (This format is of marginal use, because all numbers in @command{awk}
-are floating-point; it is provided primarily for compatibility with C.)
+are floating point; it is provided primarily for compatibility with C.)
 
 @item @code{%x}, @code{%X}
 Print an unsigned hexadecimal integer;
@@ -8847,23 +9048,22 @@ values or do something else entirely.
 @node Format Modifiers
 @subsection Modifiers for @code{printf} Formats
 
-@c STARTOFRANGE pfm
 @cindex @code{printf} statement, modifiers
 @cindex modifiers@comma{} in format specifiers
 A format specification can also include @dfn{modifiers} that can control
 how much of the item's value is printed, as well as how much space it gets.
 The modifiers come between the @samp{%} and the format-control letter.
-We will use the bullet symbol ``@bullet{}'' in the following examples to
+We use the bullet symbol ``@bullet{}'' in the following examples to
 represent
 spaces in the output. Here are the possible modifiers, in the order in
 which they may appear:
 
-@table @code
+@table @asis
 @cindex differences in @command{awk} and @command{gawk}, @code{print}/@code{printf} statements
 @cindex @code{printf} statement, positional specifiers
 @c the code{} does NOT start a secondary
 @cindex positional specifiers, @code{printf} statement
-@item @var{N}$
+@item @code{@var{N}$}
 An integer constant followed by a @samp{$} is a @dfn{positional specifier}.
 Normally, format specifications are applied to arguments in the order
 given in the format string.  With a positional specifier, the format
@@ -8884,9 +9084,9 @@ It is in fact a @command{gawk} extension, intended for use in translating
 messages at runtime.
 @xref{Printf Ordering},
 which describes how and why to use positional specifiers.
-For now, we will not use them.
+For now, we ignore them.
 
-@item -
+@item @code{-} (Minus)
 The minus sign, used before the width modifier (see later on in
 this list),
 says to left-justify
@@ -8904,14 +9104,14 @@ prints @samp{foo@bullet{}}.
 For numeric conversions, prefix positive values with a space and
 negative values with a minus sign.
 
-@item +
+@item @code{+}
 The plus sign, used before the width modifier (see later on in
 this list),
 says to always supply a sign for numeric conversions, even if the data
 to format is positive. The @samp{+} overrides the space modifier.
 
-@item #
-Use an ``alternate form'' for certain control letters.
+@item @code{#}
+Use an ``alternative form'' for certain control letters.
 For @samp{%o}, supply a leading zero.
 For @samp{%x} and @samp{%X}, supply a leading @samp{0x} or @samp{0X} for
 a nonzero result.
@@ -8919,16 +9119,16 @@ For @samp{%e}, @samp{%E}, @samp{%f}, and @samp{%F}, the result always
 contains a decimal point.
 For @samp{%g} and @samp{%G}, trailing zeros are not removed from the result.
 
-@item 0
-A leading @samp{0} (zero) acts as a flag that indicates that output should be
+@item @code{0}
+A leading @samp{0} (zero) acts as a flag indicating that output should be
 padded with zeros instead of spaces.
 This applies only to the numeric output formats.
 This flag only has an effect when the field width is wider than the
 value to print.
 
-@item '
+@item @code{'}
 A single quote or apostrophe character is a POSIX extension to ISO C.
-It indicates that the integer part of a floating point value, or the
+It indicates that the integer part of a floating-point value, or the
 entire part of an integer decimal value, should have a thousands-separator
 character in it.  This only works in locales that support such characters.
 For example:
@@ -8979,7 +9179,7 @@ prints @samp{foobar}.
 Preceding the @var{width} with a minus sign causes the output to be
 padded with spaces on the right, instead of on the left.
 
-@item .@var{prec}
+@item @code{.@var{prec}}
 A period followed by an integer constant
 specifies the precision to use when printing.
 The meaning of the precision varies by control letter:
@@ -9009,7 +9209,7 @@ prints @samp{foob}.
 @end table
 
 The C library @code{printf}'s dynamic @var{width} and @var{prec}
-capability (for example, @code{"%*.*s"}) is supported.  Instead of
+capability (e.g., @code{"%*.*s"}) is supported.  Instead of
 supplying explicit @var{width} and/or @var{prec} values in the format
 string, they are passed in the argument list.  For example:
 
@@ -9042,7 +9242,7 @@ printf "%" w "." p "s\n", s
 @end example
 
 @noindent
-This is not particularly easy to read but it does work.
+This is not particularly easy to read, but it does work.
 
 @c @cindex lint checks
 @cindex troubleshooting, fatal errors, @code{printf} format strings
@@ -9053,7 +9253,6 @@ format strings. These are not valid in @command{awk}.  Most @command{awk}
 implementations silently ignore them.  If @option{--lint} is provided
 on the command line (@pxref{Options}), @command{gawk} warns about their
 use. If @option{--posix} is supplied, their use is a fatal error.
-@c ENDOFRANGE pfm
 
 @node Printf Examples
 @subsection Examples Using @code{printf}
@@ -9089,7 +9288,7 @@ $ @kbd{awk '@{ printf "%-10s %s\n", $1, $2 @}' mail-list}
 @end example
 
 In this case, the phone numbers had to be printed as strings because
-the numbers are separated by a dash.  Printing the phone numbers as
+the numbers are separated by dashes.  Printing the phone numbers as
 numbers would have produced just the first three digits: @samp{555}.
 This would have been pretty confusing.
 
@@ -9106,17 +9305,17 @@ the @command{awk} program:
 @example
 awk 'BEGIN @{ print "Name      Number"
              print "----      ------" @}
-     @{ printf "%-10s %s\n", $1, $2 @}' mail-list
+           @{ printf "%-10s %s\n", $1, $2 @}' mail-list
 @end example
 
-The above example mixes @code{print} and @code{printf} statements in
+The preceding example mixes @code{print} and @code{printf} statements in
 the same program.  Using just @code{printf} statements can produce the
 same results:
 
 @example
 awk 'BEGIN @{ printf "%-10s %s\n", "Name", "Number"
              printf "%-10s %s\n", "----", "------" @}
-     @{ printf "%-10s %s\n", $1, $2 @}' mail-list
+           @{ printf "%-10s %s\n", $1, $2 @}' mail-list
 @end example
 
 @noindent
@@ -9131,17 +9330,14 @@ emphasized by storing it in a variable, like this:
 awk 'BEGIN @{ format = "%-10s %s\n"
              printf format, "Name", "Number"
              printf format, "----", "------" @}
-     @{ printf format, $1, $2 @}' mail-list
+           @{ printf format, $1, $2 @}' mail-list
 @end example
 
-@c ENDOFRANGE printfs
 
 @node Redirection
 @section Redirecting Output of @code{print} and @code{printf}
 
-@c STARTOFRANGE outre
 @cindex output redirection
-@c STARTOFRANGE reout
 @cindex redirection of output
 @cindex @option{--sandbox} option, output redirection with @code{print}, @code{printf}
 So far, the output from @code{print} and @code{printf} has gone
@@ -9152,7 +9348,7 @@ This is called @dfn{redirection}.
 
 @quotation NOTE
 When @option{--sandbox} is specified (@pxref{Options}),
-redirecting output to files and pipes is disabled.
+redirecting output to files, pipes, and coprocesses is disabled.
 @end quotation
 
 A redirection appears after the @code{print} or @code{printf} statement.
@@ -9205,7 +9401,7 @@ Each output file contains one name or number per line.
 @cindex @code{>} (right angle bracket), @code{>>} operator (I/O)
 @cindex right angle bracket (@code{>}), @code{>>} operator (I/O)
 @item print @var{items} >> @var{output-file}
-This redirection prints the items into the pre-existing output file
+This redirection prints the items into the preexisting output file
 named @var{output-file}.  The difference between this and the
 single-@samp{>} redirection is that the old contents (if any) of
 @var{output-file} are not erased.  Instead, the @command{awk} output is
@@ -9244,25 +9440,19 @@ The unsorted list is written with an ordinary redirection, while
 the sorted list is written by piping through the @command{sort} utility.
 
 The next example uses redirection to mail a message to the mailing
-list @samp{bug-system}.  This might be useful when trouble is encountered
+list @code{bug-system}.  This might be useful when trouble is encountered
 in an @command{awk} script run periodically for system maintenance:
 
 @example
 report = "mail bug-system"
-print "Awk script failed:", $0 | report
-m = ("at record number " FNR " of " FILENAME)
-print m | report
+print("Awk script failed:", $0) | report
+print("at record number", FNR, "of", FILENAME) | report
 close(report)
 @end example
 
-The message is built using string concatenation and saved in the variable
-@code{m}.  It's then sent down the pipeline to the @command{mail} program.
-(The parentheses group the items to concatenate---see
-@ref{Concatenation}.)
-
 The @code{close()} function is called here because it's a good idea to close
 the pipe as soon as all the intended output has been sent to it.
-@xref{Close Files And Pipes},
+@DBXREF{Close Files And Pipes}
 for more information.
 
 This example also illustrates the use of a variable to represent
@@ -9281,15 +9471,23 @@ This redirection prints the items to the input of @var{command}.
 The difference between this and the
 single-@samp{|} redirection is that the output from @var{command}
 can be read with @code{getline}.
-Thus @var{command} is a @dfn{coprocess}, which works together with,
-but subsidiary to, the @command{awk} program.
+Thus, @var{command} is a @dfn{coprocess}, which works together with
+but is subsidiary to the @command{awk} program.
 
 This feature is a @command{gawk} extension, and is not available in
 POSIX @command{awk}.
+@ifnotdocbook
 @xref{Getline/Coprocess},
 for a brief discussion.
 @xref{Two-way I/O},
 for a more complete discussion.
+@end ifnotdocbook
+@ifdocbook
+@DBXREF{Getline/Coprocess}
+for a brief discussion and
+@DBREF{Two-way I/O}
+for a more complete discussion.
+@end ifdocbook
 @end table
 
 Redirecting output using @samp{>}, @samp{>>}, @samp{|}, or @samp{|&}
@@ -9312,9 +9510,9 @@ print "Avoid improbability generators" >> "guide.txt"
 @noindent
 This is indeed how redirections must be used from the shell.  But in
 @command{awk}, it isn't necessary.  In this kind of case, a program should
-use @samp{>} for all the @code{print} statements, since the output file
+use @samp{>} for all the @code{print} statements, because the output file
 is only opened once. (It happens that if you mix @samp{>} and @samp{>>}
-that output is produced in the expected order. However, mixing the operators
+output is produced in the expected order. However, mixing the operators
 for the same file is definitely poor style, and is confusing to readers
 of your program.)
 
@@ -9360,27 +9558,13 @@ uppercase characters converted to lowercase
 The program builds up a list of command lines,
 using the @command{mv} utility to rename the files.
 It then sends the list to the shell for execution.
-@end sidebar
-@c ENDOFRANGE outre
-@c ENDOFRANGE reout
 
-@node Special Files
-@section Special @value{FFN}s in @command{gawk}
-@c STARTOFRANGE gfn
-@cindex @command{gawk}, file names in
-
-@command{gawk} provides a number of special @value{FN}s that it interprets
-internally.  These @value{FN}s provide access to standard file descriptors
-and TCP/IP networking.
-
-@menu
-* Special FD::                  Special files for I/O.
-* Special Network::             Special files for network communications.
-* Special Caveats::             Things to watch out for.
-@end menu
+@DBXREF{Shell Quoting} for a function that can help in generating
+command lines to be fed to the shell.
+@end sidebar
 
 @node Special FD
-@subsection Special Files for Standard Descriptors
+@section Special Files for Standard Preopened Data Streams
 @cindex standard input
 @cindex input, standard
 @cindex standard output
@@ -9391,9 +9575,12 @@ and TCP/IP networking.
 @cindex files, descriptors, See file descriptors
 
 Running programs conventionally have three input and output streams
-already available to them for reading and writing.  These are known as
-the @dfn{standard input}, @dfn{standard output}, and @dfn{standard error
-output}.  These streams are, by default, connected to your keyboard and screen, but
+already available to them for reading and writing.  These are known
+as the @dfn{standard input}, @dfn{standard output}, and @dfn{standard
+error output}.  These open streams (and any other open files or pipes)
+are often referred to by the technical term @dfn{file descriptors}.
+
+These streams are, by default, connected to your keyboard and screen, but
 they are often redirected with the shell, via the @samp{<}, @samp{<<},
 @samp{>}, @samp{>>}, @samp{>&}, and @samp{|} operators.  Standard error
 is typically used for writing error messages; the reason there are two separate
@@ -9402,7 +9589,7 @@ redirected separately.
 
 @cindex differences in @command{awk} and @command{gawk}, error messages
 @cindex error handling
-In other implementations of @command{awk}, the only way to write an error
+In traditional implementations of @command{awk}, the only way to write an error
 message to standard error in an @command{awk} program is as follows:
 
 @example
@@ -9428,19 +9615,19 @@ that is connected to your keyboard and screen. It represents the
 ``terminal,''@footnote{The ``tty'' in @file{/dev/tty} stands for
 ``Teletype,'' a serial terminal.} which on modern systems is a keyboard
 and screen, not a serial console.)
-This usually has the same effect but not always: although the
+This generally has the same effect, but not always: although the
 standard error stream is usually the screen, it can be redirected; when
 that happens, writing to the screen is not correct.  In fact, if
 @command{awk} is run from a background job, it may not have a
 terminal at all.
 Then opening @file{/dev/tty} fails.
 
-@command{gawk} provides special @value{FN}s for accessing the three standard
-streams. @value{COMMONEXT} It also provides syntax for accessing
-any other inherited open files.  If the @value{FN} matches
-one of these special names when @command{gawk} redirects input or output,
-then it directly uses the stream that the @value{FN} stands for.
-These special @value{FN}s work for all operating systems that @command{gawk}
+@command{gawk}, BWK @command{awk}, and @command{mawk} provide
+special @value{FN}s for accessing the three standard streams.
+If the @value{FN} matches one of these special names when @command{gawk}
+(or one of the others) redirects input or output, then it directly uses
+the descriptor that the @value{FN} stands for.  These special
+@value{FN}s work for all operating systems that @command{gawk}
 has been ported to, not just those that are POSIX-compliant:
 
 @cindex common extensions, @code{/dev/stdin} special file
@@ -9462,19 +9649,10 @@ The standard output (file descriptor 1).
 
 @item /dev/stderr
 The standard error output (file descriptor 2).
-
-@item /dev/fd/@var{N}
-The file associated with file descriptor @var{N}.  Such a file must
-be opened by the program initiating the @command{awk} execution (typically
-the shell).  Unless special pains are taken in the shell from which
-@command{gawk} is invoked, only descriptors 0, 1, and 2 are available.
 @end table
 
-The @value{FN}s @file{/dev/stdin}, @file{/dev/stdout}, and @file{/dev/stderr}
-are aliases for @file{/dev/fd/0}, @file{/dev/fd/1}, and @file{/dev/fd/2},
-respectively. However, they are more self-explanatory.
-The proper way to write an error message in a @command{gawk} program
-is to use @file{/dev/stderr}, like this:
+With these facilities,
+the proper way to write an error message then becomes:
 
 @example
 print "Serious error detected!" > "/dev/stderr"
@@ -9482,18 +9660,54 @@ print "Serious error detected!" > "/dev/stderr"
 
 @cindex troubleshooting, quotes with file names
 Note the use of quotes around the @value{FN}.
-Like any other redirection, the value must be a string.
+Like with any other redirection, the value must be a string.
 It is a common error to omit the quotes, which leads
 to confusing results.
 
-Finally, using the @code{close()} function on a @value{FN} of the
+@command{gawk} does not treat these @value{FN}s as special when
+in POSIX-compatibility mode. However, because BWK @command{awk}
+supports them, @command{gawk} does support them even when
+invoked with the @option{--traditional} option (@pxref{Options}).
+
+@node Special Files
+@section Special @value{FFN}s in @command{gawk}
+@cindex @command{gawk}, file names in
+
+Besides access to standard input, standard output, and standard error,
+@command{gawk} provides access to any open file descriptor.
+Additionally, there are special @value{FN}s reserved for
+TCP/IP networking.
+
+@menu
+* Other Inherited Files::       Accessing other open files with
+                                @command{gawk}.
+* Special Network::             Special files for network communications.
+* Special Caveats::             Things to watch out for.
+@end menu
+
+@node Other Inherited Files
+@subsection Accessing Other Open Files with @command{gawk}
+
+Besides the @code{/dev/stdin}, @code{/dev/stdout}, and @code{/dev/stderr}
+special @value{FN}s mentioned earlier, @command{gawk} provides syntax
+for accessing any other inherited open file:
+
+@table @file
+@item /dev/fd/@var{N}
+The file associated with file descriptor @var{N}.  Such a file must
+be opened by the program initiating the @command{awk} execution (typically
+the shell).  Unless special pains are taken in the shell from which
+@command{gawk} is invoked, only descriptors 0, 1, and 2 are available.
+@end table
+
+The @value{FN}s @file{/dev/stdin}, @file{/dev/stdout}, and @file{/dev/stderr}
+are essentially aliases for @file{/dev/fd/0}, @file{/dev/fd/1}, and
+@file{/dev/fd/2}, respectively. However, those names are more self-explanatory.
+
+Note that using @code{close()} on a @value{FN} of the
 form @code{"/dev/fd/@var{N}"}, for file descriptor numbers
 above two, does actually close the given file descriptor.
 
-The @file{/dev/stdin}, @file{/dev/stdout}, and @file{/dev/stderr}
-special files are also recognized internally by several other
-versions of @command{awk}.
-
 @node Special Network
 @subsection Special Files for Network Communications
 @cindex networks, support for
@@ -9508,7 +9722,7 @@ This is done using a special @value{FN} of the form:
 @file{/@var{net-type}/@var{protocol}/@var{local-port}/@var{remote-host}/@var{remote-port}}
 @end example
 
-The @var{net-type} is one of @samp{inet}, @samp{inet4} or @samp{inet6}.
+The @var{net-type} is one of @samp{inet}, @samp{inet4}, or @samp{inet6}.
 The @var{protocol} is one of @samp{tcp} or @samp{udp},
 and the other fields represent the other essential pieces of information
 for making a networking connection.
@@ -9522,38 +9736,38 @@ Full discussion is delayed until
 @node Special Caveats
 @subsection Special @value{FFN} Caveats
 
-Here is a list of things to bear in mind when using the
+Here are some things to bear in mind when using the
 special @value{FN}s that @command{gawk} provides:
 
 @itemize @value{BULLET}
 @cindex compatibility mode (@command{gawk}), file names
 @cindex file names, in compatibility mode
 @item
-Recognition of these special @value{FN}s is disabled if @command{gawk} is in
-compatibility mode (@pxref{Options}).
+Recognition of the @value{FN}s for the three standard preopened
+files is disabled only in POSIX mode.
+
+@item
+Recognition of the other special @value{FN}s is disabled if @command{gawk} is in
+compatibility mode (either @option{--traditional} or @option{--posix};
+@pxref{Options}).
 
 @item
 @command{gawk} @emph{always}
 interprets these special @value{FN}s.
 For example, using @samp{/dev/fd/4}
 for output actually writes on file descriptor 4, and not on a new
-file descriptor that is @code{dup()}'ed from file descriptor 4.  Most of
+file descriptor that is @code{dup()}ed from file descriptor 4.  Most of
 the time this does not matter; however, it is important to @emph{not}
 close any of the files related to file descriptors 0, 1, and 2.
 Doing so results in unpredictable behavior.
 @end itemize
-@c ENDOFRANGE gfn
 
 @node Close Files And Pipes
 @section Closing Input and Output Redirections
 @cindex files, output, See output files
-@c STARTOFRANGE ifc
 @cindex input files, closing
-@c STARTOFRANGE ofc
 @cindex output, files@comma{} closing
-@c STARTOFRANGE pc
 @cindex pipe, closing
-@c STARTOFRANGE cc
 @cindex coprocesses, closing
 @cindex @code{getline} command, coprocesses@comma{} using from
 
@@ -9692,7 +9906,7 @@ is not closed and released until @code{close()} is called or
 @command{awk} exits.
 
 @code{close()} silently does nothing if given an argument that
-does not represent a file, pipe or coprocess that was opened with
+does not represent a file, pipe, or coprocess that was opened with
 a redirection.  In such a case, it returns a negative value,
 indicating an error. In addition, @command{gawk} sets @code{ERRNO}
 to a string indicating the error.
@@ -9700,7 +9914,8 @@ to a string indicating the error.
 Note also that @samp{close(FILENAME)} has no ``magic'' effects on the
 implicit loop that reads through the files named on the command line.
 It is, more likely, a close of a file that was never opened with a
-redirection, so @command{awk} silently does nothing.
+redirection, so @command{awk} silently does nothing, except return
+a negative value.
 
 @cindex @code{|} (vertical bar), @code{|&} operator (I/O), pipes@comma{} closing
 When using the @samp{|&} operator to communicate with a coprocess,
@@ -9712,10 +9927,10 @@ the first argument is the name of the command or special file used
 to start the coprocess.
 The second argument should be a string, with either of the values
 @code{"to"} or @code{"from"}.  Case does not matter.
-As this is an advanced feature, a more complete discussion is
+As this is an advanced feature, discussion is
 delayed until
 @ref{Two-way I/O},
-which discusses it in more detail and gives an example.
+which describes it in more detail and gives an example.
 
 @sidebar Using @code{close()}'s Return Value
 @cindex dark corner, @code{close()} function
@@ -9725,9 +9940,10 @@ which discusses it in more detail and gives an example.
 @cindex Unix @command{awk}, @code{close()} function and
 
 In many older versions of Unix @command{awk}, the @code{close()} function
-is actually a statement.  It is a syntax error to try and use the return
-value from @code{close()}:
+is actually a statement.
 @value{DARKCORNER}
+It is a syntax error to try and use the return
+value from @code{close()}:
 
 @example
 command = "@dots{}"
@@ -9741,7 +9957,7 @@ retval = close(command)  # syntax error in many Unix awks
 The return value is @minus{}1 if the argument names something
 that was never opened with a redirection, or if there is
 a system problem closing the file or process.
-In these cases, @command{gawk} sets the built-in variable
+In these cases, @command{gawk} sets the predefined variable
 @code{ERRNO} to a string describing the problem.
 
 In @command{gawk},
@@ -9757,18 +9973,79 @@ This value is zero if the close succeeds, or @minus{}1 if
 it fails.
 
 The POSIX standard is very vague; it says that @code{close()}
-returns zero on success and nonzero otherwise.  In general,
+returns zero on success and a nonzero value otherwise.  In general,
 different implementations vary in what they report when closing
-pipes; thus the return value cannot be used portably.
+pipes; thus, the return value cannot be used portably.
 @value{DARKCORNER}
 In POSIX mode (@pxref{Options}), @command{gawk} just returns zero
 when closing a pipe.
 @end sidebar
 
-@c ENDOFRANGE ifc
-@c ENDOFRANGE ofc
-@c ENDOFRANGE pc
-@c ENDOFRANGE cc
+
+@node Nonfatal
+@section Enabling Nonfatal Output
+
+This @value{SECTION} describes a @command{gawk}-specific feature.
+
+In standard @command{awk}, output with @code{print} or @code{printf}
+to a nonexistent file, or some other I/O error (such as filling up the
+disk) is a fatal error.
+
+@example
+$ @kbd{gawk 'BEGIN @{ print "hi" > "/no/such/file" @}'}
+@error{} gawk: cmd. line:1: fatal: can't redirect to `/no/such/file' (No such file or directory)
+@end example
+
+@command{gawk} makes it possible to detect that an error has
+occurred, allowing you to possibly recover from the error, or
+at least print an error message of your choosing before exiting.
+You can do this in one of two ways:
+
+@itemize @bullet
+@item
+For all output files, by assigning any value to @code{PROCINFO["NONFATAL"]}.
+
+@item
+On a per-file basis, by assigning any value to
+@code{PROCINFO[@var{filename}, "NONFATAL"]}.
+Here, @var{filename} is the name of the file to which
+you wish output to be nonfatal.
+@end itemize
+
+Once you have enabled nonfatal output, you must check @code{ERRNO}
+after every relevant @code{print} or @code{printf} statement to
+see if something went wrong.  It is also a good idea to initialize
+@code{ERRNO} to zero before attempting the output. For example:
+
+@example
+$ @kbd{gawk '}
+> @kbd{BEGIN @{}
+> @kbd{    PROCINFO["NONFATAL"] = 1}
+> @kbd{    ERRNO = 0}
+> @kbd{    print "hi" > "/no/such/file"}
+> @kbd{    if (ERRNO) @{}
+> @kbd{        print("Output failed:", ERRNO) > "/dev/stderr"}
+> @kbd{        exit 1}
+> @kbd{    @}}
+> @kbd{@}'}
+@error{} Output failed: No such file or directory
+@end example
+
+Here, @command{gawk} did not produce a fatal error; instead
+it let the @command{awk} program code detect the problem and handle it.
+
+This mechanism works also for standard output and standard error.
+For standard output, you may use @code{PROCINFO["-", "NONFATAL"]}
+or @code{PROCINFO["/dev/stdout", "NONFATAL"]}.  For standard error, use
+@code{PROCINFO["/dev/stderr", "NONFATAL"]}.
+
+When attempting to open a TCP/IP socket (@pxref{TCP/IP Networking}),
+@command{gawk} tries multiple times. The @env{GAWK_SOCK_RETRIES}
+environment variable (@pxref{Other Environment Variables}) allows you to
+override @command{gawk}'s builtin default number of attempts.  However,
+once nonfatal I/O is enabled for a given socket, @command{gawk} only
+retries once, relying on @command{awk}-level code to notice that there
+was a problem.
 
 @node Output Summary
 @section Summary
@@ -9782,22 +10059,28 @@ for numeric values for the @code{print} statement.
 
 @item
 The @code{printf} statement provides finer-grained control over output,
-with format control letters for different data types and various flags
-that modify the behavior of the format control letters.
+with format-control letters for different data types and various flags
+that modify the behavior of the format-control letters.
 
 @item
 Output from both @code{print} and @code{printf} may be redirected to
-files, pipes, and co-processes.
+files, pipes, and coprocesses.
 
 @item
-@command{gawk} provides special file names for access to standard input,
-output and error, and for network communications.
+@command{gawk} provides special @value{FN}s for access to standard input,
+output, and error, and for network communications.
 
 @item
-Use @code{close()} to close open file, pipe and co-process redirections.
-For co-processes, it is possible to close only one direction of the
+Use @code{close()} to close open file, pipe, and coprocess redirections.
+For coprocesses, it is possible to close only one direction of the
 communications.
 
+@item
+Normally errors with @code{print} or @code{printf} are fatal.
+@command{gawk} lets you make output errors be nonfatal either for
+all files or on a per-file basis. You must then check for errors
+after every relevant output statement.
+
 @end itemize
 
 @c EXCLUDE START
@@ -9832,11 +10115,9 @@ BEGIN @{ print "Serious error detected!" > /dev/stderr @}
 @end enumerate
 @c EXCLUDE END
 
-@c ENDOFRANGE prnt
 
 @node Expressions
 @chapter Expressions
-@c STARTOFRANGE exps
 @cindex expressions
 
 Expressions are the basic building blocks of @command{awk} patterns
@@ -9847,7 +10128,7 @@ can assign a new value to a variable or a field by using an assignment operator.
 An expression can serve as a pattern or action statement on its own.
 Most other kinds of
 statements contain one or more expressions that specify the data on which to
-operate.  As in other languages, expressions in @command{awk} include
+operate.  As in other languages, expressions in @command{awk} can include
 variables, array references, constants, and function calls, as well as
 combinations of these with various operators.
 
@@ -9862,11 +10143,11 @@ combinations of these with various operators.
 @end menu
 
 @node Values
-@section Constants, Variables and Conversions
+@section Constants, Variables, and Conversions
 
 Expressions are built up from values and the operations performed
 upon them. This @value{SECTION} describes the elementary objects
-which provide the values used in expressions.
+that provide the values used in expressions.
 
 @menu
 * Constants::                   String, numeric and regexp constants.
@@ -9879,7 +10160,6 @@ which provide the values used in expressions.
 @node Constants
 @subsection Constant Expressions
 
-@c STARTOFRANGE cnst
 @cindex constants, types of
 
 The simplest type of expression is the @dfn{constant}, which always has
@@ -9888,7 +10168,7 @@ string, and regular expression.
 
 Each is used in the appropriate context when you need a data
 value that isn't going to change.  Numeric constants can
-have different forms, but are stored identically internally.
+have different forms, but are internally stored in an identical manner.
 
 @menu
 * Scalar Constants::            Numeric and string constants.
@@ -9904,7 +10184,7 @@ have different forms, but are stored identically internally.
 A @dfn{numeric constant} stands for a number.  This number can be an
 integer, a decimal fraction, or a number in scientific (exponential)
 notation.@footnote{The internal representation of all numbers,
-including integers, uses double precision floating-point numbers.
+including integers, uses double-precision floating-point numbers.
 On most modern systems, these are in IEEE 754 standard format.
 @xref{Arbitrary Precision Arithmetic}, for much more information.}
 Here are some examples of numeric constants that all
@@ -9917,8 +10197,8 @@ have the same value:
 @end example
 
 @cindex string constants
-A string constant consists of a sequence of characters enclosed in
-double-quotation marks.  For example:
+A @dfn{string constant} consists of a sequence of characters enclosed in
+double quotation marks.  For example:
 
 @example
 "parrot"
@@ -9929,7 +10209,7 @@ double-quotation marks.  For example:
 @cindex strings, length limitations
 represents the string whose contents are @samp{parrot}.  Strings in
 @command{gawk} can be of any length, and they can contain any of the possible
-eight-bit ASCII characters including ASCII @value{NUL} (character code zero).
+eight-bit ASCII characters, including ASCII @sc{nul} (character code zero).
 Other @command{awk}
 implementations may have difficulty with some character codes.
 
@@ -9940,19 +10220,19 @@ implementations may have difficulty with some character codes.
 @cindex numbers, octal
 @cindex numbers, hexadecimal
 
-In @command{awk}, all numbers are in decimal; i.e., base 10.  Many other
+In @command{awk}, all numbers are in decimal (i.e., base 10).  Many other
 programming languages allow you to specify numbers in other bases, often
 octal (base 8) and hexadecimal (base 16).
-In octal, the numbers go 0, 1, 2, 3, 4, 5, 6, 7, 10, 11, 12, etc.
-Just as @samp{11}, in decimal, is 1 times 10 plus 1, so
-@samp{11}, in octal, is 1 times 8, plus 1. This equals 9 in decimal.
-In hexadecimal, there are 16 digits. Since the everyday decimal
+In octal, the numbers go 0, 1, 2, 3, 4, 5, 6, 7, 10, 11, 12, and so on.
+Just as @samp{11} in decimal is 1 times 10 plus 1, so
+@samp{11} in octal is 1 times 8 plus 1. This equals 9 in decimal.
+In hexadecimal, there are 16 digits. Because the everyday decimal
 number system only has ten digits (@samp{0}--@samp{9}), the letters
 @samp{a} through @samp{f} are used to represent the rest.
 (Case in the letters is usually irrelevant; hexadecimal @samp{a} and @samp{A}
 have the same value.)
-Thus, @samp{11}, in
-hexadecimal, is 1 times 16 plus 1, which equals 17 in decimal.
+Thus, @samp{11} in
+hexadecimal is 1 times 16 plus 1, which equals 17 in decimal.
 
 Just by looking at plain @samp{11}, you can't tell what base it's in.
 So, in C, C++, and other languages derived from C,
@@ -9963,13 +10243,13 @@ and hexadecimal numbers start with a leading @samp{0x} or @samp{0X}:
 
 @table @code
 @item 11
-Decimal value 11.
+Decimal value 11
 
 @item 011
-Octal 11, decimal value 9.
+Octal 11, decimal value 9
 
 @item 0x11
-Hexadecimal 11, decimal value 17.
+Hexadecimal 11, decimal value 17
 @end table
 
 This example shows the difference:
@@ -9997,12 +10277,13 @@ you can use the @code{strtonum()} function
 (@pxref{String Functions})
 to convert the data into a number.
 Most of the time, you will want to use octal or hexadecimal constants
-when working with the built-in bit manipulation functions;
-see @ref{Bitwise Functions},
+when working with the built-in bit-manipulation functions;
+see @DBREF{Bitwise Functions}
 for more information.
 
-Unlike some early C implementations, @samp{8} and @samp{9} are not valid
-in octal constants; e.g., @command{gawk} treats @samp{018} as decimal 18:
+Unlike in some early C implementations, @samp{8} and @samp{9} are not
+valid in octal constants.  For example, @command{gawk} treats @samp{018}
+as decimal 18:
 
 @example
 $ @kbd{gawk 'BEGIN @{ print "021 is", 021 ; print 018 @}'}
@@ -10035,19 +10316,17 @@ $ @kbd{gawk 'BEGIN @{ printf "0x11 is <%s>\n", 0x11 @}'}
 @node Regexp Constants
 @subsubsection Regular Expression Constants
 
-@c STARTOFRANGE rec
 @cindex regexp constants
 @cindex @code{~} (tilde), @code{~} operator
 @cindex tilde (@code{~}), @code{~} operator
 @cindex @code{!} (exclamation point), @code{!~} operator
 @cindex exclamation point (@code{!}), @code{!~} operator
-A regexp constant is a regular expression description enclosed in
+A @dfn{regexp constant} is a regular expression description enclosed in
 slashes, such as @code{@w{/^beginning and end$/}}.  Most regexps used in
 @command{awk} programs are constant, but the @samp{~} and @samp{!~}
 matching operators can also match computed or dynamic regexps
 (which are typically just ordinary strings or variables that contain a regexp,
-but could be a more complex expression).
-@c ENDOFRANGE cnst
+but could be more complex expressions).
 
 @node Using Constant Regexps
 @subsection Using Regular Expression Constants
@@ -10059,7 +10338,7 @@ matched.
 However, regexp constants (such as @code{/foo/}) may be used like simple expressions.
 When a
 regexp constant appears by itself, it has the same meaning as if it appeared
-in a pattern, i.e., @samp{($0 ~ /foo/)}
+in a pattern (i.e., @samp{($0 ~ /foo/)}).
 @value{DARKCORNER}
 @xref{Expression Patterns}.
 This means that the following two code segments:
@@ -10080,7 +10359,7 @@ if (/barfly/ || /camelot/)
 @noindent
 are exactly equivalent.
 One rather bizarre consequence of this rule is that the following
-Boolean expression is valid, but does not do what the user probably
+Boolean expression is valid, but does not do what its author probably
 intended:
 
 @example
@@ -10126,10 +10405,9 @@ Modern implementations of @command{awk}, including @command{gawk}, allow
 the third argument of @code{split()} to be a regexp constant, but some
 older implementations do not.
 @value{DARKCORNER}
-This can lead to confusion when attempting to use regexp constants
-as arguments to user-defined functions
-(@pxref{User-defined}).
-For example:
+Because some built-in functions accept regexp constants as arguments,
+confusion can arise when attempting to use regexp constants as arguments
+to user-defined functions (@pxref{User-defined}).  For example:
 
 @example
 function mysub(pat, repl, str, global)
@@ -10154,19 +10432,18 @@ function mysub(pat, repl, str, global)
 In this example, the programmer wants to pass a regexp constant to the
 user-defined function @code{mysub()}, which in turn passes it on to
 either @code{sub()} or @code{gsub()}.  However, what really happens is that
-the @code{pat} parameter is either one or zero, depending upon whether
+the @code{pat} parameter is assigned a value of either one or zero, depending upon whether
 or not @code{$0} matches @code{/hi/}.
 @command{gawk} issues a warning when it sees a regexp constant used as
-a parameter to a user-defined function, since passing a truth value in
+a parameter to a user-defined function, because passing a truth value in
 this way is probably not what was intended.
-@c ENDOFRANGE rec
 
 @node Variables
 @subsection Variables
 
 @cindex variables, user-defined
 @cindex user-defined, variables
-Variables are ways of storing values at one point in your program for
+@dfn{Variables} are ways of storing values at one point in your program for
 use later in another part of your program.  They can be manipulated
 entirely within the program text, and they can also be assigned values
 on the @command{awk} command line.
@@ -10194,27 +10471,27 @@ are distinct variables.
 A variable name is a valid expression by itself; it represents the
 variable's current value.  Variables are given new values with
 @dfn{assignment operators}, @dfn{increment operators}, and
-@dfn{decrement operators}.
-@xref{Assignment Ops}.
+@dfn{decrement operators}
+(@pxref{Assignment Ops}).
 In addition, the @code{sub()} and @code{gsub()} functions can
-change a variable's value, and the @code{match()}, @code{patsplit()}
-and @code{split()} functions can change the contents of their
-array parameters. @xref{String Functions}.
+change a variable's value, and the @code{match()}, @code{split()},
+and @code{patsplit()} functions can change the contents of their
+array parameters (@pxref{String Functions}).
 
 @cindex variables, built-in
 @cindex variables, initializing
 A few variables have special built-in meanings, such as @code{FS} (the
-field separator), and @code{NF} (the number of fields in the current input
-record).  @xref{Built-in Variables}, for a list of the built-in variables.
-These built-in variables can be used and assigned just like all other
+field separator) and @code{NF} (the number of fields in the current input
+record).  @DBXREF{Built-in Variables} for a list of the predefined variables.
+These predefined variables can be used and assigned just like all other
 variables, but their values are also used or changed automatically by
-@command{awk}.  All built-in variables' names are entirely uppercase.
+@command{awk}.  All predefined variables' names are entirely uppercase.
 
 Variables in @command{awk} can be assigned either numeric or string values.
 The kind of value a variable holds can change over the life of a program.
 By default, variables are initialized to the empty string, which
 is zero if converted to a number.  There is no need to explicitly
-``initialize'' a variable in @command{awk},
+initialize a variable in @command{awk},
 which is what you would do in C and in most other traditional languages.
 
 @node Assignment Options
@@ -10246,7 +10523,7 @@ as in the following:
 the variable is set at the very beginning, even before the
 @code{BEGIN} rules execute.  The @option{-v} option and its assignment
 must precede all the @value{FN} arguments, as well as the program text.
-(@xref{Options}, for more information about
+(@DBXREF{Options} for more information about
 the @option{-v} option.)
 Otherwise, the variable assignment is performed at a time determined by
 its position among the input file arguments---after the processing of the
@@ -10286,7 +10563,7 @@ sequences
 @node Conversion
 @subsection Conversion of Strings and Numbers
 
-Number to string and string to number conversion are generally
+Number-to-string and string-to-number conversion are generally
 straightforward.  There can be subtleties to be aware of;
 this @value{SECTION} discusses this important facet of @command{awk}.
 
@@ -10297,7 +10574,7 @@ this @value{SECTION} discusses this important facet of @command{awk}.
 @end menu
 
 @node Strings And Numbers
-@subsubsection How @command{awk} Converts Between Strings And Numbers
+@subsubsection How @command{awk} Converts Between Strings and Numbers
 
 @cindex converting, strings to numbers
 @cindex strings, converting
@@ -10328,13 +10605,13 @@ string, concatenate that number with the empty string, @code{""}.
 To force a string to be converted to a number, add zero to that string.
 A string is converted to a number by interpreting any numeric prefix
 of the string as numerals:
-@code{"2.5"} converts to 2.5, @code{"1e3"} converts to 1000, and @code{"25fix"}
+@code{"2.5"} converts to 2.5, @code{"1e3"} converts to 1,000, and @code{"25fix"}
 has a numeric value of 25.
 Strings that can't be interpreted as valid numbers convert to zero.
 
 @cindex @code{CONVFMT} variable
 The exact manner in which numbers are converted into strings is controlled
-by the @command{awk} built-in variable @code{CONVFMT} (@pxref{Built-in Variables}).
+by the @command{awk} predefined variable @code{CONVFMT} (@pxref{Built-in Variables}).
 Numbers are converted using the @code{sprintf()} function
 with @code{CONVFMT} as the format
 specifier
@@ -10368,7 +10645,7 @@ b = a ""
 @code{b} has the value @code{"12"}, not @code{"12.00"}.
 @value{DARKCORNER}
 
-@sidebar Pre-POSIX @command{awk} Used @code{OFMT} For String Conversion
+@sidebar Pre-POSIX @command{awk} Used @code{OFMT} for String Conversion
 @cindex POSIX @command{awk}, @code{OFMT} variable and
 @cindex @code{OFMT} variable
 @cindex portability, new @command{awk} vs.@: old @command{awk}
@@ -10380,7 +10657,7 @@ specifies the output format to use when printing numbers with @code{print}.
 conversion from the semantics of printing.  Both @code{CONVFMT} and
 @code{OFMT} have the same default value: @code{"%.6g"}.  In the vast majority
 of cases, old @command{awk} programs do not change their behavior.
-@xref{Print}, for more information on the @code{print} statement.
+@DBXREF{Print} for more information on the @code{print} statement.
 @end sidebar
 
 @node Locale influences conversions
@@ -10402,7 +10679,7 @@ The POSIX standard says that @command{awk} always uses the period as the decimal
 point when reading the @command{awk} program source code, and for
 command-line variable assignments (@pxref{Other Arguments}).  However,
 when interpreting input data, for @code{print} and @code{printf} output,
-and for number to string conversion, the local decimal point character
+and for number-to-string conversion, the local decimal point character
 is used.  @value{DARKCORNER} In all cases, numbers in source code and
 in input data cannot have a thousands separator.  Here are some examples
 indicating the difference in behavior, on a GNU/Linux system:
@@ -10422,17 +10699,17 @@ $ @kbd{echo 4,321 | LC_ALL=en_DK.utf-8 gawk '@{ print $1 + 1 @}'}
 @noindent
 The @code{en_DK.utf-8} locale is for English in Denmark, where the comma acts as
 the decimal point separator.  In the normal @code{"C"} locale, @command{gawk}
-treats @samp{4,321} as @samp{4}, while in the Danish locale, it's treated
-as the full number, 4.321.
+treats @samp{4,321} as 4, while in the Danish locale, it's treated
+as the full number including the fractional part, 4.321.
 
 Some earlier versions of @command{gawk} fully complied with this aspect
 of the standard.  However, many users in non-English locales complained
-about this behavior, since their data used a period as the decimal
+about this behavior, because their data used a period as the decimal
 point, so the default behavior was restored to use a period as the
 decimal point character.  You can use the @option{--use-lc-numeric}
 option (@pxref{Options}) to force @command{gawk} to use the locale's
 decimal point character.  (@command{gawk} also uses the locale's decimal
-point character when in POSIX mode, either via @option{--posix}, or the
+point character when in POSIX mode, either via @option{--posix} or the
 @env{POSIXLY_CORRECT} environment variable, as shown previously.)
 
 @ref{table-locale-affects} describes the cases in which the locale's decimal
@@ -10440,7 +10717,7 @@ point character is used and when a period is used. Some of these
 features have not been described yet.
 
 @float Table,table-locale-affects
-@caption{Locale Decimal Point versus A Period}
+@caption{Locale decimal point versus a period}
 @multitable @columnfractions .15 .20 .45
 @headitem Feature @tab Default @tab @option{--posix} or @option{--use-lc-numeric}
 @item @code{%'g} @tab Use locale @tab Use locale
@@ -10450,15 +10727,15 @@ features have not been described yet.
 @end multitable
 @end float
 
-Finally, modern day formal standards and IEEE standard floating point
+Finally, modern-day formal standards and the IEEE standard floating-point
 representation can have an unusual but important effect on the way
 @command{gawk} converts some special string values to numbers.  The details
 are presented in @ref{POSIX Floating Point Problems}.
 
 @node All Operators
-@section Operators: Doing Something With Values
+@section Operators: Doing Something with Values
 
-This @value{SECTION} introduces the @dfn{operators} which make use
+This @value{SECTION} introduces the @dfn{operators} that make use
 of the values provided by constants and variables.
 
 @menu
@@ -10535,7 +10812,7 @@ Multiplication.
 Division;  because all numbers in @command{awk} are floating-point
 numbers, the result is @emph{not} rounded to an integer---@samp{3 / 4} has
 the value 0.75.  (It is a common mistake, especially for C programmers,
-to forget that @emph{all} numbers in @command{awk} are floating-point,
+to forget that @emph{all} numbers in @command{awk} are floating point,
 and that division of integer-looking constants produces a real number,
 not an integer.)
 
@@ -10620,7 +10897,7 @@ $ @kbd{awk '@{ print "Field number one:" $1 @}' mail-list}
 
 @cindex troubleshooting, string concatenation
 Because string concatenation does not have an explicit operator, it is
-often necessary to insure that it happens at the right time by using
+often necessary to ensure that it happens at the right time by using
 parentheses to enclose the items to concatenate.  For example,
 you might expect that the
 following code fragment concatenates @code{file} and @code{name}:
@@ -10636,7 +10913,7 @@ print "something meaningful" > file name
 @noindent
 This produces a syntax error with some versions of Unix
 @command{awk}.@footnote{It happens that BWK
-@command{awk}, @command{gawk} and @command{mawk} all ``get it right,''
+@command{awk}, @command{gawk}, and @command{mawk} all ``get it right,''
 but you should not rely on this.}
 It is necessary to use the following:
 
@@ -10725,11 +11002,8 @@ you're never quite sure what you'll get.
 
 @node Assignment Ops
 @subsection Assignment Expressions
-@c STARTOFRANGE asop
 @cindex assignment operators
-@c STARTOFRANGE opas
 @cindex operators, assignment
-@c STARTOFRANGE exas
 @cindex expressions, assignment
 @cindex @code{=} (equals sign), @code{=} operator
 @cindex equals sign (@code{=}), @code{=} operator
@@ -10882,7 +11156,14 @@ The indices of @code{bar} are practically guaranteed to be different, because
 @code{rand()} returns different values each time it is called.
 (Arrays and the @code{rand()} function haven't been covered yet.
 @xref{Arrays},
-and see @ref{Numeric Functions}, for more information).
+and
+@ifnotdocbook
+@DBPXREF{Numeric Functions}
+@end ifnotdocbook
+@ifdocbook
+@DBREF{Numeric Functions}
+@end ifdocbook
+for more information.)
 This example illustrates an important fact about assignment
 operators: the lefthand expression is only evaluated @emph{once}.
 
@@ -10915,7 +11196,7 @@ to a number.
 @cindex @code{*} (asterisk), @code{**=} operator
 @cindex asterisk (@code{*}), @code{**=} operator
 @float Table,table-assign-ops
-@caption{Arithmetic Assignment Operators}
+@caption{Arithmetic assignment operators}
 @multitable @columnfractions .30 .70
 @headitem Operator @tab Effect
 @item @var{lvalue} @code{+=} @var{increment} @tab Add @var{increment} to the value of @var{lvalue}.
@@ -10927,7 +11208,7 @@ to a number.
 @cindex extensions, common@comma{} @code{**=} operator
 @cindex @command{awk} language, POSIX version
 @cindex POSIX @command{awk}
-@item @var{lvalue} @code{^=} @var{power} @tab
+@item @var{lvalue} @code{^=} @var{power} @tab Raise @var{lvalue} to the power @var{power}.
 @item @var{lvalue} @code{**=} @var{power} @tab Raise @var{lvalue} to the power @var{power}. @value{COMMONEXT}
 @end multitable
 @end float
@@ -10959,7 +11240,7 @@ This is most notable in some commercial @command{awk} versions.
 For example:
 
 @example
-$ awk /==/ /dev/null
+$ @kbd{awk /==/ /dev/null}
 @error{} awk: syntax error at source line 1
 @error{}  context is
 @error{}         >>> /= <<<
@@ -10974,18 +11255,13 @@ awk '/[=]=/' /dev/null
 @end example
 
 @command{gawk} does not have this problem; BWK @command{awk}
-and @command{mawk} also do not (@pxref{Other Versions}).
+and @command{mawk} also do not.
 @end sidebar
-@c ENDOFRANGE exas
-@c ENDOFRANGE opas
-@c ENDOFRANGE asop
 
 @node Increment Ops
 @subsection Increment and Decrement Operators
 
-@c STARTOFRANGE inop
 @cindex increment operators
-@c STARTOFRANGE opde
 @cindex operators, decrement/increment
 @dfn{Increment} and @dfn{decrement operators} increase or decrease the value of
 a variable by one.  An assignment operator can do the same thing, so
@@ -11009,13 +11285,14 @@ has the value four, but it changes the value of @code{foo} to five.
 In other words, the operator returns the old value of the variable,
 but with the side effect of incrementing it.
 
+@c FIXME: Use @sup here for superscript
 The post-increment @samp{foo++} is nearly the same as writing @samp{(foo
 += 1) - 1}.  It is not perfectly equivalent because all numbers in
-@command{awk} are floating-point---in floating-point, @samp{foo + 1 - 1} does
+@command{awk} are floating point---in floating point, @samp{foo + 1 - 1} does
 not necessarily equal @code{foo}.  But the difference is minute as
 long as you stick to numbers that are fairly small (less than
 @iftex
-@math{10^12}).
+@math{10^{12}}).
 @end iftex
 @ifnottex
 @ifnotdocbook
@@ -11033,7 +11310,6 @@ just like variables.  (Use @samp{$(i++)} when you want to do a field reference
 and a variable increment at the same time.  The parentheses are necessary
 because of the precedence of the field reference operator @samp{$}.)
 
-@c STARTOFRANGE deop
 @cindex decrement operators
 The decrement operator @samp{--} works just like @samp{++}, except that
 it subtracts one instead of adding it.  As with @samp{++}, it can be used before
@@ -11073,8 +11349,8 @@ like @samp{@var{lvalue}++}, but instead of adding, it subtracts.)
 @cindex evaluation order
 @cindex Marx, Groucho
 @quotation
-@i{Doctor, doctor!  It hurts when I do this!@*
-So don't do that!}
+@i{Doctor, it hurts when I do this!@*
+Then don't do that!}
 @author Groucho Marx
 @end quotation
 
@@ -11098,7 +11374,7 @@ print b
 @cindex side effects
 In other words, when do the various side effects prescribed by the
 postfix operators (@samp{b++}) take effect?
-When side effects happen is @dfn{implementation defined}.
+When side effects happen is @dfn{implementation-defined}.
 In other words, it is up to the particular version of @command{awk}.
 The result for the first example may be 12 or 13, and for the second, it
 may be 22 or 23.
@@ -11109,14 +11385,11 @@ You should avoid such things in your own programs.
 @c You'll sleep better at night and be able to look at yourself
 @c in the mirror in the morning.
 @end sidebar
-@c ENDOFRANGE inop
-@c ENDOFRANGE opde
-@c ENDOFRANGE deop
 
 @node Truth Values and Conditions
 @section Truth Values and Conditions
 
-In certain contexts, expression values also serve as ``truth values;'' i.e.,
+In certain contexts, expression values also serve as ``truth values''; i.e.,
 they determine what should happen next as the program runs. This
 @value{SECTION} describes how @command{awk} defines ``true'' and ``false''
 and how values are compared.
@@ -11173,22 +11446,21 @@ the string constant @code{"0"} is actually true, because it is non-null.
 @subsection Variable Typing and Comparison Expressions
 @quotation
 @i{The Guide is definitive. Reality is frequently inaccurate.}
-@author The Hitchhiker's Guide to the Galaxy
+@author Douglas Adams, @cite{The Hitchhiker's Guide to the Galaxy}
 @end quotation
+@c 2/2015: Antonio Colombo points out that this is really from
+@c The Restaurant at the End of the Universe. But I'm going to
+@c leave it alone.
 
-@c STARTOFRANGE comex
 @cindex comparison expressions
-@c STARTOFRANGE excom
 @cindex expressions, comparison
 @cindex expressions, matching, See comparison expressions
 @cindex matching, expressions, See comparison expressions
 @cindex relational operators, See comparison operators
 @cindex operators, relational, See operators@comma{} comparison
-@c STARTOFRANGE varting
 @cindex variable typing
-@c STARTOFRANGE vartypc
 @cindex variables, types of, comparison expressions and
-Unlike other programming languages, @command{awk} variables do not have a
+Unlike in other programming languages, in @command{awk} variables do not have a
 fixed type. Instead, they can be either a number or a string, depending
 upon the value that is assigned to them.
 We look now at how variables are typed, and how @command{awk}
@@ -11201,7 +11473,7 @@ compares variables.
 @end menu
 
 @node Variable Typing
-@subsubsection String Type Versus Numeric Type
+@subsubsection String Type versus Numeric Type
 
 @cindex numeric, strings
 @cindex strings, numeric
@@ -11217,20 +11489,20 @@ Variable typing follows these rules:
 
 @itemize @value{BULLET}
 @item
-A numeric constant or the result of a numeric operation has the @var{numeric}
+A numeric constant or the result of a numeric operation has the @dfn{numeric}
 attribute.
 
 @item
-A string constant or the result of a string operation has the @var{string}
+A string constant or the result of a string operation has the @dfn{string}
 attribute.
 
 @item
 Fields, @code{getline} input, @code{FILENAME}, @code{ARGV} elements,
 @code{ENVIRON} elements, and the elements of an array created by
-@code{patsplit()}, @code{split()} and @code{match()} that are numeric
-strings have the @var{strnum} attribute.  Otherwise, they have
-the @var{string} attribute.  Uninitialized variables also have the
-@var{strnum} attribute.
+@code{match()}, @code{split()}, and @code{patsplit()} that are numeric
+strings have the @dfn{strnum} attribute.  Otherwise, they have
+the @dfn{string} attribute.  Uninitialized variables also have the
+@dfn{strnum} attribute.
 
 @item
 Attributes propagate across assignments but are not changed by
@@ -11374,30 +11646,31 @@ constant, then a string comparison is performed.  Otherwise, a
 numeric comparison is performed.
 
 This point bears additional emphasis: All user input is made of characters,
-and so is first and foremost of @var{string} type; input strings
-that look numeric are additionally given the @var{strnum} attribute.
+and so is first and foremost of string type; input strings
+that look numeric are additionally given the strnum attribute.
 Thus, the six-character input string @w{@samp{ +3.14}} receives the
-@var{strnum} attribute. In contrast, the eight characters
+strnum attribute. In contrast, the eight characters
 @w{@code{" +3.14"}} appearing in program text comprise a string constant.
 The following examples print @samp{1} when the comparison between
-the two different constants is true, @samp{0} otherwise:
+the two different constants is true, and @samp{0} otherwise:
 
+@c 22.9.2014: Tested with mawk and BWK awk, got same results.
 @example
-$ @kbd{echo ' +3.14' | gawk '@{ print $0 == " +3.14" @}'}    @ii{True}
+$ @kbd{echo ' +3.14' | awk '@{ print($0 == " +3.14") @}'}    @ii{True}
 @print{} 1
-$ @kbd{echo ' +3.14' | gawk '@{ print $0 == "+3.14" @}'}     @ii{False}
+$ @kbd{echo ' +3.14' | awk '@{ print($0 == "+3.14") @}'}     @ii{False}
 @print{} 0
-$ @kbd{echo ' +3.14' | gawk '@{ print $0 == "3.14" @}'}      @ii{False}
+$ @kbd{echo ' +3.14' | awk '@{ print($0 == "3.14") @}'}      @ii{False}
 @print{} 0
-$ @kbd{echo ' +3.14' | gawk '@{ print $0 == 3.14 @}'}        @ii{True}
+$ @kbd{echo ' +3.14' | awk '@{ print($0 == 3.14) @}'}        @ii{True}
 @print{} 1
-$ @kbd{echo ' +3.14' | gawk '@{ print $1 == " +3.14" @}'}    @ii{False}
+$ @kbd{echo ' +3.14' | awk '@{ print($1 == " +3.14") @}'}    @ii{False}
 @print{} 0
-$ @kbd{echo ' +3.14' | gawk '@{ print $1 == "+3.14" @}'}     @ii{True}
+$ @kbd{echo ' +3.14' | awk '@{ print($1 == "+3.14") @}'}     @ii{True}
 @print{} 1
-$ @kbd{echo ' +3.14' | gawk '@{ print $1 == "3.14" @}'}      @ii{False}
+$ @kbd{echo ' +3.14' | awk '@{ print($1 == "3.14") @}'}      @ii{False}
 @print{} 0
-$ @kbd{echo ' +3.14' | gawk '@{ print $1 == 3.14 @}'}        @ii{True}
+$ @kbd{echo ' +3.14' | awk '@{ print($1 == 3.14) @}'}        @ii{True}
 @print{} 1
 @end example
 
@@ -11427,18 +11700,18 @@ operators}, which are a superset of those in C.
 @cindex exclamation point (@code{!}), @code{!~} operator
 @cindex @code{in} operator
 @float Table,table-relational-ops
-@caption{Relational Operators}
+@caption{Relational operators}
 @multitable @columnfractions .25 .75
 @headitem Expression @tab Result
-@item @var{x} @code{<} @var{y} @tab True if @var{x} is less than @var{y}.
-@item @var{x} @code{<=} @var{y} @tab True if @var{x} is less than or equal to @var{y}.
-@item @var{x} @code{>} @var{y} @tab True if @var{x} is greater than @var{y}.
-@item @var{x} @code{>=} @var{y} @tab True if @var{x} is greater than or equal to @var{y}.
-@item @var{x} @code{==} @var{y} @tab True if @var{x} is equal to @var{y}.
-@item @var{x} @code{!=} @var{y} @tab True if @var{x} is not equal to @var{y}.
-@item @var{x} @code{~} @var{y} @tab True if the string @var{x} matches the regexp denoted by @var{y}.
-@item @var{x} @code{!~} @var{y} @tab True if the string @var{x} does not match the regexp denoted by @var{y}.
-@item @var{subscript} @code{in} @var{array} @tab True if the array @var{array} has an element with the subscript @var{subscript}.
+@item @var{x} @code{<} @var{y} @tab True if @var{x} is less than @var{y}
+@item @var{x} @code{<=} @var{y} @tab True if @var{x} is less than or equal to @var{y}
+@item @var{x} @code{>} @var{y} @tab True if @var{x} is greater than @var{y}
+@item @var{x} @code{>=} @var{y} @tab True if @var{x} is greater than or equal to @var{y}
+@item @var{x} @code{==} @var{y} @tab True if @var{x} is equal to @var{y}
+@item @var{x} @code{!=} @var{y} @tab True if @var{x} is not equal to @var{y}
+@item @var{x} @code{~} @var{y} @tab True if the string @var{x} matches the regexp denoted by @var{y}
+@item @var{x} @code{!~} @var{y} @tab True if the string @var{x} does not match the regexp denoted by @var{y}
+@item @var{subscript} @code{in} @var{array} @tab True if the array @var{array} has an element with the subscript @var{subscript}
 @end multitable
 @end float
 
@@ -11471,30 +11744,29 @@ part of the test always succeeds.  Because the operators are
 so similar, this kind of error is very difficult to spot when
 scanning the source code.
 
-@cindex @command{gawk}, comparison operators and
-The following table of expressions illustrates the kind of comparison
-@command{gawk} performs, as well as what the result of the comparison is:
+The following list of expressions illustrates the kinds of comparisons
+@command{awk} performs, as well as what the result of each comparison is:
 
 @table @code
 @item 1.5 <= 2.0
-numeric comparison (true)
+Numeric comparison (true)
 
 @item "abc" >= "xyz"
-string comparison (false)
+String comparison (false)
 
 @item 1.5 != " +2"
-string comparison (true)
+String comparison (true)
 
 @item "1e2" < "3"
-string comparison (true)
+String comparison (true)
 
 @item a = 2; b = "2"
 @itemx a == b
-string comparison (true)
+String comparison (true)
 
 @item a = 2; b = " +2"
 @itemx a == b
-string comparison (false)
+String comparison (false)
 @end table
 
 In this example:
@@ -11510,7 +11782,7 @@ $ @kbd{echo 1e2 3 | awk '@{ print ($1 < $2) ? "true" : "false" @}'}
 @noindent
 the result is @samp{false} because both @code{$1} and @code{$2}
 are user input.  They are numeric strings---therefore both have
-the @var{strnum} attribute, dictating a numeric comparison.
+the strnum attribute, dictating a numeric comparison.
 The purpose of the comparison rules and the use of numeric strings is
 to attempt to produce the behavior that is ``least surprising,'' while
 still ``doing the right thing.''
@@ -11546,8 +11818,8 @@ dynamic regexp (@pxref{Regexp Usage}; also
 
 @cindex @command{awk}, regexp constants and
 @cindex regexp constants
-In modern implementations of @command{awk}, a constant regular
-expression in slashes by itself is also an expression.  The regexp
+A constant regular
+expression in slashes by itself is also an expression.
 @code{/@var{regexp}/} is an abbreviation for the following comparison expression:
 
 @example
@@ -11561,15 +11833,15 @@ One special place where @code{/foo/} is @emph{not} an abbreviation for
 where this is discussed in more detail.
 
 @node POSIX String Comparison
-@subsubsection String Comparison With POSIX Rules
+@subsubsection String Comparison with POSIX Rules
 
 The POSIX standard says that string comparison is performed based
 on the locale's @dfn{collating order}. This is the order in which
 characters sort, as defined by the locale (for more discussion,
-@pxref{Ranges and Locales}).  This order is usually very different
+@pxref{Locales}).  This order is usually very different
 from the results obtained when doing straight character-by-character
 comparison.@footnote{Technically, string comparison is supposed
-to behave the same way as if the strings are compared with the C
+to behave the same way as if the strings were compared with the C
 @code{strcoll()} function.}
 
 Because this behavior differs considerably from existing practice,
@@ -11586,19 +11858,13 @@ $ @kbd{gawk --posix 'BEGIN @{ printf("ABC < abc = %s\n",}
 @print{} ABC < abc = FALSE
 @end example
 
-@c ENDOFRANGE comex
-@c ENDOFRANGE excom
-@c ENDOFRANGE vartypc
-@c ENDOFRANGE varting
 
 @node Boolean Ops
 @subsection Boolean Expressions
 @cindex and Boolean-logic operator
 @cindex or Boolean-logic operator
 @cindex not Boolean-logic operator
-@c STARTOFRANGE exbo
 @cindex expressions, Boolean
-@c STARTOFRANGE boex
 @cindex Boolean expressions
 @cindex operators, Boolean, See Boolean expressions
 @cindex Boolean operators, See Boolean expressions
@@ -11646,7 +11912,7 @@ no substring @samp{foo} in the record.
 True if at least one of @var{boolean1} or @var{boolean2} is true.
 For example, the following statement prints all records in the input
 that contain @emph{either} @samp{edu} or
-@samp{li} or both:
+@samp{li}:
 
 @example
 if ($0 ~ /edu/ || $0 ~ /li/) print
@@ -11655,6 +11921,9 @@ if ($0 ~ /edu/ || $0 ~ /li/) print
 The subexpression @var{boolean2} is evaluated only if @var{boolean1}
 is false.  This can make a difference when @var{boolean2} contains
 expressions that have side effects.
+(Thus, this test never really distinguishes records that contain both
+@samp{edu} and @samp{li}---as soon as @samp{edu} is matched,
+the full test succeeds.)
 
 @item ! @var{boolean}
 True if @var{boolean} is false.  For example,
@@ -11664,7 +11933,7 @@ variable is not defined:
 
 @example
 BEGIN @{ if (! ("HOME" in ENVIRON))
-               print "no home!" @}
+            print "no home!" @}
 @end example
 
 (The @code{in} operator is described in
@@ -11679,7 +11948,7 @@ BEGIN @{ if (! ("HOME" in ENVIRON))
 @cindex vertical bar (@code{|}), @code{||} operator
 The @samp{&&} and @samp{||} operators are called @dfn{short-circuit}
 operators because of the way they work.  Evaluation of the full expression
-is ``short-circuited'' if the result can be determined part way through
+is ``short-circuited'' if the result can be determined partway through
 its evaluation.
 
 @cindex line continuations
@@ -11741,8 +12010,6 @@ next record, and start processing the rules over again at the top.
 The reason it's there is to avoid printing the bracketing
 @samp{START} and @samp{END} lines.
 @end quotation
-@c ENDOFRANGE exbo
-@c ENDOFRANGE boex
 
 @node Conditional Exp
 @subsection Conditional Expressions
@@ -11753,8 +12020,8 @@ The reason it's there is to avoid printing the bracketing
 A @dfn{conditional expression} is a special kind of expression that has
 three operands.  It allows you to use one expression's value to select
 one of two other expressions.
-The conditional expression is the same as in the C language,
-as shown here:
+The conditional expression in @command{awk} is the same as in the C
+language, as shown here:
 
 @example
 @var{selector} ? @var{if-true-exp} : @var{if-false-exp}
@@ -11763,8 +12030,8 @@ as shown here:
 @noindent
 There are three subexpressions.  The first, @var{selector}, is always
 computed first.  If it is ``true'' (not zero or not null), then
-@var{if-true-exp} is computed next and its value becomes the value of
-the whole expression.  Otherwise, @var{if-false-exp} is computed next
+@var{if-true-exp} is computed next, and its value becomes the value of
+the whole expression.  Otherwise, @var{if-false-exp} is computed next,
 and its value becomes the value of the whole expression.
 For example, the following expression produces the absolute value of @code{x}:
 
@@ -11812,15 +12079,15 @@ ask for it by name at any point in the program.  For
 example, the function @code{sqrt()} computes the square root of a number.
 
 @cindex functions, built-in
-A fixed set of functions are @dfn{built-in}, which means they are
+A fixed set of functions are @dfn{built in}, which means they are
 available in every @command{awk} program.  The @code{sqrt()} function is one
-of these.  @xref{Built-in}, for a list of built-in
+of these.  @DBXREF{Built-in} for a list of built-in
 functions and their descriptions.  In addition, you can define
 functions for use in your program.
-@xref{User-defined},
+@DBXREF{User-defined}
 for instructions on how to do this.
 Finally, @command{gawk} lets you write functions in C or C++
-that may be called from your program: see @ref{Dynamic Extensions}.
+that may be called from your program (@pxref{Dynamic Extensions}).
 
 @cindex arguments, in function calls
 The way to use a function is with a @dfn{function call} expression,
@@ -11839,7 +12106,7 @@ rand()                 @ii{no arguments}
 
 @cindex troubleshooting, function call syntax
 @quotation CAUTION
-Do not put any space between the function name and the open-parenthesis!
+Do not put any space between the function name and the opening parenthesis!
 A user-defined function name looks just like the name of a
 variable---a space would make the expression look like concatenation of
 a variable with an expression inside parentheses.
@@ -11860,7 +12127,7 @@ Some of the built-in functions have one or
 more optional arguments.
 If those arguments are not supplied, the functions
 use a reasonable default value.
-@xref{Built-in}, for full details.  If arguments
+@DBXREF{Built-in} for full details.  If arguments
 are omitted in calls to user-defined functions, then those arguments are
 treated as local variables. Such local variables act like the
 empty string if referenced where a string value is required,
@@ -11921,9 +12188,7 @@ $ @kbd{awk -f matchit.awk}
 
 @node Precedence
 @section Operator Precedence (How Operators Nest)
-@c STARTOFRANGE prec
 @cindex precedence
-@c STARTOFRANGE oppr
 @cindex operators, precedence
 
 @dfn{Operator precedence} determines how operators are grouped when
@@ -11963,7 +12228,7 @@ expression because the first @samp{$} has higher precedence than the
 @samp{++}; to avoid the problem the expression can be rewritten as
 @samp{$($0++)--}.
 
-This table presents @command{awk}'s operators, in order of highest
+This list presents @command{awk}'s operators, in order of highest
 to lowest precedence:
 
 @c @asis for docbook to come out right
@@ -11988,7 +12253,7 @@ Increment, decrement.
 @cindex @code{*} (asterisk), @code{**} operator
 @cindex asterisk (@code{*}), @code{**} operator
 @item @code{^ **}
-Exponentiation.  These operators group right-to-left.
+Exponentiation.  These operators group right to left.
 
 @cindex @code{+} (plus sign), @code{+} operator
 @cindex plus sign (@code{+}), @code{+} operator
@@ -12015,7 +12280,7 @@ Multiplication, division, remainder.
 @item @code{+ -}
 Addition, subtraction.
 
-@item String Concatenation
+@item String concatenation
 There is no special symbol for concatenation.
 The operands are simply written side by side
 (@pxref{Concatenation}).
@@ -12054,7 +12319,7 @@ statements belong to the statement level, not to expressions.  The
 redirection does not produce an expression that could be the operand of
 another operator.  As a result, it does not make sense to use a
 redirection operator near another operator of lower precedence without
-parentheses.  Such combinations (for example, @samp{print foo > a ? b : c}),
+parentheses.  Such combinations (e.g., @samp{print foo > a ? b : c})
 result in syntax errors.
 The correct way to write this statement is @samp{print foo > (a ? b : c)}.
 
@@ -12072,17 +12337,17 @@ Array membership.
 @cindex @code{&} (ampersand), @code{&&} operator
 @cindex ampersand (@code{&}), @code{&&} operator
 @item @code{&&}
-Logical ``and''.
+Logical ``and.''
 
 @cindex @code{|} (vertical bar), @code{||} operator
 @cindex vertical bar (@code{|}), @code{||} operator
 @item @code{||}
-Logical ``or''.
+Logical ``or.''
 
 @cindex @code{?} (question mark), @code{?:} operator
 @cindex question mark (@code{?}), @code{?:} operator
 @item @code{?:}
-Conditional.  This operator groups right-to-left.
+Conditional.  This operator groups right to left.
 
 @cindex @code{+} (plus sign), @code{+=} operator
 @cindex plus sign (@code{+}), @code{+=} operator
@@ -12099,7 +12364,7 @@ Conditional.  This operator groups right-to-left.
 @cindex @code{^} (caret), @code{^=} operator
 @cindex caret (@code{^}), @code{^=} operator
 @item @code{= += -= *= /= %= ^= **=}
-Assignment.  These operators group right-to-left.
+Assignment.  These operators group right to left.
 @end table
 
 @cindex POSIX @command{awk}, @code{**} operator and
@@ -12108,11 +12373,9 @@ Assignment.  These operators group right-to-left.
 The @samp{|&}, @samp{**}, and @samp{**=} operators are not specified by POSIX.
 For maximum portability, do not use them.
 @end quotation
-@c ENDOFRANGE prec
-@c ENDOFRANGE oppr
 
 @node Locales
-@section Where You Are Makes A Difference
+@section Where You Are Makes a Difference
 @cindex locale, definition of
 
 Modern systems support the notion of @dfn{locales}: a way to tell the
@@ -12120,8 +12383,8 @@ system about the local character set and language.  The ISO C standard
 defines a default @code{"C"} locale, which is an environment that is
 typical of what many C programmers are used to.
 
-Once upon a time, the locale setting used to affect regexp matching
-(@pxref{Ranges and Locales}), but this is no longer true.
+Once upon a time, the locale setting used to affect regexp matching,
+but this is no longer true (@pxref{Ranges and Locales}).
 
 Locales can affect record splitting.  For the normal case of @samp{RS =
 "\n"}, the locale is largely irrelevant.  For other single-character
@@ -12132,7 +12395,7 @@ character}, to find the record terminator.
 
 Locales can affect how dates and times are formatted (@pxref{Time
 Functions}).  For example, a common way to abbreviate the date September
-4, 2015 in the United States is ``9/4/15.''  In many countries in
+4, 2015, in the United States is ``9/4/15.''  In many countries in
 Europe, however, it is abbreviated ``4.9.15.''  Thus, the @samp{%x}
 specification in a @code{"US"} locale might produce @samp{9/4/15},
 while in a @code{"EUROPE"} locale, it might produce @samp{4.9.15}.
@@ -12151,13 +12414,13 @@ in @ref{Conversion}.
 @itemize @value{BULLET}
 @item
 Expressions are the basic elements of computation in programs.  They are
-built from constants, variables, function calls and combinations of the
+built from constants, variables, function calls, and combinations of the
 various kinds of values with operators.
 
 @item
 @command{awk} supplies three kinds of constants: numeric, string, and
 regexp.  @command{gawk} lets you specify numeric constants in octal
-and hexadecimal (bases 8 and 16) in addition to decimal (base 10).
+and hexadecimal (bases 8 and 16) as well as decimal (base 10).
 In certain contexts, a standalone regexp constant such as @code{/foo/}
 has the same meaning as @samp{$0 ~ /foo/}.
 
@@ -12175,7 +12438,8 @@ Locales can influence the conversions.
 @item
 @command{awk} provides the usual arithmetic operators (addition,
 subtraction, multiplication, division, modulus), and unary plus and minus.
-It also provides comparison operators, boolean operators, and regexp
+It also provides comparison operators, Boolean operators, an array membership
+testing operator, and regexp
 matching operators.  String concatenation is accomplished by placing
 two expressions next to each other; there is no explicit operator.
 The three-operand @samp{?:} operator provides an ``if-else'' test within
@@ -12186,20 +12450,20 @@ Assignment operators provide convenient shorthands for common arithmetic
 operations.
 
 @item
-In @command{awk}, a value is considered to be true if it is non-zero
+In @command{awk}, a value is considered to be true if it is nonzero
 @emph{or} non-null. Otherwise, the value is false.
 
 @item
-A value's type is set upon each assignment and may change over its
+A variable's type is set upon each assignment and may change over its
 lifetime.  The type determines how it behaves in comparisons (string
 or numeric).
 
 @item
-Function calls return a value which may be used as part of a larger
+Function calls return a value that may be used as part of a larger
 expression.  Expressions used to pass parameter values are fully
 evaluated before the function is called.  @command{awk} provides
-built-in and user-defined functions; this is described later on in this
-@value{DOCUMENT}.
+built-in and user-defined functions; this is described in
+@ref{Functions}.
 
 @item
 Operator precedence specifies the order in which operations are performed,
@@ -12212,19 +12476,17 @@ program, and occasionally the format for data read as input.
 
 @end itemize
 
-@c ENDOFRANGE exps
 
 @node Patterns and Actions
 @chapter Patterns, Actions, and Variables
-@c STARTOFRANGE pat
 @cindex patterns
 
 As you have already seen, each @command{awk} statement consists of
 a pattern with an associated action.  This @value{CHAPTER} describes how
 you build patterns and actions, what kinds of things you can do within
-actions, and @command{awk}'s built-in variables.
+actions, and @command{awk}'s predefined variables.
 
-The pattern-action rules and the statements available for use
+The pattern--action rules and the statements available for use
 within actions form the core of @command{awk} programming.
 In a sense, everything covered
 up to here has been the foundation
@@ -12237,7 +12499,7 @@ building something useful.
 * Action Overview::             What goes into an action.
 * Statements::                  Describes the various control statements in
                                 detail.
-* Built-in Variables::          Summarizes the built-in variables.
+* Built-in Variables::          Summarizes the predefined variables.
 * Pattern Action Summary::      Patterns and Actions summary.
 @end menu
 
@@ -12270,7 +12532,7 @@ is nonzero (if a number) or non-null (if a string).
 (@xref{Expression Patterns}.)
 
 @item @var{begpat}, @var{endpat}
-A pair of patterns separated by a comma, specifying a range of records.
+A pair of patterns separated by a comma, specifying a @dfn{range} of records.
 The range includes both the initial record that matches @var{begpat} and
 the final record that matches @var{endpat}.
 (@xref{Ranges}.)
@@ -12412,11 +12674,11 @@ The subexpressions of a Boolean operator in a pattern can be constant regular
 expressions, comparisons, or any other @command{awk} expressions.  Range
 patterns are not expressions, so they cannot appear inside Boolean
 patterns.  Likewise, the special patterns @code{BEGIN}, @code{END},
-@code{BEGINFILE} and @code{ENDFILE},
+@code{BEGINFILE}, and @code{ENDFILE},
 which never match any input record, are not expressions and cannot
 appear inside Boolean patterns.
 
-The precedence of the different operators which can appear in
+The precedence of the different operators that can appear in
 patterns is described in @ref{Precedence}.
 
 @node Ranges
@@ -12442,7 +12704,7 @@ prints every record in @file{myfile} between @samp{on}/@samp{off} pairs, inclusi
 
 A range pattern starts out by matching @var{begpat} against every
 input record.  When a record matches @var{begpat}, the range pattern is
-@dfn{turned on} and the range pattern matches this record as well.  As long as
+@dfn{turned on}, and the range pattern matches this record as well.  As long as
 the range pattern stays turned on, it automatically matches every input
 record read.  The range pattern also matches @var{endpat} against every
 input record; when this succeeds, the range pattern is @dfn{turned off} again
@@ -12513,9 +12775,7 @@ a range pattern.  @value{DARKCORNER}
 @node BEGIN/END
 @subsection The @code{BEGIN} and @code{END} Special Patterns
 
-@c STARTOFRANGE beg
 @cindex @code{BEGIN} pattern
-@c STARTOFRANGE end
 @cindex @code{END} pattern
 All the patterns described so far are for matching input records.
 The @code{BEGIN} and @code{END} special patterns are different.
@@ -12523,7 +12783,7 @@ They supply startup and cleanup actions for @command{awk} programs.
 @code{BEGIN} and @code{END} rules must have actions; there is no default
 action for these rules because there is no current record when they run.
 @code{BEGIN} and @code{END} rules are often referred to as
-``@code{BEGIN} and @code{END} blocks'' by long-time @command{awk}
+``@code{BEGIN} and @code{END} blocks'' by longtime @command{awk}
 programmers.
 
 @menu
@@ -12543,7 +12803,7 @@ input is read.  For example:
 @example
 $ @kbd{awk '}
 > @kbd{BEGIN @{ print "Analysis of \"li\"" @}}
-> @kbd{/li/ @{ ++n @}}
+> @kbd{/li/  @{ ++n @}}
 > @kbd{END   @{ print "\"li\" appears in", n, "records." @}' mail-list}
 @print{} Analysis of "li"
 @print{} "li" appears in 4 records.
@@ -12554,7 +12814,7 @@ $ @kbd{awk '}
 This program finds the number of records in the input file @file{mail-list}
 that contain the string @samp{li}.  The @code{BEGIN} rule prints a title
 for the report.  There is no need to use the @code{BEGIN} rule to
-initialize the counter @code{n} to zero, since @command{awk} does this
+initialize the counter @code{n} to zero, as @command{awk} does this
 automatically (@pxref{Variables}).
 The second rule increments the variable @code{n} every time a
 record containing the pattern @samp{li} is read.  The @code{END} rule
@@ -12582,13 +12842,13 @@ The order in which library functions are named on the command line
 controls the order in which their @code{BEGIN} and @code{END} rules are
 executed.  Therefore, you have to be careful when writing such rules in
 library files so that the order in which they are executed doesn't matter.
-@xref{Options}, for more information on
+@DBXREF{Options} for more information on
 using library functions.
 @xref{Library Functions},
 for a number of useful library functions.
 
 If an @command{awk} program has only @code{BEGIN} rules and no
-other rules, then the program exits after the @code{BEGIN} rule is
+other rules, then the program exits after the @code{BEGIN} rules are
 run.@footnote{The original version of @command{awk} kept
 reading and ignoring input until the end of the file was seen.}  However, if an
 @code{END} rule exists, then the input is read, even if there are
@@ -12616,25 +12876,26 @@ Another way is simply to assign a value to @code{$0}.
 @cindex @code{print} statement, @code{BEGIN}/@code{END} patterns and
 @cindex @code{BEGIN} pattern, @code{print} statement and
 @cindex @code{END} pattern, @code{print} statement and
-The second point is similar to the first but from the other direction.
+The second point is similar to the first, but from the other direction.
 Traditionally, due largely to implementation issues, @code{$0} and
 @code{NF} were @emph{undefined} inside an @code{END} rule.
 The POSIX standard specifies that @code{NF} is available in an @code{END}
 rule. It contains the number of fields from the last input record.
 Most probably due to an oversight, the standard does not say that @code{$0}
 is also preserved, although logically one would think that it should be.
-In fact, @command{gawk} does preserve the value of @code{$0} for use in
-@code{END} rules.  Be aware, however, that BWK @command{awk}, and possibly
-other implementations, do not.
+In fact, all of BWK @command{awk}, @command{mawk}, and @command{gawk}
+preserve the value of @code{$0} for use in @code{END} rules.  Be aware,
+however, that some other implementations and many older versions
+of Unix @command{awk} do not.
 
 The third point follows from the first two.  The meaning of @samp{print}
 inside a @code{BEGIN} or @code{END} rule is the same as always:
 @samp{print $0}.  If @code{$0} is the null string, then this prints an
-empty record.  Many long time @command{awk} programmers use an unadorned
+empty record.  Many longtime @command{awk} programmers use an unadorned
 @samp{print} in @code{BEGIN} and @code{END} rules, to mean @samp{@w{print ""}},
 relying on @code{$0} being null.  Although one might generally get away with
 this in @code{BEGIN} rules, it is a very bad idea in @code{END} rules,
-at least in @command{gawk}.  It is also poor style, since if an empty
+at least in @command{gawk}.  It is also poor style, because if an empty
 line is needed in the output, the program should print one explicitly.
 
 @cindex @code{next} statement, @code{BEGIN}/@code{END} patterns and
@@ -12644,11 +12905,14 @@ line is needed in the output, the program should print one explicitly.
 Finally, the @code{next} and @code{nextfile} statements are not allowed
 in a @code{BEGIN} rule, because the implicit
 read-a-record-and-match-against-the-rules loop has not started yet.  Similarly, those statements
-are not valid in an @code{END} rule, since all the input has been read.
-(@xref{Next Statement}, and see
-@ref{Nextfile Statement}.)
-@c ENDOFRANGE beg
-@c ENDOFRANGE end
+are not valid in an @code{END} rule, because all the input has been read.
+(@DBXREF{Next Statement} and
+@ifnotdocbook
+@DBPXREF{Nextfile Statement}.)
+@end ifnotdocbook
+@ifdocbook
+@DBREF{Nextfile Statement}.)
+@end ifdocbook
 
 @node BEGINFILE/ENDFILE
 @subsection The @code{BEGINFILE} and @code{ENDFILE} Special Patterns
@@ -12701,7 +12965,7 @@ fatal error.
 
 @item
 If you have written extensions that modify the record handling (by
-inserting an ``input parser,'' @pxref{Input Parsers}), you can invoke
+inserting an ``input parser''; @pxref{Input Parsers}), you can invoke
 them at this point, before @command{gawk} has started processing the file.
 (This is a @emph{very} advanced feature, currently used only by the
 @uref{http://gawkextlib.sourceforge.net, @code{gawkextlib} project}.)
@@ -12712,17 +12976,17 @@ the last record in an input file.  For the last input file,
 it will be called before any @code{END} rules.
 The @code{ENDFILE} rule is executed even for empty input files.
 
-Normally, when an error occurs when reading input in the normal input
-processing loop, the error is fatal.  However, if an @code{ENDFILE}
+Normally, when an error occurs when reading input in the normal
+input-processing loop, the error is fatal.  However, if an @code{ENDFILE}
 rule is present, the error becomes non-fatal, and instead @code{ERRNO}
 is set.  This makes it possible to catch and process I/O errors at the
 level of the @command{awk} program.
 
 @cindex @code{next} statement, @code{BEGINFILE}/@code{ENDFILE} patterns and
 The @code{next} statement (@pxref{Next Statement}) is not allowed inside
-either a @code{BEGINFILE} or and @code{ENDFILE} rule.  The @code{nextfile}
-statement (@pxref{Nextfile Statement}) is allowed only inside a
-@code{BEGINFILE} rule, but not inside an @code{ENDFILE} rule.
+either a @code{BEGINFILE} or an @code{ENDFILE} rule.  The @code{nextfile}
+statement is allowed only inside a
+@code{BEGINFILE} rule, not inside an @code{ENDFILE} rule.
 
 @cindex @code{getline} statement, @code{BEGINFILE}/@code{ENDFILE} patterns and
 The @code{getline} statement (@pxref{Getline}) is restricted inside
@@ -12769,7 +13033,6 @@ awk '@{ print $1 @}' mail-list
 
 @noindent
 prints the first field of every record.
-@c ENDOFRANGE pat
 
 @node Using Shell Variables
 @section Using Shell Variables in Programs
@@ -12785,7 +13048,7 @@ There are two ways to get the value of the shell variable
 into the body of the @command{awk} program.
 
 @cindex shells, quoting
-The most common method is to use shell quoting to substitute
+A common method is to use shell quoting to substitute
 the variable's value into the program inside the script.
 For example, consider the following program:
 
@@ -12803,7 +13066,7 @@ The first part is double-quoted, which allows substitution of
 the @code{pattern} shell variable inside the quotes.
 The second part is single-quoted.
 
-Variable substitution via quoting works, but can be potentially
+Variable substitution via quoting works, but can potentially be
 messy.  It requires a good understanding of the shell's quoting rules
 (@pxref{Quoting}),
 and it's often difficult to correctly
@@ -12830,7 +13093,7 @@ The assignment @samp{-v pat="$pattern"} still requires double quotes,
 in case there is whitespace in the value of @code{$pattern}.
 The @command{awk} variable @code{pat} could be named @code{pattern}
 too, but that would be more confusing.  Using a variable also
-provides more flexibility, since the variable can be used anywhere inside
+provides more flexibility, as the variable can be used anywhere inside
 the program---for printing, as an array subscript, or for any other
 use---without requiring the quoting tricks at every point in the program.
 
@@ -12903,7 +13166,7 @@ is used in order to put several statements together in the body of an
 Use the @code{getline} command
 (@pxref{Getline}).
 Also supplied in @command{awk} are the @code{next}
-statement (@pxref{Next Statement}),
+statement (@pxref{Next Statement})
 and the @code{nextfile} statement
 (@pxref{Nextfile Statement}).
 
@@ -12918,11 +13181,8 @@ For deleting array elements.
 
 @node Statements
 @section Control Statements in Actions
-@c STARTOFRANGE csta
 @cindex control statements
-@c STARTOFRANGE acs
 @cindex statements, control, in actions
-@c STARTOFRANGE accs
 @cindex actions, control statements in
 
 @dfn{Control statements}, such as @code{if}, @code{while}, and so on,
@@ -12991,7 +13251,7 @@ else
     print "x is odd"
 @end example
 
-In this example, if the expression @samp{x % 2 == 0} is true (that is,
+In this example, if the expression @samp{x % 2 == 0} is true (i.e.,
 if the value of @code{x} is evenly divisible by two), then the first
 @code{print} statement is executed; otherwise, the second @code{print}
 statement is executed.
@@ -13042,20 +13302,21 @@ If the @var{condition} is true, it executes the statement @var{body}.
 is not zero and not a null string.)
 @end ifinfo
 After @var{body} has been executed,
-@var{condition} is tested again, and if it is still true, @var{body} is
-executed again.  This process repeats until the @var{condition} is no longer
-true.  If the @var{condition} is initially false, the body of the loop is
-never executed and @command{awk} continues with the statement following
+@var{condition} is tested again, and if it is still true, @var{body}
+executes again.  This process repeats until the @var{condition} is no longer
+true.  If the @var{condition} is initially false, the body of the loop
+never executes and @command{awk} continues with the statement following
 the loop.
 This example prints the first three fields of each record, one per line:
 
 @example
-awk '@{
-       i = 1
-       while (i <= 3) @{
-           print $i
-           i++
-       @}
+awk '
+@{
+    i = 1
+    while (i <= 3) @{
+        print $i
+        i++
+    @}
 @}' inventory-shipped
 @end example
 
@@ -13064,13 +13325,13 @@ The body of this loop is a compound statement enclosed in braces,
 containing two statements.
 The loop works in the following manner: first, the value of @code{i} is set to one.
 Then, the @code{while} statement tests whether @code{i} is less than or equal to
-three.  This is true when @code{i} equals one, so the @code{i}-th
+three.  This is true when @code{i} equals one, so the @code{i}th
 field is printed.  Then the @samp{i++} increments the value of @code{i}
 and the loop repeats.  The loop terminates when @code{i} reaches four.
 
 A newline is not required between the condition and the
-body; however using one makes the program clearer unless the body is a
-compound statement or else is very simple.  The newline after the open-brace
+body; however, using one makes the program clearer unless the body is a
+compound statement or else is very simple.  The newline after the open brace
 that begins the compound statement is not required either, but the
 program is harder to read without it.
 
@@ -13089,34 +13350,34 @@ do
 while (@var{condition})
 @end example
 
-Even if the @var{condition} is false at the start, the @var{body} is
-executed at least once (and only once, unless executing @var{body}
+Even if the @var{condition} is false at the start, the @var{body}
+executes at least once (and only once, unless executing @var{body}
 makes @var{condition} true).  Contrast this with the corresponding
 @code{while} statement:
 
 @example
 while (@var{condition})
-  @var{body}
+    @var{body}
 @end example
 
 @noindent
-This statement does not execute @var{body} even once if the @var{condition}
-is false to begin with.
-The following is an example of a @code{do} statement:
+This statement does not execute the @var{body} even once if the
+@var{condition} is false to begin with.  The following is an example of
+a @code{do} statement:
 
 @example
 @{
-       i = 1
-       do @{
-          print $0
-          i++
-       @} while (i <= 10)
+    i = 1
+    do @{
+        print $0
+        i++
+    @} while (i <= 10)
 @}
 @end example
 
 @noindent
 This program prints each input record 10 times.  However, it isn't a very
-realistic example, since in this case an ordinary @code{while} would do
+realistic example, because in this case an ordinary @code{while} would do
 just as well.  This situation reflects actual experience; only
 occasionally is there a real use for a @code{do} statement.
 
@@ -13147,9 +13408,10 @@ compares it against the desired number of iterations.
 For example:
 
 @example
-awk '@{
-       for (i = 1; i <= 3; i++)
-          print $i
+awk '
+@{
+    for (i = 1; i <= 3; i++)
+        print $i
 @}' inventory-shipped
 @end example
 
@@ -13168,7 +13430,7 @@ their assignments as separate statements preceding the @code{for} loop.)
 The same is true of the @var{increment} part. Incrementing additional
 variables requires separate statements at the end of the loop.
 The C compound expression, using C's comma operator, is useful in
-this context but it is not supported in @command{awk}.
+this context, but it is not supported in @command{awk}.
 
 Most often, @var{increment} is an increment expression, as in the previous
 example.  But this is not required; it can be any expression
@@ -13177,7 +13439,7 @@ between 1 and 100:
 
 @example
 for (i = 1; i <= 100; i *= 2)
-  print i
+    print i
 @end example
 
 If there is nothing to be done, any of the three expressions in the
@@ -13212,7 +13474,7 @@ very common in loops.  It can be easier to think of this counting as part
 of looping rather than as something to do inside the loop.
 
 @cindex @code{in} operator
-There is an alternate version of the @code{for} loop, for iterating over
+There is an alternative version of the @code{for} loop, for iterating over
 all the indices of an array:
 
 @example
@@ -13221,7 +13483,7 @@ for (i in array)
 @end example
 
 @noindent
-@xref{Scanning an Array},
+@DBXREF{Scanning an Array}
 for more information on this version of the @code{for} loop.
 
 @node Switch Statement
@@ -13241,7 +13503,7 @@ are checked for a match in the order they are defined.  If no suitable
 
 Each @code{case} contains a single constant, be it numeric, string, or
 regexp.  The @code{switch} expression is evaluated, and then each
-@code{case}'s constant is compared against the result in turn. The type of constant 
+@code{case}'s constant is compared against the result in turn. The type of constant
 determines the comparison: numeric or string do the usual comparisons.
 A regexp constant does a regular expression match against the string
 value of the original expression.  The general form of the @code{switch}
@@ -13259,7 +13521,7 @@ default:
 Control flow in
 the @code{switch} statement works as it does in C. Once a match to a given
 case is made, the case statement bodies execute until a @code{break},
-@code{continue}, @code{next}, @code{nextfile}  or @code{exit} is encountered,
+@code{continue}, @code{next}, @code{nextfile}, or @code{exit} is encountered,
 or the end of the @code{switch} statement itself. For example:
 
 @example
@@ -13288,9 +13550,9 @@ while ((c = getopt(ARGC, ARGV, "aksx")) != -1) @{
 @}
 @end example
 
-Note that if none of the statements specified above halt execution
+Note that if none of the statements specified here halt execution
 of a matched @code{case} statement, execution falls through to the
-next @code{case} until execution halts. In the above example, the
+next @code{case} until execution halts. In this example, the
 @code{case} for @code{"?"} falls through to the @code{default}
 case, which is to call a function named @code{usage()}.
 (The @code{getopt()} function being called here is
@@ -13311,12 +13573,12 @@ numbers:
 # find smallest divisor of num
 @{
     num = $1
-    for (div = 2; div * div <= num; div++) @{
-        if (num % div == 0)
+    for (divisor = 2; divisor * divisor <= num; divisor++) @{
+        if (num % divisor == 0)
             break
     @}
-    if (num % div == 0)
-        printf "Smallest divisor of %d is %d\n", num, div
+    if (num % divisor == 0)
+        printf "Smallest divisor of %d is %d\n", num, divisor
     else
         printf "%d is prime\n", num
 @}
@@ -13337,12 +13599,12 @@ an @code{if}:
 # find smallest divisor of num
 @{
     num = $1
-    for (div = 2; ; div++) @{
-        if (num % div == 0) @{
-            printf "Smallest divisor of %d is %d\n", num, div
+    for (divisor = 2; ; divisor++) @{
+        if (num % divisor == 0) @{
+            printf "Smallest divisor of %d is %d\n", num, divisor
             break
         @}
-        if (div * div > num) @{
+        if (divisor * divisor > num) @{
             printf "%d is prime\n", num
             break
         @}
@@ -13417,7 +13679,7 @@ BEGIN @{
 @end example
 
 @noindent
-This program loops forever once @code{x} reaches 5, since
+This program loops forever once @code{x} reaches 5, because
 the increment (@samp{x++}) is never reached.
 
 @c @cindex @code{continue}, outside of loops
@@ -13433,7 +13695,12 @@ body of a loop.  Historical versions of @command{awk} treated a @code{continue}
 statement outside a loop the same way they treated a @code{break}
 statement outside a loop: as if it were a @code{next}
 statement
+@ifset FOR_PRINT
+(discussed in the following section).
+@end ifset
+@ifclear FOR_PRINT
 (@pxref{Next Statement}).
+@end ifclear
 @value{DARKCORNER}
 Recent versions of BWK @command{awk} no longer work this way, nor
 does @command{gawk}.
@@ -13478,7 +13745,7 @@ Because of the @code{next} statement,
 the program's subsequent rules won't see the bad record.  The error
 message is redirected to the standard error output stream, as error
 messages should be.
-For more detail see
+For more detail, see
 @ref{Special Files}.
 
 If the @code{next} statement causes the end of the input to be reached,
@@ -13497,7 +13764,7 @@ The @code{next} statement is not allowed inside @code{BEGINFILE} and
 @cindex functions, user-defined, @code{next}/@code{nextfile} statements and
 According to the POSIX standard, the behavior is undefined if the
 @code{next} statement is used in a @code{BEGIN} or @code{END} rule.
-@command{gawk} treats it as a syntax error.  Although POSIX permits it,
+@command{gawk} treats it as a syntax error.  Although POSIX does not disallow it,
 most other @command{awk} implementations don't allow the @code{next}
 statement inside function bodies (@pxref{User-defined}).  Just as with any
 other @code{next} statement, a @code{next} statement inside a function
@@ -13544,7 +13811,7 @@ rule to skip over a file that would otherwise cause @command{gawk}
 to exit with a fatal error. In this case, @code{ENDFILE} rules are not
 executed. @xref{BEGINFILE/ENDFILE}.
 
-While one might think that @samp{close(FILENAME)} would accomplish
+Although it might seem that @samp{close(FILENAME)} would accomplish
 the same as @code{nextfile}, this isn't true.  @code{close()} is
 reserved for closing files, pipes, and coprocesses that are
 opened with redirections.  It is not related to the main processing that
@@ -13552,7 +13819,7 @@ opened with redirections.  It is not related to the main processing that
 
 @quotation NOTE
 For many years, @code{nextfile} was a
-@command{gawk} extension. As of September, 2012, it was accepted for
+common extension. In September 2012, it was accepted for
 inclusion into the POSIX standard.
 See @uref{http://austingroupbugs.net/view.php?id=607, the Austin Group website}.
 @end quotation
@@ -13561,8 +13828,8 @@ See @uref{http://austingroupbugs.net/view.php?id=607, the Austin Group website}.
 @cindex @code{nextfile} statement, user-defined functions and
 @cindex Brian Kernighan's @command{awk}
 @cindex @command{mawk} utility
-The current version of BWK @command{awk}, and @command{mawk} (@pxref{Other
-Versions}) also support @code{nextfile}.  However, they don't allow the
+The current version of BWK @command{awk} and @command{mawk}
+also support @code{nextfile}.  However, they don't allow the
 @code{nextfile} statement inside function bodies (@pxref{User-defined}).
 @command{gawk} does; a @code{nextfile} inside a function body reads the
 next record and starts processing it with the first rule in the program,
@@ -13594,14 +13861,14 @@ the program to stop immediately.
 An @code{exit} statement that is not part of a @code{BEGIN} or @code{END}
 rule stops the execution of any further automatic rules for the current
 record, skips reading any remaining input records, and executes the
-@code{END} rule if there is one.
-Any @code{ENDFILE} rules are also skipped; they are not executed.
+@code{END} rule if there is one.  @command{gawk} also skips
+any @code{ENDFILE} rules; they do not execute.
 
 In such a case,
 if you don't want the @code{END} rule to do its job, set a variable
-to nonzero before the @code{exit} statement and check that variable in
+to a nonzero value before the @code{exit} statement and check that variable in
 the @code{END} rule.
-@xref{Assert Function},
+@DBXREF{Assert Function}
 for an example that does this.
 
 @cindex dark corner, @code{exit} statement
@@ -13612,7 +13879,7 @@ In the case where an argument
 is supplied to a first @code{exit} statement, and then @code{exit} is
 called a second time from an @code{END} rule with no argument,
 @command{awk} uses the previously supplied exit value.  @value{DARKCORNER}
-@xref{Exit Status}, for more information.
+@DBXREF{Exit Status} for more information.
 
 @cindex programming conventions, @code{exit} statement
 For example, suppose an error condition occurs that is difficult or
@@ -13638,16 +13905,11 @@ Negative values, and values of 127 or greater, may not produce consistent
 results across different operating systems.
 @end quotation
 
-@c ENDOFRANGE csta
-@c ENDOFRANGE acs
-@c ENDOFRANGE accs
 
 @node Built-in Variables
-@section Built-in Variables
-@c STARTOFRANGE bvar
-@cindex built-in variables
-@c STARTOFRANGE varb
-@cindex variables, built-in
+@section Predefined Variables
+@cindex predefined variables
+@cindex variables, predefined
 
 Most @command{awk} variables are available to use for your own
 purposes; they never change unless your program assigns values to
@@ -13658,8 +13920,8 @@ to tell @command{awk} how to do certain things.  Others are set
 automatically by @command{awk}, so that they carry information from the
 internal workings of @command{awk} to your program.
 
-@cindex @command{gawk}, built-in variables and
-This @value{SECTION} documents all of @command{gawk}'s built-in variables,
+@cindex @command{gawk}, predefined variables and
+This @value{SECTION} documents all of @command{gawk}'s predefined variables,
 most of which are also documented in the @value{CHAPTER}s describing
 their areas of activity.
 
@@ -13673,9 +13935,7 @@ their areas of activity.
 
 @node User-modified
 @subsection Built-in Variables That Control @command{awk}
-@c STARTOFRANGE bvaru
-@cindex built-in variables, user-modifiable
-@c STARTOFRANGE nmbv
+@cindex predefined variables, user-modifiable
 @cindex user-modifiable variables
 
 The following is an alphabetical list of variables that you can change to
@@ -13703,7 +13963,7 @@ respectively, should use binary I/O.  A string value of @code{"rw"} or
 @code{"wr"} indicates that all files should use binary I/O.  Any other
 string value is treated the same as @code{"rw"}, but causes @command{gawk}
 to generate a warning message.  @code{BINMODE} is described in more
-detail in @ref{PC Using}.  @command{mawk} @pxref{Other Versions}),
+detail in @ref{PC Using}.  @command{mawk} (@pxref{Other Versions})
 also supports this variable, but only using numeric values.
 
 @cindex @code{CONVFMT} variable
@@ -13711,7 +13971,7 @@ also supports this variable, but only using numeric values.
 @cindex numbers, converting, to strings
 @cindex strings, converting, numbers to
 @item @code{CONVFMT}
-This string controls conversion of numbers to
+A string that controls the conversion of numbers to
 strings (@pxref{Conversion}).
 It works by being passed, in effect, as the first argument to the
 @code{sprintf()} function
@@ -13729,7 +13989,7 @@ A space-separated list of columns that tells @command{gawk}
 how to split input with fixed columnar boundaries.
 Assigning a value to @code{FIELDWIDTHS}
 overrides the use of @code{FS} and @code{FPAT} for field splitting.
-@xref{Constant Size}, for more information.
+@DBXREF{Constant Size} for more information.
 
 @cindex @command{gawk}, @code{FPAT} variable in
 @cindex @code{FPAT} variable
@@ -13741,7 +14001,7 @@ A regular expression (as a string) that tells @command{gawk}
 to create the fields based on text that matches the regular expression.
 Assigning a value to @code{FPAT}
 overrides the use of @code{FS} and @code{FIELDWIDTHS} for field splitting.
-@xref{Splitting By Content}, for more information.
+@DBXREF{Splitting By Content} for more information.
 
 @cindex @code{FS} variable
 @cindex separators, field
@@ -13786,12 +14046,13 @@ is to simply say @samp{FS = FS}, perhaps with an explanatory comment.
 @cindex regular expressions, case sensitivity
 @item IGNORECASE #
 If @code{IGNORECASE} is nonzero or non-null, then all string comparisons
-and all regular expression matching are case independent.  Thus, regexp
-matching with @samp{~} and @samp{!~}, as well as the @code{gensub()},
-@code{gsub()}, @code{index()}, @code{match()}, @code{patsplit()},
-@code{split()}, and @code{sub()}
-functions, record termination with @code{RS}, and field splitting with
-@code{FS} and @code{FPAT}, all ignore case when doing their particular regexp operations.
+and all regular expression matching are case-independent.
+This applies to
+regexp matching with @samp{~} and @samp{!~},
+the @code{gensub()}, @code{gsub()}, @code{index()}, @code{match()},
+@code{patsplit()}, @code{split()}, and @code{sub()} functions,
+record termination with @code{RS}, and field splitting with
+@code{FS} and @code{FPAT}.
 However, the value of @code{IGNORECASE} does @emph{not} affect array subscripting
 and it does not affect field splitting when using a single-character
 field separator.
@@ -13812,7 +14073,7 @@ Any other true value prints nonfatal warnings.
 Assigning a false value to @code{LINT} turns off the lint warnings.
 
 This variable is a @command{gawk} extension.  It is not special
-in other @command{awk} implementations.  Unlike the other special variables,
+in other @command{awk} implementations.  Unlike with the other special variables,
 changing @code{LINT} does affect the production of lint warnings,
 even if @command{gawk} is in compatibility mode.  Much as
 the @option{--lint} and @option{--traditional} options independently
@@ -13824,13 +14085,13 @@ of @command{awk} being executed.
 @cindex numbers, converting, to strings
 @cindex strings, converting, numbers to
 @item OFMT
-Controls conversion of numbers to
+A string that controls conversion of numbers to
 strings (@pxref{Conversion}) for
 printing with the @code{print} statement.  It works by being passed
 as the first argument to the @code{sprintf()} function
 (@pxref{String Functions}).
 Its default value is @code{"%.6g"}.  Earlier versions of @command{awk}
-also used @code{OFMT} to specify the format for converting numbers to
+used @code{OFMT} to specify the format for converting numbers to
 strings in general expressions; this is now done by @code{CONVFMT}.
 
 @cindex @code{sprintf()} function, @code{OFMT} variable and
@@ -13839,7 +14100,7 @@ strings in general expressions; this is now done by @code{CONVFMT}.
 @cindex separators, field
 @cindex field separators
 @item OFS
-This is the output field separator (@pxref{Output Separators}).  It is
+The output field separator (@pxref{Output Separators}).  It is
 output between the fields printed by a @code{print} statement.  Its
 default value is @w{@code{" "}}, a string consisting of a single space.
 
@@ -13851,13 +14112,13 @@ character.  (@xref{Output Separators}.)
 
 @cindex @code{PREC} variable
 @item PREC #
-The working precision of arbitrary precision floating-point numbers,
+The working precision of arbitrary-precision floating-point numbers,
 53 bits by default (@pxref{Setting precision}).
 
 @cindex @code{ROUNDMODE} variable
 @item ROUNDMODE #
-The rounding mode to use for arbitrary precision arithmetic on
-numbers, by default @code{"N"} (@samp{roundTiesToEven} in
+The rounding mode to use for arbitrary-precision arithmetic on
+numbers, by default @code{"N"} (@code{roundTiesToEven} in
 the IEEE 754 standard; @pxref{Setting the rounding mode}).
 
 @cindex @code{RS} variable
@@ -13886,7 +14147,7 @@ just the first character of @code{RS}'s value is used.
 @item @code{SUBSEP}
 The subscript separator.  It has the default value of
 @code{"\034"} and is used to separate the parts of the indices of a
-multidimensional array.  Thus, the expression @code{@w{foo["A", "B"]}}
+multidimensional array.  Thus, the expression @samp{@w{foo["A", "B"]}}
 really accesses @code{foo["A\034B"]}
 (@pxref{Multidimensional}).
 
@@ -13898,22 +14159,16 @@ really accesses @code{foo["A\034B"]}
 Used for internationalization of programs at the
 @command{awk} level.  It sets the default text domain for specially
 marked string constants in the source text, as well as for the
-@code{dcgettext()}, @code{dcngettext()} and @code{bindtextdomain()} functions
+@code{dcgettext()}, @code{dcngettext()}, and @code{bindtextdomain()} functions
 (@pxref{Internationalization}).
 The default value of @code{TEXTDOMAIN} is @code{"messages"}.
 @end table
-@c ENDOFRANGE bvar
-@c ENDOFRANGE varb
-@c ENDOFRANGE bvaru
-@c ENDOFRANGE nmbv
 
 @node Auto-set
 @subsection Built-in Variables That Convey Information
 
-@c STARTOFRANGE bvconi
-@cindex built-in variables, conveying information
-@c STARTOFRANGE vbconi
-@cindex variables, built-in, conveying information
+@cindex predefined variables, conveying information
+@cindex variables, predefined conveying information
 The following is an alphabetical list of variables that @command{awk}
 sets automatically on certain occasions in order to provide
 information to your program.
@@ -13921,7 +14176,7 @@ information to your program.
 The variables that are specific to @command{gawk} are marked with a pound
 sign (@samp{#}).  These variables are @command{gawk} extensions.  In other
 @command{awk} implementations or if @command{gawk} is in compatibility
-mode (@pxref{Options}), they are not special.
+mode (@pxref{Options}), they are not special:
 
 @c @asis for docbook
 @table @asis
@@ -13962,7 +14217,7 @@ method of accessing command-line arguments.
 The value of @code{ARGV[0]} can vary from system to system.
 Also, you should note that the program text is @emph{not} included in
 @code{ARGV}, nor are any of @command{awk}'s command-line options.
-@xref{ARGC and ARGV}, for information
+@DBXREF{ARGC and ARGV} for information
 about how @command{awk} uses these variables.
 @value{DARKCORNER}
 
@@ -13982,8 +14237,8 @@ successive instances of the same @value{FN} on the command line.
 
 @cindex file names, distinguishing
 While you can change the value of @code{ARGIND} within your @command{awk}
-program, @command{gawk} automatically sets it to a new value when the
-next file is opened.
+program, @command{gawk} automatically sets it to a new value when it
+opens the next file.
 
 @cindex @code{ENVIRON} array
 @cindex environment variables, in @code{ENVIRON} array
@@ -14004,12 +14259,23 @@ that it creates.  You should therefore be especially careful if you
 modify @code{ENVIRON["PATH"]"}, which is the search path for finding
 executable programs.
 
+This can also affect the running @command{gawk} program, since some of the
+built-in functions may pay attention to certain environment variables.
+The most notable instance of this is @code{mktime()} (@pxref{Time
+Functions}), which pays attention the value of the @env{TZ} environment
+variable on many systems.
+
 Some operating systems may not have environment variables.
 On such systems, the @code{ENVIRON} array is empty (except for
 @w{@code{ENVIRON["AWKPATH"]}} and
 @w{@code{ENVIRON["AWKLIBPATH"]}};
-@pxref{AWKPATH Variable}, and
+@DBPXREF{AWKPATH Variable} and
+@ifdocbook
+@DBREF{AWKLIBPATH Variable}).
+@end ifdocbook
+@ifnotdocbook
 @pxref{AWKLIBPATH Variable}).
+@end ifnotdocbook
 
 @cindex @command{gawk}, @code{ERRNO} variable in
 @cindex @code{ERRNO} variable
@@ -14031,6 +14297,11 @@ value to be meaningful when an I/O operation returns a failure value,
 such as @code{getline} returning @minus{}1.  You are, of course, free
 to clear it yourself before doing an I/O operation.
 
+If the value of @code{ERRNO} corresponds to a system error in the C
+@code{errno} variable, then @code{PROCINFO["errno"]} will be set to the value
+of @code{errno}.  For non-system errors, @code{PROCINFO["errno"]} will
+be zero.
+
 @cindex @code{FILENAME} variable
 @cindex dark corner, @code{FILENAME} variable
 @item @code{FILENAME}
@@ -14038,7 +14309,7 @@ The name of the current input file.  When no @value{DF}s are listed
 on the command line, @command{awk} reads from the standard input and
 @code{FILENAME} is set to @code{"-"}.  @code{FILENAME} changes each
 time a new file is read (@pxref{Reading Files}).  Inside a @code{BEGIN}
-rule, the value of @code{FILENAME} is @code{""}, since there are no input
+rule, the value of @code{FILENAME} is @code{""}, because there are no input
 files being processed yet.@footnote{Some early implementations of Unix
 @command{awk} initialized @code{FILENAME} to @code{"-"}, even if there
 were @value{DF}s to be processed. This behavior was incorrect and should
@@ -14048,21 +14319,21 @@ can give @code{FILENAME} a value.
 
 @cindex @code{FNR} variable
 @item @code{FNR}
-The current record number in the current file.  @code{FNR} is
-incremented each time a new record is read
-(@pxref{Records}).  It is reinitialized
-to zero each time a new input file is started.
+The current record number in the current file.  @command{awk} increments
+@code{FNR} each time it reads a new record (@pxref{Records}).
+@command{awk} resets @code{FNR} to zero each time it starts a new
+input file.
 
 @cindex @code{NF} variable
 @item @code{NF}
 The number of fields in the current input record.
 @code{NF} is set each time a new record is read, when a new field is
-created or when @code{$0} changes (@pxref{Fields}).
+created, or when @code{$0} changes (@pxref{Fields}).
 
 Unlike most of the variables described in this @value{SUBSECTION},
 assigning a value to @code{NF} has the potential to affect
 @command{awk}'s internal workings.  In particular, assignments
-to @code{NF} can be used to create or remove fields from the
+to @code{NF} can be used to create fields in or remove fields from the
 current record. @xref{Changing Fields}.
 
 @cindex @code{FUNCTAB} array
@@ -14070,7 +14341,7 @@ current record. @xref{Changing Fields}.
 @cindex differences in @command{awk} and @command{gawk}, @code{FUNCTAB} variable
 @item @code{FUNCTAB #}
 An array whose indices and corresponding values are the names of all
-the built-in, user-defined and extension functions in the program.
+the built-in, user-defined, and extension functions in the program.
 
 @quotation NOTE
 Attempting to use the @code{delete} statement with the @code{FUNCTAB}
@@ -14083,7 +14354,7 @@ array causes a fatal error.  Any attempt to assign to an element of
 The number of input records @command{awk} has processed since
 the beginning of the program's execution
 (@pxref{Records}).
-@code{NR} is incremented each time a new record is read.
+@command{awk} increments @code{NR} each time it reads a new record.
 
 @cindex @command{gawk}, @code{PROCINFO} array in
 @cindex @code{PROCINFO} array
@@ -14099,6 +14370,10 @@ are guaranteed to be available:
 @item PROCINFO["egid"]
 The value of the @code{getegid()} system call.
 
+@item PROCINFO["errno"]
+The value of the C @code{errno} variable when @code{ERRNO} is set to
+the associated error message.
+
 @item PROCINFO["euid"]
 @cindex effective user ID of @command{gawk} user
 The value of the @code{geteuid()} system call.
@@ -14112,7 +14387,7 @@ or @code{"FPAT"} if field matching with @code{FPAT} is in effect.
 @item PROCINFO["identifiers"]
 @cindex program identifiers
 A subarray, indexed by the names of all identifiers used in the text of
-the AWK program.  An @dfn{identifier} is simply the name of a variable
+the @command{awk} program.  An @dfn{identifier} is simply the name of a variable
 (be it scalar or array), built-in function, user-defined function, or
 extension function.  For each identifier, the value of the element is
 one of the following:
@@ -14132,7 +14407,7 @@ The identifier is an extension function loaded via
 The identifier is a scalar.
 
 @item "untyped"
-The identifier is untyped (could be used as a scalar or array,
+The identifier is untyped (could be used as a scalar or an array;
 @command{gawk} doesn't know yet).
 
 @item "user"
@@ -14149,7 +14424,7 @@ while the program runs.
 The value of the @code{getgid()} system call.
 
 @item PROCINFO["pgrpid"]
-@cindex process group idIDof @command{gawk} process
+@cindex process group ID of @command{gawk} process
 The process group ID of the current process.
 
 @item PROCINFO["pid"]
@@ -14163,8 +14438,8 @@ The parent process ID of the current process.
 @item PROCINFO["sorted_in"]
 If this element exists in @code{PROCINFO}, its value controls the
 order in which array indices will be processed by
-@samp{for (@var{index} in @var{array})} loops.
-Since this is an advanced feature, we defer the
+@samp{for (@var{indx} in @var{array})} loops.
+This is an advanced feature, so we defer the
 full description until later; see
 @ref{Scanning an Array}.
 
@@ -14184,10 +14459,10 @@ The version of @command{gawk}.
 
 The following additional elements in the array
 are available to provide information about the MPFR and GMP libraries
-if your version of @command{gawk} supports arbitrary precision numbers
-(@pxref{Arbitrary Precision Arithmetic}): 
+if your version of @command{gawk} supports arbitrary-precision arithmetic
+(@pxref{Arbitrary Precision Arithmetic}):
 
-@table @code 
+@table @code
 @cindex version of GNU MPFR library
 @item PROCINFO["mpfr_version"]
 The version of the GNU MPFR library.
@@ -14201,7 +14476,7 @@ The version of the GNU MP library.
 The maximum precision supported by MPFR.
 
 @item PROCINFO["prec_min"]
-@cindex minimum precision supported by MPFR library
+@cindex minimum precision required by MPFR library
 The minimum precision required by MPFR.
 @end table
 
@@ -14233,14 +14508,19 @@ The @code{PROCINFO} array has the following additional uses:
 
 @itemize @value{BULLET}
 @item
+It may be used to provide a timeout when reading from any
+open input file, pipe, or coprocess.
+@DBXREF{Read Timeout} for more information.
+
+@item
+It may be used to indicate that input may be retried when it fails due to
+certain errors.
+@DBXREF{Retrying Input} for more information.
+
+@item
 It may be used to cause coprocesses to communicate over pseudo-ttys
 instead of through two-way pipes; this is discussed further in
 @ref{Two-way I/O}.
-
-@item
-It may be used to provide a timeout when reading from any
-open input file, pipe, or coprocess.
-@xref{Read Timeout}, for more information.
 @end itemize
 
 @cindex @code{RLENGTH} variable
@@ -14253,7 +14533,7 @@ is the length of the matched string, or @minus{}1 if no match is found.
 
 @cindex @code{RSTART} variable
 @item @code{RSTART}
-The start-index in characters of the substring that is matched by the
+The start index in characters of the substring that is matched by the
 @code{match()} function
 (@pxref{String Functions}).
 @code{RSTART} is set by invoking the @code{match()} function.  Its value
@@ -14271,9 +14551,13 @@ the record separator.  It is set every time a record is read.
 @cindex @code{SYMTAB} array
 @cindex differences in @command{awk} and @command{gawk}, @code{SYMTAB} variable
 @item @code{SYMTAB #}
-An array whose indices are the names of all currently defined
-global variables and arrays in the program.  The array may be used
-for indirect access to read or write the value of a variable:
+An array whose indices are the names of all defined global variables and
+arrays in the program.  @code{SYMTAB} makes @command{gawk}'s symbol table
+visible to the @command{awk} programmer.  It is built as @command{gawk}
+parses the program and is complete before the program starts to run.
+
+The array may be used for indirect access to read or write the value of
+a variable:
 
 @example
 foo = 5
@@ -14316,11 +14600,9 @@ function multiply(variable, amount)
 @quotation NOTE
 In order to avoid severe time-travel paradoxes,@footnote{Not to mention difficult
 implementation issues.} neither @code{FUNCTAB} nor @code{SYMTAB}
-are available as elements within the @code{SYMTAB} array.
+is available as an element within the @code{SYMTAB} array.
 @end quotation
 @end table
-@c ENDOFRANGE bvconi
-@c ENDOFRANGE vbconi
 
 @sidebar Changing @code{NR} and @code{FNR}
 @cindex @code{NR} variable, changing
@@ -14430,8 +14712,14 @@ use the @code{delete} statement to remove elements from
 
 All of these actions are typically done in the @code{BEGIN} rule,
 before actual processing of the input begins.
-@xref{Split Program}, and see
-@ref{Tee Program}, for examples
+@DBXREF{Split Program} and
+@ifnotdocbook
+@DBPXREF{Tee Program}
+@end ifnotdocbook
+@ifdocbook
+@DBREF{Tee Program}
+@end ifdocbook
+for examples
 of each way of removing elements from @code{ARGV}.
 
 To actually get options into an @command{awk} program,
@@ -14443,7 +14731,7 @@ awk -f myprog.awk -- -v -q file1 file2 @dots{}
 @end example
 
 The following fragment processes @code{ARGV} in order to examine, and
-then remove, the above command-line options:
+then remove, the previously mentioned command-line options:
 
 @example
 BEGIN @{
@@ -14479,23 +14767,36 @@ gawk -f myprog.awk -q -v file1 file2 @dots{}
 @noindent
 Because @option{-q} is not a valid @command{gawk} option, it and the
 following @option{-v} are passed on to the @command{awk} program.
-(@xref{Getopt Function}, for an @command{awk} library function that
+(@DBXREF{Getopt Function} for an @command{awk} library function that
 parses command-line options.)
 
+When designing your program, you should choose options that don't
+conflict with @command{gawk}'s, because it will process any options
+that it accepts before passing the rest of the command line on to
+your program.  Using @samp{#!} with the @option{-E} option may help
+(@DBPXREF{Executable Scripts}
+and
+@ifnotdocbook
+@DBPXREF{Options}).
+@end ifnotdocbook
+@ifdocbook
+@DBREF{Options}).
+@end ifdocbook
+
 @node Pattern Action Summary
 @section Summary
 
 @itemize @value{BULLET}
 @item
-Pattern-action pairs make up the basic elements of an @command{awk}
+Pattern--action pairs make up the basic elements of an @command{awk}
 program.  Patterns are either normal expressions, range expressions,
-regexp constants, one of the special keywords @code{BEGIN}, @code{END},
-@code{BEGINFILE}, @code{ENDFILE}, or empty.  The action executes if
+or regexp constants; one of the special keywords @code{BEGIN}, @code{END},
+@code{BEGINFILE}, or @code{ENDFILE}; or empty.  The action executes if
 the current record matches the pattern.  Empty (missing) patterns match
 all records.
 
 @item
-I/O from @code{BEGIN} and @code{END} rules have certain constraints.
+I/O from @code{BEGIN} and @code{END} rules has certain constraints.
 This is also true, only more so, for @code{BEGINFILE} and @code{ENDFILE}
 rules.  The latter two give you ``hooks'' into @command{gawk}'s file
 processing, allowing you to recover from a file that otherwise would
@@ -14516,7 +14817,7 @@ input and output statements, and deletion statements.
 The control statements in @command{awk} are @code{if}-@code{else},
 @code{while}, @code{for}, and @code{do}-@code{while}.  @command{gawk}
 adds the @code{switch} statement.  There are two flavors of @code{for}
-statement: one for for performing general looping, and the other iterating
+statement: one for performing general looping, and the other for iterating
 through an array.
 
 @item
@@ -14525,25 +14826,29 @@ iteration of a loop (or get out of a @code{switch}).
 
 @item
 @code{next} and @code{nextfile} let you read the next record and start
-over at the top of your program, or skip to the next input file and
+over at the top of your program or skip to the next input file and
 start over, respectively.
 
 @item
 The @code{exit} statement terminates your program. When executed
-from an action (or function body) it transfers control to the
+from an action (or function body), it transfers control to the
 @code{END} statements. From an @code{END} statement body, it exits
 immediately.  You may pass an optional numeric value to be used
-at @command{awk}'s exit status.
+as @command{awk}'s exit status.
 
 @item
-Some built-in variables provide control over @command{awk}, mainly for I/O.
+Some predefined variables provide control over @command{awk}, mainly for I/O.
 Other variables convey information from @command{awk} to your program.
 
+@item
+@code{ARGC} and @code{ARGV} make the command-line arguments available
+to your program. Manipulating them from a @code{BEGIN} rule lets you
+control how @command{awk} will process the provided @value{DF}s.
+
 @end itemize
 
 @node Arrays
 @chapter Arrays in @command{awk}
-@c STARTOFRANGE arrs
 @cindex arrays
 
 An @dfn{array} is a table of values called @dfn{elements}.  The
@@ -14559,24 +14864,13 @@ The @value{CHAPTER} moves on to discuss @command{gawk}'s facility
 for sorting arrays, and ends with a brief description of @command{gawk}'s
 ability to support true arrays of arrays.
 
-@cindex variables, names of
-@cindex functions, names of
-@cindex arrays, names of, and names of functions/variables
-@cindex names, arrays/variables
-@cindex namespace issues
-@command{awk} maintains a single set
-of names that may be used for naming variables, arrays, and functions
-(@pxref{User-defined}).
-Thus, you cannot have a variable and an array with the same name in the
-same @command{awk} program.
-
 @menu
 * Array Basics::                The basics of arrays.
-* Delete::                      The @code{delete} statement removes an element
-                                from an array.
 * Numeric Array Subscripts::    How to use numbers as subscripts in
                                 @command{awk}.
 * Uninitialized Subscripts::    Using Uninitialized variables as subscripts.
+* Delete::                      The @code{delete} statement removes an element
+                                from an array.
 * Multidimensional::            Emulating multidimensional arrays in
                                 @command{awk}.
 * Arrays of Arrays::            True multidimensional arrays.
@@ -14622,14 +14916,14 @@ as a variable) in the same @command{awk} program.
 Arrays in @command{awk} superficially resemble arrays in other programming
 languages, but there are fundamental differences.  In @command{awk}, it
 isn't necessary to specify the size of an array before starting to use it.
-Additionally, any number or string in @command{awk}, not just consecutive integers,
+Additionally, any number or string, not just consecutive integers,
 may be used as an array index.
 
 In most other languages, arrays must be @dfn{declared} before use,
 including a specification of
 how many elements or components they contain.  In such languages, the
 declaration causes a contiguous block of memory to be allocated for that
-many elements.  Usually, an index in the array must be a positive integer.
+many elements.  Usually, an index in the array must be a nonnegative integer.
 For example, the index zero specifies the first element in the array, which is
 actually stored at the beginning of the block of memory.  Index one
 specifies the second element, which is stored in memory right after the
@@ -14640,19 +14934,21 @@ the declaration.
 indices---e.g., @samp{15 .. 27}---but the size of the array is still fixed when
 the array is declared.)
 
-A contiguous array of four elements might look like the following example,
-conceptually, if the element values are 8, @code{"foo"},
-@code{""}, and 30
+@c 1/2015: Do not put the numeric values into @code. Array element
+@c values are no different than scalar variable values.
+A contiguous array of four elements might look like
 @ifnotdocbook
-as shown in @ref{figure-array-elements}:
+@ref{figure-array-elements},
 @end ifnotdocbook
 @ifdocbook
-as shown in @inlineraw{docbook, <xref linkend="figure-array-elements"/>}:
+@inlineraw{docbook, <xref linkend="figure-array-elements"/>},
 @end ifdocbook
+conceptually, if the element values are eight, @code{"foo"},
+@code{""}, and 30.
 
 @ifnotdocbook
 @float Figure,figure-array-elements
-@caption{A Contiguous Array}
+@caption{A contiguous array}
 @ifinfo
 @center @image{array-elements, , , Basic Program Stages, txt}
 @end ifinfo
@@ -14664,7 +14960,7 @@ as shown in @inlineraw{docbook, <xref linkend="figure-array-elements"/>}:
 
 @docbook
 <figure id="figure-array-elements" float="0">
-<title>A Contiguous Array</title>
+<title>A contiguous array</title>
 <mediaobject>
 <imageobject role="web"><imagedata fileref="array-elements.png" format="PNG"/></imageobject>
 </mediaobject>
@@ -14673,33 +14969,33 @@ as shown in @inlineraw{docbook, <xref linkend="figure-array-elements"/>}:
 
 @noindent
 Only the values are stored; the indices are implicit from the order of
-the values. Here, 8 is the value at index zero, because 8 appears in the
+the values. Here, eight is the value at index zero, because eight appears in the
 position with zero elements before it.
 
-@c STARTOFRANGE arrin
 @cindex arrays, indexing
-@c STARTOFRANGE inarr
 @cindex indexing arrays
 @cindex associative arrays
 @cindex arrays, associative
 Arrays in @command{awk} are different---they are @dfn{associative}.  This means
-that each array is a collection of pairs: an index and its corresponding
+that each array is a collection of pairs---an index and its corresponding
 array element value:
 
 @ifnotdocbook
-@example
-@r{Index} 3     @r{Value} 30
-@r{Index} 1     @r{Value} "foo"
-@r{Index} 0     @r{Value} 8
-@r{Index} 2     @r{Value} ""
-@end example
+@c extra empty column to indent it right
+@multitable @columnfractions .1 .1 .1
+@headitem @tab Index @tab Value
+@item @tab @code{3} @tab @code{30}
+@item @tab @code{1} @tab @code{"foo"}
+@item @tab @code{0} @tab @code{8}
+@item @tab @code{2} @tab @code{""}
+@end multitable
 @end ifnotdocbook
 
 @docbook
 <informaltable>
 <tgroup cols="2">
-<colspec colname="1" align="center"/>
-<colspec colname="2" align="center"/>
+<colspec colname="1" align="left"/>
+<colspec colname="2" align="left"/>
 <thead>
 <row>
 <entry>Index</entry>
@@ -14745,20 +15041,22 @@ at any time.  For example, suppose a tenth element is added to the array
 whose value is @w{@code{"number ten"}}.  The result is:
 
 @ifnotdocbook
-@example
-@r{Index} 10    @r{Value} "number ten"
-@r{Index} 3     @r{Value} 30
-@r{Index} 1     @r{Value} "foo"
-@r{Index} 0     @r{Value} 8
-@r{Index} 2     @r{Value} ""
-@end example
+@c extra empty column to indent it right
+@multitable @columnfractions .1 .1 .2
+@headitem @tab Index @tab Value
+@item @tab @code{10} @tab @code{"number ten"}
+@item @tab @code{3} @tab @code{30}
+@item @tab @code{1} @tab @code{"foo"}
+@item @tab @code{0} @tab @code{8}
+@item @tab @code{2} @tab @code{""}
+@end multitable
 @end ifnotdocbook
 
 @docbook
 <informaltable>
 <tgroup cols="2">
-<colspec colname="1" align="center"/>
-<colspec colname="2" align="center"/>
+<colspec colname="1" align="left"/>
+<colspec colname="2" align="left"/>
 <thead>
 <row>
 <entry>Index</entry>
@@ -14805,24 +15103,25 @@ Now the array is @dfn{sparse}, which just means some indices are missing.
 It has elements 0--3 and 10, but doesn't have elements 4, 5, 6, 7, 8, or 9.
 
 Another consequence of associative arrays is that the indices don't
-have to be positive integers.  Any number, or even a string, can be
+have to be nonnegative integers.  Any number, or even a string, can be
 an index.  For example, the following is an array that translates words from
 English to French:
 
 @ifnotdocbook
-@example
-@r{Index} "dog" @r{Value} "chien"
-@r{Index} "cat" @r{Value} "chat"
-@r{Index} "one" @r{Value} "un"
-@r{Index} 1     @r{Value} "un"
-@end example
+@multitable @columnfractions .1 .1 .1
+@headitem @tab Index @tab Value
+@item @tab @code{"dog"} @tab @code{"chien"}
+@item @tab @code{"cat"} @tab @code{"chat"}
+@item @tab @code{"one"} @tab @code{"un"}
+@item @tab @code{1} @tab @code{"un"}
+@end multitable
 @end ifnotdocbook
 
 @docbook
 <informaltable>
 <tgroup cols="2">
-<colspec colname="1" align="center"/>
-<colspec colname="2" align="center"/>
+<colspec colname="1" align="left"/>
+<colspec colname="2" align="left"/>
 <thead>
 <row>
 <entry>Index</entry>
@@ -14864,7 +15163,7 @@ numbers and strings as indices.
 There are some subtleties to how numbers work when used as
 array subscripts; this is discussed in more detail in
 @ref{Numeric Array Subscripts}.)
-Here, the number @code{1} isn't double-quoted, since @command{awk}
+Here, the number @code{1} isn't double-quoted, because @command{awk}
 automatically converts it to a string.
 
 @cindex @command{gawk}, @code{IGNORECASE} variable in
@@ -14881,8 +15180,6 @@ that array's indices are consecutive integers starting at one.
 
 @command{awk}'s arrays are efficient---the time to access an element
 is independent of the number of elements in the array.
-@c ENDOFRANGE arrin
-@c ENDOFRANGE inarr
 
 @node Reference to Elements
 @subsection Referring to an Array Element
@@ -14891,7 +15188,7 @@ is independent of the number of elements in the array.
 @cindex elements of arrays
 
 The principal way to use an array is to refer to one of its elements.
-An array reference is an expression as follows:
+An @dfn{array reference} is an expression as follows:
 
 @example
 @var{array}[@var{index-expression}]
@@ -14901,8 +15198,11 @@ An array reference is an expression as follows:
 Here, @var{array} is the name of an array.  The expression @var{index-expression} is
 the index of the desired element of the array.
 
+@c 1/2015: Having the 4.3 in @samp is a little iffy. It's essentially
+@c an expression though, so leave be. It's to early in the discussion
+@c to mention that it's really a string.
 The value of the array reference is the current value of that array
-element.  For example, @code{foo[4.3]} is an expression for the element
+element.  For example, @code{foo[4.3]} is an expression referencing the element
 of array @code{foo} at index @samp{4.3}.
 
 @cindex arrays, unassigned elements
@@ -14949,7 +15249,7 @@ This expression tests whether the particular index @var{indx} exists,
 without the side effect of creating that element if it is not present.
 The expression has the value one (true) if @code{@var{array}[@var{indx}]}
 exists and zero (false) if it does not exist.
-(We use @var{indx} here, since @samp{index} is the name of a built-in
+(We use @var{indx} here, because @samp{index} is the name of a built-in
 function.)
 For example, this statement tests whether the array @code{frequencies}
 contains the index @samp{2}:
@@ -14994,7 +15294,7 @@ assign to that element of the array.
 
 The following program takes a list of lines, each beginning with a line
 number, and prints them out in order of line number.  The line numbers
-are not in order when they are first read---instead they
+are not in order when they are first read---instead, they
 are scrambled.  This program sorts the lines by making an array using
 the line numbers as subscripts.  The program then prints out the lines
 in sorted order of their numbers.  It is a very simple program and gets
@@ -15004,14 +15304,14 @@ begin with a number:
 @example
 @c file eg/misc/arraymax.awk
 @{
-  if ($1 > max)
-    max = $1
-  arr[$1] = $0
+    if ($1 > max)
+        max = $1
+    arr[$1] = $0
 @}
 
 END @{
-  for (x = 1; x <= max; x++)
-    print arr[x]
+    for (x = 1; x <= max; x++)
+        print arr[x]
 @}
 @c endfile
 @end example
@@ -15051,9 +15351,9 @@ program's @code{END} rule, as follows:
 
 @example
 END @{
-  for (x = 1; x <= max; x++)
-    if (x in arr)
-      print arr[x]
+    for (x = 1; x <= max; x++)
+        if (x in arr)
+            print arr[x]
 @}
 @end example
 
@@ -15066,7 +15366,7 @@ END @{
 
 In programs that use arrays, it is often necessary to use a loop that
 executes once for each element of an array.  In other languages, where
-arrays are contiguous and indices are limited to positive integers,
+arrays are contiguous and indices are limited to nonnegative integers,
 this is easy: all the valid indices can be found by counting from
 the lowest index up to the highest.  This technique won't do the job
 in @command{awk}, because any number or string can be an array index.
@@ -15075,7 +15375,7 @@ an array:
 
 @example
 for (@var{var} in @var{array})
-  @var{body}
+    @var{body}
 @end example
 
 @noindent
@@ -15088,11 +15388,11 @@ program has previously used, with the variable @var{var} set to that index.
 The following program uses this form of the @code{for} statement.  The
 first rule scans the input records and notes which words appear (at
 least once) in the input, by storing a one into the array @code{used} with
-the word as index.  The second rule scans the elements of @code{used} to
+the word as the index.  The second rule scans the elements of @code{used} to
 find all the distinct words that appear in the input.  It prints each
 word that is more than 10 characters long and also prints the number of
 such words.
-@xref{String Functions},
+@DBXREF{String Functions}
 for more information on the built-in function @code{length()}.
 
 @example
@@ -15115,7 +15415,7 @@ END @{
 @end example
 
 @noindent
-@xref{Word Sorting},
+@DBXREF{Word Sorting}
 for a more detailed example of this type.
 
 @cindex arrays, elements, order of access by @code{in} operator
@@ -15148,7 +15448,7 @@ BEGIN @{
 @}
 @end example
 
-Here is what happens when run with @command{gawk}:
+Here is what happens when run with @command{gawk} (and @command{mawk}):
 
 @example
 $ @kbd{gawk -f loopcheck.awk}
@@ -15170,7 +15470,7 @@ $ @kbd{nawk -f loopcheck.awk}
 @end example
 
 @node Controlling Scanning
-@subsection Using Predefined Array Scanning Orders With @command{gawk}
+@subsection Using Predefined Array Scanning Orders with @command{gawk}
 
 This @value{SUBSECTION} describes a feature that is specific to @command{gawk}.
 
@@ -15185,7 +15485,7 @@ and will vary from one version of @command{awk} to the next.
 Often, though, you may wish to do something simple, such as
 ``traverse the array by comparing the indices in ascending order,''
 or ``traverse the array by comparing the values in descending order.''
-@command{gawk} provides two mechanisms which give you this control.
+@command{gawk} provides two mechanisms that give you this control:
 
 @itemize @value{BULLET}
 @item
@@ -15195,7 +15495,7 @@ We describe this now.
 @item
 Set @code{PROCINFO["sorted_in"]} to the name of a user-defined function
 to use for comparison of array elements. This advanced feature
-is described later, in @ref{Array Sorting}.
+is described later in @ref{Array Sorting}.
 @end itemize
 
 @cindex @code{PROCINFO}, values of @code{sorted_in}
@@ -15213,7 +15513,7 @@ the index is @code{"10"} rather than numeric 10.)
 
 @item "@@ind_num_asc"
 Order by indices in ascending order but force them to be treated as numbers in the process.
-Any index with a non-numeric value will end up positioned as if it were zero. 
+Any index with a non-numeric value will end up positioned as if it were zero.
 
 @item "@@val_type_asc"
 Order by element values in ascending order (rather than by indices).
@@ -15225,11 +15525,11 @@ which in turn come before all subarrays.
 @pxref{Arrays of Arrays}.)
 
 @item "@@val_str_asc"
-Order by element values in ascending order (rather than by indices).  Scalar values are 
+Order by element values in ascending order (rather than by indices).  Scalar values are
 compared as strings.  Subarrays, if present, come out last.
 
 @item "@@val_num_asc"
-Order by element values in ascending order (rather than by indices).  Scalar values are 
+Order by element values in ascending order (rather than by indices).  Scalar values are
 compared as numbers.  Subarrays, if present, come out last.
 When numeric values are equal, the string values are used to provide
 an ordering: this guarantees consistent results across different
@@ -15242,21 +15542,26 @@ across different environments.} which @command{gawk} uses internally
 to perform the sorting.
 
 @item "@@ind_str_desc"
-String indices ordered from high to low.
+Like @code{"@@ind_str_asc"}, but the
+string indices are ordered from high to low.
 
 @item "@@ind_num_desc"
-Numeric indices ordered from high to low.
+Like @code{"@@ind_num_asc"}, but the
+numeric indices are ordered from high to low.
 
 @item "@@val_type_desc"
-Element values, based on type, ordered from high to low.
+Like @code{"@@val_type_asc"}, but the
+element values, based on type, are ordered from high to low.
 Subarrays, if present, come out first.
 
 @item "@@val_str_desc"
-Element values, treated as strings, ordered from high to low.
+Like @code{"@@val_str_asc"}, but the
+element values, treated as strings, are ordered from high to low.
 Subarrays, if present, come out first.
 
 @item "@@val_num_desc"
-Element values, treated as numbers, ordered from high to low.
+Like @code{"@@val_num_asc"}, but the
+element values, treated as numbers, are ordered from high to low.
 Subarrays, if present, come out first.
 @end table
 
@@ -15266,7 +15571,8 @@ does not affect the loop.
 For example:
 
 @example
-$ @kbd{gawk 'BEGIN @{}
+$ @kbd{gawk '}
+> @kbd{BEGIN @{}
 > @kbd{   a[4] = 4}
 > @kbd{   a[3] = 3}
 > @kbd{   for (i in a)}
@@ -15274,7 +15580,8 @@ $ @kbd{gawk 'BEGIN @{}
 > @kbd{@}'}
 @print{} 4 4
 @print{} 3 3
-$ @kbd{gawk 'BEGIN @{}
+$ @kbd{gawk '}
+> @kbd{BEGIN @{}
 > @kbd{   PROCINFO["sorted_in"] = "@@ind_str_asc"}
 > @kbd{   a[4] = 4}
 > @kbd{   a[3] = 3}
@@ -15288,11 +15595,11 @@ $ @kbd{gawk 'BEGIN @{}
 When sorting an array by element values, if a value happens to be
 a subarray then it is considered to be greater than any string or
 numeric value, regardless of what the subarray itself contains,
-and all subarrays are treated as being equal to each other.  Their 
+and all subarrays are treated as being equal to each other.  Their
 order relative to each other is determined by their index strings.
 
 Here are some additional things to bear in mind about sorted
-array traversal.
+array traversal:
 
 @itemize @value{BULLET}
 @item
@@ -15312,7 +15619,7 @@ if (save_sorted)
 @end example
 
 @item
-As mentioned, the default array traversal order is represented by
+As already mentioned, the default array traversal order is represented by
 @code{"@@unsorted"}.  You can also get the default behavior by assigning
 the null string to @code{PROCINFO["sorted_in"]} or by just deleting the
 @code{"sorted_in"} element from the @code{PROCINFO} array with
@@ -15323,118 +15630,6 @@ the @code{delete} statement.
 In addition, @command{gawk} provides built-in functions for
 sorting arrays; see @ref{Array Sorting Functions}.
 
-@node Delete
-@section The @code{delete} Statement
-@cindex @code{delete} statement
-@cindex deleting elements in arrays
-@cindex arrays, elements, deleting
-@cindex elements in arrays, deleting
-
-To remove an individual element of an array, use the @code{delete}
-statement:
-
-@example
-delete @var{array}[@var{index-expression}]
-@end example
-
-Once an array element has been deleted, any value the element once
-had is no longer available. It is as if the element had never
-been referred to or been given a value.
-The following is an example of deleting elements in an array:
-
-@example
-for (i in frequencies)
-  delete frequencies[i]
-@end example
-
-@noindent
-This example removes all the elements from the array @code{frequencies}.
-Once an element is deleted, a subsequent @code{for} statement to scan the array
-does not report that element and the @code{in} operator to check for
-the presence of that element returns zero (i.e., false):
-
-@example
-delete foo[4]
-if (4 in foo)
-    print "This will never be printed"
-@end example
-
-@cindex null strings, and deleting array elements
-It is important to note that deleting an element is @emph{not} the
-same as assigning it a null value (the empty string, @code{""}).
-For example:
-
-@example
-foo[4] = ""
-if (4 in foo)
-  print "This is printed, even though foo[4] is empty"
-@end example
-
-@cindex lint checking, array elements
-It is not an error to delete an element that does not exist.
-However, if @option{--lint} is provided on the command line
-(@pxref{Options}),
-@command{gawk} issues a warning message when an element that
-is not in the array is deleted.
-
-@cindex common extensions, @code{delete} to delete entire arrays
-@cindex extensions, common@comma{} @code{delete} to delete entire arrays
-@cindex arrays, deleting entire contents
-@cindex deleting entire arrays
-@cindex @code{delete} @var{array}
-@cindex differences in @command{awk} and @command{gawk}, array elements, deleting
-All the elements of an array may be deleted with a single statement
-by leaving off the subscript in the @code{delete} statement,
-as follows:
-
-
-@example
-delete @var{array}
-@end example
-
-Using this version of the @code{delete} statement is about three times
-more efficient than the equivalent loop that deletes each element one
-at a time.
-
-@cindex Brian Kernighan's @command{awk}
-@quotation NOTE
-For many years,
-using @code{delete} without a subscript was a @command{gawk} extension.
-As of September, 2012, it was accepted for
-inclusion into the POSIX standard. See @uref{http://austingroupbugs.net/view.php?id=544,
-the Austin Group website}.  This form of the @code{delete} statement is also supported
-by BWK @command{awk} and @command{mawk}, as well as
-by a number of other implementations (@pxref{Other Versions}).
-@end quotation
-
-@cindex portability, deleting array elements
-@cindex Brennan, Michael
-The following statement provides a portable but nonobvious way to clear
-out an array:@footnote{Thanks to Michael Brennan for pointing this out.}
-
-@example
-split("", array)
-@end example
-
-@cindex @code{split()} function, array elements@comma{} deleting
-The @code{split()} function
-(@pxref{String Functions})
-clears out the target array first. This call asks it to split
-apart the null string. Because there is no data to split out, the
-function simply clears the array and then returns.
-
-@quotation CAUTION
-Deleting an array does not change its type; you cannot
-delete an array and then use the array's name as a scalar
-(i.e., a regular variable). For example, the following does not work:
-
-@example
-a[1] = 3
-delete a
-a = 3
-@end example
-@end quotation
-
 @node Numeric Array Subscripts
 @section Using Numbers to Subscript Arrays
 
@@ -15446,7 +15641,7 @@ An important aspect to remember about arrays is that @emph{array subscripts
 are always strings}.  When a numeric value is used as a subscript,
 it is converted to a string value before being used for subscripting
 (@pxref{Conversion}).
-This means that the value of the built-in variable @code{CONVFMT} can
+This means that the value of the predefined variable @code{CONVFMT} can
 affect how your program accesses elements of an array.  For example:
 
 @example
@@ -15469,13 +15664,13 @@ The program then changes
 the value of @code{CONVFMT}.  The test @samp{(xyz in data)} generates a new
 string value from @code{xyz}---this time @code{"12.15"}---because the value of
 @code{CONVFMT} only allows two significant digits.  This test fails,
-since @code{"12.15"} is different from @code{"12.153"}.
+because @code{"12.15"} is different from @code{"12.153"}.
 
 @cindex converting integer array subscripts
 @cindex integer array indices
 According to the rules for conversions
 (@pxref{Conversion}), integer
-values are always converted to strings as integers, no matter what the
+values always convert to strings as integers, no matter what the
 value of @code{CONVFMT} may happen to be.  So the usual case of
 the following works:
 
@@ -15487,19 +15682,19 @@ for (i = 1; i <= maxsub; i++)
 The ``integer values always convert to strings as integers'' rule
 has an additional consequence for array indexing.
 Octal and hexadecimal constants
+@ifnotdocbook
 (@pxref{Nondecimal-numbers})
+@end ifnotdocbook
+@ifdocbook
+(covered in @ref{Nondecimal-numbers})
+@end ifdocbook
 are converted internally into numbers, and their original form
-is forgotten.
-This means, for example, that
-@code{array[17]},
-@code{array[021]},
-and
-@code{array[0x11]}
-all refer to the same element!
+is forgotten.  This means, for example, that @code{array[17]},
+@code{array[021]}, and @code{array[0x11]} all refer to the same element!
 
 As with many things in @command{awk}, the majority of the time
-things work as one would expect them to.  But it is useful to have a precise
-knowledge of the actual rules since they can sometimes have a subtle
+things work as you would expect them to.  But it is useful to have a precise
+knowledge of the actual rules, as they can sometimes have a subtle
 effect on your programs.
 
 @node Uninitialized Subscripts
@@ -15562,6 +15757,119 @@ Even though it is somewhat unusual, the null string
 if @option{--lint} is provided
 on the command line (@pxref{Options}).
 
+@node Delete
+@section The @code{delete} Statement
+@cindex @code{delete} statement
+@cindex deleting elements in arrays
+@cindex arrays, elements, deleting
+@cindex elements in arrays, deleting
+
+To remove an individual element of an array, use the @code{delete}
+statement:
+
+@example
+delete @var{array}[@var{index-expression}]
+@end example
+
+Once an array element has been deleted, any value the element once
+had is no longer available. It is as if the element had never
+been referred to or been given a value.
+The following is an example of deleting elements in an array:
+
+@example
+for (i in frequencies)
+    delete frequencies[i]
+@end example
+
+@noindent
+This example removes all the elements from the array @code{frequencies}.
+Once an element is deleted, a subsequent @code{for} statement to scan the array
+does not report that element and using the @code{in} operator to check for
+the presence of that element returns zero (i.e., false):
+
+@example
+delete foo[4]
+if (4 in foo)
+    print "This will never be printed"
+@end example
+
+@cindex null strings, and deleting array elements
+It is important to note that deleting an element is @emph{not} the
+same as assigning it a null value (the empty string, @code{""}).
+For example:
+
+@example
+foo[4] = ""
+if (4 in foo)
+  print "This is printed, even though foo[4] is empty"
+@end example
+
+@cindex lint checking, array elements
+It is not an error to delete an element that does not exist.
+However, if @option{--lint} is provided on the command line
+(@pxref{Options}),
+@command{gawk} issues a warning message when an element that
+is not in the array is deleted.
+
+@cindex common extensions, @code{delete} to delete entire arrays
+@cindex extensions, common@comma{} @code{delete} to delete entire arrays
+@cindex arrays, deleting entire contents
+@cindex deleting entire arrays
+@cindex @code{delete} @var{array}
+@cindex differences in @command{awk} and @command{gawk}, array elements, deleting
+All the elements of an array may be deleted with a single statement
+by leaving off the subscript in the @code{delete} statement,
+as follows:
+
+
+@example
+delete @var{array}
+@end example
+
+Using this version of the @code{delete} statement is about three times
+more efficient than the equivalent loop that deletes each element one
+at a time.
+
+This form of the @code{delete} statement is also supported
+by BWK @command{awk} and @command{mawk}, as well as
+by a number of other implementations.
+
+@cindex Brian Kernighan's @command{awk}
+@quotation NOTE
+For many years, using @code{delete} without a subscript was a common
+extension.  In September 2012, it was accepted for inclusion into the
+POSIX standard.  See @uref{http://austingroupbugs.net/view.php?id=544,
+the Austin Group website}.
+@end quotation
+
+@cindex portability, deleting array elements
+@cindex Brennan, Michael
+The following statement provides a portable but nonobvious way to clear
+out an array:@footnote{Thanks to Michael Brennan for pointing this out.}
+
+@example
+split("", array)
+@end example
+
+@cindex @code{split()} function, array elements@comma{} deleting
+The @code{split()} function
+(@pxref{String Functions})
+clears out the target array first. This call asks it to split
+apart the null string. Because there is no data to split out, the
+function simply clears the array and then returns.
+
+@quotation CAUTION
+Deleting all the elements from an array does not change its type; you cannot
+clear an array and then use the array's name as a scalar
+(i.e., a regular variable). For example, the following does not work:
+
+@example
+a[1] = 3
+delete a
+a = 3
+@end example
+@end quotation
+
 @node Multidimensional
 @section Multidimensional Arrays
 
@@ -15571,9 +15879,9 @@ on the command line (@pxref{Options}).
 
 @cindex subscripts in arrays, multidimensional
 @cindex arrays, multidimensional
-A multidimensional array is an array in which an element is identified
+A @dfn{multidimensional array} is an array in which an element is identified
 by a sequence of indices instead of a single index.  For example, a
-two-dimensional array requires two indices.  The usual way (in most
+two-dimensional array requires two indices.  The usual way (in many
 languages, including @command{awk}) to refer to an element of a
 two-dimensional array named @code{grid} is with
 @code{grid[@var{x},@var{y}]}.
@@ -15613,7 +15921,7 @@ stored as @samp{foo["a@@b@@c"]}.
 @cindex @code{in} operator, index existence in multidimensional arrays
 To test whether a particular index sequence exists in a
 multidimensional array, use the same operator (@code{in}) that is
-used for single dimensional arrays.  Write the whole sequence of indices
+used for single-dimensional arrays.  Write the whole sequence of indices
 in parentheses, separated by commas, as the left operand:
 
 @example
@@ -15736,8 +16044,8 @@ a[1][2] = 2
 This simulates a true two-dimensional array. Each subarray element can
 contain another subarray as a value, which in turn can hold other arrays
 as well. In this way, you can create arrays of three or more dimensions.
-The indices can be any @command{awk} expression, including scalars
-separated by commas (that is, a regular @command{awk} simulated
+The indices can be any @command{awk} expressions, including scalars
+separated by commas (i.e., a regular @command{awk} simulated
 multidimensional subscript). So the following is valid in
 @command{gawk}:
 
@@ -15748,14 +16056,15 @@ a[1][3][1, "name"] = "barney"
 Each subarray and the main array can be of different length. In fact, the
 elements of an array or its subarray do not all have to have the same
 type. This means that the main array and any of its subarrays can be
-non-rectangular, or jagged in structure. One can assign a scalar value to
-the index @code{4} of the main array @code{a}:
+nonrectangular, or jagged in structure. You can assign a scalar value to
+the index @code{4} of the main array @code{a}, even though @code{a[1]}
+is itself an array and not a scalar:
 
 @example
 a[4] = "An element in a jagged array"
 @end example
-  
-The terms @dfn{dimension}, @dfn{row} and @dfn{column} are
+
+The terms @dfn{dimension}, @dfn{row}, and @dfn{column} are
 meaningless when applied
 to such an array, but we will use ``dimension'' henceforth to imply the
 maximum number of indices needed to refer to an existing element. The
@@ -15771,7 +16080,8 @@ a[4][5][6][7] = "An element in a four-dimensional array"
 
 @noindent
 This removes the scalar value from index @code{4} and then inserts a
-subarray of subarray of subarray containing a scalar. You can also
+three-level nested subarray
+containing a scalar. You can also
 delete an entire subarray or subarray of subarrays:
 
 @example
@@ -15782,7 +16092,7 @@ a[4][5] = "An element in subarray a[4]"
 But recall that you can not delete the main array @code{a} and then use it
 as a scalar.
 
-The built-in functions which take array arguments can also be used
+The built-in functions that take array arguments can also be used
 with subarrays. For example, the following code fragment uses @code{length()}
 (@pxref{String Functions})
 to determine the number of elements in the main array @code{a} and
@@ -15811,14 +16121,14 @@ The @samp{for (item in array)} statement (@pxref{Scanning an Array})
 can be nested to scan all the
 elements of an array of arrays if it is rectangular in structure. In order
 to print the contents (scalar values) of a two-dimensional array of arrays
-(i.e., in which each first-level element is itself an 
-array, not necessarily of the same length) 
+(i.e., in which each first-level element is itself an
+array, not necessarily of the same length),
 you could use the following code:
 
 @example
 for (i in array)
     for (j in array[i])
-        print array[i][j] 
+        print array[i][j]
 @end example
 
 The @code{isarray()} function (@pxref{Type Functions})
@@ -15828,15 +16138,17 @@ lets you test if an array element is itself an array:
 for (i in array) @{
     if (isarray(array[i]) @{
         for (j in array[i]) @{
-            print array[i][j] 
+            print array[i][j]
         @}
     @}
+    else
+        print array[i]
 @}
 @end example
 
 If the structure of a jagged array of arrays is known in advance,
 you can often devise workarounds using control statements. For example,
-the following code prints the elements of our main array @code{a}: 
+the following code prints the elements of our main array @code{a}:
 
 @example
 for (i in a) @{
@@ -15846,13 +16158,13 @@ for (i in a) @{
                 print a[i][j][k]
         @} else
             print a[i][j]
-    @} 
+    @}
 @}
 @end example
 
 @noindent
-@xref{Walking Arrays}, for a user-defined function that ``walks'' an
-arbitrarily-dimensioned array of arrays.
+@DBXREF{Walking Arrays} for a user-defined function that ``walks'' an
+arbitrarily dimensioned array of arrays.
 
 Recall that a reference to an uninitialized array element yields a value
 of @code{""}, the null string. This has one important implication when you
@@ -15902,16 +16214,17 @@ special predefined values to @code{PROCINFO["sorted_in"]}.
 
 @item
 Use @samp{delete @var{array}[@var{indx}]} to delete an individual element.
-You may also use @samp{delete @var{array}} to delete all of the elements
-in the array.  This latter feature has been a common extension for many
+To delete all of the elements in an array,
+use @samp{delete @var{array}}.
+This latter feature has been a common extension for many
 years and is now standard, but may not be supported by all commercial
 versions of @command{awk}.
 
 @item
 Standard @command{awk} simulates multidimensional arrays by separating
-subscript values with a comma.  The values are concatenated into a
+subscript values with commas.  The values are concatenated into a
 single string, separated by the value of @code{SUBSEP}.  The fact
-that such a subscript was created in this way is not retained; thus
+that such a subscript was created in this way is not retained; thus,
 changing @code{SUBSEP} may have unexpected consequences.  You can use
 @samp{(@var{sub1}, @var{sub2}, @dots{}) in @var{array}} to see if such
 a multidimensional subscript exists in @var{array}.
@@ -15920,7 +16233,7 @@ a multidimensional subscript exists in @var{array}.
 @command{gawk} provides true arrays of arrays. You use a separate
 set of square brackets for each dimension in such an array:
 @code{data[row][col]}, for example. Array elements may thus be either
-scalar values (number or string) or another array.
+scalar values (number or string) or other arrays.
 
 @item
 Use the @code{isarray()} built-in function to determine if an array
@@ -15928,25 +16241,26 @@ element is itself a subarray.
 
 @end itemize
 
-@c ENDOFRANGE arrs
 
 @node Functions
 @chapter Functions
 
-@c STARTOFRANGE funcbi
 @cindex functions, built-in
-@c STARTOFRANGE bifunc
 @cindex built-in functions
 This @value{CHAPTER} describes @command{awk}'s built-in functions,
 which fall into three categories: numeric, string, and I/O.
 @command{gawk} provides additional groups of functions
 to work with values that represent time, do
-bit manipulation, sort arrays, and internationalize and localize programs.
+bit manipulation, sort arrays,
+provide type information, and internationalize and localize programs.
 
 Besides the built-in functions, @command{awk} has provisions for
 writing new functions that the rest of a program can use.
 The second half of this @value{CHAPTER} describes these
 @dfn{user-defined} functions.
+Finally, we explore indirect function calls, a @command{gawk}-specific
+extension that lets you determine at runtime what function is to
+be called.
 
 @menu
 * Built-in::                    Summarizes the built-in functions.
@@ -15989,7 +16303,7 @@ is a call to the function @code{atan2()} and has two arguments.
 @cindex programming conventions, functions, calling
 @cindex whitespace, functions@comma{} calling
 Whitespace is ignored between the built-in function name and the
-open parenthesis, but nonetheless it is good practice to avoid using whitespace
+opening parenthesis, but nonetheless it is good practice to avoid using whitespace
 there.  User-defined functions do not permit whitespace in this way, and
 it is easier to avoid mistakes by following a simple
 convention that always works---no whitespace after a function name.
@@ -16026,11 +16340,11 @@ right to left.  For example:
 
 @example
 i = 5
-j = atan2(i++, i *= 2)
+j = atan2(++i, i *= 2)
 @end example
 
 If the order of evaluation is left to right, then @code{i} first becomes
-6, and then 12, and @code{atan2()} is called with the two arguments 6
+six, and then 12, and @code{atan2()} is called with the two arguments six
 and 12.  But if the order of evaluation is right to left, @code{i}
 first becomes 10, then 11, and @code{atan2()} is called with the
 two arguments 11 and 10.
@@ -16057,23 +16371,6 @@ You can use @samp{pi = atan2(0, -1)} to retrieve the value of
 @cindex cosine
 Return the cosine of @var{x}, with @var{x} in radians.
 
-@item @code{div(@var{numerator}, @var{denominator}, @var{result})}
-@cindexawkfunc{div}
-@cindex div
-Perform integer division, similar to the standard C function of the
-same name.  First, truncate @code{numerator} and @code{denominator}
-towards zero, creating integer values.  Clear the @code{result}
-array, and then set @code{result["quotient"]} to the result of
-@samp{numerator / denominator}, truncated towards zero to an integer,
-and set @code{result["remainder"]} to the result of @samp{numerator %
-denominator}, truncated towards zero to an integer.  This function is
-primarily intended for use with arbitrary length integers; it avoids
-creating MPFR arbitrary precision floating-point values (@pxref{Arbitrary
-Precision Integers}).
-
-This function is a @code{gawk} extension.  It is not available in
-compatibility mode (@pxref{Options}).
-
 @item @code{exp(@var{x})}
 @cindexawkfunc{exp}
 @cindex exponent
@@ -16086,10 +16383,26 @@ depends on your machine's floating-point representation.
 @cindex round to nearest integer
 Return the nearest integer to @var{x}, located between @var{x} and zero and
 truncated toward zero.
-
 For example, @code{int(3)} is 3, @code{int(3.9)} is 3, @code{int(-3.9)}
 is @minus{}3, and @code{int(-3)} is @minus{}3 as well.
 
+@item @code{intdiv(@var{numerator}, @var{denominator}, @var{result})}
+@cindexawkfunc{intdiv}
+@cindex intdiv
+Perform integer division, similar to the standard C function of the
+same name.  First, truncate @code{numerator} and @code{denominator}
+towards zero, creating integer values.  Clear the @code{result}
+array, and then set @code{result["quotient"]} to the result of
+@samp{numerator / denominator}, truncated towards zero to an integer,
+and set @code{result["remainder"]} to the result of @samp{numerator %
+denominator}, truncated towards zero to an integer.  This function is
+primarily intended for use with arbitrary length integers; it avoids
+creating MPFR arbitrary precision floating-point values (@pxref{Arbitrary
+Precision Integers}).
+
+This function is a @code{gawk} extension.  It is not available in
+compatibility mode (@pxref{Options}).
+
 @item @code{log(@var{x})}
 @cindexawkfunc{log}
 @cindex logarithm
@@ -16112,17 +16425,18 @@ In fact, @command{gawk} uses the BSD @code{random()} function, which is
 considerably better than @code{rand()}, to produce random numbers.}
 
 Often random integers are needed instead.  Following is a user-defined function
-that can be used to obtain a random non-negative integer less than @var{n}:
+that can be used to obtain a random nonnegative integer less than @var{n}:
 
 @example
-function randint(n) @{
-     return int(n * rand())
+function randint(n)
+@{
+    return int(n * rand())
 @}
 @end example
 
 @noindent
-The multiplication produces a random number greater than zero and less
-than @code{n}.  Using @code{int()}, this result is made into
+The multiplication produces a random number greater than or equal to
+zero and less than @code{n}.  Using @code{int()}, this result is made into
 an integer between zero and @code{n} @minus{} 1, inclusive.
 
 The following example uses a similar function to produce random integers
@@ -16136,8 +16450,7 @@ function roll(n) @{ return 1 + int(rand() * n) @}
 # Roll 3 six-sided dice and
 # print total number of points.
 @{
-      printf("%d points\n",
-             roll(6)+roll(6)+roll(6))
+    printf("%d points\n", roll(6) + roll(6) + roll(6))
 @}
 @end example
 
@@ -16175,8 +16488,8 @@ for generating random numbers to the value @var{x}.
 
 Each seed value leads to a particular sequence of random
 numbers.@footnote{Computer-generated random numbers really are not truly
-random.  They are technically known as ``pseudorandom.''  This means
-that while the numbers in a sequence appear to be random, you can in
+random.  They are technically known as @dfn{pseudorandom}.  This means
+that although the numbers in a sequence appear to be random, you can in
 fact generate the same sequence of random numbers over and over again.}
 Thus, if the seed is set to the same value a second time,
 the same sequence of random numbers is produced again.
@@ -16207,7 +16520,7 @@ implementations.
 The functions in this @value{SECTION} look at or change the text of one
 or more strings.
 
-@code{gawk} understands locales (@pxref{Locales}), and does all
+@command{gawk} understands locales (@pxref{Locales}) and does all
 string processing in terms of @emph{characters}, not @emph{bytes}.
 This distinction is particularly important to understand for locales
 where one character may be represented by multiple bytes.  Thus, for
@@ -16226,7 +16539,7 @@ doing index calculations, particularly if you are used to C.
 In the following list, optional parameters are enclosed in square brackets@w{ ([ ]).}
 Several functions perform string substitution; the full discussion is
 provided in the description of the @code{sub()} function, which comes
-towards the end since the list is presented in alphabetic order.
+toward the end, because the list is presented alphabetically.
 
 Those functions that are specific to @command{gawk} are marked with a
 pound sign (@samp{#}).  They are not available in compatibility mode
@@ -16252,10 +16565,10 @@ These two functions are similar in behavior, so they are described
 together.
 
 @quotation NOTE
-The following description ignores the third argument, @var{how}, since it
+The following description ignores the third argument, @var{how}, as it
 requires understanding features that we have not discussed yet.  Thus,
 the discussion here is a deliberate simplification.  (We do provide all
-the details later on: @xref{Array Sorting Functions}, for the full story.)
+the details later on; see @DBREF{Array Sorting Functions} for the full story.)
 @end quotation
 
 Both functions return the number of elements in the array @var{source}.
@@ -16270,6 +16583,7 @@ When comparing strings, @code{IGNORECASE} affects the sorting
 (@pxref{Array Sorting Functions}).  If the
 @var{source} array contains subarrays as values (@pxref{Arrays of
 Arrays}), they will come last, after all scalar values.
+Subarrays are @emph{not} recursively sorted.
 
 For example, if the contents of @code{a} are as follows:
 
@@ -16295,7 +16609,7 @@ a[2] = "de"
 a[3] = "sac"
 @end example
 
-The @code{asorti()} function works similarly to @code{asort()}, however,
+The @code{asorti()} function works similarly to @code{asort()}; however,
 the @emph{indices} are sorted, instead of the values. Thus, in the
 previous example, starting with the same initial set of indices and
 values in @code{a}, calling @samp{asorti(a)} would yield:
@@ -16406,7 +16720,11 @@ $ @kbd{awk 'BEGIN @{ print index("peanut", "an") @}'}
 @noindent
 If @var{find} is not found, @code{index()} returns zero.
 
-It is a fatal error to use a regexp constant for @var{find}.
+@cindex dark corner, regexp as second argument to @code{index()}
+With BWK @command{awk} and @command{gawk},
+it is a fatal error to use a regexp constant for @var{find}.
+Other implementations allow it, simply treating the regexp
+constant as an expression meaning @samp{$0 ~ /regexp/}. @value{DARKCORNER}
 
 @item @code{length(}[@var{string}]@code{)}
 @cindexawkfunc{length}
@@ -16489,7 +16807,7 @@ If @option{--posix} is supplied, using an array argument is a fatal error
 @cindex string, regular expression match
 @cindex match regexp in string
 Search @var{string} for the
-longest, leftmost substring matched by the regular expression,
+longest, leftmost substring matched by the regular expression
 @var{regexp} and return the character position (index)
 at which that substring begins (one, if it starts at the beginning of
 @var{string}).  If no match is found, return zero.
@@ -16497,11 +16815,11 @@ at which that substring begins (one, if it starts at the beginning of
 The @var{regexp} argument may be either a regexp constant
 (@code{/}@dots{}@code{/}) or a string constant (@code{"}@dots{}@code{"}).
 In the latter case, the string is treated as a regexp to be matched.
-@xref{Computed Regexps}, for a
+@DBXREF{Computed Regexps} for a
 discussion of the difference between the two forms, and the
 implications for writing your program correctly.
 
-The order of the first two arguments is backwards from most other string
+The order of the first two arguments is the opposite of most other string
 functions that work with regular expressions, such as
 @code{sub()} and @code{gsub()}.  It might help to remember that
 for @code{match()}, the order is the same as for the @samp{~} operator:
@@ -16510,8 +16828,8 @@ for @code{match()}, the order is the same as for the @samp{~} operator:
 @cindex @code{RSTART} variable, @code{match()} function and
 @cindex @code{RLENGTH} variable, @code{match()} function and
 @cindex @code{match()} function, @code{RSTART}/@code{RLENGTH} variables
-The @code{match()} function sets the built-in variable @code{RSTART} to
-the index.  It also sets the built-in variable @code{RLENGTH} to the
+The @code{match()} function sets the predefined variable @code{RSTART} to
+the index.  It also sets the predefined variable @code{RLENGTH} to the
 length in characters of the matched substring.  If no match is found,
 @code{RSTART} is set to zero, and @code{RLENGTH} to @minus{}1.
 
@@ -16520,13 +16838,12 @@ For example:
 @example
 @c file eg/misc/findpat.awk
 @{
-       if ($1 == "FIND")
-         regex = $2
-       else @{
-         where = match($0, regex)
-         if (where != 0)
-           print "Match of", regex, "found at",
-                     where, "in", $0
+    if ($1 == "FIND")
+        regex = $2
+    else @{
+        where = match($0, regex)
+        if (where != 0)
+            print "Match of", regex, "found at", where, "in", $0
        @}
 @}
 @c endfile
@@ -16591,7 +16908,7 @@ $ @kbd{echo foooobazbarrrrr |}
 @end example
 
 There may not be subscripts for the start and index for every parenthesized
-subexpression, since they may not all have matched text; thus they
+subexpression, because they may not all have matched text; thus, they
 should be tested for with the @code{in} operator
 (@pxref{Reference to Elements}).
 
@@ -16622,7 +16939,7 @@ Any leading separator will be in @code{@var{seps}[0]}.
 
 The @code{patsplit()} function splits strings into pieces in a
 manner similar to the way input lines are split into fields using @code{FPAT}
-(@pxref{Splitting By Content}.
+(@pxref{Splitting By Content}).
 
 Before splitting the string, @code{patsplit()} deletes any previously existing
 elements in the arrays @var{array} and @var{seps}.
@@ -16635,19 +16952,18 @@ and store the pieces in @var{array} and the separator strings in the
 @code{@var{array}[1]}, the second piece in @code{@var{array}[2]}, and so
 forth.  The string value of the third argument, @var{fieldsep}, is
 a regexp describing where to split @var{string} (much as @code{FS} can
-be a regexp describing where to split input records;
-@pxref{Regexp Field Splitting}).
+be a regexp describing where to split input records).
 If @var{fieldsep} is omitted, the value of @code{FS} is used.
 @code{split()} returns the number of elements created.
-@var{seps} is a @command{gawk} extension with @code{@var{seps}[@var{i}]} 
+@var{seps} is a @command{gawk} extension, with @code{@var{seps}[@var{i}]}
 being the separator string
-between @code{@var{array}[@var{i}]} and @code{@var{array}[@var{i}+1]}. 
+between @code{@var{array}[@var{i}]} and @code{@var{array}[@var{i}+1]}.
 If @var{fieldsep} is a single
-space then any leading whitespace goes into @code{@var{seps}[0]} and 
+space, then any leading whitespace goes into @code{@var{seps}[0]} and
 any trailing
-whitespace goes into @code{@var{seps}[@var{n}]} where @var{n} is the 
-return value of 
-@code{split()} (that is, the number of elements in @var{array}).
+whitespace goes into @code{@var{seps}[@var{n}]}, where @var{n} is the
+return value of
+@code{split()} (i.e., the number of elements in @var{array}).
 
 The @code{split()} function splits strings into pieces in a
 manner similar to the way input lines are split into fields.  For example:
@@ -16658,7 +16974,7 @@ split("cul-de-sac", a, "-", seps)
 
 @noindent
 @cindex strings splitting, example
-splits the string @samp{cul-de-sac} into three fields using @samp{-} as the
+splits the string @code{"cul-de-sac"} into three fields using @samp{-} as the
 separator.  It sets the contents of the array @code{a} as follows:
 
 @example
@@ -16683,21 +16999,20 @@ As with input field-splitting, when the value of @var{fieldsep} is
 the elements of
 @var{array} but not in @var{seps}, and the elements
 are separated by runs of whitespace.
-Also as with input field-splitting, if @var{fieldsep} is the null string, each
+Also, as with input field splitting, if @var{fieldsep} is the null string, each
 individual character in the string is split into its own array element.
 @value{COMMONEXT}
 
 Note, however, that @code{RS} has no effect on the way @code{split()}
-works. Even though @samp{RS = ""} causes newline to also be an input
+works. Even though @samp{RS = ""} causes the newline character to also be an input
 field separator, this does not affect how @code{split()} splits strings.
 
 @cindex dark corner, @code{split()} function
 Modern implementations of @command{awk}, including @command{gawk}, allow
-the third argument to be a regexp constant (@code{/abc/}) as well as a
-string.
-@value{DARKCORNER}
+the third argument to be a regexp constant (@w{@code{/}@dots{}@code{/}})
+as well as a string.  @value{DARKCORNER}
 The POSIX standard allows this as well.
-@xref{Computed Regexps}, for a
+@DBXREF{Computed Regexps} for a
 discussion of the difference between using a string constant or a regexp constant,
 and the implications for writing your program correctly.
 
@@ -16748,7 +17063,7 @@ Using the @code{strtonum()} function is @emph{not} the same as adding zero
 to a string value; the automatic coercion of strings to numbers
 works only for decimal data, not for octal or hexadecimal.@footnote{Unless
 you use the @option{--non-decimal-data} option, which isn't recommended.
-@xref{Nondecimal Data}, for more information.}
+@DBXREF{Nondecimal Data} for more information.}
 
 Note also that @code{strtonum()} uses the current locale's decimal point
 for recognizing numbers (@pxref{Locales}).
@@ -16766,7 +17081,7 @@ Return the number of substitutions made (zero or one).
 The @var{regexp} argument may be either a regexp constant
 (@code{/}@dots{}@code{/}) or a string constant (@code{"}@dots{}@code{"}).
 In the latter case, the string is treated as a regexp to be matched.
-@xref{Computed Regexps}, for a
+@DBXREF{Computed Regexps} for a
 discussion of the difference between the two forms, and the
 implications for writing your program correctly.
 
@@ -16832,7 +17147,7 @@ an @samp{&}:
 @cindex @code{sub()} function, arguments of
 @cindex @code{gsub()} function, arguments of
 As mentioned, the third argument to @code{sub()} must
-be a variable, field or array element.
+be a variable, field, or array element.
 Some versions of @command{awk} allow the third argument to
 be an expression that is not an lvalue.  In such a case, @code{sub()}
 still searches for the pattern and returns zero or one, but the result of
@@ -16931,8 +17246,28 @@ Nonalphabetic characters are left unchanged.  For example,
 @code{toupper("MiXeD cAsE 123")} returns @code{"MIXED CASE 123"}.
 @end table
 
+@sidebar Matching the Null String
+@cindex matching, null strings
+@cindex null strings, matching
+@cindex @code{*} (asterisk), @code{*} operator, null strings@comma{} matching
+@cindex asterisk (@code{*}), @code{*} operator, null strings@comma{} matching
+
+In @command{awk}, the @samp{*} operator can match the null string.
+This is particularly important for the @code{sub()}, @code{gsub()},
+and @code{gensub()} functions.  For example:
+
+@example
+$ @kbd{echo abc | awk '@{ gsub(/m*/, "X"); print @}'}
+@print{} XaXbXcX
+@end example
+
+@noindent
+Although this makes a certain amount of sense, it can be surprising.
+@end sidebar
+
+
 @node Gory Details
-@subsubsection More About @samp{\} and @samp{&} with @code{sub()}, @code{gsub()}, and @code{gensub()}
+@subsubsection More about @samp{\} and @samp{&} with @code{sub()}, @code{gsub()}, and @code{gensub()}
 
 @cindex escape processing, @code{gsub()}/@code{gensub()}/@code{sub()} functions
 @cindex @code{sub()} function, escape processing
@@ -16944,7 +17279,7 @@ Nonalphabetic characters are left unchanged.  For example,
 @cindex ampersand (@code{&}), @code{gsub()}/@code{gensub()}/@code{sub()} functions and
 
 @quotation CAUTION
-This section has been known to cause headaches.
+This subsubsection has been reported to cause headaches.
 You might want to skip it upon first reading.
 @end quotation
 
@@ -16971,15 +17306,15 @@ example, @code{"a\qb"} is treated as @code{"aqb"}.
 
 At the runtime level, the various functions handle sequences of
 @samp{\} and @samp{&} differently.  The situation is (sadly) somewhat complex.
-Historically, the @code{sub()} and @code{gsub()} functions treated the two
-character sequence @samp{\&} specially; this sequence was replaced in
+Historically, the @code{sub()} and @code{gsub()} functions treated the
+two-character sequence @samp{\&} specially; this sequence was replaced in
 the generated text with a single @samp{&}.  Any other @samp{\} within
 the @var{replacement} string that did not precede an @samp{&} was passed
 through unchanged.  This is illustrated in @ref{table-sub-escapes}.
 
 @c Thank to Karl Berry for help with the TeX stuff.
 @float Table,table-sub-escapes
-@caption{Historical Escape Sequence Processing for @code{sub()} and @code{gsub()}}
+@caption{Historical escape sequence processing for @code{sub()} and @code{gsub()}}
 @tex
 \vbox{\bigskip
 % We need more characters for escape and tab ...
@@ -17030,7 +17365,7 @@ _bigskip}
 @end float
 
 @noindent
-This table shows both the lexical-level processing, where
+This table shows the lexical-level processing, where
 an odd number of backslashes becomes an even number at the runtime level,
 as well as the runtime processing done by @code{sub()}.
 (For the sake of simplicity, the rest of the following tables only show the
@@ -17051,7 +17386,7 @@ This is shown in
 @ref{table-sub-proposed}.
 
 @float Table,table-sub-proposed
-@caption{GNU @command{awk} Rules For @code{sub()} And Backslash}
+@caption{@command{gawk} rules for @code{sub()} and backslash}
 @tex
 \vbox{\bigskip
 % We need more characters for escape and tab ...
@@ -17096,7 +17431,7 @@ _bigskip}
 @end float
 
 In a nutshell, at the runtime level, there are now three special sequences
-of characters (@samp{\\\&}, @samp{\\&} and @samp{\&}) whereas historically
+of characters (@samp{\\\&}, @samp{\\&}, and @samp{\&}) whereas historically
 there was only one.  However, as in the historical case, any @samp{\} that
 is not part of one of these three sequences is not special and appears
 in the output literally.
@@ -17114,7 +17449,7 @@ by anything else is not special; the @samp{\} is placed straight into the output
 These rules are presented in @ref{table-posix-sub}.
 
 @float Table,table-posix-sub
-@caption{POSIX Rules For @code{sub()} And @code{gsub()}}
+@caption{POSIX rules for @code{sub()} and @code{gsub()}}
 @tex
 \vbox{\bigskip
 % We need more characters for escape and tab ...
@@ -17162,13 +17497,13 @@ The only case where the difference is noticeable is the last one: @samp{\\\\}
 is seen as @samp{\\} and produces @samp{\} instead of @samp{\\}.
 
 Starting with @value{PVERSION} 3.1.4, @command{gawk} followed the POSIX rules
-when @option{--posix} is specified (@pxref{Options}). Otherwise,
-it continued to follow the proposed rules, since
+when @option{--posix} was specified (@pxref{Options}). Otherwise,
+it continued to follow the proposed rules, as
 that had been its behavior for many years.
 
 When @value{PVERSION} 4.0.0 was released, the @command{gawk} maintainer
 made the POSIX rules the default, breaking well over a decade's worth
-of backwards compatibility.@footnote{This was rather naive of him, despite
+of backward compatibility.@footnote{This was rather naive of him, despite
 there being a note in this section indicating that the next major version
 would move to the POSIX rules.} Needless to say, this was a bad idea,
 and as of @value{PVERSION} 4.0.1, @command{gawk} resumed its historical
@@ -17183,7 +17518,7 @@ appears in the generated text and the @samp{\} does not,
 as shown in @ref{table-gensub-escapes}.
 
 @float Table,table-gensub-escapes
-@caption{Escape Sequence Processing For @code{gensub()}}
+@caption{Escape sequence processing for @code{gensub()}}
 @tex
 \vbox{\bigskip
 % We need more characters for escape and tab ...
@@ -17230,30 +17565,11 @@ _bigskip}
 @end ifnottex
 @end float
 
-Because of the complexity of the lexical and runtime level processing
+Because of the complexity of the lexical- and runtime-level processing
 and the special cases for @code{sub()} and @code{gsub()},
 we recommend the use of @command{gawk} and @code{gensub()} when you have
 to do substitutions.
 
-@sidebar Matching the Null String
-@cindex matching, null strings
-@cindex null strings, matching
-@cindex @code{*} (asterisk), @code{*} operator, null strings@comma{} matching
-@cindex asterisk (@code{*}), @code{*} operator, null strings@comma{} matching
-
-In @command{awk}, the @samp{*} operator can match the null string.
-This is particularly important for the @code{sub()}, @code{gsub()},
-and @code{gensub()} functions.  For example:
-
-@example
-$ @kbd{echo abc | awk '@{ gsub(/m*/, "X"); print @}'}
-@print{} XaXbXcX
-@end example
-
-@noindent
-Although this makes a certain amount of sense, it can be surprising.
-@end sidebar
-
 @node I/O Functions
 @subsection Input/Output Functions
 @cindex input/output functions
@@ -17269,12 +17585,13 @@ Optional parameters are enclosed in square brackets ([ ]):
 Close the file @var{filename} for input or output. Alternatively, the
 argument may be a shell command that was used for creating a coprocess, or
 for redirecting to or from a pipe; then the coprocess or pipe is closed.
-@xref{Close Files And Pipes},
+@DBXREF{Close Files And Pipes}
 for more information.
 
 When closing a coprocess, it is occasionally useful to first close
 one end of the two-way pipe and then to close the other.  This is done
 by providing a second argument to @code{close()}.  This second argument
+(@var{how})
 should be one of the two string values @code{"to"} or @code{"from"},
 indicating which end of the pipe to close.  Case in the string does
 not matter.
@@ -17293,26 +17610,25 @@ a pipe or coprocess.
 
 @cindex buffers, flushing
 @cindex output, buffering
-Many utility programs @dfn{buffer} their output; i.e., they save information
+Many utility programs @dfn{buffer} their output (i.e., they save information
 to write to a disk file or the screen in memory until there is enough
-for it to be worthwhile to send the data to the output device.
+for it to be worthwhile to send the data to the output device).
 This is often more efficient than writing
 every little bit of information as soon as it is ready.  However, sometimes
-it is necessary to force a program to @dfn{flush} its buffers; that is,
-write the information to its destination, even if a buffer is not full.
+it is necessary to force a program to @dfn{flush} its buffers (i.e.,
+write the information to its destination, even if a buffer is not full).
 This is the purpose of the @code{fflush()} function---@command{gawk} also
-buffers its output and the @code{fflush()} function forces
+buffers its output, and the @code{fflush()} function forces
 @command{gawk} to flush its buffers.
 
 @cindex extensions, common@comma{} @code{fflush()} function
 @cindex Brian Kernighan's @command{awk}
-@code{fflush()} was added to BWK @command{awk} in
-April of 1992.  For two decades, it was not part of the POSIX standard.
-As of December, 2012, it was accepted for inclusion into the POSIX
-standard.
+Brian Kernighan added @code{fflush()} to his @command{awk} in April
+1992.  For two decades, it was a common extension.  In December
+2012, it was accepted for inclusion into the POSIX standard.
 See @uref{http://austingroupbugs.net/view.php?id=634, the Austin Group website}.
 
-POSIX standardizes @code{fflush()} as follows: If there
+POSIX standardizes @code{fflush()} as follows: if there
 is no argument, or if the argument is the null string (@w{@code{""}}),
 then @command{awk} flushes the buffers for @emph{all} open output files
 and pipes.
@@ -17323,7 +17639,7 @@ would flush only the standard output if there was no argument,
 and flush all output files and pipes if the argument was the null
 string. This was changed in order to be compatible with Brian
 Kernighan's @command{awk}, in the hope that standardizing this
-feature in POSIX would then be easier (which indeed helped).
+feature in POSIX would then be easier (which indeed proved to be the case).
 
 With @command{gawk},
 you can use @samp{fflush("/dev/stdout")} if you wish to flush
@@ -17334,7 +17650,7 @@ only the standard output.
 @c @cindex warnings, automatic
 @cindex troubleshooting, @code{fflush()} function
 @code{fflush()} returns zero if the buffer is successfully flushed;
-otherwise, it returns non-zero. (@command{gawk} returns @minus{}1.)
+otherwise, it returns a nonzero value. (@command{gawk} returns @minus{}1.)
 In the case where all buffers are flushed, the return value is zero
 only if all buffers were flushed successfully.  Otherwise, it is
 @minus{}1, and @command{gawk} warns about the problem @var{filename}.
@@ -17344,11 +17660,54 @@ a file or pipe that was opened for reading (such as with @code{getline}),
 or if @var{filename} is not an open file, pipe, or coprocess.
 In such a case, @code{fflush()} returns @minus{}1, as well.
 
+@sidebar Interactive Versus Noninteractive Buffering
+@cindex buffering, interactive vs.@: noninteractive
+
+As a side point, buffering issues can be even more confusing if
+your program is @dfn{interactive} (i.e., communicating
+with a user sitting at a keyboard).@footnote{A program is interactive
+if the standard output is connected to a terminal device. On modern
+systems, this means your keyboard and screen.}
+
+@c Thanks to Walter.Mecky@dresdnerbank.de for this example, and for
+@c motivating me to write this section.
+Interactive programs generally @dfn{line buffer} their output (i.e., they
+write out every line).  Noninteractive programs wait until they have
+a full buffer, which may be many lines of output.
+Here is an example of the difference:
+
+@example
+$ @kbd{awk '@{ print $1 + $2 @}'}
+@kbd{1 1}
+@print{} 2
+@kbd{2 3}
+@print{} 5
+@kbd{Ctrl-d}
+@end example
+
+@noindent
+Each line of output is printed immediately. Compare that behavior
+with this example:
+
+@example
+$ @kbd{awk '@{ print $1 + $2 @}' | cat}
+@kbd{1 1}
+@kbd{2 3}
+@kbd{Ctrl-d}
+@print{} 2
+@print{} 5
+@end example
+
+@noindent
+Here, no output is printed until after the @kbd{Ctrl-d} is typed, because
+it is all buffered and sent down the pipe to @command{cat} in one shot.
+@end sidebar
+
 @item @code{system(@var{command})}
 @cindexawkfunc{system}
 @cindex invoke shell command
 @cindex interacting with other programs
-Execute the operating-system
+Execute the operating system
 command @var{command} and then return to the @command{awk} program.
 Return @var{command}'s exit status.
 
@@ -17391,49 +17750,6 @@ When @option{--sandbox} is specified, the @code{system()} function is disabled
 
 @end table
 
-@sidebar Interactive Versus Noninteractive Buffering
-@cindex buffering, interactive vs.@: noninteractive
-
-As a side point, buffering issues can be even more confusing, depending
-upon whether your program is @dfn{interactive}, i.e., communicating
-with a user sitting at a keyboard.@footnote{A program is interactive
-if the standard output is connected to a terminal device. On modern
-systems, this means your keyboard and screen.}
-
-@c Thanks to Walter.Mecky@dresdnerbank.de for this example, and for
-@c motivating me to write this section.
-Interactive programs generally @dfn{line buffer} their output; i.e., they
-write out every line.  Noninteractive programs wait until they have
-a full buffer, which may be many lines of output.
-Here is an example of the difference:
-
-@example
-$ @kbd{awk '@{ print $1 + $2 @}'}
-@kbd{1 1}
-@print{} 2
-@kbd{2 3}
-@print{} 5
-@kbd{Ctrl-d}
-@end example
-
-@noindent
-Each line of output is printed immediately. Compare that behavior
-with this example:
-
-@example
-$ @kbd{awk '@{ print $1 + $2 @}' | cat}
-@kbd{1 1}
-@kbd{2 3}
-@kbd{Ctrl-d}
-@print{} 2
-@print{} 5
-@end example
-
-@noindent
-Here, no output is printed until after the @kbd{Ctrl-d} is typed, because
-it is all buffered and sent down the pipe to @command{cat} in one shot.
-@end sidebar
-
 @sidebar Controlling Output Buffering with @code{system()}
 @cindex buffers, flushing
 @cindex buffering, input/output
@@ -17452,7 +17768,7 @@ system("")   # flush output
 @command{gawk} treats this use of the @code{system()} function as a special
 case and is smart enough not to run a shell (or other command
 interpreter) with the empty command.  Therefore, with @command{gawk}, this
-idiom is not only useful, it is also efficient.  While this method should work
+idiom is not only useful, it is also efficient.  Although this method should work
 with other @command{awk} implementations, it does not necessarily avoid
 starting an unnecessary shell.  (Other implementations may only
 flush the buffer associated with the standard output and not necessarily
@@ -17495,18 +17811,14 @@ you would see the latter (undesirable) output.
 @subsection Time Functions
 @cindex time functions
 
-@c STARTOFRANGE tst
 @cindex timestamps
-@c STARTOFRANGE logftst
 @cindex log files, timestamps in
-@c STARTOFRANGE filogtst
 @cindex files, log@comma{} timestamps in
-@c STARTOFRANGE gawtst
 @cindex @command{gawk}, timestamps
 @cindex POSIX @command{awk}, timestamps and
-@code{awk} programs are commonly used to process log files
+@command{awk} programs are commonly used to process log files
 containing timestamp information, indicating when a
-particular log record was written.  Many programs log their timestamp
+particular log record was written.  Many programs log their timestamps
 in the form returned by the @code{time()} system call, which is the
 number of seconds since a particular epoch.  On POSIX-compliant systems,
 it is the number of seconds since
@@ -17533,6 +17845,7 @@ which is sufficient to represent times through
 2038-01-19 03:14:07 UTC.  Many systems support a wider range of timestamps,
 including negative timestamps that represent times before the
 epoch.
+@c FIXME: Use @sup here for superscript
 
 @cindex @command{date} utility, GNU
 @cindex time, retrieving
@@ -17567,7 +17880,7 @@ The values of these numbers need not be within the ranges specified;
 for example, an hour of @minus{}1 means 1 hour before midnight.
 The origin-zero Gregorian calendar is assumed, with year 0 preceding
 year 1 and year @minus{}1 preceding year 0.
-The time is assumed to be in the local timezone.
+The time is assumed to be in the local time zone.
 If the daylight-savings flag is positive, the time is assumed to be
 daylight savings time; if zero, the time is assumed to be standard
 time; and if negative (the default), @code{mktime()} attempts to determine
@@ -17578,8 +17891,7 @@ is out of range, @code{mktime()} returns @minus{}1.
 
 @cindex @command{gawk}, @code{PROCINFO} array in
 @cindex @code{PROCINFO} array
-@item @code{strftime(} [@var{format} [@code{,} @var{timestamp} [@code{,} @var{utc-flag}] ] ]@code{)}
-@c STARTOFRANGE strf
+@item @code{strftime(}[@var{format} [@code{,} @var{timestamp} [@code{,} @var{utc-flag}] ] ]@code{)}
 @cindexgawkfunc{strftime}
 @cindex format time string
 Format the time specified by @var{timestamp}
@@ -17591,14 +17903,14 @@ Mean Time). Otherwise, the value is formatted for the local time zone.
 The @var{timestamp} is in the same format as the value returned by the
 @code{systime()} function.  If no @var{timestamp} argument is supplied,
 @command{gawk} uses the current time of day as the timestamp.
-If no @var{format} argument is supplied, @code{strftime()} uses
+Without a @var{format} argument, @code{strftime()} uses
 the value of @code{PROCINFO["strftime"]} as the format string
 (@pxref{Built-in Variables}).
 The default string value is
 @code{@w{"%a %b %e %H:%M:%S %Z %Y"}}.  This format string produces
 output that is equivalent to that of the @command{date} utility.
 You can assign a new value to @code{PROCINFO["strftime"]} to
-change the default format; see below for the various format directives.
+change the default format; see the following list for the various format directives.
 
 @item @code{systime()}
 @cindexgawkfunc{systime}
@@ -17675,9 +17987,9 @@ This is the ISO 8601 date format.
 
 @item %g
 The year modulo 100 of the ISO 8601 week number, as a decimal number (00--99).
-For example, January 1, 2012 is in week 53 of 2011. Thus, the year
+For example, January 1, 2012, is in week 53 of 2011. Thus, the year
 of its ISO 8601 week number is 2011, even though its year is 2012.
-Similarly, December 31, 2012 is in week 1 of 2013. Thus, the year
+Similarly, December 31, 2012, is in week 1 of 2013. Thus, the year
 of its ISO week number is 2013, even though its year is 2012.
 
 @item %G
@@ -17728,12 +18040,12 @@ Equivalent to specifying @samp{%H:%M:%S}.
 The weekday as a decimal number (1--7).  Monday is day one.
 
 @item %U
-The week number of the year (the first Sunday as the first day of week one)
+The week number of the year (with the first Sunday as the first day of week one)
 as a decimal number (00--53).
 
 @c @cindex ISO 8601
 @item %V
-The week number of the year (the first Monday as the first
+The week number of the year (with the first Monday as the first
 day of week one) as a decimal number (01--53).
 The method for determining the week number is as specified by ISO 8601.
 (To wit: if the week containing January 1 has four or more days in the
@@ -17744,7 +18056,7 @@ and the next week is week one.)
 The weekday as a decimal number (0--6).  Sunday is day zero.
 
 @item %W
-The week number of the year (the first Monday as the first day of week one)
+The week number of the year (with the first Monday as the first day of week one)
 as a decimal number (00--53).
 
 @item %x
@@ -17764,8 +18076,8 @@ The full year as a decimal number (e.g., 2015).
 @c @cindex RFC 822
 @c @cindex RFC 1036
 @item %z
-The timezone offset in a +HHMM format (e.g., the format necessary to
-produce RFC 822/RFC 1036 date headers).
+The time zone offset in a @samp{+@var{HHMM}} format (e.g., the format
+necessary to produce RFC 822/RFC 1036 date headers).
 
 @item %Z
 The time zone name or abbreviation; no characters if
@@ -17773,7 +18085,7 @@ no time zone is determinable.
 
 @item %Ec %EC %Ex %EX %Ey %EY %Od %Oe %OH
 @itemx %OI %Om %OM %OS %Ou %OU %OV %Ow %OW %Oy
-``Alternate representations'' for the specifications
+``Alternative representations'' for the specifications
 that use only the second letter (@samp{%c}, @samp{%C},
 and so on).@footnote{If you don't understand any of this, don't worry about
 it; these facilities are meant to make it easier to ``internationalize''
@@ -17786,7 +18098,7 @@ Other internationalization features are described in
 A literal @samp{%}.
 @end table
 
-If a conversion specifier is not one of the above, the behavior is
+If a conversion specifier is not one of those just listed, the behavior is
 undefined.@footnote{This is because ISO C leaves the
 behavior of the C version of @code{strftime()} undefined and @command{gawk}
 uses the system's version of @code{strftime()} if it's there.
@@ -17813,11 +18125,11 @@ Single-digit numbers are padded with a space.
 @ignore
 @item %N
 The ``Emperor/Era'' name.
-Equivalent to @code{%C}.
+Equivalent to @samp{%C}.
 
 @item %o
 The ``Emperor/Era'' year.
-Equivalent to @code{%y}.
+Equivalent to @samp{%y}.
 @end ignore
 
 @item %s
@@ -17828,9 +18140,8 @@ The time as a decimal timestamp in seconds since the epoch.
 The date in VMS format (e.g., @samp{20-JUN-1991}).
 @end ignore
 @end table
-@c ENDOFRANGE strf
 
-Additionally, the alternate representations are recognized but their
+Additionally, the alternative representations are recognized but their
 normal representations are used.
 
 @cindex @code{date} utility, POSIX
@@ -17844,8 +18155,8 @@ interprets the current time according to the format specifiers in
 the string.  For example:
 
 @example
-$ date '+Today is %A, %B %d, %Y.'
-@print{} Today is Monday, May 05, 2014.
+$ @kbd{date '+Today is %A, %B %d, %Y.'}
+@print{} Today is Monday, September 22, 2014.
 @end example
 
 Here is the @command{gawk} version of the @command{date} utility.
@@ -17879,23 +18190,14 @@ gawk 'BEGIN  @{
     exit exitval
 @}' "$@@"
 @end example
-@c ENDOFRANGE tst
-@c ENDOFRANGE logftst
-@c ENDOFRANGE filogtst
-@c ENDOFRANGE gawtst
 
 @node Bitwise Functions
 @subsection Bit-Manipulation Functions
 @cindex bit-manipulation functions
-@c STARTOFRANGE bit
 @cindex bitwise, operations
-@c STARTOFRANGE and
 @cindex AND bitwise operation
-@c STARTOFRANGE oro
 @cindex OR bitwise operation
-@c STARTOFRANGE xor
 @cindex XOR bitwise operation
-@c STARTOFRANGE opbit
 @cindex operations, bitwise
 @quotation
 @i{I can explain it for you, but I can't understand it for you.}
@@ -17908,12 +18210,14 @@ each successive pair of bits in the operands.
 Three common operations are bitwise AND, OR, and XOR.
 The operations are described in @ref{table-bitwise-ops}.
 
+@c 11/2014: Postprocessing turns the docbook informaltable
+@c into a table. Hurray for scripting!
 @float Table,table-bitwise-ops
-@caption{Bitwise Operations}
+@caption{Bitwise operations}
 @ifnottex
 @ifnotdocbook
 @display
-                Bit Operator
+                Bit operator
           |  AND  |   OR  |  XOR
           |---+---+---+---+---+---
 Operands  | 0 | 1 | 0 | 1 | 0 | 1
@@ -17971,7 +18275,7 @@ Operands  | 0 | 1 | 0 | 1 | 0 | 1
 <tbody>
 <row>
 <entry colsep="0"></entry>
-<entry spanname="optitle"><emphasis role="bold">Bit Operator</emphasis></entry>
+<entry spanname="optitle"><emphasis role="bold">Bit operator</emphasis></entry>
 </row>
 
 <row rowsep="1">
@@ -18035,21 +18339,19 @@ of a given value.
 Finally, two other common operations are to shift the bits left or right.
 For example, if you have a bit string @samp{10111001} and you shift it
 right by three bits, you end up with @samp{00010111}.@footnote{This example
-shows that 0's come in on the left side. For @command{gawk}, this is
+shows that zeros come in on the left side. For @command{gawk}, this is
 always true, but in some languages, it's possible to have the left side
-fill with 1's. Caveat emptor.}
-@c Purposely decided to use   0's   and   1's   here.  2/2001.
-If you start over
-again with @samp{10111001} and shift it left by three bits, you end up
-with @samp{11001000}.
-@command{gawk} provides built-in functions that implement the
-bitwise operations just described. They are:
+fill with ones.}
+If you start over again with @samp{10111001} and shift it left by three
+bits, you end up with @samp{11001000}.  The following list describes
+@command{gawk}'s built-in functions that implement the bitwise operations.
+Optional parameters are enclosed in square brackets ([ ]):
 
 @cindex @command{gawk}, bitwise operations in
 @table @code
 @cindexgawkfunc{and}
 @cindex bitwise AND
-@item @code{and(@var{v1}, @var{v2}} [@code{,} @dots{}]@code{)}
+@item @code{and(}@var{v1}@code{,} @var{v2} [@code{,} @dots{}]@code{)}
 Return the bitwise AND of the arguments. There must be at least two.
 
 @cindexgawkfunc{compl}
@@ -18064,7 +18366,7 @@ Return the value of @var{val}, shifted left by @var{count} bits.
 
 @cindexgawkfunc{or}
 @cindex bitwise OR
-@item @code{or(@var{v1}, @var{v2}} [@code{,} @dots{}]@code{)}
+@item @code{or(}@var{v1}@code{,} @var{v2} [@code{,} @dots{}]@code{)}
 Return the bitwise OR of the arguments. There must be at least two.
 
 @cindexgawkfunc{rshift}
@@ -18074,11 +18376,11 @@ Return the value of @var{val}, shifted right by @var{count} bits.
 
 @cindexgawkfunc{xor}
 @cindex bitwise XOR
-@item @code{xor(@var{v1}, @var{v2}} [@code{,} @dots{}]@code{)}
+@item @code{xor(}@var{v1}@code{,} @var{v2} [@code{,} @dots{}]@code{)}
 Return the bitwise XOR of the arguments. There must be at least two.
 @end table
 
-For all of these functions, first the double precision floating-point value is
+For all of these functions, first the double-precision floating-point value is
 converted to the widest C unsigned integer type, then the bitwise operation is
 performed.  If the result cannot be represented exactly as a C @code{double},
 leading nonzero bits are removed one by one until it can be represented
@@ -18093,7 +18395,7 @@ that illustrates the use of these functions:
 @example
 @group
 @c file eg/lib/bits2str.awk
-# bits2str --- turn a byte into readable 1's and 0's
+# bits2str --- turn a byte into readable ones and zeros
 
 function bits2str(bits,        data, mask)
 @{
@@ -18167,17 +18469,18 @@ $ @kbd{gawk -f testbits.awk}
 @cindex converting, numbers to strings
 @cindex number as string of bits
 The @code{bits2str()} function turns a binary number into a string.
-The number @code{1} represents a binary value where the rightmost bit
-is set to 1.  Using this mask,
+Initializing @code{mask} to one creates
+a binary value where the rightmost bit
+is set to one.  Using this mask,
 the function repeatedly checks the rightmost bit.
 ANDing the mask with the value indicates whether the
-rightmost bit is 1 or not. If so, a @code{"1"} is concatenated onto the front
+rightmost bit is one or not. If so, a @code{"1"} is concatenated onto the front
 of the string.
 Otherwise, a @code{"0"} is added.
 The value is then shifted right by one bit and the loop continues
-until there are no more 1 bits.
+until there are no more one bits.
 
-If the initial value is zero it returns a simple @code{"0"}.
+If the initial value is zero, it returns a simple @code{"0"}.
 Otherwise, at the end, it pads the value with zeros to represent multiples
 of 8-bit quantities. This is typical in modern computers.
 
@@ -18186,25 +18489,20 @@ decimal and octal values for the same numbers
 (@pxref{Nondecimal-numbers}),
 and then demonstrates the
 results of the @code{compl()}, @code{lshift()}, and @code{rshift()} functions.
-@c ENDOFRANGE bit
-@c ENDOFRANGE and
-@c ENDOFRANGE oro
-@c ENDOFRANGE xor
-@c ENDOFRANGE opbit
 
 @node Type Functions
 @subsection Getting Type Information
 
 @command{gawk} provides a single function that lets you distinguish
 an array from a scalar variable.  This is necessary for writing code
-that traverses every element of an array of arrays.
+that traverses every element of an array of arrays
 (@pxref{Arrays of Arrays}).
 
 @table @code
 @cindexgawkfunc{isarray}
 @cindex scalar or array
 @item isarray(@var{x})
-Return a true value if @var{x} is an array. Otherwise return false.
+Return a true value if @var{x} is an array. Otherwise, return false.
 @end table
 
 @code{isarray()} is meant for use in two circumstances. The first is when
@@ -18213,12 +18511,14 @@ an array or not.  The second is inside the body of a user-defined function
 (not discussed yet; @pxref{User-defined}), to test if a parameter is an
 array or not.
 
-Note, however, that using @code{isarray()} at the global level to test 
-variables makes no sense. Since you are the one writing the program, you
+@quotation NOTE
+Using @code{isarray()} at the global level to test
+variables makes no sense. Because you are the one writing the program, you
 are supposed to know if your variables are arrays or not. And in fact,
 due to the way @command{gawk} works, if you pass the name of a variable
 that has not been previously used to @code{isarray()}, @command{gawk}
-will end up turning it into a scalar.
+ends up turning it into a scalar.
+@end quotation
 
 @node I18N Functions
 @subsection String-Translation Functions
@@ -18263,25 +18563,21 @@ The default value for @var{category} is @code{"LC_MESSAGES"}.
 Return the plural form used for @var{number} of the
 translation of @var{string1} and @var{string2} in text domain
 @var{domain} for locale category @var{category}. @var{string1} is the
-English singular variant of a message, and @var{string2} the English plural
+English singular variant of a message, and @var{string2} is the English plural
 variant of the same message.
 The default value for @var{domain} is the current value of @code{TEXTDOMAIN}.
 The default value for @var{category} is @code{"LC_MESSAGES"}.
 @end table
-@c ENDOFRANGE funcbi
-@c ENDOFRANGE bifunc
 
 @node User-defined
 @section User-Defined Functions
 
-@c STARTOFRANGE udfunc
 @cindex user-defined functions
-@c STARTOFRANGE funcud
 @cindex functions, user-defined
 Complicated @command{awk} programs can often be simplified by defining
 your own functions.  User-defined functions can be called just like
 built-in ones (@pxref{Function Calls}), but it is up to you to define
-them, i.e., to tell @command{awk} what they should do.
+them (i.e., to tell @command{awk} what they should do).
 
 @menu
 * Definition Syntax::           How to write definitions and what they mean.
@@ -18296,12 +18592,11 @@ them, i.e., to tell @command{awk} what they should do.
 @subsection Function Definition Syntax
 
 @quotation
-@i{It's entirely fair to say that the @command{awk} syntax for local
+@i{It's entirely fair to say that the awk syntax for local
 variable definitions is appallingly awful.}
 @author Brian Kernighan
 @end quotation
 
-@c STARTOFRANGE fdef
 @cindex functions, defining
 Definitions of functions can appear anywhere between the rules of an
 @command{awk} program.  Thus, the general form of an @command{awk} program is
@@ -18339,14 +18634,23 @@ the call.
 
 A function cannot have two parameters with the same name, nor may it
 have a parameter with the same name as the function itself.
-In addition, according to the POSIX standard, function parameters
-cannot have the same name as one of the special built-in variables
-(@pxref{Built-in Variables}).  Not all versions of @command{awk} enforce
-this restriction.
+
+@quotation CAUTION
+According to the POSIX standard, function parameters
+cannot have the same name as one of the special predefined variables
+(@pxref{Built-in Variables}), nor may a function parameter have the
+same name as another function.
+
+Not all versions of @command{awk} enforce
+these restrictions.
+@command{gawk} always enforces the first restriction.
+With @option{--posix} (@pxref{Options}),
+it also enforces the second restriction.
+@end quotation
 
 Local variables act like the empty string if referenced where a string
 value is required, and like zero if referenced where a numeric value
-is required. This is the same as regular variables that have never been
+is required. This is the same as the behavior of regular variables that have never been
 assigned a value.  (There is more to understand about local variables;
 @pxref{Dynamic Typing}.)
 
@@ -18380,7 +18684,7 @@ During execution of the function body, the arguments and local variable
 values hide, or @dfn{shadow}, any variables of the same names used in the
 rest of the program.  The shadowed variables are not accessible in the
 function definition, because there is no way to name them while their
-names have been taken away for the local variables.  All other variables
+names have been taken away for the arguments and local variables.  All other variables
 used in the @command{awk} program can be referenced or set normally in the
 function's body.
 
@@ -18420,13 +18724,13 @@ func foo() @{ a = sqrt($1) ; print a @}
 @end example
 
 @noindent
-Instead it defines a rule that, for each record, concatenates the value
+Instead, it defines a rule that, for each record, concatenates the value
 of the variable @samp{func} with the return value of the function @samp{foo}.
 If the resulting string is non-null, the action is executed.
 This is probably not what is desired.  (@command{awk} accepts this input as
 syntactically valid, because functions may be used before they are defined
 in @command{awk} programs.@footnote{This program won't actually run,
-since @code{foo()} is undefined.})
+because @code{foo()} is undefined.})
 
 @cindex portability, functions@comma{} defining
 To ensure that your @command{awk} programs are portable, always use the
@@ -18447,7 +18751,7 @@ function myprint(num)
 @end example
 
 @noindent
-To illustrate, here is an @command{awk} rule that uses our @code{myprint}
+To illustrate, here is an @command{awk} rule that uses our @code{myprint()}
 function:
 
 @example
@@ -18479,7 +18783,7 @@ extra whitespace signifies the start of the local variable list):
 function delarray(a,    i)
 @{
     for (i in a)
-       delete a[i]
+        delete a[i]
 @}
 @end example
 
@@ -18488,16 +18792,16 @@ in an array and start over with a new list of elements
 (@pxref{Delete}).
 Instead of having
 to repeat this loop everywhere that you need to clear out
-an array, your program can just call @code{delarray}.
+an array, your program can just call @code{delarray()}.
 (This guarantees portability.  The use of @samp{delete @var{array}} to delete
-the contents of an entire array is a recent@footnote{Late in 2012.}
+the contents of an entire array is a relatively recent@footnote{Late in 2012.}
 addition to the POSIX standard.)
 
 The following is an example of a recursive function.  It takes a string
-as an input parameter and returns the string in backwards order.
+as an input parameter and returns the string in reverse order.
 Recursive functions must always have a test that stops the recursion.
 In this case, the recursion terminates when the input string is
-already empty.
+already empty:
 
 @c 8/2014: Thanks to Mike Brennan for the improved formulation
 @cindex @code{rev()} user-defined function
@@ -18520,7 +18824,7 @@ $ @kbd{echo "Don't Panic!" |}
 @print{} !cinaP t'noD
 @end example
 
-The C @code{ctime()} function takes a timestamp and returns it in a string,
+The C @code{ctime()} function takes a timestamp and returns it as a string,
 formatted in a well-known fashion.
 The following example uses the built-in @code{strftime()} function
 (@pxref{Time Functions})
@@ -18535,19 +18839,23 @@ to create an @command{awk} version of @code{ctime()}:
 
 function ctime(ts,    format)
 @{
-    format = PROCINFO["strftime"]
+    format = "%a %b %e %H:%M:%S %Z %Y"
+
     if (ts == 0)
         ts = systime()       # use current time as default
     return strftime(format, ts)
 @}
 @c endfile
 @end example
-@c ENDOFRANGE fdef
+
+You might think that @code{ctime()} could use @code{PROCINFO["strftime"]}
+for its format string. That would be a mistake, because @code{ctime()} is
+supposed to return the time formatted in a standard fashion, and user-level
+code could have changed @code{PROCINFO["strftime"]}.
 
 @node Function Caveats
 @subsection Calling User-Defined Functions
 
-@c STARTOFRANGE fudc
 @cindex functions, user-defined, calling
 @dfn{Calling a function} means causing the function to run and do its job.
 A function call is an expression and its value is the value returned by
@@ -18560,7 +18868,7 @@ the function.
 @end menu
 
 @node Calling A Function
-@subsubsection Writing A Function Call
+@subsubsection Writing a Function Call
 
 A function call consists of the function name followed by the arguments
 in parentheses.  @command{awk} expressions are what you write in the
@@ -18575,7 +18883,7 @@ foo(x y, "lose", 4 * z)
 
 @quotation CAUTION
 Whitespace characters (spaces and TABs) are not allowed
-between the function name and the open-parenthesis of the argument list.
+between the function name and the opening parenthesis of the argument list.
 If you write whitespace by mistake, @command{awk} might think that you mean
 to concatenate a variable with an expression in parentheses.  However, it
 notices that you used a function name and not a variable name, and reports
@@ -18587,7 +18895,7 @@ an error.
 
 @cindex local variables, in a function
 @cindex variables, local to a function
-Unlike many languages,
+Unlike in many languages,
 there is no way to make a variable local to a @code{@{} @dots{} @code{@}} block in
 @command{awk}, but you can make a variable local to a function. It is
 good practice to do so whenever a variable is needed only in that
@@ -18596,7 +18904,7 @@ function.
 To make a variable local to a function, simply declare the variable as
 an argument after the actual function arguments
 (@pxref{Definition Syntax}).
-Look at the following example where variable
+Look at the following example, where variable
 @code{i} is a global variable used by both functions @code{foo()} and
 @code{bar()}:
 
@@ -18615,7 +18923,7 @@ function foo(j)
     print "foo's i=" i
 @}
 
-BEGIN @{ 
+BEGIN @{
       i = 10
       print "top's i=" i
       foo(0)
@@ -18637,14 +18945,14 @@ foo's i=3
 top's i=3
 @end example
 
-If you want @code{i} to be local to both @code{foo()} and @code{bar()} do as
-follows (the extra-space before @code{i} is a coding convention to
+If you want @code{i} to be local to both @code{foo()} and @code{bar()}, do as
+follows (the extra space before @code{i} is a coding convention to
 indicate that @code{i} is a local variable, not an argument):
 
 @example
 function bar(    i)
 @{
-    for (i = 0; i < 3; i++) 
+    for (i = 0; i < 3; i++)
         print "bar's i=" i
 @}
 
@@ -18656,10 +18964,10 @@ function foo(j,    i)
     print "foo's i=" i
 @}
 
-BEGIN @{ 
+BEGIN @{
       i = 10
       print "top's i=" i
-      foo(0) 
+      foo(0)
       print "top's i=" i
 @}
 @end example
@@ -18718,21 +19026,16 @@ At level 2, index 2 is found in a
 @end example
 
 @node Pass By Value/Reference
-@subsubsection Passing Function Arguments By Value Or By Reference
+@subsubsection Passing Function Arguments by Value Or by Reference
 
 In @command{awk}, when you declare a function, there is no way to
 declare explicitly whether the arguments are passed @dfn{by value} or
 @dfn{by reference}.
 
-Instead the passing convention is determined at runtime when
-the function is called according to the following rule:
-
-@itemize
-@item
-If the argument is an array variable, then it is passed by reference,
-@item
-Otherwise the argument is passed by value.
-@end itemize
+Instead, the passing convention is determined at runtime when
+the function is called, according to the following rule:
+if the argument is an array variable, then it is passed by reference.
+Otherwise, the argument is passed by value.
 
 @cindex call by value
 Passing an argument by value means that when a function is called, it
@@ -18807,7 +19110,7 @@ prints @samp{a[1] = 1, a[2] = two, a[3] = 3}, because
 @cindex undefined functions
 @cindex functions, undefined
 Some @command{awk} implementations allow you to call a function that
-has not been defined. They only report a problem at runtime when the
+has not been defined. They only report a problem at runtime, when the
 program actually tries to call the function. For example:
 
 @example
@@ -18835,10 +19138,15 @@ If @option{--lint} is specified
 Some @command{awk} implementations generate a runtime
 error if you use either the @code{next} statement
 or the @code{nextfile} statement
-(@pxref{Next Statement}, also @pxref{Nextfile Statement})
+(@pxref{Next Statement}, and
+@ifdocbook
+@ref{Nextfile Statement})
+@end ifdocbook
+@ifnotdocbook
+@pxref{Nextfile Statement})
+@end ifnotdocbook
 inside a user-defined function.
 @command{gawk} does not have this limitation.
-@c ENDOFRANGE fudc
 
 @node Return Statement
 @subsection The @code{return} Statement
@@ -18861,15 +19169,15 @@ makes the returned value undefined, and therefore, unpredictable.
 In practice, though, all versions of @command{awk} simply return the
 null string, which acts like zero if used in a numeric context.
 
-A @code{return} statement with no value expression is assumed at the end of
-every function definition.  So if control reaches the end of the function
-body, then technically, the function returns an unpredictable value.
+A @code{return} statement without an @var{expression} is assumed at the end of
+every function definition.  So, if control reaches the end of the function
+body, then technically the function returns an unpredictable value.
 In practice, it returns the empty string.  @command{awk}
 does @emph{not} warn you if you use the return value of such a function.
 
 Sometimes, you want to write a function for what it does, not for
 what it returns.  Such a function corresponds to a @code{void} function
-in C, C++ or Java, or to a @code{procedure} in Ada.  Thus, it may be appropriate to not
+in C, C++, or Java, or to a @code{procedure} in Ada.  Thus, it may be appropriate to not
 return any value; simply bear in mind that you should not be using the
 return value of such a function.
 
@@ -18891,8 +19199,8 @@ function maxelt(vec,   i, ret)
 @noindent
 You call @code{maxelt()} with one argument, which is an array name.  The local
 variables @code{i} and @code{ret} are not intended to be arguments;
-while there is nothing to stop you from passing more than one argument
-to @code{maxelt()}, the results would be strange.  The extra space before
+there is nothing to stop you from passing more than one argument
+to @code{maxelt()} but the results would be strange.  The extra space before
 @code{i} in the function parameter list indicates that @code{i} and
 @code{ret} are local variables.
 You should follow this convention when defining functions.
@@ -18966,7 +19274,6 @@ does report the second error.
 
 Usually, such things aren't a big issue, but it's worth
 being aware of them.
-@c ENDOFRANGE udfunc
 
 @node Indirect Calls
 @section Indirect Function Calls
@@ -18989,13 +19296,15 @@ function calls, you can specify the name of the function to call as a
 string variable, and then call the function.  Let's look at an example.
 
 Suppose you have a file with your test scores for the classes you
-are taking.  The first field is the class name. The following fields
+are taking, and
+you wish to get the sum and the average of
+your test scores.
+The first field is the class name. The following fields
 are the functions to call to process the data, up to a ``marker''
 field @samp{data:}.  Following the marker, to the end of the record,
 are the various numeric test scores.
 
-Here is the initial file; you wish to get the sum and the average of
-your test scores:
+Here is the initial file:
 
 @example
 @c file eg/data/class_data1
@@ -19029,8 +19338,8 @@ variable as the @emph{name} of the function to call.
 @cindex indirect function calls, @code{@@}-notation
 @cindex function calls, indirect, @code{@@}-notation for
 The syntax is similar to that of a regular function call: an identifier
-immediately followed by a left parenthesis, any arguments, and then
-a closing right parenthesis, with the addition of a leading @samp{@@}
+immediately followed by an opening parenthesis, any arguments, and then
+a closing parenthesis, with the addition of a leading @samp{@@}
 character:
 
 @example
@@ -19039,7 +19348,7 @@ result = @@the_func()   # calls the sum() function
 @end example
 
 Here is a full program that processes the previously shown data,
-using indirect function calls.
+using indirect function calls:
 
 @example
 @c file eg/prog/indirectcall.awk
@@ -19078,9 +19387,9 @@ function sum(first, last,   ret, i)
 @c endfile
 @end example
 
-These two functions expect to work on fields; thus the parameters
+These two functions expect to work on fields; thus, the parameters
 @code{first} and @code{last} indicate where in the fields to start and end.
-Otherwise they perform the expected computations and are not unusual.
+Otherwise, they perform the expected computations and are not unusual:
 
 @example
 @c file eg/prog/indirectcall.awk
@@ -19125,11 +19434,11 @@ $ @kbd{gawk -f indirectcall.awk class_data1}
 @print{} Biology 101:
 @print{}     sum: <352.8>
 @print{}     average: <88.2>
-@print{} 
+@print{}
 @print{} Chemistry 305:
 @print{}     sum: <356.4>
 @print{}     average: <89.1>
-@print{} 
+@print{}
 @print{} English 401:
 @print{}     sum: <376.1>
 @print{}     average: <94.025>
@@ -19139,8 +19448,8 @@ The ability to use indirect function calls is more powerful than you may
 think at first.  The C and C++ languages provide ``function pointers,'' which
 are a mechanism for calling a function chosen at runtime.  One of the most
 well-known uses of this ability is the C @code{qsort()} function, which sorts
-an array using the famous ``quick sort'' algorithm
-(see @uref{http://en.wikipedia.org/wiki/Quick_sort, the Wikipedia article}
+an array using the famous ``quicksort'' algorithm
+(see @uref{http://en.wikipedia.org/wiki/Quicksort, the Wikipedia article}
 for more information).  To use this function, you supply a pointer to a comparison
 function.  This mechanism allows you to sort arbitrary data in an arbitrary
 fashion.
@@ -19159,11 +19468,11 @@ We can do something similar using @command{gawk}, like this:
 # January 2009
 
 @c endfile
-
 @end ignore
 @c file eg/lib/quicksort.awk
-# quicksort --- C.A.R. Hoare's quick sort algorithm. See Wikipedia
-#               or almost any algorithms or computer science text
+
+# quicksort --- C.A.R. Hoare's quicksort algorithm. See Wikipedia
+#               or almost any algorithms or computer science text.
 @c endfile
 @ignore
 @c file eg/lib/quicksort.awk
@@ -19190,7 +19499,7 @@ function quicksort(data, left, right, less_than,    i, last)
 
 # quicksort_swap --- helper function for quicksort, should really be inline
 
-function quicksort_swap(data, i, j, temp)
+function quicksort_swap(data, i, j,      temp)
 @{
     temp = data[i]
     data[i] = data[j]
@@ -19201,7 +19510,7 @@ function quicksort_swap(data, i, j, temp)
 
 The @code{quicksort()} function receives the @code{data} array, the starting and ending
 indices to sort (@code{left} and @code{right}), and the name of a function that
-performs a ``less than'' comparison.  It then implements the quick sort algorithm.
+performs a ``less than'' comparison.  It then implements the quicksort algorithm.
 
 To make use of the sorting function, we return to our previous example. The
 first thing to do is write some comparison functions:
@@ -19251,7 +19560,7 @@ function do_sort(first, last, compare,      data, i, retval)
     retval = data[1]
     for (i = 2; i in data; i++)
         retval = retval " " data[i]
-    
+
     return retval
 @}
 @c endfile
@@ -19297,13 +19606,13 @@ $ @kbd{gawk -f quicksort.awk -f indirectcall.awk class_data2}
 @print{}     average: <88.2>
 @print{}     sort: <78.5 87.0 92.4 94.9>
 @print{}     rsort: <94.9 92.4 87.0 78.5>
-@print{} 
+@print{}
 @print{} Chemistry 305:
 @print{}     sum: <356.4>
 @print{}     average: <89.1>
 @print{}     sort: <75.2 88.2 94.7 98.3>
 @print{}     rsort: <98.3 94.7 88.2 75.2>
-@print{} 
+@print{}
 @print{} English 401:
 @print{}     sum: <376.1>
 @print{}     average: <94.025>
@@ -19311,14 +19620,30 @@ $ @kbd{gawk -f quicksort.awk -f indirectcall.awk class_data2}
 @print{}     rsort: <100.0 95.6 93.4 87.1>
 @end example
 
+Another example where indirect functions calls are useful can be found in
+processing arrays. This is described in @ref{Walking Arrays}.
+
 Remember that you must supply a leading @samp{@@} in front of an indirect function call.
 
 Starting with @value{PVERSION} 4.1.2 of @command{gawk}, indirect function
 calls may also be used with built-in functions and with extension functions
-(@pxref{Dynamic Extensions}).  The only thing you cannot do is pass a regular
-expression constant to a built-in function through an indirect function
-call.@footnote{This may change in a future version; recheck the documentation that
-comes with your version of @command{gawk} to see if it has.}
+(@pxref{Dynamic Extensions}). There are some limitations when calling
+built-in functions indirectly, as follows.
+
+@itemize @value{BULLET}
+@item
+You cannot pass a regular expression constant to a built-in function
+through an indirect function call.@footnote{This may change in a future
+version; recheck the documentation that comes with your version of
+@command{gawk} to see if it has.} This applies to the @code{sub()},
+@code{gsub()}, @code{gensub()}, @code{match()}, @code{split()} and
+@code{patsplit()} functions.
+
+@item
+If calling @code{sub()} or @code{gsub()}, you may only pass two arguments,
+since those functions are unusual in that they update their third argument.
+This means that @code{$0} will be updated.
+@end itemize
 
 @command{gawk} does its best to make indirect function calls efficient.
 For example, in the following case:
@@ -19329,7 +19654,7 @@ for (i = 1; i <= n; i++)
 @end example
 
 @noindent
-@code{gawk} looks up the actual function to call only once.
+@command{gawk} looks up the actual function to call only once.
 
 @node Functions Summary
 @section Summary
@@ -19341,10 +19666,11 @@ functions.
 
 @item
 POSIX @command{awk} provides three kinds of built-in functions: numeric,
-string, and I/O.  @command{gawk} provides functions that work with values
-representing time, do bit manipulation, sort arrays, and internationalize
-and localize programs.  @command{gawk} also provides several extensions to
-some of standard functions, typically in the form of additional arguments.
+string, and I/O.  @command{gawk} provides functions that sort arrays, work
+with values representing time, do bit manipulation, determine variable
+type (array versus scalar), and internationalize and localize programs.
+@command{gawk} also provides several extensions to some of standard
+functions, typically in the form of additional arguments.
 
 @item
 Functions accept zero or more arguments and return a value.  The
@@ -19395,10 +19721,9 @@ program. This is equivalent to function pointers in C and C++.
 
 @end itemize
 
-@c ENDOFRANGE funcud
 
 @ifnotinfo
-@part @value{PART2}Problem Solving With @command{awk}
+@part @value{PART2}Problem Solving with @command{awk}
 @end ifnotinfo
 
 @ifdocbook
@@ -19408,27 +19733,24 @@ It contains the following chapters:
 
 @itemize @value{BULLET}
 @item
-@ref{Library Functions}.
+@ref{Library Functions}
 
 @item
-@ref{Sample Programs}.
+@ref{Sample Programs}
 @end itemize
 @end ifdocbook
 
 @node Library Functions
 @chapter A Library of @command{awk} Functions
-@c STARTOFRANGE libf
 @cindex libraries of @command{awk} functions
-@c STARTOFRANGE flib
 @cindex functions, library
-@c STARTOFRANGE fudlib
 @cindex functions, user-defined, library of
 
 @DBREF{User-defined} describes how to write
 your own @command{awk} functions.  Writing functions is important, because
 it allows you to encapsulate algorithms and program tasks in a single
 place.  It simplifies programming, making program development more
-manageable, and making programs more readable.
+manageable and making programs more readable.
 
 @cindex Kernighan, Brian
 @cindex Plauger, P.J.@:
@@ -19472,9 +19794,9 @@ and would like to contribute them to the @command{awk} user community, see
 @cindex portability, example programs
 The programs in this @value{CHAPTER} and in
 @ref{Sample Programs},
-freely use features that are @command{gawk}-specific.
+freely use @command{gawk}-specific features.
 Rewriting these programs for different implementations of @command{awk}
-is pretty straightforward.
+is pretty straightforward:
 
 @itemize @value{BULLET}
 @item
@@ -19544,7 +19866,7 @@ Library functions often need to have global variables that they can use to
 preserve state information between calls to the function---for example,
 @code{getopt()}'s variable @code{_opti}
 (@pxref{Getopt Function}).
-Such variables are called @dfn{private}, since the only functions that need to
+Such variables are called @dfn{private}, as the only functions that need to
 use them are the ones in the library.
 
 When writing a library function, you should try to choose names for your
@@ -19557,7 +19879,7 @@ often use variable names like these for their own purposes.
 The example programs shown in this @value{CHAPTER} all start the names of their
 private variables with an underscore (@samp{_}).  Users generally don't use
 leading underscores in their variable names, so this convention immediately
-decreases the chances that the variable name will be accidentally shared
+decreases the chances that the variable names will be accidentally shared
 with the user's program.
 
 @cindex @code{_} (underscore), in names of private variables
@@ -19566,28 +19888,28 @@ In addition, several of the library functions use a prefix that helps
 indicate what function or set of functions use the variables---for example,
 @code{_pw_byname()} in the user database routines
 (@pxref{Passwd Functions}).
-This convention is recommended, since it even further decreases the
+This convention is recommended, as it even further decreases the
 chance of inadvertent conflict among variable names.  Note that this
 convention is used equally well for variable names and for private
-function names.@footnote{While all the library routines could have
+function names.@footnote{Although all the library routines could have
 been rewritten to use this convention, this was not done, in order to
 show how our own @command{awk} programming style has evolved and to
 provide some basis for this discussion.}
 
 As a final note on variable naming, if a function makes global variables
-available for use by a main program, it is a good convention to start that
-variable's name with a capital letter---for
+available for use by a main program, it is a good convention to start those
+variables' names with a capital letter---for
 example, @code{getopt()}'s @code{Opterr} and @code{Optind} variables
 (@pxref{Getopt Function}).
 The leading capital letter indicates that it is global, while the fact that
 the variable name is not all capital letters indicates that the variable is
-not one of @command{awk}'s built-in variables, such as @code{FS}.
+not one of @command{awk}'s predefined variables, such as @code{FS}.
 
 @cindex @option{--dump-variables} option, using for library functions
 It is also important that @emph{all} variables in library
 functions that do not need to save state are, in fact, declared
 local.@footnote{@command{gawk}'s @option{--dump-variables} command-line
-option is useful for verifying this.} If this is not done, the variable
+option is useful for verifying this.} If this is not done, the variables
 could accidentally be used in the user's program, leading to bugs that
 are very difficult to track down:
 
@@ -19595,8 +19917,9 @@ are very difficult to track down:
 function lib_func(x, y,    l1, l2)
 @{
     @dots{}
-    @var{use variable} some_var   # some_var should be local
-    @dots{}                     # but is not by oversight
+    # some_var should be local but by oversight is not
+    @var{use variable} some_var
+    @dots{}
 @}
 @end example
 
@@ -19637,10 +19960,11 @@ programming use.
 * Join Function::               A function to join an array into a string.
 * Getlocaltime Function::       A function to get formatted times.
 * Readfile Function::           A function to read an entire file at once.
+* Shell Quoting::               A function to quote strings for the shell.
 @end menu
 
 @node Strtonum Function
-@subsection Converting Strings To Numbers
+@subsection Converting Strings to Numbers
 
 The @code{strtonum()} function (@pxref{String Functions})
 is a @command{gawk} extension.  The following function
@@ -19707,8 +20031,8 @@ function mystrtonum(str,        ret, n, i, k, c)
 #     a[5] = "123.45"
 #     a[6] = "1.e3"
 #     a[7] = "1.32"
-#     a[7] = "1.32E2"
-# 
+#     a[8] = "1.32E2"
+#
 #     for (i = 1; i in a; i++)
 #         print a[i], strtonum(a[i]), mystrtonum(a[i])
 # @}
@@ -19718,9 +20042,12 @@ function mystrtonum(str,        ret, n, i, k, c)
 The function first looks for C-style octal numbers (base 8).
 If the input string matches a regular expression describing octal
 numbers, then @code{mystrtonum()} loops through each character in the
-string.  It sets @code{k} to the index in @code{"01234567"} of the current
-octal digit.  Since the return value is one-based, the @samp{k--}
-adjusts @code{k} so it can be used in computing the return value.
+string.  It sets @code{k} to the index in @code{"1234567"} of the current
+octal digit.
+The return value will either be the same number as the digit, or zero
+if the character is not there, which will be true for a @samp{0}.
+This is safe, because the regexp test in the @code{if} ensures that
+only octal values are converted.
 
 Similar logic applies to the code that checks for and converts a
 hexadecimal value, which starts with @samp{0x} or @samp{0X}.
@@ -19739,13 +20066,9 @@ be tested with @command{gawk} and the results compared to the built-in
 @node Assert Function
 @subsection Assertions
 
-@c STARTOFRANGE asse
 @cindex assertions
-@c STARTOFRANGE assef
 @cindex @code{assert()} function (C library)
-@c STARTOFRANGE libfass
 @cindex libraries of @command{awk} functions, assertions
-@c STARTOFRANGE flibass
 @cindex functions, library, assertions
 @cindex @command{awk} programs, lengthy, assertions
 When writing large programs, it is often useful to know
@@ -19753,7 +20076,7 @@ that a condition or set of conditions is true.  Before proceeding with a
 particular computation, you make a statement about what you believe to be
 the case.  Such a statement is known as an
 @dfn{assertion}.  The C language provides an @code{<assert.h>} header file
-and corresponding @code{assert()} macro that the programmer can use to make
+and corresponding @code{assert()} macro that a programmer can use to make
 assertions.  If an assertion fails, the @code{assert()} macro arranges to
 print a diagnostic message describing the condition that should have
 been true but was not, and then it kills the program.  In C, using
@@ -19784,7 +20107,7 @@ Following is the function:
 
 @example
 @c file eg/lib/assert.awk
-# assert --- assert that a condition is true. Otherwise exit.
+# assert --- assert that a condition is true. Otherwise, exit.
 
 @c endfile
 @ignore
@@ -19820,7 +20143,7 @@ is false, it prints a message to standard error, using the @code{string}
 parameter to describe the failed condition.  It then sets the variable
 @code{_assert_exit} to one and executes the @code{exit} statement.
 The @code{exit} statement jumps to the @code{END} rule. If the @code{END}
-rules finds @code{_assert_exit} to be true, it exits immediately.
+rule finds @code{_assert_exit} to be true, it exits immediately.
 
 The purpose of the test in the @code{END} rule is to
 keep any other @code{END} rules from running.  When an assertion fails, the
@@ -19861,10 +20184,6 @@ most likely causing the program to hang as it waits for input.
 There is a simple workaround to this:
 make sure that such a @code{BEGIN} rule always ends
 with an @code{exit} statement.
-@c ENDOFRANGE asse
-@c ENDOFRANGE assef
-@c ENDOFRANGE flibass
-@c ENDOFRANGE libfass
 
 @node Round Function
 @subsection Rounding Numbers
@@ -20066,7 +20385,7 @@ is always 1.  This means that on those systems, characters
 have numeric values from 128 to 255.
 Finally, large mainframe systems use the EBCDIC character set, which
 uses all 256 values.
-While there are other character sets in use on some older systems,
+There are other character sets in use on some older systems, but
 they are not really worth worrying about:
 
 @example
@@ -20116,11 +20435,11 @@ all the strings in an array into one long string.  The following function,
 the application programs
 (@pxref{Sample Programs}).
 
-Good function design is important; this function needs to be general but it
+Good function design is important; this function needs to be general, but it
 should also have a reasonable default behavior.  It is called with an array
 as well as the beginning and ending indices of the elements in the array to be
 merged.  This assumes that the array indices are numeric---a reasonable
-assumption since the array was likely created with @code{split()}
+assumption, as the array was likely created with @code{split()}
 (@pxref{String Functions}):
 
 @cindex @code{join()} user-defined function
@@ -20173,7 +20492,7 @@ more difficult than they really need to be.}
 The @code{systime()} and @code{strftime()} functions described in
 @DBREF{Time Functions}
 provide the minimum functionality necessary for dealing with the time of day
-in human readable form.  While @code{strftime()} is extensive, the control
+in human-readable form.  Although @code{strftime()} is extensive, the control
 formats are not necessarily easy to remember or intuitively obvious when
 reading a program.
 
@@ -20223,7 +20542,7 @@ function getlocaltime(time,    ret, now, i)
     now = systime()
 
     # return date(1)-style output
-    ret = strftime(PROCINFO["strftime"], now)
+    ret = strftime("%a %b %e %H:%M:%S %Z %Y", now)
 
     # clear out target array
     delete time
@@ -20264,7 +20583,7 @@ allowed the user to supply an optional timestamp value to use instead
 of the current time.
 
 @node Readfile Function
-@subsection Reading A Whole File At Once
+@subsection Reading a Whole File at Once
 
 Often, it is convenient to have the entire contents of a file available
 in memory as a single string. A straightforward but naive way to
@@ -20321,13 +20640,13 @@ function readfile(file,     tmp, save_rs)
 
 It works by setting @code{RS} to @samp{^$}, a regular expression that
 will never match if the file has contents.  @command{gawk} reads data from
-the file into @code{tmp} attempting to match @code{RS}.  The match fails
+the file into @code{tmp}, attempting to match @code{RS}.  The match fails
 after each read, but fails quickly, such that @command{gawk} fills
 @code{tmp} with the entire contents of the file.
-(@xref{Records}, for information on @code{RT} and @code{RS}.)
+(@DBXREF{Records} for information on @code{RT} and @code{RS}.)
 
 In the case that @code{file} is empty, the return value is the null
-string.  Thus calling code may use something like:
+string.  Thus, calling code may use something like:
 
 @example
 contents = readfile("/some/path")
@@ -20338,14 +20657,92 @@ if (length(contents) == 0)
 This tests the result to see if it is empty or not. An equivalent
 test would be @samp{contents == ""}.
 
+@DBXREF{Extension Sample Readfile} for an extension function that
+also reads an entire file into memory.
+
+@node Shell Quoting
+@subsection Quoting Strings to Pass to the Shell
+
+@c included by permission
+@ignore
+Date: Sun, 27 Jul 2014 17:16:16 -0700
+Message-ID: <CAKuGj+iCF_obaCLDUX60aSAgbfocFVtguG39GyeoNxTFby5sqQ@mail.gmail.com>
+Subject: Useful awk function
+From: Mike Brennan <mike@madronabluff.com>
+To: Arnold Robbins <arnold@skeeve.com>
+@end ignore
+
+Michael Brennan offers the following programming pattern,
+which he uses frequently:
+
+@example
+#! /bin/sh
+
+awkp='
+   @dots{}
+   '
+
+@var{input_program} | awk "$awkp" | /bin/sh
+@end example
+
+For example, a program of his named @command{flac-edit} has this form:
+
+@example
+$ @kbd{flac-edit -song="Whoope! That's Great" file.flac}
+@end example
+
+It generates the following output, which is to be piped to
+the shell (@file{/bin/sh}):
+
+@example
+chmod +w file.flac
+metaflac --remove-tag=TITLE file.flac
+LANG=en_US.88591 metaflac --set-tag=TITLE='Whoope! That'"'"'s Great' file.flac
+chmod -w file.flac
+@end example
+
+Note the need for shell quoting.  The function @code{shell_quote()}
+does it.  @code{SINGLE} is the one-character string @code{"'"} and
+@code{QSINGLE} is the three-character string @code{"\"'\""}:
+
+@example
+@c file eg/lib/shellquote.awk
+# shell_quote --- quote an argument for passing to the shell
+@c endfile
+@ignore
+@c file eg/lib/shellquote.awk
+#
+# Michael Brennan
+# brennan@@madronabluff.com
+# September 2014
+@c endfile
+@end ignore
+@c file eg/lib/shellquote.awk
+
+function shell_quote(s,             # parameter
+    SINGLE, QSINGLE, i, X, n, ret)  # locals
+@{
+    if (s == "")
+        return "\"\""
+
+    SINGLE = "\x27"  # single quote
+    QSINGLE = "\"\x27\""
+    n = split(s, X, SINGLE)
+
+    ret = SINGLE X[1] SINGLE
+    for (i = 2; i <= n; i++)
+        ret = ret QSINGLE SINGLE X[i] SINGLE
+
+    return ret
+@}
+@c endfile
+@end example
+
 @node Data File Management
 @section @value{DDF} Management
 
-@c STARTOFRANGE dataf
 @cindex files, managing
-@c STARTOFRANGE libfdataf
 @cindex libraries of @command{awk} functions, managing, data files
-@c STARTOFRANGE flibdataf
 @cindex functions, library, managing data files
 This @value{SECTION} presents functions that are useful for managing
 command-line @value{DF}s.
@@ -20363,12 +20760,12 @@ command-line @value{DF}s.
 
 @cindex files, managing, data file boundaries
 @cindex files, initialization and cleanup
-The @code{BEGIN} and @code{END} rules are each executed exactly once at
+The @code{BEGIN} and @code{END} rules are each executed exactly once, at
 the beginning and end of your @command{awk} program, respectively
 (@pxref{BEGIN/END}).
 We (the @command{gawk} authors) once had a user who mistakenly thought that the
-@code{BEGIN} rule is executed at the beginning of each @value{DF} and the
-@code{END} rule is executed at the end of each @value{DF}.
+@code{BEGIN} rules were executed at the beginning of each @value{DF} and the
+@code{END} rules were executed at the end of each @value{DF}.
 
 When informed
 that this was not the case, the user requested that we add new special
@@ -20395,21 +20792,20 @@ Besides solving the problem in only nine(!) lines of code, it does so
 @c # Arnold Robbins, arnold@@skeeve.com, Public Domain
 @c # January 1992
 
-FILENAME != _oldfilename \
-@{
+FILENAME != _oldfilename @{
     if (_oldfilename != "")
         endfile(_oldfilename)
     _oldfilename = FILENAME
     beginfile(FILENAME)
 @}
 
-END   @{ endfile(FILENAME) @}
+END @{ endfile(FILENAME) @}
 @end example
 
 This file must be loaded before the user's ``main'' program, so that the
 rule it supplies is executed first.
 
-This rule relies on @command{awk}'s @code{FILENAME} variable that
+This rule relies on @command{awk}'s @code{FILENAME} variable, which
 automatically changes for each new @value{DF}.  The current @value{FN} is
 saved in a private variable, @code{_oldfilename}.  If @code{FILENAME} does
 not equal @code{_oldfilename}, then a new @value{DF} is being processed and
@@ -20425,7 +20821,7 @@ first @value{DF}.
 The program also supplies an @code{END} rule to do the final processing for
 the last file.  Because this @code{END} rule comes before any @code{END} rules
 supplied in the ``main'' program, @code{endfile()} is called first.  Once
-again the value of multiple @code{BEGIN} and @code{END} rules should be clear.
+again, the value of multiple @code{BEGIN} and @code{END} rules should be clear.
 
 @cindex @code{beginfile()} user-defined function
 @cindex @code{endfile()} user-defined function
@@ -20436,7 +20832,7 @@ The following version solves the problem:
 
 @example
 @c file eg/lib/ftrans.awk
-# ftrans.awk --- handle data file transitions
+# ftrans.awk --- handle datafile transitions
 #
 # user supplies beginfile() and endfile() functions
 @c endfile
@@ -20456,7 +20852,7 @@ FNR == 1 @{
     beginfile(FILENAME)
 @}
 
-END  @{ endfile(_filename_) @}
+END @{ endfile(_filename_) @}
 @c endfile
 @end example
 
@@ -20464,26 +20860,27 @@ END  @{ endfile(_filename_) @}
 shows how this library function can be used and
 how it simplifies writing the main program.
 
-@sidebar So Why Does @command{gawk} have @code{BEGINFILE} and @code{ENDFILE}?
+@sidebar So Why Does @command{gawk} Have @code{BEGINFILE} and @code{ENDFILE}?
 
 You are probably wondering, if @code{beginfile()} and @code{endfile()}
 functions can do the job, why does @command{gawk} have
-@code{BEGINFILE} and @code{ENDFILE} patterns (@pxref{BEGINFILE/ENDFILE})?
+@code{BEGINFILE} and @code{ENDFILE} patterns?
 
 Good question.  Normally, if @command{awk} cannot open a file, this
 causes an immediate fatal error.  In this case, there is no way for a
-user-defined function to deal with the problem, since the mechanism for
+user-defined function to deal with the problem, as the mechanism for
 calling it relies on the file being open and at the first record.  Thus,
 the main reason for @code{BEGINFILE} is to give you a ``hook'' to catch
 files that cannot be processed.  @code{ENDFILE} exists for symmetry,
 and because it provides an easy way to do per-file cleanup processing.
+For more information, refer to @ref{BEGINFILE/ENDFILE}.
 @end sidebar
 
 @node Rewind Function
 @subsection Rereading the Current File
 
 @cindex files, reading
-Another request for a new built-in function was for a @code{rewind()}
+Another request for a new built-in function was for a
 function that would make it possible to reread the current file.
 The requesting user didn't want to have to use @code{getline}
 (@pxref{Getline})
@@ -20492,7 +20889,7 @@ inside a loop.
 However, as long as you are not in the @code{END} rule, it is
 quite easy to arrange to immediately close the current input file
 and then start over with it from the top.
-For lack of a better name, we'll call it @code{rewind()}:
+For lack of a better name, we'll call the function @code{rewind()}:
 
 @cindex @code{rewind()} user-defined function
 @example
@@ -20526,24 +20923,12 @@ function rewind(    i)
 @c endfile
 @end example
 
-This code relies on the @code{ARGIND} variable
-(@pxref{Auto-set}),
-which is specific to @command{gawk}.
-If you are not using
-@command{gawk}, you can use ideas presented in
-@ifnotinfo
-the previous @value{SECTION}
-@end ifnotinfo
-@ifinfo
-@ref{Filetrans Function},
-@end ifinfo
-to either update @code{ARGIND} on your own
-or modify this code as appropriate.
-
-The @code{rewind()} function also relies on the @code{nextfile} keyword
-(@pxref{Nextfile Statement}).  Because of this, you should not call it
-from an @code{ENDFILE} rule.  (This isn't necessary anyway, since as soon
-as an @code{ENDFILE} rule finishes @command{gawk} goes to the next file!)
+The @code{rewind()} function relies on the @code{ARGIND} variable
+(@pxref{Auto-set}), which is specific to @command{gawk}.  It also
+relies on the @code{nextfile} keyword (@pxref{Nextfile Statement}).
+Because of this, you should not call it from an @code{ENDFILE} rule.
+(This isn't necessary anyway, because @command{gawk} goes to the next
+file as soon as an @code{ENDFILE} rule finishes!)
 
 @node File Checking
 @subsection Checking for Readable @value{DDF}s
@@ -20576,7 +20961,7 @@ the following program to your @command{awk} program:
 
 BEGIN @{
     for (i = 1; i < ARGC; i++) @{
-        if (ARGV[i] ~ /^[[:alpha:]_][[:alnum:]_]*=.*/ \
+        if (ARGV[i] ~ /^[a-zA-Z_][a-zA-Z0-9_]*=.*/ \
             || ARGV[i] == "-" || ARGV[i] == "/dev/stdin")
             continue    # assignment or standard input
         else if ((getline junk < ARGV[i]) < 0) # unreadable
@@ -20591,17 +20976,22 @@ BEGIN @{
 @cindex troubleshooting, @code{getline} function
 This works, because the @code{getline} won't be fatal.
 Removing the element from @code{ARGV} with @code{delete}
-skips the file (since it's no longer in the list).
+skips the file (because it's no longer in the list).
 See also @ref{ARGC and ARGV}.
 
+Because @command{awk} variable names only allow the English letters,
+the regular expression check purposely does not use character classes
+such as @samp{[:alpha:]} and @samp{[:alnum:]}
+(@pxref{Bracket Expressions}).
+
 @node Empty Files
-@subsection Checking for Zero-length Files
+@subsection Checking for Zero-Length Files
 
 All known @command{awk} implementations silently skip over zero-length files.
-This is a by-product of @command{awk}'s implicit 
+This is a by-product of @command{awk}'s implicit
 read-a-record-and-match-against-the-rules loop: when @command{awk}
 tries to read a record from an empty file, it immediately receives an
-end of file indication, closes the file, and proceeds on to the next
+end-of-file indication, closes the file, and proceeds on to the next
 command-line @value{DF}, @emph{without} executing any user-level
 @command{awk} program code.
 
@@ -20666,7 +21056,7 @@ Occasionally, you might not want @command{awk} to process command-line
 variable assignments
 (@pxref{Assignment Options}).
 In particular, if you have a @value{FN} that contains an @samp{=} character,
-@command{awk} treats the @value{FN} as an assignment, and does not process it.
+@command{awk} treats the @value{FN} as an assignment and does not process it.
 
 Some users have suggested an additional command-line option for @command{gawk}
 to disable command-line assignments.  However, some simple programming with
@@ -20690,7 +21080,7 @@ a library file does the trick:
 function disable_assigns(argc, argv,    i)
 @{
     for (i = 1; i < argc; i++)
-        if (argv[i] ~ /^[[:alpha:]_][[:alnum:]_]*=.*/)
+        if (argv[i] ~ /^[a-zA-Z_][a-zA-Z0-9_]*=.*/)
             argv[i] = ("./" argv[i])
 @}
 
@@ -20716,30 +21106,22 @@ The use of @code{No_command_assign} allows you to disable command-line
 assignments at invocation time, by giving the variable a true value.
 When not set, it is initially zero (i.e., false), so the command-line arguments
 are left alone.
-@c ENDOFRANGE dataf
-@c ENDOFRANGE flibdataf
-@c ENDOFRANGE libfdataf
 
 @node Getopt Function
 @section Processing Command-Line Options
 
-@c STARTOFRANGE libfclo
 @cindex libraries of @command{awk} functions, command-line options
-@c STARTOFRANGE flibclo
 @cindex functions, library, command-line options
-@c STARTOFRANGE clop
 @cindex command-line options, processing
-@c STARTOFRANGE oclp
 @cindex options, command-line, processing
-@c STARTOFRANGE clibf
 @cindex functions, library, C library
 @cindex arguments, processing
-Most utilities on POSIX compatible systems take options on
+Most utilities on POSIX-compatible systems take options on
 the command line that can be used to change the way a program behaves.
 @command{awk} is an example of such a program
 (@pxref{Options}).
-Often, options take @dfn{arguments}; i.e., data that the program needs to
-correctly obey the command-line option.  For example, @command{awk}'s
+Often, options take @dfn{arguments} (i.e., data that the program needs to
+correctly obey the command-line option).  For example, @command{awk}'s
 @option{-F} option requires a string to use as the field separator.
 The first occurrence on the command line of either @option{--} or a
 string that does not begin with @samp{-} ends the options.
@@ -20843,7 +21225,7 @@ necessary for accessing individual characters
 (@pxref{String Functions}).@footnote{This
 function was written before @command{gawk} acquired the ability to
 split strings into single characters using @code{""} as the separator.
-We have left it alone, since using @code{substr()} is more portable.}
+We have left it alone, as using @code{substr()} is more portable.}
 
 The discussion that follows walks through the code a bit at a time:
 
@@ -21011,9 +21393,9 @@ next element in @code{argv}.  If neither condition is true, then only
 on the next call to @code{getopt()}.
 
 The @code{BEGIN} rule initializes both @code{Opterr} and @code{Optind} to one.
-@code{Opterr} is set to one, since the default behavior is for @code{getopt()}
+@code{Opterr} is set to one, because the default behavior is for @code{getopt()}
 to print a diagnostic message upon seeing an invalid option.  @code{Optind}
-is set to one, since there's no reason to look at the program name, which is
+is set to one, because there's no reason to look at the program name, which is
 in @code{ARGV[0]}:
 
 @example
@@ -21036,8 +21418,8 @@ BEGIN @{
 @c endfile
 @end example
 
-The rest of the @code{BEGIN} rule is a simple test program.  Here is the
-result of two sample runs of the test program:
+The rest of the @code{BEGIN} rule is a simple test program.  Here are the
+results of two sample runs of the test program:
 
 @example
 $ @kbd{awk -f getopt.awk -v _getopt_test=1 -- -a -cbARG bax -x}
@@ -21062,41 +21444,45 @@ In both runs, the first @option{--} terminates the arguments to
 etc., as its own options.
 
 @quotation NOTE
-After @code{getopt()} is through, it is the responsibility of the
-user level code to clear out all the elements of @code{ARGV} from 1
+After @code{getopt()} is through,
+user-level code must clear out all the elements of @code{ARGV} from 1
 to @code{Optind}, so that @command{awk} does not try to process the
 command-line options as @value{FN}s.
 @end quotation
 
+Using @samp{#!} with the @option{-E} option may help avoid
+conflicts between your program's options and @command{gawk}'s options,
+as @option{-E} causes @command{gawk} to abandon processing of
+further options
+(@DBPXREF{Executable Scripts} and
+@ifnotdocbook
+@pxref{Options}).
+@end ifnotdocbook
+@ifdocbook
+@ref{Options}).
+@end ifdocbook
+
 Several of the sample programs presented in
 @ref{Sample Programs},
 use @code{getopt()} to process their arguments.
-@c ENDOFRANGE libfclo
-@c ENDOFRANGE flibclo
-@c ENDOFRANGE clop
-@c ENDOFRANGE oclp
 
 @node Passwd Functions
 @section Reading the User Database
 
-@c STARTOFRANGE libfudata
 @cindex libraries of @command{awk} functions, user database, reading
-@c STARTOFRANGE flibudata
 @cindex functions, library, user database@comma{} reading
-@c STARTOFRANGE udatar
 @cindex user database@comma{} reading
-@c STARTOFRANGE dataur
 @cindex database, users@comma{} reading
 @cindex @code{PROCINFO} array
 The @code{PROCINFO} array
 (@pxref{Built-in Variables})
 provides access to the current user's real and effective user and group ID
-numbers, and if available, the user's supplementary group set.
+numbers, and, if available, the user's supplementary group set.
 However, because these are numbers, they do not provide very useful
 information to the average user.  There needs to be some way to find the
 user information associated with the user and group ID numbers.  This
 @value{SECTION} presents a suite of functions for retrieving information from the
-user database.  @xref{Group Functions},
+user database.  @DBXREF{Group Functions}
 for a similar suite that retrieves information from the group database.
 
 @cindex @code{getpwent()} function (C library)
@@ -21111,11 +21497,11 @@ kept.  Instead, it provides the @code{<pwd.h>} header file
 and several C language subroutines for obtaining user information.
 The primary function is @code{getpwent()}, for ``get password entry.''
 The ``password'' comes from the original user database file,
-@file{/etc/passwd}, which stores user information, along with the
+@file{/etc/passwd}, which stores user information along with the
 encrypted passwords (hence the name).
 
 @cindex @command{pwcat} program
-While an @command{awk} program could simply read @file{/etc/passwd}
+Although an @command{awk} program could simply read @file{/etc/passwd}
 directly, this file may not contain complete information about the
 system's set of users.@footnote{It is often the case that password
 information is stored in a network database.} To be sure you are able to
@@ -21210,12 +21596,12 @@ The user's encrypted password.  This may not be available on some systems.
 
 @item User-ID
 The user's numeric user ID number.
-(On some systems it's a C @code{long}, and not an @code{int}.  Thus
+(On some systems, it's a C @code{long}, and not an @code{int}.  Thus,
 we cast it to @code{long} for all cases.)
 
 @item Group-ID
 The user's numeric group ID number.
-(Similar comments about @code{long} vs.@: @code{int} apply here.)
+(Similar comments about @code{long} versus @code{int} apply here.)
 
 @item Full name
 The user's full name, and perhaps other information associated with the
@@ -21237,7 +21623,7 @@ A few lines representative of @command{pwcat}'s output are as follows:
 @cindex Robbins, Miriam
 @example
 $ @kbd{pwcat}
-@print{} root:3Ov02d5VaUPB6:0:1:Operator:/:/bin/sh
+@print{} root:x:0:1:Operator:/:/bin/sh
 @print{} nobody:*:65534:65534::/:
 @print{} daemon:*:1:1::/:
 @print{} sys:*:2:2::/:/bin/csh
@@ -21312,27 +21698,23 @@ The @code{BEGIN} rule sets a private variable to the directory where
 routine, we have chosen to put it in @file{/usr/local/libexec/awk};
 however, you might want it to be in a different directory on your system.
 
-The function @code{_pw_init()} keeps three copies of the user information
-in three associative arrays.  The arrays are indexed by username
+The function @code{_pw_init()} fills three copies of the user information
+into three associative arrays.  The arrays are indexed by username
 (@code{_pw_byname}), by user ID number (@code{_pw_byuid}), and by order of
 occurrence (@code{_pw_bycount}).
-The variable @code{_pw_inited} is used for efficiency, since @code{_pw_init()}
+The variable @code{_pw_inited} is used for efficiency, as @code{_pw_init()}
 needs to be called only once.
 
+@cindex @code{PROCINFO} array, testing the field splitting
 @cindex @code{getline} command, @code{_pw_init()} function
 Because this function uses @code{getline} to read information from
 @command{pwcat}, it first saves the values of @code{FS}, @code{RS}, and @code{$0}.
 It notes in the variable @code{using_fw} whether field splitting
 with @code{FIELDWIDTHS} is in effect or not.
-Doing so is necessary, since these functions could be called
+Doing so is necessary, as these functions could be called
 from anywhere within a user's program, and the user may have his
-or her
-own way of splitting records and fields.
-
-@cindex @code{PROCINFO} array, testing the field splitting
-The @code{using_fw} variable checks @code{PROCINFO["FS"]}, which
-is @code{"FIELDWIDTHS"} if field splitting is being done with
-@code{FIELDWIDTHS}.  This makes it possible to restore the correct
+or her own way of splitting records and fields.
+This makes it possible to restore the correct
 field-splitting mechanism later.  The test can only be true for
 @command{gawk}.  It is false if using @code{FS} or @code{FPAT},
 or on some other @command{awk} implementation.
@@ -21341,7 +21723,7 @@ The code that checks for using @code{FPAT}, using @code{using_fpat}
 and @code{PROCINFO["FS"]}, is similar.
 
 The main part of the function uses a loop to read database lines, split
-the line into fields, and then store the line into each array as necessary.
+the lines into fields, and then store the lines into each array as necessary.
 When the loop is done, @code{@w{_pw_init()}} cleans up by closing the pipeline,
 setting @code{@w{_pw_inited}} to one, and restoring @code{FS}
 (and @code{FIELDWIDTHS} or @code{FPAT}
@@ -21431,26 +21813,18 @@ In turn, calling @code{_pw_init()} is not too expensive, because the
 once.  If you are worried about squeezing every last cycle out of your
 @command{awk} program, the check of @code{_pw_inited} could be moved out of
 @code{_pw_init()} and duplicated in all the other functions.  In practice,
-this is not necessary, since most @command{awk} programs are I/O-bound,
+this is not necessary, as most @command{awk} programs are I/O-bound,
 and such a change would clutter up the code.
 
 The @command{id} program in @DBREF{Id Program}
 uses these functions.
-@c ENDOFRANGE libfudata
-@c ENDOFRANGE flibudata
-@c ENDOFRANGE udatar
-@c ENDOFRANGE dataur
 
 @node Group Functions
 @section Reading the Group Database
 
-@c STARTOFRANGE libfgdata
 @cindex libraries of @command{awk} functions, group database, reading
-@c STARTOFRANGE flibgdata
 @cindex functions, library, group database@comma{} reading
-@c STARTOFRANGE gdatar
 @cindex group database, reading
-@c STARTOFRANGE datagr
 @cindex database, group, reading
 @cindex @code{PROCINFO} array, and group membership
 @cindex @code{getgrent()} function (C library)
@@ -21566,11 +21940,11 @@ it is usually empty or set to @samp{*}.
 @item Group ID Number
 The group's numeric group ID number;
 the association of name to number must be unique within the file.
-(On some systems it's a C @code{long}, and not an @code{int}.  Thus
+(On some systems it's a C @code{long}, and not an @code{int}.  Thus,
 we cast it to @code{long} for all cases.)
 
 @item Group Member List
-A comma-separated list of user names.  These users are members of the group.
+A comma-separated list of usernames.  These users are members of the group.
 Modern Unix systems allow users to be members of several groups
 simultaneously.  If your system does, then there are elements
 @code{"group1"} through @code{"group@var{N}"} in @code{PROCINFO}
@@ -21646,8 +22020,7 @@ function _gr_init(    oldfs, oldrs, olddol0, grcat,
         n = split($4, a, "[ \t]*,[ \t]*")
         for (i = 1; i <= n; i++)
             if (a[i] in _gr_groupsbyuser)
-                _gr_groupsbyuser[a[i]] = \
-                    _gr_groupsbyuser[a[i]] " " $1
+                _gr_groupsbyuser[a[i]] = gr_groupsbyuser[a[i]] " " $1
             else
                 _gr_groupsbyuser[a[i]] = $1
 
@@ -21681,32 +22054,32 @@ The @code{@w{_gr_init()}} function first saves @code{FS},
 @code{$0}, and then sets @code{FS} and @code{RS} to the correct values for
 scanning the group information.
 It also takes care to note whether @code{FIELDWIDTHS} or @code{FPAT}
-is being used, and to restore the appropriate field splitting mechanism.
+is being used, and to restore the appropriate field-splitting mechanism.
 
-The group information is stored is several associative arrays.
+The group information is stored in several associative arrays.
 The arrays are indexed by group name (@code{@w{_gr_byname}}), by group ID number
 (@code{@w{_gr_bygid}}), and by position in the database (@code{@w{_gr_bycount}}).
-There is an additional array indexed by user name (@code{@w{_gr_groupsbyuser}}),
+There is an additional array indexed by username (@code{@w{_gr_groupsbyuser}}),
 which is a space-separated list of groups to which each user belongs.
 
-Unlike the user database, it is possible to have multiple records in the
+Unlike in the user database, it is possible to have multiple records in the
 database for the same group.  This is common when a group has a large number
 of members.  A pair of such entries might look like the following:
 
 @example
-tvpeople:*:101:johny,jay,arsenio
+tvpeople:*:101:johnny,jay,arsenio
 tvpeople:*:101:david,conan,tom,joan
 @end example
 
 For this reason, @code{_gr_init()} looks to see if a group name or
-group ID number is already seen.  If it is, then the user names are
-simply concatenated onto the previous list of users.@footnote{There is actually a
+group ID number is already seen.  If so, the usernames are
+simply concatenated onto the previous list of users.@footnote{There is a
 subtle problem with the code just presented.  Suppose that
 the first time there were no names. This code adds the names with
 a leading comma. It also doesn't check that there is a @code{$4}.}
 
 Finally, @code{_gr_init()} closes the pipeline to @command{grcat}, restores
-@code{FS} (and @code{FIELDWIDTHS} or @code{FPAT} if necessary), @code{RS}, and @code{$0},
+@code{FS} (and @code{FIELDWIDTHS} or @code{FPAT}, if necessary), @code{RS}, and @code{$0},
 initializes @code{_gr_count} to zero
 (it is used later), and makes @code{_gr_inited} nonzero.
 
@@ -21745,7 +22118,7 @@ function getgrgid(gid)
 
 @cindex @code{getgruser()} function (C library)
 The @code{getgruser()} function does not have a C counterpart. It takes a
-user name and returns the list of groups that have the user as a member:
+username and returns the list of groups that have the user as a member:
 
 @cindex @code{getgruser()} function, user-defined
 @example
@@ -21774,7 +22147,6 @@ function getgrent()
 @}
 @c endfile
 @end example
-@c ENDOFRANGE clibf
 
 @cindex @code{endgrent()} function (C library)
 The @code{endgrent()} function resets @code{_gr_count} to zero so that @code{getgrent()} can
@@ -21807,12 +22179,12 @@ uses these functions.
 
 @DBREF{Arrays of Arrays} described how @command{gawk}
 provides arrays of arrays.  In particular, any element of
-an array may be either a scalar, or another array. The
+an array may be either a scalar or another array. The
 @code{isarray()} function (@pxref{Type Functions})
 lets you distinguish an array
 from a scalar.
 The following function, @code{walk_array()}, recursively traverses
-an array, printing each element's indices and value.
+an array, printing the element indices and values.
 You call it with the array and a string representing the name
 of the array:
 
@@ -21855,18 +22227,74 @@ When run, the program produces the following output:
 
 @example
 $ @kbd{gawk -f walk_array.awk}
-@print{} a[4][1][1] = 411
-@print{} a[4][2] = 42
 @print{} a[1] = 1
 @print{} a[2][1] = 21
 @print{} a[2][2] = 22
 @print{} a[3] = 3
+@print{} a[4][1][1] = 411
+@print{} a[4][2] = 42
 @end example
 
-@c ENDOFRANGE libfgdata
-@c ENDOFRANGE flibgdata
-@c ENDOFRANGE gdatar
-@c ENDOFRANGE libf
+The function just presented simply prints the
+name and value of each scalar array element. However, it is easy to
+generalize it, by passing in the name of a function to call
+when walking an array. The modified function looks like this:
+
+@example
+@c file eg/lib/processarray.awk
+function process_array(arr, name, process, do_arrays,   i, new_name)
+@{
+    for (i in arr) @{
+        new_name = (name "[" i "]")
+        if (isarray(arr[i])) @{
+            if (do_arrays)
+                @@process(new_name, arr[i])
+            process_array(arr[i], new_name, process, do_arrays)
+        @} else
+            @@process(new_name, arr[i])
+    @}
+@}
+@c endfile
+@end example
+
+The arguments are as follows:
+
+@table @code
+@item arr
+The array.
+
+@item name
+The name of the array (a string).
+
+@item process
+The name of the function to call.
+
+@item do_arrays
+If this is true, the function can handle elements that are subarrays.
+@end table
+
+If subarrays are to be processed, that is done before walking them further.
+
+When run with the following scaffolding, the function produces the same
+results as does the earlier version of @code{walk_array()}:
+
+@example
+BEGIN @{
+    a[1] = 1
+    a[2][1] = 21
+    a[2][2] = 22
+    a[3] = 3
+    a[4][1][1] = 411
+    a[4][2] = 42
+
+    process_array(a, "a", "do_print", 0)
+@}
+
+function do_print(name, element)
+@{
+    printf "%s = %s\n", name, element
+@}
+@end example
 
 @node Library Functions Summary
 @section Summary
@@ -21874,8 +22302,8 @@ $ @kbd{gawk -f walk_array.awk}
 @itemize @value{BULLET}
 @item
 Reading programs is an excellent way to learn Good Programming.
-The functions provided in this @value{CHAPTER} and the next are intended
-to serve that purpose.
+The functions and programs provided in this @value{CHAPTER} and the next
+are intended to serve that purpose.
 
 @item
 When writing general-purpose library functions, put some thought into how
@@ -21888,24 +22316,24 @@ The functions presented here fit into the following categories:
 @c nested list
 @table @asis
 @item General problems
-Number to string conversion, assertions, rounding, random number
+Number-to-string conversion, testing assertions, rounding, random number
 generation, converting characters to numbers, joining strings, getting
 easily usable time-of-day information, and reading a whole file in
-one shot.
+one shot
 
 @item Managing @value{DF}s
 Noting @value{DF} boundaries, rereading the current file, checking for
 readable files, checking for zero-length files, and treating assignments
-as @value{FN}s.
+as @value{FN}s
 
 @item Processing command-line options
-An @command{awk} version of the standard C @code{getopt()} function.
+An @command{awk} version of the standard C @code{getopt()} function
 
 @item Reading the user and group databases
-Two sets of routines that parallel the C library versions.
+Two sets of routines that parallel the C library versions
 
 @item Traversing arrays of arrays
-A simple function to traverse an array of arrays to any depth.
+Two functions that traverse an array of arrays to any depth
 @end table
 @c end nested list
 
@@ -21948,7 +22376,7 @@ ARGIND != Argind @{
 @}
 END @{
     if (ARGIND < ARGC - 1)
-        ARGIND = ARGC - 1 
+        ARGIND = ARGC - 1
     if (ARGIND > Argind)
         for (Argind++; Argind <= ARGIND; Argind++)
             zerofile(ARGV[Argind], Argind)
@@ -21980,13 +22408,9 @@ output identical to that of the original version.
 @end enumerate
 @c EXCLUDE END
 
-@c ENDOFRANGE flib
-@c ENDOFRANGE fudlib
-@c ENDOFRANGE datagr
 
 @node Sample Programs
 @chapter Practical @command{awk} Programs
-@c STARTOFRANGE awkpex
 @cindex @command{awk} programs, examples of
 
 @c FULLXREF ON
@@ -22004,10 +22428,10 @@ in this @value{CHAPTER}.
 The second presents @command{awk}
 versions of several common POSIX utilities.
 These are programs that you are hopefully already familiar with,
-and therefore, whose problems are understood.
+and therefore whose problems are understood.
 By reimplementing these programs in @command{awk},
 you can focus on the @command{awk}-related aspects of solving
-the programming problem.
+the programming problems.
 
 The third is a grab bag of interesting programs.
 These solve a number of different data-manipulation and management
@@ -22056,7 +22480,6 @@ cut.awk -- -c1-8 myfiles > results
 
 @node Clones
 @section Reinventing Wheels for Fun and Profit
-@c STARTOFRANGE posimawk
 @cindex POSIX, programs@comma{} implementing in @command{awk}
 
 This @value{SECTION} presents a number of POSIX utilities implemented in
@@ -22068,7 +22491,7 @@ It should be noted that these programs are not necessarily intended to
 replace the installed versions on your system.
 Nor may all of these programs be fully compliant with the most recent
 POSIX standard.  This is not a problem; their
-purpose is to illustrate @command{awk} language programming for ``real world''
+purpose is to illustrate @command{awk} language programming for ``real-world''
 tasks.
 
 The programs are presented in alphabetical order.
@@ -22084,14 +22507,11 @@ The programs are presented in alphabetical order.
 @end menu
 
 @node Cut Program
-@subsection Cutting out Fields and Columns
+@subsection Cutting Out Fields and Columns
 
 @cindex @command{cut} utility
-@c STARTOFRANGE cut
 @cindex @command{cut} utility
-@c STARTOFRANGE ficut
 @cindex fields, cutting
-@c STARTOFRANGE colcut
 @cindex columns, cutting
 The @command{cut} utility selects, or ``cuts,'' characters or fields
 from its standard input and sends them to its standard output.
@@ -22100,7 +22520,7 @@ but you may supply a command-line option to change the field
 @dfn{delimiter} (i.e., the field-separator character). @command{cut}'s
 definition of fields is less general than @command{awk}'s.
 
-A common use of @command{cut} might be to pull out just the login name of
+A common use of @command{cut} might be to pull out just the login names of
 logged-on users from the output of @command{who}.  For example, the following
 pipeline generates a sorted, unique list of the logged-on users:
 
@@ -22162,22 +22582,16 @@ supplied:
 # Requires getopt() and join() library functions
 
 @group
-function usage(    e1, e2)
+function usage()
 @{
-    e1 = "usage: cut [-f list] [-d c] [-s] [files...]"
-    e2 = "usage: cut [-c list] [files...]"
-    print e1 > "/dev/stderr"
-    print e2 > "/dev/stderr"
+    print("usage: cut [-f list] [-d c] [-s] [files...]") > "/dev/stderr"
+    print("usage: cut [-c list] [files...]") > "/dev/stderr"
     exit 1
 @}
 @end group
 @c endfile
 @end example
 
-@noindent
-The variables @code{e1} and @code{e2} are used so that the function
-fits nicely on the @value{PAGE}.
-
 @cindex @code{BEGIN} pattern, running @command{awk} programs and
 @cindex @code{FS} variable, running @command{awk} programs and
 Next comes a @code{BEGIN} rule that parses the command-line options.
@@ -22367,7 +22781,7 @@ function set_charlist(    field, i, j, f, g, n, m, t,
 @c endfile
 @end example
 
-Next is the rule that actually processes the data.  If the @option{-s} option
+Next is the rule that processes the data.  If the @option{-s} option
 is given, then @code{suppress} is true.  The first @code{if} statement
 makes sure that the input record does have the field separator.  If
 @command{cut} is processing fields, @code{suppress} is true, and the field
@@ -22399,27 +22813,20 @@ written out between the fields:
 @end example
 
 This version of @command{cut} relies on @command{gawk}'s @code{FIELDWIDTHS}
-variable to do the character-based cutting.  While it is possible in
+variable to do the character-based cutting.  It is possible in
 other @command{awk} implementations to use @code{substr()}
-(@pxref{String Functions}),
+(@pxref{String Functions}), but
 it is also extremely painful.
 The @code{FIELDWIDTHS} variable supplies an elegant solution to the problem
 of picking the input line apart by characters.
-@c ENDOFRANGE cut
-@c ENDOFRANGE ficut
-@c ENDOFRANGE colcut
 
 
 @node Egrep Program
 @subsection Searching for Regular Expressions in Files
 
-@c STARTOFRANGE regexps
 @cindex regular expressions, searching for
-@c STARTOFRANGE sfregexp
 @cindex searching, files for regular expressions
-@c STARTOFRANGE fsregexp
 @cindex files, searching for regular expressions
-@c STARTOFRANGE egrep
 @cindex @command{egrep} utility
 The @command{egrep} utility searches files for patterns.  It uses regular
 expressions that are almost identical to those available in @command{awk}
@@ -22472,7 +22879,7 @@ and the file transition library program
 The program begins with a descriptive comment and then a @code{BEGIN} rule
 that processes the command-line arguments with @code{getopt()}.  The @option{-i}
 (ignore case) option is particularly easy with @command{gawk}; we just use the
-@code{IGNORECASE} built-in variable
+@code{IGNORECASE} predefined variable
 (@pxref{Built-in Variables}):
 
 @cindex @code{egrep.awk} program
@@ -22546,7 +22953,7 @@ matched lines in the output:
 @c endfile
 @end example
 
-The last two lines are commented out, since they are not needed in
+The last two lines are commented out, as they are not needed in
 @command{gawk}.  They should be uncommented if you have to use another version
 of @command{awk}.
 
@@ -22556,7 +22963,7 @@ into lowercase if the @option{-i} option is specified.@footnote{It
 also introduces a subtle bug;
 if a match happens, we output the translated line, not the original.}
 The rule is
-commented out since it is not necessary with @command{gawk}:
+commented out as it is not necessary with @command{gawk}:
 
 @example
 @c file eg/prog/egrep.awk
@@ -22622,7 +23029,7 @@ successful or unsuccessful match.  If the line does not match, the
 @code{next} statement just moves on to the next record.
 
 A number of additional tests are made, but they are only done if we
-are not counting lines.  First, if the user only wants exit status
+are not counting lines.  First, if the user only wants the exit status
 (@code{no_print} is true), then it is enough to know that @emph{one}
 line in this file matched, and we can skip on to the next file with
 @code{nextfile}.  Similarly, if we are only printing @value{FN}s, we can
@@ -22663,7 +23070,7 @@ if necessary:
 @end example
 
 The @code{END} rule takes care of producing the correct exit status. If
-there are no matches, the exit status is one; otherwise it is zero:
+there are no matches, the exit status is one; otherwise, it is zero:
 
 @example
 @c file eg/prog/egrep.awk
@@ -22678,30 +23085,21 @@ and then exits:
 
 @example
 @c file eg/prog/egrep.awk
-function usage(    e)
+function usage()
 @{
-    e = "Usage: egrep [-csvil] [-e pat] [files ...]"
-    e = e "\n\tegrep [-csvil] pat [files ...]"
-    print e > "/dev/stderr"
+    print("Usage: egrep [-csvil] [-e pat] [files ...]") > "/dev/stderr"
+    print("\n\tegrep [-csvil] pat [files ...]") > "/dev/stderr"
     exit 1
 @}
 @c endfile
 @end example
 
-The variable @code{e} is used so that the function fits nicely
-on the printed page.
-
-@c ENDOFRANGE regexps
-@c ENDOFRANGE sfregexp
-@c ENDOFRANGE fsregexp
-@c ENDOFRANGE egrep
 
 @node Id Program
-@subsection Printing out User Information
+@subsection Printing Out User Information
 
 @cindex printing, user information
 @cindex users, information about, printing
-@c STARTOFRANGE id
 @cindex @command{id} utility
 The @command{id} utility lists a user's real and effective user ID numbers,
 real and effective group ID numbers, and the user's group set, if any.
@@ -22724,7 +23122,8 @@ Here is a simple version of @command{id} written in @command{awk}.
 It uses the user database library functions
 (@pxref{Passwd Functions})
 and the group database library functions
-(@pxref{Group Functions}):
+(@pxref{Group Functions})
+from @ref{Library Functions}.
 
 The program is fairly straightforward.  All the work is done in the
 @code{BEGIN} rule.  The user and group ID numbers are obtained from
@@ -22748,6 +23147,7 @@ numbers:
 # May 1993
 # Revised February 1996
 # Revised May 2014
+# Revised September 2014
 
 @c endfile
 @end ignore
@@ -22766,26 +23166,22 @@ BEGIN @{
 
     printf("uid=%d", uid)
     pw = getpwuid(uid)
-    if (pw != "")
-        pr_first_field(pw)
+    pr_first_field(pw)
 
     if (euid != uid) @{
         printf(" euid=%d", euid)
         pw = getpwuid(euid)
-        if (pw != "")
-            pr_first_field(pw)
+        pr_first_field(pw)
     @}
 
     printf(" gid=%d", gid)
     pw = getgrgid(gid)
-    if (pw != "")
-        pr_first_field(pw)
+    pr_first_field(pw)
 
     if (egid != gid) @{
         printf(" egid=%d", egid)
         pw = getgrgid(egid)
-        if (pw != "")
-            pr_first_field(pw)
+        pr_first_field(pw)
     @}
 
     for (i = 1; ("group" i) in PROCINFO; i++) @{
@@ -22794,8 +23190,7 @@ BEGIN @{
         group = PROCINFO["group" i]
         printf("%d", group)
         pw = getgrgid(group)
-        if (pw != "")
-            pr_first_field(pw)
+        pr_first_field(pw)
         if (("group" (i+1)) in PROCINFO)
             printf(",")
     @}
@@ -22805,8 +23200,10 @@ BEGIN @{
 
 function pr_first_field(str,  a)
 @{
-    split(str, a, ":")
-    printf("(%s)", a[1])
+    if (str != "") @{
+        split(str, a, ":")
+        printf("(%s)", a[1])
+    @}
 @}
 @c endfile
 @end example
@@ -22814,7 +23211,7 @@ function pr_first_field(str,  a)
 The test in the @code{for} loop is worth noting.
 Any supplementary groups in the @code{PROCINFO} array have the
 indices @code{"group1"} through @code{"group@var{N}"} for some
-@var{N}, i.e., the total number of supplementary groups.
+@var{N} (i.e., the total number of supplementary groups).
 However, we don't know in advance how many of these groups
 there are.
 
@@ -22829,18 +23226,16 @@ tested, and the loop body never executes.
 
 The @code{pr_first_field()} function simply isolates out some
 code that is used repeatedly, making the whole program
-slightly shorter and cleaner.
+shorter and cleaner. In particular, moving the check for
+the empty string into this function saves several lines of code.
 
-@c ENDOFRANGE id
 
 @node Split Program
 @subsection Splitting a Large File into Pieces
 
 @c FIXME: One day, update to current POSIX version of split
 
-@c STARTOFRANGE filspl
 @cindex files, splitting
-@c STARTOFRANGE split
 @cindex @code{split} utility
 The @command{split} program splits large text files into smaller pieces.
 Usage is as follows:@footnote{This is the traditional usage. The
@@ -22853,10 +23248,10 @@ aims to demonstrate.}
 
 By default,
 the output files are named @file{xaa}, @file{xab}, and so on. Each file has
-1000 lines in it, with the likely exception of the last file. To change the
+1,000 lines in it, with the likely exception of the last file. To change the
 number of lines in each file, supply a number on the command line
-preceded with a minus; e.g., @samp{-500} for files with 500 lines in them
-instead of 1000.  To change the name of the output files to something like
+preceded with a minus sign (e.g., @samp{-500} for files with 500 lines in them
+instead of 1,000).  To change the names of the output files to something like
 @file{myfileaa}, @file{myfileab}, and so on, supply an additional
 argument that specifies the @value{FN} prefix.
 
@@ -22904,7 +23299,7 @@ BEGIN @{
     @}
     # test argv in case reading from stdin instead of file
     if (i in ARGV)
-        i++    # skip data file name
+        i++    # skip datafile name
     if (i in ARGV) @{
         outfile = ARGV[i]
         ARGV[i] = ""
@@ -22956,19 +23351,14 @@ The @code{usage()} function simply prints an error message and exits:
 
 @example
 @c file eg/prog/split.awk
-function usage(   e)
+function usage()
 @{
-    e = "usage: split [-num] [file] [outname]"
-    print e > "/dev/stderr"
+    print("usage: split [-num] [file] [outname]") > "/dev/stderr"
     exit 1
 @}
 @c endfile
 @end example
 
-@noindent
-The variable @code{e} is used so that the function
-fits nicely on the @value{PAGE}.
-
 This program is a bit sloppy; it relies on @command{awk} to automatically close the last file
 instead of doing it in an @code{END} rule.
 It also assumes that letters are contiguous in the character set,
@@ -22980,15 +23370,12 @@ You might want to consider how to eliminate the use of
 way as to solve the EBCDIC issue as well.
 @end ifset
 
-@c ENDOFRANGE filspl
-@c ENDOFRANGE split
 
 @node Tee Program
 @subsection Duplicating Output into Multiple Files
 
 @cindex files, multiple@comma{} duplicating output into
 @cindex output, duplicating into files
-@c STARTOFRANGE tee
 @cindex @code{tee} utility
 The @code{tee} program is known as a ``pipe fitting.''  @code{tee} copies
 its standard input to its standard output and also duplicates it to the
@@ -23003,8 +23390,8 @@ truncating them and starting over.
 
 The @code{BEGIN} rule first makes a copy of all the command-line arguments
 into an array named @code{copy}.
-@code{ARGV[0]} is not copied, since it is not needed.
-@code{tee} cannot use @code{ARGV} directly, since @command{awk} attempts to
+@code{ARGV[0]} is not needed, so it is not copied.
+@code{tee} cannot use @code{ARGV} directly, because @command{awk} attempts to
 process each @value{FN} in @code{ARGV} as input data.
 
 @cindex flag variables
@@ -23053,7 +23440,7 @@ BEGIN @{
 @c endfile
 @end example
 
-The following single rule does all the work.  Since there is no pattern, it is
+The following single rule does all the work.  Because there is no pattern, it is
 executed for each line of input.  The body of the rule simply prints the
 line into each file on the command line, and then to the standard output:
 
@@ -23084,7 +23471,7 @@ for (i in copy)
 @end example
 
 @noindent
-This is more concise but it is also less efficient.  The @samp{if} is
+This is more concise, but it is also less efficient.  The @samp{if} is
 tested for each record and for each output file.  By duplicating the loop
 body, the @samp{if} is only tested once for each input record.  If there are
 @var{N} input records and @var{M} output files, the first method only
@@ -23101,18 +23488,14 @@ END @{
 @}
 @c endfile
 @end example
-@c ENDOFRANGE tee
 
 @node Uniq Program
 @subsection Printing Nonduplicated Lines of Text
 
 @c FIXME: One day, update to current POSIX version of uniq
 
-@c STARTOFRANGE prunt
 @cindex printing, unduplicated lines of text
-@c STARTOFRANGE tpul
 @cindex text@comma{} printing, unduplicated lines of
-@c STARTOFRANGE uniq
 @cindex @command{uniq} utility
 The @command{uniq} utility reads sorted lines of data on its standard
 input, and by default removes duplicate lines.  In other words, it only
@@ -23127,10 +23510,10 @@ The options for @command{uniq} are:
 
 @table @code
 @item -d
-Print only repeated lines.
+Print only repeated (duplicated) lines.
 
 @item -u
-Print only nonrepeated lines.
+Print only nonrepeated (unique) lines.
 
 @item -c
 Count lines. This option overrides @option{-d} and @option{-u}.  Both repeated
@@ -23199,10 +23582,9 @@ standard output, @file{/dev/stdout}:
 @end ignore
 @c file eg/prog/uniq.awk
 
-function usage(    e)
+function usage()
 @{
-    e = "Usage: uniq [-udc [-n]] [+n] [ in [ out ]]"
-    print e > "/dev/stderr"
+    print("Usage: uniq [-udc [-n]] [+n] [ in [ out ]]") > "/dev/stderr"
     exit 1
 @}
 
@@ -23256,22 +23638,20 @@ BEGIN @{
 @end example
 
 The following function, @code{are_equal()}, compares the current line,
-@code{$0}, to the
-previous line, @code{last}.  It handles skipping fields and characters.
-If no field count and no character count are specified, @code{are_equal()}
-simply returns one or zero depending upon the result of a simple string
-comparison of @code{last} and @code{$0}.  Otherwise, things get more
-complicated.
-If fields have to be skipped, each line is broken into an array using
-@code{split()}
-(@pxref{String Functions});
-the desired fields are then joined back into a line using @code{join()}.
-The joined lines are stored in @code{clast} and @code{cline}.
-If no fields are skipped, @code{clast} and @code{cline} are set to
-@code{last} and @code{$0}, respectively.
-Finally, if characters are skipped, @code{substr()} is used to strip off the
-leading @code{charcount} characters in @code{clast} and @code{cline}.  The
-two strings are then compared and @code{are_equal()} returns the result:
+@code{$0}, to the previous line, @code{last}.  It handles skipping fields
+and characters.  If no field count and no character count are specified,
+@code{are_equal()} returns one or zero depending upon the result of a
+simple string comparison of @code{last} and @code{$0}.
+
+Otherwise, things get more complicated.  If fields have to be skipped,
+each line is broken into an array using @code{split()} (@pxref{String
+Functions}); the desired fields are then joined back into a line
+using @code{join()}.  The joined lines are stored in @code{clast} and
+@code{cline}.  If no fields are skipped, @code{clast} and @code{cline}
+are set to @code{last} and @code{$0}, respectively.  Finally, if
+characters are skipped, @code{substr()} is used to strip off the leading
+@code{charcount} characters in @code{clast} and @code{cline}.  The two
+strings are then compared and @code{are_equal()} returns the result:
 
 @example
 @c file eg/prog/uniq.awk
@@ -23307,10 +23687,10 @@ The second rule does the work. The variable @code{equal} is one or zero,
 depending upon the results of @code{are_equal()}'s comparison. If @command{uniq}
 is counting repeated lines, and the lines are equal, then it increments the @code{count} variable.
 Otherwise, it prints the line and resets @code{count},
-since the two lines are not equal.
+because the two lines are not equal.
 
 If @command{uniq} is not counting, and if the lines are equal, @code{count} is incremented.
-Nothing is printed, since the point is to remove duplicates.
+Nothing is printed, as the point is to remove duplicates.
 Otherwise, if @command{uniq} is counting repeated lines and more than
 one line is seen, or if @command{uniq} is counting nonrepeated lines
 and only one line is seen, then the line is printed, and @code{count}
@@ -23362,6 +23742,13 @@ END @{
 @c endfile
 @end example
 
+@c FIXME: Include this?
+@ignore
+This program does not follow our recommended convention of naming
+global variables with a leading capital letter.  Doing that would
+make the program a little easier to follow.
+@end ignore
+
 @ifset FOR_PRINT
 The logic for choosing which lines to print represents a @dfn{state
 machine}, which is ``a device that can be in one of a set number of stable
@@ -23369,34 +23756,25 @@ conditions depending on its previous condition and on the present values
 of its inputs.''@footnote{This is the definition returned from entering
 @code{define: state machine} into Google.}
 Brian Kernighan suggests that
-``an alternative approach to state mechines is to just read
+``an alternative approach to state machines is to just read
 the input into an array, then use indexing.  It's almost always
 easier code, and for most inputs where you would use this, just
-as fast.''  Consider how to rewrite the logic to follow this 
+as fast.''  Consider how to rewrite the logic to follow this
 suggestion.
 @end ifset
 
 
-@c ENDOFRANGE prunt
-@c ENDOFRANGE tpul
-@c ENDOFRANGE uniq
 
 @node Wc Program
 @subsection Counting Things
 
 @c FIXME: One day, update to current POSIX version of wc
 
-@c STARTOFRANGE count
 @cindex counting
-@c STARTOFRANGE infco
 @cindex input files, counting elements in
-@c STARTOFRANGE woco
 @cindex words, counting
-@c STARTOFRANGE chco
 @cindex characters, counting
-@c STARTOFRANGE lico
 @cindex lines, counting
-@c STARTOFRANGE wc
 @cindex @command{wc} utility
 The @command{wc} (word count) utility counts lines, words, and characters in
 one or more input files. Its usage is as follows:
@@ -23407,7 +23785,7 @@ one or more input files. Its usage is as follows:
 
 If no files are specified on the command line, @command{wc} reads its standard
 input. If there are multiple files, it also prints total counts for all
-the files.  The options and their meanings are shown in the following list:
+the files.  The options and their meanings are as follows:
 
 @table @code
 @item -l
@@ -23424,7 +23802,7 @@ Count only characters.
 @end table
 
 Implementing @command{wc} in @command{awk} is particularly elegant,
-since @command{awk} does a lot of the work for us; it splits lines into
+because @command{awk} does a lot of the work for us; it splits lines into
 words (i.e., fields) and counts them, it counts lines (i.e., records),
 and it can easily tell us how long a line is.
 
@@ -23529,7 +23907,7 @@ function endfile(file)
 @end example
 
 There is one rule that is executed for each line. It adds the length of
-the record, plus one, to @code{chars}.@footnote{Since @command{gawk}
+the record, plus one, to @code{chars}.@footnote{Because @command{gawk}
 understands multibyte locales, this code counts characters, not bytes.}
 Adding one plus the record length
 is needed because the newline character separating records (the value
@@ -23566,13 +23944,6 @@ END @{
 @}
 @c endfile
 @end example
-@c ENDOFRANGE count
-@c ENDOFRANGE infco
-@c ENDOFRANGE lico
-@c ENDOFRANGE woco
-@c ENDOFRANGE chco
-@c ENDOFRANGE wc
-@c ENDOFRANGE posimawk
 
 @node Miscellaneous Programs
 @section A Grab Bag of @command{awk} Programs
@@ -23703,9 +24074,7 @@ Aharon Robbins <arnold@skeeve.com> wrote:
 @author Erik Quanstrom
 @end quotation
 
-@c STARTOFRANGE tialarm
 @cindex time, alarm clock example program
-@c STARTOFRANGE alaex
 @cindex alarm clock example program
 The following program is a simple ``alarm clock'' program.
 You give it a time of day and an optional message.  At the specified time,
@@ -23721,7 +24090,7 @@ checking and setting of defaults: the delay, the count, and the message to
 print.  If the user supplied a message without the ASCII BEL
 character (known as the ``alert'' character, @code{"\a"}), then it is added to
 the message.  (On many systems, printing the ASCII BEL generates an
-audible alert. Thus when the alarm goes off, the system calls attention
+audible alert. Thus, when the alarm goes off, the system calls attention
 to itself in case the user is not looking at the computer.)
 Just for a change, this program uses a @code{switch} statement
 (@pxref{Switch Statement}), but the processing could be done with a series of
@@ -23857,15 +24226,11 @@ seconds are necessary:
 @}
 @c endfile
 @end example
-@c ENDOFRANGE tialarm
-@c ENDOFRANGE alaex
 
 @node Translate Program
 @subsection Transliterating Characters
 
-@c STARTOFRANGE chtra
 @cindex characters, transliterating
-@c STARTOFRANGE tr
 @cindex @command{tr} utility
 The system @command{tr} utility transliterates characters.  For example, it is
 often used to map uppercase letters into lowercase for further processing:
@@ -23877,8 +24242,8 @@ often used to map uppercase letters into lowercase for further processing:
 @command{tr} requires two lists of characters.@footnote{On some older
 systems, including Solaris, the system version of @command{tr} may require
 that the lists be written as range expressions enclosed in square brackets
-(@samp{[a-z]}) and quoted, to prevent the shell from attempting a file
-name expansion.  This is not a feature.}  When processing the input, the
+(@samp{[a-z]}) and quoted, to prevent the shell from attempting a
+@value{FN} expansion.  This is not a feature.}  When processing the input, the
 first character in the first list is replaced with the first character
 in the second list, the second character in the first list is replaced
 with the second character in the second list, and so on.  If there are
@@ -23888,34 +24253,31 @@ character of the ``to'' list is used for the remaining characters in the
 
 Once upon a time,
 @c early or mid-1989!
-a user proposed that a transliteration function should
-be added to @command{gawk}.
+a user proposed adding a transliteration function
+to @command{gawk}.
 @c Wishing to avoid gratuitous new features,
 @c at least theoretically
 The following program was written to
 prove that character transliteration could be done with a user-level
-function.  This program is not as complete as the system @command{tr} utility
+function.  This program is not as complete as the system @command{tr} utility,
 but it does most of the job.
 
-The @command{translate} program demonstrates one of the few weaknesses
-of standard @command{awk}: dealing with individual characters is very
-painful, requiring repeated use of the @code{substr()}, @code{index()},
-and @code{gsub()} built-in functions
-(@pxref{String Functions}).@footnote{This
-program was also written before @command{gawk} acquired the ability to
-split each character in a string into separate array elements.}
-There are two functions.  The first, @code{stranslate()}, takes three
-arguments:
+The @command{translate} program was written long before @command{gawk}
+acquired the ability to split each character in a string into separate
+array elements.  Thus, it makes repeated use of the @code{substr()},
+@code{index()}, and @code{gsub()} built-in functions (@pxref{String
+Functions}).  There are two functions.  The first, @code{stranslate()},
+takes three arguments:
 
 @table @code
 @item from
-A list of characters from which to translate.
+A list of characters from which to translate
 
 @item to
-A list of characters to which to translate.
+A list of characters to which to translate
 
 @item target
-The string on which to do the translation.
+The string on which to do the translation
 @end table
 
 Associative arrays make the translation part fairly easy. @code{t_ar} holds
@@ -23924,7 +24286,7 @@ loop goes through @code{from}, one character at a time.  For each character
 in @code{from}, if the character appears in @code{target},
 it is replaced with the corresponding @code{to} character.
 
-The @code{translate()} function simply calls @code{stranslate()} using @code{$0}
+The @code{translate()} function calls @code{stranslate()}, using @code{$0}
 as the target.  The main program sets two global variables, @code{FROM} and
 @code{TO}, from the command line, and then changes @code{ARGV} so that
 @command{awk} reads from the standard input.
@@ -23946,7 +24308,7 @@ Finally, the processing rule simply calls @code{translate()} for each record:
 @c endfile
 @end ignore
 @c file eg/prog/translate.awk
-# Bugs: does not handle things like: tr A-Z a-z, it has
+# Bugs: does not handle things like tr A-Z a-z; it has
 # to be spelled out. However, if `to' is shorter than `from',
 # the last character in `to' is used for the rest of `from'.
 
@@ -23996,9 +24358,9 @@ BEGIN @{
 @c endfile
 @end example
 
-While it is possible to do character transliteration in a user-level
-function, it is not necessarily efficient, and we (the @command{gawk}
-authors) started to consider adding a built-in function.  However,
+It is possible to do character transliteration in a user-level
+function, but it is not necessarily efficient, and we (the @command{gawk}
+developers) started to consider adding a built-in function.  However,
 shortly after writing this program, we learned that Brian Kernighan
 had added the @code{toupper()} and @code{tolower()} functions to his
 @command{awk} (@pxref{String Functions}).  These functions handle the
@@ -24016,17 +24378,13 @@ such as @samp{a-z}, as allowed by the @command{tr} utility.
 Look at the code for @file{cut.awk} (@pxref{Cut Program})
 for inspiration.
 
-@c ENDOFRANGE chtra
-@c ENDOFRANGE tr
 
 @node Labels Program
 @subsection Printing Mailing Labels
 
-@c STARTOFRANGE prml
 @cindex printing, mailing labels
-@c STARTOFRANGE mlprint
 @cindex mailing labels@comma{} printing
-Here is a ``real world''@footnote{``Real world'' is defined as
+Here is a ``real-world''@footnote{``Real world'' is defined as
 ``a program actually used to get something done.''}
 program.  This
 script reads lists of names and
@@ -24035,14 +24393,14 @@ on it, two across and 10 down.  The addresses are guaranteed to be no more
 than five lines of data.  Each address is separated from the next by a blank
 line.
 
-The basic idea is to read 20 labels worth of data.  Each line of each label
+The basic idea is to read 20 labels' worth of data.  Each line of each label
 is stored in the @code{line} array.  The single rule takes care of filling
 the @code{line} array and printing the page when 20 labels have been read.
 
 The @code{BEGIN} rule simply sets @code{RS} to the empty string, so that
 @command{awk} splits records at blank lines
 (@pxref{Records}).
-It sets @code{MAXLINES} to 100, since 100 is the maximum number
+It sets @code{MAXLINES} to 100, because 100 is the maximum number
 of lines on the page
 @iftex
 (@math{20 @cdot 5 = 100}).
@@ -24058,12 +24416,12 @@ of lines on the page
 
 Most of the work is done in the @code{printpage()} function.
 The label lines are stored sequentially in the @code{line} array.  But they
-have to print horizontally; @code{line[1]} next to @code{line[6]},
-@code{line[2]} next to @code{line[7]}, and so on.  Two loops are used to
+have to print horizontally: @code{line[1]} next to @code{line[6]},
+@code{line[2]} next to @code{line[7]}, and so on.  Two loops
 accomplish this.  The outer loop, controlled by @code{i}, steps through
 every 10 lines of data; this is each row of labels.  The inner loop,
 controlled by @code{j}, goes through the lines within the row.
-As @code{j} goes from 0 to 4, @samp{i+j} is the @code{j}-th line in
+As @code{j} goes from 0 to 4, @samp{i+j} is the @code{j}th line in
 the row, and @samp{i+j+5} is the entry next to it.  The output ends up
 looking something like this:
 
@@ -24088,7 +24446,6 @@ that there are two blank lines at the top and two blank lines at the bottom.
 The @code{END} rule arranges to flush the final page of labels; there may
 not have been an even multiple of 20 labels in the data:
 
-@c STARTOFRANGE labels
 @cindex @code{labels.awk} program
 @example
 @c file eg/prog/labels.awk
@@ -24153,14 +24510,10 @@ END @{
 @}
 @c endfile
 @end example
-@c ENDOFRANGE prml
-@c ENDOFRANGE mlprint
-@c ENDOFRANGE labels
 
 @node Word Sorting
 @subsection Generating Word-Usage Counts
 
-@c STARTOFRANGE worus
 @cindex words, usage counts@comma{} generating
 
 When working with large amounts of text, it can be interesting to know
@@ -24173,7 +24526,7 @@ in a useful format.
 At first glance, a program like this would seem to do the job:
 
 @example
-# Print list of word frequencies
+# wordfreq-first-try.awk --- print list of word frequencies
 
 @{
     for (i = 1; i <= NF; i++)
@@ -24186,8 +24539,8 @@ END @{
 @}
 @end example
 
-The program relies on @command{awk}'s default field splitting
-mechanism to break each line up into ``words,'' and uses an
+The program relies on @command{awk}'s default field-splitting
+mechanism to break each line up into ``words'' and uses an
 associative array named @code{freq}, indexed by each word, to count
 the number of times the word occurs. In the @code{END} rule,
 it prints the counts.
@@ -24199,9 +24552,9 @@ useful on real text files:
 @item
 The @command{awk} language considers upper- and lowercase characters to be
 distinct.  Therefore, ``bartender'' and ``Bartender'' are not treated
-as the same word.  This is undesirable, since in normal text, words
-are capitalized if they begin sentences, and a frequency analyzer should not
-be sensitive to capitalization.
+as the same word.  This is undesirable, because words are capitalized
+if they begin sentences in normal text, and a frequency analyzer should
+not be sensitive to capitalization.
 
 @item
 Words are detected using the @command{awk} convention that fields are
@@ -24222,7 +24575,6 @@ to remove punctuation characters.  Finally, we solve the third problem
 by using the system @command{sort} utility to process the output of the
 @command{awk} script.  Here is the new version of the program:
 
-@c STARTOFRANGE wordfreq
 @cindex @code{wordfreq.awk} program
 @example
 @c file eg/prog/wordfreq.awk
@@ -24243,8 +24595,8 @@ END @{
 @}
 @end example
 
-The regexp @samp{/[^[:alnum:]_[:blank:]]/} might have been written
-@samp{/[[:punct:]]/}, but then underscores would also be removed,
+The regexp @code{/[^[:alnum:]_[:blank:]]/} might have been written
+@code{/[[:punct:]]/}, but then underscores would also be removed,
 and we want to keep them.
 
 Assuming we have saved this program in a file named @file{wordfreq.awk},
@@ -24287,16 +24639,13 @@ This way of sorting must be used on systems that do not
 have true pipes at the command-line (or batch-file) level.
 See the general operating system documentation for more information on how
 to use the @command{sort} program.
-@c ENDOFRANGE worus
-@c ENDOFRANGE wordfreq
 
 @node History Sorting
 @subsection Removing Duplicates from Unsorted Text
 
-@c STARTOFRANGE lidu
 @cindex lines, duplicate@comma{} removing
 The @command{uniq} program
-(@pxref{Uniq Program}),
+(@pxref{Uniq Program})
 removes duplicate lines from @emph{sorted} data.
 
 Suppose, however, you need to remove duplicate lines from a @value{DF} but
@@ -24318,7 +24667,6 @@ Each element of @code{lines} is a unique command, and the indices of
 The @code{END} rule simply prints out the lines, in order:
 
 @cindex Rakitzis, Byron
-@c STARTOFRANGE histsort
 @cindex @code{histsort.awk} program
 @example
 @c file eg/prog/histsort.awk
@@ -24361,15 +24709,11 @@ print data[lines[i]], lines[i]
 @noindent
 This works because @code{data[$0]} is incremented each time a line is
 seen.
-@c ENDOFRANGE lidu
-@c ENDOFRANGE histsort
 
 @node Extract Program
 @subsection Extracting Programs from Texinfo Source Files
 
-@c STARTOFRANGE texse
 @cindex Texinfo, extracting programs from source files
-@c STARTOFRANGE fitex
 @cindex files, Texinfo@comma{} extracting programs from
 @ifnotinfo
 Both this chapter and the previous chapter
@@ -24382,24 +24726,24 @@ The nodes
 and @ref{Sample Programs},
 are the top level nodes for a large number of @command{awk} programs.
 @end ifinfo
-If you want to experiment with these programs, it is tedious to have to type
+If you want to experiment with these programs, it is tedious to type
 them in by hand.  Here we present a program that can extract parts of a
 Texinfo input file into separate files.
 
 @cindex Texinfo
 This @value{DOCUMENT} is written in @uref{http://www.gnu.org/software/texinfo/, Texinfo},
-the GNU project's document formatting language.
+the GNU Project's document formatting language.
 A single Texinfo source file can be used to produce both
-printed and online documentation.
+printed documentation, with @TeX{}, and online documentation.
 @ifnotinfo
-Texinfo is fully documented in the book
+(Texinfo is fully documented in the book
 @cite{Texinfo---The GNU Documentation Format},
 available from the Free Software Foundation,
-and also available @uref{http://www.gnu.org/software/texinfo/manual/texinfo/, online}.
+and also available @uref{http://www.gnu.org/software/texinfo/manual/texinfo/, online}.)
 @end ifnotinfo
 @ifinfo
-The Texinfo language is described fully, starting with
-@inforef{Top, , Texinfo, texinfo,Texinfo---The GNU Documentation Format}.
+(The Texinfo language is described fully, starting with
+@inforef{Top, , Texinfo, texinfo,Texinfo---The GNU Documentation Format}.)
 @end ifinfo
 
 For our purposes, it is enough to know three things about Texinfo input
@@ -24447,7 +24791,7 @@ The Texinfo file looks something like this:
 
 @example
 @dots{}
-This program has a @@code@{BEGIN@} rule,
+This program has a @@code@{BEGIN@} rule
 that prints a nice message:
 
 @@example
@@ -24460,7 +24804,7 @@ It also prints some final advice:
 
 @@example
 @@c file examples/messages.awk
-END @@@{ print "Always avoid bored archeologists!" @@@}
+END @@@{ print "Always avoid bored archaeologists!" @@@}
 @@c end file
 @@end example
 @dots{}
@@ -24473,12 +24817,10 @@ The first rule handles calling @code{system()}, checking that a command is
 given (@code{NF} is at least three) and also checking that the command
 exits with a zero exit status, signifying OK:
 
-@c STARTOFRANGE extract
 @cindex @code{extract.awk} program
 @example
 @c file eg/prog/extract.awk
-# extract.awk --- extract files and run programs
-#                 from texinfo files
+# extract.awk --- extract files and run programs from Texinfo files
 @c endfile
 @ignore
 @c file eg/prog/extract.awk
@@ -24492,8 +24834,7 @@ exits with a zero exit status, signifying OK:
 
 BEGIN    @{ IGNORECASE = 1 @}
 
-/^@@c(omment)?[ \t]+system/    \
-@{
+/^@@c(omment)?[ \t]+system/ @{
     if (NF < 3) @{
         e = ("extract: " FILENAME ":" FNR)
         e = (e  ": badly formed `system' line")
@@ -24520,12 +24861,12 @@ The second rule handles moving data into files.  It verifies that a
 @value{FN} is given in the directive.  If the file named is not the
 current file, then the current file is closed.  Keeping the current file
 open until a new file is encountered allows the use of the @samp{>}
-redirection for printing the contents, keeping open file management
+redirection for printing the contents, keeping open-file management
 simple.
 
 The @code{for} loop does the work.  It reads lines using @code{getline}
 (@pxref{Getline}).
-For an unexpected end of file, it calls the @code{@w{unexpected_eof()}}
+For an unexpected end-of-file, it calls the @code{@w{unexpected_eof()}}
 function.  If the line is an ``endfile'' line, then it breaks out of
 the loop.
 If the line is an @samp{@@group} or @samp{@@end group} line, then it
@@ -24550,8 +24891,7 @@ line.  That line is then printed to the output file:
 
 @example
 @c file eg/prog/extract.awk
-/^@@c(omment)?[ \t]+file/    \
-@{
+/^@@c(omment)?[ \t]+file/ @{
     if (NF != 3) @{
         e = ("extract: " FILENAME ":" FNR ": badly formed `file' line")
         print e > "/dev/stderr"
@@ -24611,7 +24951,7 @@ The @code{END} rule handles the final cleanup, closing the open file:
 function unexpected_eof()
 @{
     printf("extract: %s:%d: unexpected EOF or error\n",
-        FILENAME, FNR) > "/dev/stderr"
+                     FILENAME, FNR) > "/dev/stderr"
     exit 1
 @}
 @end group
@@ -24622,29 +24962,26 @@ END @{
 @}
 @c endfile
 @end example
-@c ENDOFRANGE texse
-@c ENDOFRANGE fitex
-@c ENDOFRANGE extract
 
 @node Simple Sed
 @subsection A Simple Stream Editor
 
 @cindex @command{sed} utility
 @cindex stream editors
-The @command{sed} utility is a stream editor, a program that reads a
+The @command{sed} utility is a @dfn{stream editor}, a program that reads a
 stream of data, makes changes to it, and passes it on.
 It is often used to make global changes to a large file or to a stream
 of data generated by a pipeline of commands.
-While @command{sed} is a complicated program in its own right, its most common
+Although @command{sed} is a complicated program in its own right, its most common
 use is to perform global substitutions in the middle of a pipeline:
 
 @example
-command1 < orig.data | sed 's/old/new/g' | command2 > result
+@var{command1} < orig.data | sed 's/old/new/g' | @var{command2} > result
 @end example
 
 Here, @samp{s/old/new/g} tells @command{sed} to look for the regexp
 @samp{old} on each input line and globally replace it with the text
-@samp{new}, i.e., all the occurrences on a line.  This is similar to
+@samp{new} (i.e., all the occurrences on a line).  This is similar to
 @command{awk}'s @code{gsub()} function
 (@pxref{String Functions}).
 
@@ -24654,7 +24991,6 @@ additional arguments are treated as @value{DF} names to process. If none
 are provided, the standard input is used:
 
 @cindex Brennan, Michael
-@c STARTOFRANGE awksed
 @cindex @command{awksed.awk} program
 @c @cindex simple stream editor
 @c @cindex stream editor, simple
@@ -24728,17 +25064,14 @@ not treated as @value{FN}s
 (@pxref{ARGC and ARGV}).
 
 The @code{usage()} function prints an error message and exits.
-Finally, the single rule handles the printing scheme outlined above,
+Finally, the single rule handles the printing scheme outlined earlier,
 using @code{print} or @code{printf} as appropriate, depending upon the
 value of @code{RT}.
-@c ENDOFRANGE awksed
 
 @node Igawk Program
 @subsection An Easy Way to Use Library Functions
 
-@c STARTOFRANGE libfex
 @cindex libraries of @command{awk} functions, example program for using
-@c STARTOFRANGE flibex
 @cindex functions, library, example program for using
 In @ref{Include Files}, we saw how @command{gawk} provides a built-in
 file-inclusion capability.  However, this is a @command{gawk} extension.
@@ -24772,15 +25105,15 @@ BEGIN @{
 
 The following program, @file{igawk.sh}, provides this service.
 It simulates @command{gawk}'s searching of the @env{AWKPATH} variable
-and also allows @dfn{nested} includes; i.e., a file that is included
-with @code{@@include} can contain further @code{@@include} statements.
+and also allows @dfn{nested} includes (i.e., a file that is included
+with @code{@@include} can contain further @code{@@include} statements).
 @command{igawk} makes an effort to only include files once, so that nested
 includes don't accidentally include a library function twice.
 
 @command{igawk} should behave just like @command{gawk} externally.  This
 means it should accept all of @command{gawk}'s command-line arguments,
 including the ability to have multiple source files specified via
-@option{-f}, and the ability to mix command-line and library source files.
+@option{-f} and the ability to mix command-line and library source files.
 
 The program is written using the POSIX Shell (@command{sh}) command
 language.@footnote{Fully explaining the @command{sh} language is beyond
@@ -24803,10 +25136,10 @@ Literal text, provided with @option{-e} or @option{--source}.  This
 text is just appended directly.
 
 @item
-Source @value{FN}s, provided with @option{-f}.  We use a neat trick and append
-@samp{@@include @var{filename}} to the shell variable's contents.  Since the file-inclusion
-program works the way @command{gawk} does, this gets the text
-of the file included into the program at the correct point.
+Source @value{FN}s, provided with @option{-f}.  We use a neat trick and
+append @samp{@@include @var{filename}} to the shell variable's contents.
+Because the file-inclusion program works the way @command{gawk} does, this
+gets the text of the file included in the program at the correct point.
 @end enumerate
 
 @item
@@ -24819,7 +25152,7 @@ Run the expanded program with @command{gawk} and any other original command-line
 arguments that the user supplied (such as the @value{DF} names).
 @end enumerate
 
-This program uses shell variables extensively: for storing command-line arguments,
+This program uses shell variables extensively: for storing command-line arguments and
 the text of the @command{awk} program that will expand the user's program, for the
 user's original program, and for the expanded program.  Doing so removes some
 potential problems that might arise were we to use temporary files instead,
@@ -24871,12 +25204,12 @@ should be the @command{awk} program.  If there are no command-line
 arguments left, @command{igawk} prints an error message and exits.
 Otherwise, the first argument is appended to @code{program}.
 In any case, after the arguments have been processed,
+the shell variable
 @code{program} contains the complete text of the original @command{awk}
 program.
 
 The program is as follows:
 
-@c STARTOFRANGE igawk
 @cindex @code{igawk.sh} program
 @example
 @c file eg/prog/igawk.sh
@@ -24993,8 +25326,8 @@ the path, and an attempt is made to open the generated @value{FN}.
 The only way to test if a file can be read in @command{awk} is to go
 ahead and try to read it with @code{getline}; this is what @code{pathto()}
 does.@footnote{On some very old versions of @command{awk}, the test
-@samp{getline junk < t} can loop forever if the file exists but is empty.
-Caveat emptor.} If the file can be read, it is closed and the @value{FN}
+@samp{getline junk < t} can loop forever if the file exists but is empty.}
+If the file can be read, it is closed and the @value{FN}
 is returned:
 
 @ignore
@@ -25104,9 +25437,10 @@ EOF
 @c endfile
 @end example
 
-The shell construct @samp{@var{command} << @var{marker}} is called a @dfn{here document}.
-Everything in the shell script up to the @var{marker} is fed to @var{command} as input.
-The shell processes the contents of the here document for variable and command substitution
+The shell construct @samp{@var{command} << @var{marker}} is called
+a @dfn{here document}.  Everything in the shell script up to the
+@var{marker} is fed to @var{command} as input.  The shell processes
+the contents of the here document for variable and command substitution
 (and possibly other things as well, depending upon the shell).
 
 The shell construct @samp{$(@dots{})} is called @dfn{command substitution}.
@@ -25121,34 +25455,21 @@ It's done in these steps:
 @enumerate
 @item
 Run @command{gawk} with the @code{@@include}-processing program (the
-value of the @code{expand_prog} shell variable) on standard input.
+value of the @code{expand_prog} shell variable) reading standard input.
 
 @item
-Standard input is the contents of the user's program, from the shell variable @code{program}.
-Its contents are fed to @command{gawk} via a here document.
+Standard input is the contents of the user's program,
+from the shell variable @code{program}.
+Feed its contents to @command{gawk} via a here document.
 
 @item
-The results of this processing are saved in the shell variable @code{processed_program} by using command substitution.
+Save the results of this processing in the shell variable
+@code{processed_program} by using command substitution.
 @end enumerate
 
 The last step is to call @command{gawk} with the expanded program,
 along with the original
-options and command-line arguments that the user supplied.
-
-@c this causes more problems than it solves, so leave it out.
-@ignore
-The special file @file{/dev/null} is passed as a @value{DF} to @command{gawk}
-to handle an interesting case. Suppose that the user's program only has
-a @code{BEGIN} rule and there are no @value{DF}s to read.
-The program should exit without reading any @value{DF}s.
-However, suppose that an included library file defines an @code{END}
-rule of its own. In this case, @command{gawk} will hang, reading standard
-input. In order to avoid this, @file{/dev/null} is explicitly added to the
-command line. Reading from @file{/dev/null} always returns an immediate
-end of file indication.
-
-@c Hmm. Add /dev/null if $# is 0?  Still messes up ARGV. Sigh.
-@end ignore
+options and command-line arguments that the user supplied:
 
 @example
 @c file eg/prog/igawk.sh
@@ -25194,19 +25515,13 @@ in C or C++, and it is frequently easier to do certain kinds of string
 and argument manipulation using the shell than it is in @command{awk}.
 
 Finally, @command{igawk} shows that it is not always necessary to add new
-features to a program; they can often be layered on top.
-@ignore
-With @command{igawk},
-there is no real reason to build @code{@@include} processing into
-@command{gawk} itself.
-@end ignore
-@c ENDOFRANGE libfex
-@c ENDOFRANGE flibex
-@c ENDOFRANGE awkpex
-@c ENDOFRANGE igawk
+features to a program; they can often be layered on top.@footnote{@command{gawk}
+does @code{@@include} processing itself in order to support the use
+of @command{awk} programs as Web CGI scripts.}
+
 
 @node Anagram Program
-@subsection Finding Anagrams From A Dictionary
+@subsection Finding Anagrams from a Dictionary
 
 @cindex anagrams, finding
 An interesting programming challenge is to
@@ -25215,25 +25530,23 @@ word list (such as
 @file{/usr/share/dict/words} on many GNU/Linux systems).
 One word is an anagram of another if both words contain
 the same letters
-(for example, ``babbling'' and ``blabbing'').
+(e.g., ``babbling'' and ``blabbing'').
 
-An elegant algorithm is presented in Column 2, Problem C of
-Jon Bentley's @cite{Programming Pearls}, second edition.
-The idea is to give words that are anagrams a common signature,
-sort all the words together by their signature, and then print them.
-Dr.@: Bentley observes that taking the letters in each word and
-sorting them produces that common signature.
+Column 2, Problem C, of Jon Bentley's @cite{Programming Pearls}, Second
+Edition, presents an elegant algorithm.  The idea is to give words that
+are anagrams a common signature, sort all the words together by their
+signatures, and then print them.  Dr.@: Bentley observes that taking the
+letters in each word and sorting them produces those common signatures.
 
 The following program uses arrays of arrays to bring together
 words with the same signature and array sorting to print the words
-in sorted order.
+in sorted order:
 
-@c STARTOFRANGE anagram
 @cindex @code{anagram.awk} program
 @example
 @c file eg/prog/anagram.awk
-# anagram.awk --- An implementation of the anagram finding algorithm
-#                 from Jon Bentley's "Programming Pearls", 2nd edition.
+# anagram.awk --- An implementation of the anagram-finding algorithm
+#                 from Jon Bentley's "Programming Pearls," 2nd edition.
 #                 Addison Wesley, 2000, ISBN 0-201-65788-0.
 #                 Column 2, Problem C, section 2.8, pp 18-20.
 @c endfile
@@ -25281,7 +25594,7 @@ sorts the letters, and then joins them back together:
 
 @example
 @c file eg/prog/anagram.awk
-# word2key --- split word apart into letters, sort, joining back together
+# word2key --- split word apart into letters, sort, and join back together
 
 function word2key(word,     a, i, n, result)
 @{
@@ -25298,7 +25611,7 @@ function word2key(word,     a, i, n, result)
 
 Finally, the @code{END} rule traverses the array
 and prints out the anagram lists.  It sends the output
-to the system @command{sort} command, since otherwise
+to the system @command{sort} command because otherwise
 the anagrams would appear in arbitrary order:
 
 @example
@@ -25326,21 +25639,20 @@ Here is some partial output when the program is run:
 @example
 $ @kbd{gawk -f anagram.awk /usr/share/dict/words | grep '^b'}
 @dots{}
-babbled blabbed 
-babbler blabber brabble 
-babblers blabbers brabbles 
-babbling blabbing 
-babbly blabby 
-babel bable 
-babels beslab 
-babery yabber 
+babbled blabbed
+babbler blabber brabble
+babblers blabbers brabbles
+babbling blabbing
+babbly blabby
+babel bable
+babels beslab
+babery yabber
 @dots{}
 @end example
 
-@c ENDOFRANGE anagram
 
 @node Signature Program
-@subsection And Now For Something Completely Different
+@subsection And Now for Something Completely Different
 
 @cindex signature program
 @cindex Brini, Davide
@@ -25380,28 +25692,28 @@ Subject: The GNU Awk User's Guide, Section 13.3.11
 From: "Chris Johansen" <johansen@main.nc.us>
 Message-ID: <op.v0iw6wlv7finx3@asusodin.thrudvang.lan>
 
-Arnold, you don't know me, but we have a tenuous connection.  My wife is  
+Arnold, you don't know me, but we have a tenuous connection.  My wife is
 Barbara A. Field, FAIA, GIT '65 (B. Arch.).
 
-I have had a couple of paper copies of "Effective Awk Programming" for  
-years, and now I'm going through a Kindle version of "The GNU Awk User's  
-Guide" again.  When I got to section 13.3.11, I reformatted and lightly  
+I have had a couple of paper copies of "Effective Awk Programming" for
+years, and now I'm going through a Kindle version of "The GNU Awk User's
+Guide" again.  When I got to section 13.3.11, I reformatted and lightly
 commented Davide Brin's signature script to understand its workings.
 
-It occurs to me that this might have pedagogical value as an example  
-(although imperfect) of the value of whitespace and comments, and a  
-starting point for that discussion.  It certainly helped _me_ understand  
-what's going on.  You are welcome to it, as-is or modified (subject to  
+It occurs to me that this might have pedagogical value as an example
+(although imperfect) of the value of whitespace and comments, and a
+starting point for that discussion.  It certainly helped _me_ understand
+what's going on.  You are welcome to it, as-is or modified (subject to
 Davide's constraints, of course, which I think I have met).
 
-If I were to include it in a future edition, I would put it at some  
-distance from section 13.3.11, say, as a note or an appendix, so as not to  
+If I were to include it in a future edition, I would put it at some
+distance from section 13.3.11, say, as a note or an appendix, so as not to
 be a "spoiler" to the puzzle.
 
 Best regards,
--- 
+--
 Chris Johansen {johansen at main dot nc dot us}
-  . . . collapsing the probability wave function, sending ripples of  
+  . . . collapsing the probability wave function, sending ripples of
 certainty through the space-time continuum.
 
 
@@ -25410,7 +25722,7 @@ certainty through the space-time continuum.
 # From "13.3.11 And Now For Something Completely Different"
 #   http://www.gnu.org/software/gawk/manual/html_node/Signature-Program.html#Signature-Program
 
-# Copyright © 2008 Davide Brini 
+# Copyright © 2008 Davide Brini
 
 # Copying and distribution of the code published in this page, with
 # or without modification, are permitted in any medium without
@@ -25456,7 +25768,7 @@ BEGIN {
 
 @itemize @value{BULLET}
 @item
-The functions provided in this @value{CHAPTER} and the previous one
+The programs provided in this @value{CHAPTER}
 continue on the theme that reading programs is an excellent way to learn
 Good Programming.
 
@@ -25477,12 +25789,13 @@ characters.  The ability to use @code{split()} with the empty string as
 the separator can considerably simplify such tasks.
 
 @item
-The library functions from @ref{Library Functions}, proved their
-usefulness for a number of real (if small) programs.
+The examples here demonstrate the usefulness of the library
+functions from @DBREF{Library Functions}
+for a number of real (if small) programs.
 
 @item
 Besides reinventing POSIX wheels, other programs solved a selection of
-interesting problems, such as finding duplicates words in text, printing
+interesting problems, such as finding duplicate words in text, printing
 mailing labels, and finding anagrams.
 
 @end itemize
@@ -25494,7 +25807,7 @@ mailing labels, and finding anagrams.
 @enumerate
 @item
 Rewrite @file{cut.awk} (@pxref{Cut Program})
-using @code{split()} with @code{""} as the seperator.
+using @code{split()} with @code{""} as the separator.
 
 @item
 In @ref{Egrep Program}, we mentioned that @samp{egrep -i} could be
@@ -25526,10 +25839,10 @@ conditions depending on its previous condition and on the present values
 of its inputs.''@footnote{This is the definition returned from entering
 @code{define: state machine} into Google.}
 Brian Kernighan suggests that
-``an alternative approach to state mechines is to just read
+``an alternative approach to state machines is to just read
 the input into an array, then use indexing.  It's almost always
 easier code, and for most inputs where you would use this, just
-as fast.''  Rewrite the logic to follow this 
+as fast.''  Rewrite the logic to follow this
 suggestion.
 
 
@@ -25630,7 +25943,7 @@ the use of the external @command{sort} utility.
 @c EXCLUDE END
 
 @ifnotinfo
-@part @value{PART3}Moving Beyond Standard @command{awk} With @command{gawk}
+@part @value{PART3}Moving Beyond Standard @command{awk} with @command{gawk}
 @end ifnotinfo
 
 @ifdocbook
@@ -25639,27 +25952,25 @@ It contains the following chapters:
 
 @itemize @value{BULLET}
 @item
-@ref{Advanced Features}.
+@ref{Advanced Features}
 
 @item
-@ref{Internationalization}.
+@ref{Internationalization}
 
 @item
-@ref{Debugger}.
+@ref{Debugger}
 
 @item
-@ref{Arbitrary Precision Arithmetic}.
+@ref{Arbitrary Precision Arithmetic}
 
 @item
-@ref{Dynamic Extensions}.
+@ref{Dynamic Extensions}
 @end itemize
 @end ifdocbook
 
 @node Advanced Features
 @chapter Advanced Features of @command{gawk}
-@c STARTOFRANGE gawadv
 @cindex @command{gawk}, features, advanced
-@c STARTOFRANGE advgaw
 @cindex advanced features, @command{gawk}
 @ignore
 Contributed by: Peter Langston <pud!psl@bellcore.bellcore.com>
@@ -25680,18 +25991,18 @@ a violent psychopath who knows where you live.}
 This @value{CHAPTER} discusses advanced features in @command{gawk}.
 It's a bit of a ``grab bag'' of items that are otherwise unrelated
 to each other.
-First, a command-line option allows @command{gawk} to recognize
+First, we look at a command-line option that allows @command{gawk} to recognize
 nondecimal numbers in input data, not just in @command{awk}
 programs.
 Then, @command{gawk}'s special features for sorting arrays are presented.
 Next, two-way I/O, discussed briefly in earlier parts of this
 @value{DOCUMENT}, is described in full detail, along with the basics
-of TCP/IP networking.  Finally, @command{gawk}
+of TCP/IP networking.  Finally, we see how @command{gawk}
 can @dfn{profile} an @command{awk} program, making it possible to tune
 it for performance.
 
 @c FULLXREF ON
-A number of advanced features require separate @value{CHAPTER}s of their
+Additional advanced features are discussed in separate @value{CHAPTER}s of their
 own:
 
 @itemize @value{BULLET}
@@ -25733,13 +26044,11 @@ discusses the ability to dynamically add new built-in functions to
 @cindex constants, nondecimal
 
 If you run @command{gawk} with the @option{--non-decimal-data} option,
-you can have nondecimal constants in your input data:
+you can have nondecimal values in your input data:
 
-@c line break here for small book format
 @example
 $ @kbd{echo 0123 123 0x123 |}
-> @kbd{gawk --non-decimal-data '@{ printf "%d, %d, %d\n",}
->                                         @kbd{$1, $2, $3 @}'}
+> @kbd{gawk --non-decimal-data '@{ printf "%d, %d, %d\n", $1, $2, $3 @}'}
 @print{} 83, 123, 291
 @end example
 
@@ -25780,12 +26089,15 @@ Instead, use the @code{strtonum()} function to convert your data
 (@pxref{String Functions}).
 This makes your programs easier to write and easier to read, and
 leads to less surprising results.
+
+This option may disappear in a future version of @command{gawk}.
 @end quotation
 
 @node Array Sorting
 @section Controlling Array Traversal and Array Sorting
 
-@command{gawk} lets you control the order in which a @samp{for (i in array)}
+@command{gawk} lets you control the order in which a
+@samp{for (@var{indx} in @var{array})}
 loop traverses an array.
 
 In addition, two built-in functions, @code{asort()} and @code{asorti()},
@@ -25801,7 +26113,7 @@ to order the elements during sorting.
 @node Controlling Array Traversal
 @subsection Controlling Array Traversal
 
-By default, the order in which a @samp{for (i in array)} loop
+By default, the order in which a @samp{for (@var{indx} in @var{array})} loop
 scans an array is not defined; it is generally based upon
 the internal implementation of arrays inside @command{awk}.
 
@@ -25810,11 +26122,13 @@ in a particular order that you, the programmer, choose.  @command{gawk}
 lets you do this.
 
 @DBREF{Controlling Scanning} describes how you can assign special,
-pre-defined values to @code{PROCINFO["sorted_in"]} in order to
+predefined values to @code{PROCINFO["sorted_in"]} in order to
 control the order in which @command{gawk} traverses an array
 during a @code{for} loop.
 
-In addition, the value of @code{PROCINFO["sorted_in"]} can be a function name.
+In addition, the value of @code{PROCINFO["sorted_in"]} can be a
+function name.@footnote{This is why the predefined sorting orders
+start with an @samp{@@} character, which cannot be part of an identifier.}
 This lets you traverse an array based on any custom criterion.
 The array elements are ordered according to the return value of this
 function.  The comparison function should be defined with at least
@@ -25828,23 +26142,23 @@ function comp_func(i1, v1, i2, v2)
 @}
 @end example
 
-Here, @var{i1} and @var{i2} are the indices, and @var{v1} and @var{v2}
+Here, @code{i1} and @code{i2} are the indices, and @code{v1} and @code{v2}
 are the corresponding values of the two elements being compared.
-Either @var{v1} or @var{v2}, or both, can be arrays if the array being
+Either @code{v1} or @code{v2}, or both, can be arrays if the array being
 traversed contains subarrays as values.
-(@xref{Arrays of Arrays}, for more information about subarrays.)
+(@DBXREF{Arrays of Arrays} for more information about subarrays.)
 The three possible return values are interpreted as follows:
 
 @table @code
 @item comp_func(i1, v1, i2, v2) < 0
-Index @var{i1} comes before index @var{i2} during loop traversal.
+Index @code{i1} comes before index @code{i2} during loop traversal.
 
 @item comp_func(i1, v1, i2, v2) == 0
-Indices @var{i1} and @var{i2}
-come together but the relative order with respect to each other is undefined.
+Indices @code{i1} and @code{i2}
+come together, but the relative order with respect to each other is undefined.
 
 @item comp_func(i1, v1, i2, v2) > 0
-Index @var{i1} comes after index @var{i2} during loop traversal.
+Index @code{i1} comes after index @code{i2} during loop traversal.
 @end table
 
 Our first comparison function can be used to scan an array in
@@ -25875,7 +26189,7 @@ function cmp_str_val(i1, v1, i2, v2)
 
 The third
 comparison function makes all numbers, and numeric strings without
-any leading or trailing spaces, come out first during loop traversal:  
+any leading or trailing spaces, come out first during loop traversal:
 
 @example
 function cmp_num_str_val(i1, v1, i2, v2,   n1, n2)
@@ -25883,10 +26197,10 @@ function cmp_num_str_val(i1, v1, i2, v2,   n1, n2)
      # numbers before string value comparison, ascending order
      n1 = v1 + 0
      n2 = v2 + 0
-     if (n1 == v1) 
+     if (n1 == v1)
          return (n2 == v2) ? (n1 - n2) : -1
      else if (n2 == v2)
-         return 1 
+         return 1
      return (v1 < v2) ? -1 : (v1 != v2)
 @}
 @end example
@@ -25901,7 +26215,7 @@ BEGIN @{
     data[10] = "one"
     data[100] = 100
     data[20] = "two"
-    
+
     f[1] = "cmp_num_idx"
     f[2] = "cmp_str_val"
     f[3] = "cmp_num_str_val"
@@ -25925,14 +26239,14 @@ $ @kbd{gawk -f compdemo.awk}
 @print{}     data[10] = one
 @print{}     data[20] = two
 @print{}     data[100] = 100
-@print{} 
+@print{}
 @print{} Sort function: cmp_str_val      @ii{Sort by element values as strings}
 @print{}     data[one] = 10
 @print{}     data[100] = 100             @ii{String 100 is less than string 20}
 @print{}     data[two] = 20
 @print{}     data[10] = one
 @print{}     data[20] = two
-@print{} 
+@print{}
 @print{} Sort function: cmp_num_str_val  @ii{Sort all numeric values before all strings}
 @print{}     data[one] = 10
 @print{}     data[two] = 20
@@ -25943,10 +26257,10 @@ $ @kbd{gawk -f compdemo.awk}
 
 Consider sorting the entries of a GNU/Linux system password file
 according to login name.  The following program sorts records
-by a specific field position and can be used for this purpose:   
+by a specific field position and can be used for this purpose:
 
 @example
-# sort.awk --- simple program to sort by field position
+# passwd-sort.awk --- simple program to sort by field position
 # field position is specified by the global variable POS
 
 function cmp_field(i1, v1, i2, v2)
@@ -25989,7 +26303,7 @@ $ @kbd{gawk -v POS=1 -F: -f sort.awk /etc/passwd}
 
 The comparison should normally always return the same value when given a
 specific pair of array elements as its arguments.  If inconsistent
-results are returned then the order is undefined.  This behavior can be
+results are returned, then the order is undefined.  This behavior can be
 exploited to introduce random order into otherwise seemingly
 ordered data:
 
@@ -26001,11 +26315,11 @@ function cmp_randomize(i1, v1, i2, v2)
 @}
 @end example
 
-As mentioned above, the order of the indices is arbitrary if two
+As already mentioned, the order of the indices is arbitrary if two
 elements compare equal.  This is usually not a problem, but letting
 the tied elements come out in arbitrary order can be an issue, especially
 when comparing item values.  The partial ordering of the equal elements
-may change during the next loop traversal, if other elements are added or
+may change the next time the array is traversed, if other elements are added to or
 removed from the array.  One way to resolve ties when comparing elements
 with otherwise equal values is to include the indices in the comparison
 rules.  Note that doing this may make the loop traversal less efficient,
@@ -26042,21 +26356,21 @@ When string comparisons are made during a sort, either for element
 values where one or both aren't numbers, or for element indices
 handled as strings, the value of @code{IGNORECASE}
 (@pxref{Built-in Variables}) controls whether
-the comparisons treat corresponding uppercase and lowercase letters as
+the comparisons treat corresponding upper- and lowercase letters as
 equivalent or distinct.
 
-Another point to keep in mind is that in the case of subarrays
+Another point to keep in mind is that in the case of subarrays,
 the element values can themselves be arrays; a production comparison
 function should use the @code{isarray()} function
-(@pxref{Type Functions}),
+(@pxref{Type Functions})
 to check for this, and choose a defined sorting order for subarrays.
 
 All sorting based on @code{PROCINFO["sorted_in"]}
 is disabled in POSIX mode,
-since the @code{PROCINFO} array is not special in that case.
+because the @code{PROCINFO} array is not special in that case.
 
 As a side note, sorting the array indices before traversing
-the array has been reported to add 15% to 20% overhead to the
+the array has been reported to add a 15% to 20% overhead to the
 execution time of @command{awk} programs. For this reason,
 sorted array traversal is not the default.
 
@@ -26074,8 +26388,8 @@ sorted array traversal is not the default.
 @cindex @code{asorti()} function (@command{gawk}), arrays@comma{} sorting
 @cindex sort function, arrays, sorting
 In most @command{awk} implementations, sorting an array requires writing
-a @code{sort()} function.  While this can be educational for exploring
-different sorting algorithms, usually that's not the point of the program.
+a @code{sort()} function.  This can be educational for exploring
+different sorting algorithms, but usually that's not the point of the program.
 @command{gawk} provides the built-in @code{asort()} and @code{asorti()}
 functions (@pxref{String Functions}) for sorting arrays.  For example:
 
@@ -26115,7 +26429,7 @@ However, the @code{source} array is not affected.
 Often, what's needed is to sort on the values of the @emph{indices}
 instead of the values of the elements.  To do that, use the
 @code{asorti()} function.  The interface and behavior are identical to
-that of @code{asort()}, except that the index values are used for sorting,
+that of @code{asort()}, except that the index values are used for sorting
 and become the values of the result array:
 
 @example
@@ -26150,8 +26464,8 @@ it chooses}, taking into account just the indices, just the values,
 or both.  This is extremely powerful.
 
 Once the array is sorted, @code{asort()} takes the @emph{values} in
-their final order, and uses them to fill in the result array, whereas
-@code{asorti()} takes the @emph{indices} in their final order, and uses
+their final order and uses them to fill in the result array, whereas
+@code{asorti()} takes the @emph{indices} in their final order and uses
 them to fill in the result array.
 
 @cindex reference counting, sorting arrays
@@ -26171,10 +26485,9 @@ Because @code{IGNORECASE} affects string comparisons, the value
 of @code{IGNORECASE} also affects sorting for both @code{asort()} and @code{asorti()}.
 Note also that the locale's sorting order does @emph{not}
 come into play; comparisons are based on character values only.@footnote{This
-is true because locale-based comparison occurs only when in POSIX
-compatibility mode, and since @code{asort()} and @code{asorti()} are
+is true because locale-based comparison occurs only when in
+POSIX-compatibility mode, and because @code{asort()} and @code{asorti()} are
 @command{gawk} extensions, they are not available in that case.}
-Caveat Emptor.
 
 @node Two-way I/O
 @section Two-Way Communications with Another Process
@@ -26240,7 +26553,7 @@ for example, @file{/tmp} will not do, as another user might happen
 to be using a temporary file with the same name.@footnote{Michael
 Brennan suggests the use of @command{rand()} to generate unique
 @value{FN}s. This is a valid point; nevertheless, temporary files
-remain more difficult than two-way pipes.} @c 8/2014
+remain more difficult to use than two-way pipes.} @c 8/2014
 
 @cindex coprocesses
 @cindex input/output, two-way
@@ -26249,7 +26562,7 @@ remain more difficult than two-way pipes.} @c 8/2014
 @cindex @command{csh} utility, @code{|&} operator, comparison with
 However, with @command{gawk}, it is possible to
 open a @emph{two-way} pipe to another process.  The second process is
-termed a @dfn{coprocess}, since it runs in parallel with @command{gawk}.
+termed a @dfn{coprocess}, as it runs in parallel with @command{gawk}.
 The two-way connection is created using the @samp{|&} operator
 (borrowed from the Korn shell, @command{ksh}):@footnote{This is very
 different from the same operator in the C shell and in Bash.}
@@ -26354,7 +26667,7 @@ like so:
 @example
 command = "sort -nr"           # command, save in convenience variable
 PROCINFO[command, "pty"] = 1   # update PROCINFO
-print @dots{} |& command       # start two-way pipe
+print @dots{} |& command           # start two-way pipe
 @dots{}
 @end example
 
@@ -26368,7 +26681,6 @@ using regular pipes.
 @section Using @command{gawk} for Network Programming
 @cindex advanced features, network programming
 @cindex networks, programming
-@c STARTOFRANGE tcpip
 @cindex TCP/IP
 @cindex @code{/inet/@dots{}} special files (@command{gawk})
 @cindex files, @code{/inet/@dots{}} (@command{gawk})
@@ -26379,21 +26691,23 @@ using regular pipes.
 @cindex @code{EMISTERED}
 @ifnotdocbook
 @quotation
-@code{EMISTERED}:@*
+@code{EMRED}:@*
 @ @ @ @ @i{A host is a host from coast to coast,@*
-@ @ @ @ and no-one can talk to host that's close,@*
+@ @ @ @ and nobody talks to a host that's close,@*
 @ @ @ @ unless the host that isn't close@*
-@ @ @ @ is busy hung or dead.}
+@ @ @ @ is busy, hung, or dead.}
+@author Mike O'Brien (aka Mr.@: Protocol)
 @end quotation
 @end ifnotdocbook
 
 @docbook
 <blockquote>
+<attribution>Mike O'Brien (aka Mr.&nbsp;Protocol)</attribution>
 <literallayout class="normal"><literal>EMISTERED</literal>:
 &nbsp;&nbsp;&nbsp;&nbsp;<emphasis>A host is a host from coast to coast,</emphasis>
 &nbsp;&nbsp;&nbsp;&nbsp;<emphasis>and no-one can talk to host that's close,</emphasis>
 &nbsp;&nbsp;&nbsp;&nbsp;<emphasis>unless the host that isn't close</emphasis>
-&nbsp;&nbsp;&nbsp;&nbsp;<emphasis>is busy hung or dead.</emphasis></literallayout>
+&nbsp;&nbsp;&nbsp;&nbsp;<emphasis>is busy, hung, or dead.</emphasis></literallayout>
 </blockquote>
 @end docbook
 
@@ -26407,7 +26721,7 @@ You can think of this as just a @emph{very long} two-way pipeline to
 a coprocess.
 The way @command{gawk} decides that you want to use TCP/IP networking is
 by recognizing special @value{FN}s that begin with one of @samp{/inet/},
-@samp{/inet4/} or @samp{/inet6/}.
+@samp{/inet4/}, or @samp{/inet6/}.
 
 The full syntax of the special @value{FN} is
 @file{/@var{net-type}/@var{protocol}/@var{local-port}/@var{remote-host}/@var{remote-port}}.
@@ -26424,7 +26738,7 @@ the system default, most likely IPv4.
 @item protocol
 The protocol to use over IP.  This must be either @samp{tcp}, or
 @samp{udp}, for a TCP or UDP IP connection,
-respectively.  The use of TCP is recommended for most applications.
+respectively.  TCP should be used for most applications.
 
 @item local-port
 @cindex @code{getaddrinfo()} function (C library)
@@ -26436,7 +26750,7 @@ or @samp{http}, in which case @command{gawk} attempts to determine
 the predefined port number using the C @code{getaddrinfo()} function.
 
 @item remote-host
-The IP address or fully-qualified domain name of the Internet
+The IP address or fully qualified domain name of the Internet
 host to which you want to connect.
 
 @item remote-port
@@ -26448,7 +26762,7 @@ service name.
 @cindex @command{gawk}, @code{ERRNO} variable in
 @cindex @code{ERRNO} variable
 @quotation NOTE
-Failure in opening a two-way socket will result in a non-fatal error
+Failure in opening a two-way socket will result in a nonfatal error
 being returned to the calling code. The value of @code{ERRNO} indicates
 the error (@pxref{Auto-set}).
 @end quotation
@@ -26457,39 +26771,36 @@ Consider the following very simple example:
 
 @example
 BEGIN @{
-  Service = "/inet/tcp/0/localhost/daytime"
-  Service |& getline
-  print $0
-  close(Service)
+    Service = "/inet/tcp/0/localhost/daytime"
+    Service |& getline
+    print $0
+    close(Service)
 @}
 @end example
 
 This program reads the current date and time from the local system's
-TCP @samp{daytime} server.
+TCP @code{daytime} server.
 It then prints the results and closes the connection.
 
 Because this topic is extensive, the use of @command{gawk} for
 TCP/IP programming is documented separately.
 @ifinfo
 See
-@inforef{Top, , General Introduction, gawkinet, TCP/IP Internetworking with @command{gawk}},
+@inforef{Top, , General Introduction, gawkinet, @value{GAWKINETTITLE}},
 @end ifinfo
 @ifnotinfo
 See
 @uref{http://www.gnu.org/software/gawk/manual/gawkinet/,
-@cite{TCP/IP Internetworking with @command{gawk}}},
+@cite{@value{GAWKINETTITLE}}},
 which comes as part of the @command{gawk} distribution,
 @end ifnotinfo
 for a much more complete introduction and discussion, as well as
 extensive examples.
 
-@c ENDOFRANGE tcpip
 
 @node Profiling
 @section Profiling Your @command{awk} Programs
-@c STARTOFRANGE awkp
 @cindex @command{awk} programs, profiling
-@c STARTOFRANGE proawk
 @cindex profiling @command{awk} programs
 @cindex @code{awkprof.out} file
 @cindex files, @code{awkprof.out}
@@ -26510,12 +26821,12 @@ gawk --profile=myprog.prof -f myprog.awk data1 data2
 @end example
 
 @noindent
-In the above example, @command{gawk} places the profile in
+In the preceding example, @command{gawk} places the profile in
 @file{myprog.prof} instead of in @file{awkprof.out}.
 
-Here is a sample session showing a simple @command{awk} program, its input data, and the
-results from running @command{gawk} with the @option{--profile} option.
-First, the @command{awk} program:
+Here is a sample session showing a simple @command{awk} program,
+its input data, and the results from running @command{gawk} with the
+@option{--profile} option.  First, the @command{awk} program:
 
 @example
 BEGIN @{ print "First BEGIN rule" @}
@@ -26556,16 +26867,16 @@ junk
 @end example
 
 Here is the @file{awkprof.out} that results from running the
-@command{gawk} profiler on this program and data. (This example also
+@command{gawk} profiler on this program and data (this example also
 illustrates that @command{awk} programmers sometimes get up very early
-in the morning to work.)
+in the morning to work):
 
 @cindex @code{BEGIN} pattern, and profiling
 @cindex @code{END} pattern, and profiling
 @example
-    # gawk profile, created Thu Feb 27 05:16:21 2014
+    # gawk profile, created Mon Sep 29 05:16:21 2014
 
-    # BEGIN block(s)
+    # BEGIN rule(s)
 
     BEGIN @{
  1          print "First BEGIN rule"
@@ -26592,7 +26903,7 @@ in the morning to work.)
             @}
     @}
 
-    # END block(s)
+    # END rule(s)
 
     END @{
  1          print "First END rule"
@@ -26618,8 +26929,8 @@ They are as follows:
 @item
 The program is printed in the order @code{BEGIN} rules,
 @code{BEGINFILE} rules,
-pattern/action rules,
-@code{ENDFILE} rules, @code{END} rules and functions, listed
+pattern--action rules,
+@code{ENDFILE} rules, @code{END} rules, and functions, listed
 alphabetically.
 Multiple @code{BEGIN} and @code{END} rules retain their
 separate identities, as do
@@ -26627,7 +26938,7 @@ multiple @code{BEGINFILE} and @code{ENDFILE} rules.
 
 @cindex patterns, counts, in a profile
 @item
-Pattern-action rules have two counts.
+Pattern--action rules have two counts.
 The first count, to the left of the rule, shows how many times
 the rule's pattern was @emph{tested}.
 The second count, to the right of the rule's opening left brace
@@ -26673,7 +26984,7 @@ the body of an @code{if}, @code{else}, or loop is only a single statement.
 @item
 Parentheses are used only where needed, as indicated by the structure
 of the program and the precedence rules.
-For example, @samp{(3 + 5) * 4} means add three plus five, then multiply
+For example, @samp{(3 + 5) * 4} means add three and five, then multiply
 the total by four.  However, @samp{3 + 5 * 4} has no parentheses, and
 means @samp{3 + (5 * 4)}.
 
@@ -26694,16 +27005,15 @@ the target of a redirection isn't a scalar, it gets parenthesized.
 @command{gawk} supplies leading comments in
 front of the @code{BEGIN} and @code{END} rules,
 the @code{BEGINFILE} and @code{ENDFILE} rules,
-the pattern/action rules, and the functions.
+the pattern--action rules, and the functions.
 
 @end itemize
 
 The profiled version of your program may not look exactly like what you
 typed when you wrote it.  This is because @command{gawk} creates the
-profiled version by ``pretty printing'' its internal representation of
+profiled version by ``pretty-printing'' its internal representation of
 the program.  The advantage to this is that @command{gawk} can produce
-a standard representation.  The disadvantage is that all source-code
-comments are lost.
+a standard representation.
 Also, things such as:
 
 @example
@@ -26720,7 +27030,7 @@ come out as:
 @end example
 
 @noindent
-which is correct, but possibly surprising.
+which is correct, but possibly unexpected.
 
 @cindex profiling @command{awk} programs, dynamically
 @cindex @command{gawk} program, dynamic profiling
@@ -26752,7 +27062,7 @@ $ @kbd{kill -USR1 13992}
 
 @noindent
 As usual, the profiled version of the program is written to
-@file{awkprof.out}, or to a different file if one specified with
+@file{awkprof.out}, or to a different file if one was specified with
 the @option{--profile} option.
 
 Along with the regular profile, as shown earlier, the profile file
@@ -26784,24 +27094,38 @@ If you use the @code{HUP} signal instead of the @code{USR1} signal,
 @cindex @code{SIGQUIT} signal (MS-Windows)
 @cindex signals, @code{QUIT}/@code{SIGQUIT} (MS-Windows)
 When @command{gawk} runs on MS-Windows systems, it uses the
-@code{INT} and @code{QUIT} signals for producing the profile and, in
+@code{INT} and @code{QUIT} signals for producing the profile, and in
 the case of the @code{INT} signal, @command{gawk} exits.  This is
 because these systems don't support the @command{kill} command, so the
 only signals you can deliver to a program are those generated by the
 keyboard.  The @code{INT} signal is generated by the
-@kbd{Ctrl-@key{C}} or @kbd{Ctrl-@key{BREAK}} key, while the
-@code{QUIT} signal is generated by the @kbd{Ctrl-@key{\}} key.
+@kbd{Ctrl-c} or @kbd{Ctrl-BREAK} key, while the
+@code{QUIT} signal is generated by the @kbd{Ctrl-\} key.
 
 Finally, @command{gawk} also accepts another option, @option{--pretty-print}.
-When called this way, @command{gawk} ``pretty prints'' the program into
+When called this way, @command{gawk} ``pretty-prints'' the program into
 @file{awkprof.out}, without any execution counts.
 
 @quotation NOTE
 Once upon a time, the @option{--pretty-print} option would also run
 your program.  This is is no longer the case.
 @end quotation
-@c ENDOFRANGE awkp
-@c ENDOFRANGE proawk
+
+There is a significant difference between the output created when
+profiling, and that created when pretty-printing.  Pretty-printed output
+preserves the original comments that were in the program, although their
+placement may not correspond exactly to their original locations in the
+source code.
+
+However, as a deliberate design decision, profiling output @emph{omits}
+the original program's comments. This allows you to focus on the
+execution count data and helps you avoid the temptation to use the
+profiler for pretty-printing.
+
+Additionally, pretty-printed output does not have the leading indentation
+that the profiling output does. This makes it easy to pretty-print your
+code once development is completed, and then use the result as the final
+version of your program.
 
 @node Advanced Features Summary
 @section Summary
@@ -26812,6 +27136,7 @@ The @option{--non-decimal-data} option causes @command{gawk} to treat
 octal- and hexadecimal-looking input data as octal and hexadecimal.
 This option should be used with caution or not at all; use of @code{strtonum()}
 is preferable.
+Note that this option may disappear in a future version of @command{gawk}.
 
 @item
 You can take over complete control of sorting in @samp{for (@var{indx} in @var{array})}
@@ -26825,15 +27150,15 @@ those functions sort arrays. Or you may provide one of the predefined control
 strings that work for @code{PROCINFO["sorted_in"]}.
 
 @item
-You can use the @samp{|&} operator to create a two-way pipe to a co-process.
-You read from the co-process with @code{getline} and write to it with @code{print}
-or @code{printf}. Use @code{close()} to close off the co-process completely, or
+You can use the @samp{|&} operator to create a two-way pipe to a coprocess.
+You read from the coprocess with @code{getline} and write to it with @code{print}
+or @code{printf}. Use @code{close()} to close off the coprocess completely, or
 optionally, close off one side of the two-way communications.
 
 @item
-By using special ``@value{FN}s'' with the @samp{|&} operator, you can open a
-TCP/IP (or UDP/IP) connection to remote hosts in the Internet. @command{gawk}
-supports both IPv4 an IPv6.
+By using special @value{FN}s with the @samp{|&} operator, you can open a
+TCP/IP (or UDP/IP) connection to remote hosts on the Internet. @command{gawk}
+supports both IPv4 and IPv6.
 
 @item
 You can generate statement count profiles of your program. This can help you
@@ -26842,13 +27167,11 @@ you tune them more easily.  Sending the @code{USR1} signal while profiling cause
 @command{gawk} to dump the profile and keep going, including a function call stack.
 
 @item
-You can also just ``pretty print'' the program. This currently also runs
+You can also just ``pretty-print'' the program. This currently also runs
 the program, but that will change in the next major release.
 
 @end itemize
 
-@c ENDOFRANGE advgaw
-@c ENDOFRANGE gawadv
 
 @node Internationalization
 @chapter Internationalization with @command{gawk}
@@ -26861,7 +27184,6 @@ countries, they were able to sell more systems.
 As a result, internationalization and localization
 of programs and software systems became a common practice.
 
-@c STARTOFRANGE inloc
 @cindex internationalization, localization
 @cindex @command{gawk}, internationalization and, See internationalization
 @cindex internationalization, localization, @command{gawk} and
@@ -26894,7 +27216,7 @@ a requirement.
 @cindex localization
 @dfn{Internationalization} means writing (or modifying) a program once,
 in such a way that it can use multiple languages without requiring
-further source-code changes.
+further source code changes.
 @dfn{Localization} means providing the data necessary for an
 internationalized program to work in a particular language.
 Most typically, these terms refer to features such as the language
@@ -26906,11 +27228,10 @@ monetary values are printed and read.
 @section GNU @command{gettext}
 
 @cindex internationalizing a program
-@c STARTOFRANGE gettex
 @cindex @command{gettext} library
 @command{gawk} uses GNU @command{gettext} to provide its internationalization
 features.
-The facilities in GNU @command{gettext} focus on messages; strings printed
+The facilities in GNU @command{gettext} focus on messages: strings printed
 by a program, either directly or via formatting with @code{printf} or
 @code{sprintf()}.@footnote{For some operating systems, the @command{gawk}
 port doesn't support GNU @command{gettext}.
@@ -26931,8 +27252,7 @@ following steps, in this order:
 
 @enumerate
 @item
-The programmer goes
-through the source for all of @command{guide}'s components
+The programmer reviews the source for all of @command{guide}'s components
 and marks each string that is a candidate for translation.
 For example, @code{"`-F': option required"} is a good candidate for translation.
 A table with strings of option names is not (e.g., @command{gawk}'s
@@ -26959,7 +27279,6 @@ lookup of the translations.
 
 @cindex @code{.po} files
 @cindex files, @code{.po}
-@c STARTOFRANGE portobfi
 @cindex portable object files
 @cindex files, portable object
 @item
@@ -26971,7 +27290,6 @@ For example, there might be a @file{fr.po} for a French translation.
 @cindex @code{.gmo} files
 @cindex files, @code{.gmo}
 @cindex message object files
-@c STARTOFRANGE portmsgfi
 @cindex files, message object
 @item
 Each language's @file{.po} file is converted into a binary
@@ -27052,8 +27370,8 @@ if necessary.  (It is almost never necessary to supply a different category.)
 @cindex sorting characters in different languages
 @cindex @code{LC_COLLATE} locale category
 @item LC_COLLATE
-Text-collation information; i.e., how different characters
-and/or groups of characters sort in a given language.
+Text-collation information (i.e., how different characters
+and/or groups of characters sort in a given language).
 
 @cindex @code{LC_CTYPE} locale category
 @item LC_CTYPE
@@ -27071,7 +27389,7 @@ In June 2001 Bruno Haible wrote:
 This information is accessed via the
 POSIX character classes in regular expressions,
 such as @code{/[[:alnum:]]/}
-(@pxref{Regexp Operators}).
+(@pxref{Bracket Expressions}).
 
 @cindex monetary information, localization
 @cindex currency symbols, localization
@@ -27099,14 +27417,12 @@ before or after the day in a date, local month abbreviations, and so on.
 @item LC_ALL
 All of the above.  (Not too useful in the context of @command{gettext}.)
 @end table
-@c ENDOFRANGE gettex
 
 @node Programmer i18n
 @section Internationalizing @command{awk} Programs
-@c STARTOFRANGE inap
 @cindex @command{awk} programs, internationalizing
 
-@command{gawk} provides the following variables and functions for
+@command{gawk} provides the following variables for
 internationalization:
 
 @table @code
@@ -27122,7 +27438,12 @@ value is @code{"messages"}.
 String constants marked with a leading underscore
 are candidates for translation at runtime.
 String constants without a leading underscore are not translated.
+@end table
+
+@command{gawk} provides the following functions for
+internationalization:
 
+@table @code
 @cindexgawkfunc{dcgettext}
 @item @code{dcgettext(@var{string}} [@code{,} @var{domain} [@code{,} @var{category}]]@code{)}
 Return the translation of @var{string} in
@@ -27154,7 +27475,7 @@ default arguments.
 Return the plural form used for @var{number} of the
 translation of @var{string1} and @var{string2} in text domain
 @var{domain} for locale category @var{category}. @var{string1} is the
-English singular variant of a message, and @var{string2} the English plural
+English singular variant of a message, and @var{string2} is the English plural
 variant of the same message.
 The default value for @var{domain} is the current value of @code{TEXTDOMAIN}.
 The default value for @var{category} is @code{"LC_MESSAGES"}.
@@ -27179,15 +27500,7 @@ If @var{directory} is the null string (@code{""}), then
 given @var{domain}.
 @end table
 
-To use these facilities in your @command{awk} program, follow the steps
-outlined in
-@ifnotinfo
-the previous @value{SECTION},
-@end ifnotinfo
-@ifinfo
-@ref{Explaining gettext},
-@end ifinfo
-like so:
+To use these facilities in your @command{awk} program, follow these steps:
 
 @enumerate
 @cindex @code{BEGIN} pattern, @code{TEXTDOMAIN} variable and
@@ -27242,9 +27555,11 @@ This example would be better done with @code{dcngettext()}:
 
 @example
 if (groggy)
-    message = dcngettext("%d customer disturbing me\n", "%d customers disturbing me\n", "adminprog")
+    message = dcngettext("%d customer disturbing me\n",
+                         "%d customers disturbing me\n", "adminprog")
 else
-    message = dcngettext("enjoying %d customer\n", "enjoying %d customers\n", "adminprog")
+    message = dcngettext("enjoying %d customer\n",
+                         "enjoying %d customers\n", "adminprog")
 printf(message, ncustomers)
 @end example
 
@@ -27270,7 +27585,7 @@ BEGIN @{
 
 @end enumerate
 
-@xref{I18N Example},
+@DBXREF{I18N Example}
 for an example program showing the steps to create
 and use translations from @command{awk}.
 
@@ -27316,7 +27631,7 @@ First, use the @option{--gen-pot} command-line option to create
 the initial @file{.pot} file:
 
 @example
-$ @kbd{gawk --gen-pot -f guide.awk > guide.pot}
+gawk --gen-pot -f guide.awk > guide.pot
 @end example
 
 @cindex @code{xgettext} utility
@@ -27331,11 +27646,9 @@ second argument to @code{dcngettext()}.@footnote{The
 You should distribute the generated @file{.pot} file with
 your @command{awk} program; translators will eventually use it
 to provide you translations that you can also then distribute.
-@xref{I18N Example},
+@DBXREF{I18N Example}
 for the full list of steps to go through to create and test
 translations for @command{guide}.
-@c ENDOFRANGE portobfi
-@c ENDOFRANGE portmsgfi
 
 @node Printf Ordering
 @subsection Rearranging @code{printf} Arguments
@@ -27380,11 +27693,11 @@ example, @samp{string} is the first argument and @samp{length(string)} is the se
 
 @example
 $ @kbd{gawk 'BEGIN @{}
->     @kbd{string = "Dont Panic"}
+>     @kbd{string = "Don\47t Panic"}
 >     @kbd{printf "%2$d characters live in \"%1$s\"\n",}
 >                         @kbd{string, length(string)}
 > @kbd{@}'}
-@print{} 10 characters live in "Dont Panic"
+@print{} 11 characters live in "Don't Panic"
 @end example
 
 If present, positional specifiers come first in the format specification,
@@ -27459,7 +27772,7 @@ change:
 @cindex @code{TEXTDOMAIN} variable, portability and
 @item
 Assignments to @code{TEXTDOMAIN} won't have any effect,
-since @code{TEXTDOMAIN} is not special in other @command{awk} implementations.
+because @code{TEXTDOMAIN} is not special in other @command{awk} implementations.
 
 @item
 Non-GNU versions of @command{awk} treat marked strings
@@ -27470,7 +27783,7 @@ the null string (@code{""}) as its value, leaving the original string constant a
 the result.
 
 @item
-By defining ``dummy'' functions to replace @code{dcgettext()}, @code{dcngettext()}
+By defining ``dummy'' functions to replace @code{dcgettext()}, @code{dcngettext()},
 and @code{bindtextdomain()}, the @command{awk} program can be made to run, but
 all the messages are output in the original language.
 For example:
@@ -27507,11 +27820,10 @@ enough arguments are supplied in the function call.  Many versions of
 underlying C library version of @code{sprintf()}, but only one format and
 argument at a time.  What happens if a positional specification is
 used is anybody's guess.
-However, since the positional specifications are primarily for use in
-@emph{translated} format strings, and since non-GNU @command{awk}s never
+However, because the positional specifications are primarily for use in
+@emph{translated} format strings, and because non-GNU @command{awk}s never
 retrieve the translated string, this should not be a problem in practice.
 @end itemize
-@c ENDOFRANGE inap
 
 @node I18N Example
 @section A Simple Internationalization Example
@@ -27571,7 +27883,7 @@ called ``Hippy.'' Ah, well.}
 
 @example
 @group
-$ cp guide.pot guide-mellow.po
+$ @kbd{cp guide.pot guide-mellow.po}
 @var{Add translations to} guide-mellow.po @dots{}
 @end group
 @end example
@@ -27596,7 +27908,8 @@ msgstr "Like, the scoop is"
 @cindex GNU/Linux
 The next step is to make the directory to hold the binary message object
 file and then to create the @file{guide.mo} file.
-We pretend that our file is to be used in the @code{en_US.UTF-8} locale.
+We pretend that our file is to be used in the @code{en_US.UTF-8} locale,
+because we have to use a locale name known to the C @command{gettext} routines.
 The directory layout shown here is standard for GNU @command{gettext} on
 GNU/Linux systems.  Other versions of @command{gettext} may use a different
 layout:
@@ -27617,8 +27930,8 @@ $ @kbd{mkdir en_US.UTF-8 en_US.UTF-8/LC_MESSAGES}
 The @command{msgfmt} utility does the conversion from human-readable
 @file{.po} file to machine-readable @file{.mo} file.
 By default, @command{msgfmt} creates a file named @file{messages}.
-This file must be renamed and placed in the proper directory so that
-@command{gawk} can find it:
+This file must be renamed and placed in the proper directory (using
+the @option{-o} option) so that @command{gawk} can find it:
 
 @example
 $ @kbd{msgfmt guide-mellow.po -o en_US.UTF-8/LC_MESSAGES/guide.mo}
@@ -27633,7 +27946,7 @@ $ @kbd{gawk -f guide.awk}
 @print{} Pardon me, Zaphod who?
 @end example
 
-If the three replacement functions for @code{dcgettext()}, @code{dcngettext()}
+If the three replacement functions for @code{dcgettext()}, @code{dcngettext()},
 and @code{bindtextdomain()}
 (@pxref{I18N Portability})
 are in a file named @file{libintl.awk},
@@ -27654,15 +27967,15 @@ using the GNU @command{gettext} package.
 (GNU @command{gettext} is described in
 complete detail in
 @ifinfo
-@inforef{Top, , GNU @command{gettext} utilities, gettext, GNU gettext tools}.)
+@inforef{Top, , GNU @command{gettext} utilities, gettext, GNU @command{gettext} utilities}.)
 @end ifinfo
 @ifnotinfo
 @uref{http://www.gnu.org/software/gettext/manual/,
-@cite{GNU gettext tools}}.)
+@cite{GNU @command{gettext} utilities}}.)
 @end ifnotinfo
 As of this writing, the latest version of GNU @command{gettext} is
-@uref{ftp://ftp.gnu.org/gnu/gettext/gettext-0.19.1.tar.gz,
-@value{PVERSION} 0.19.1}.
+@uref{ftp://ftp.gnu.org/gnu/gettext/gettext-0.19.4.tar.gz,
+@value{PVERSION} 0.19.4}.
 
 If a translation of @command{gawk}'s messages exists,
 then @command{gawk} produces usage messages, warnings,
@@ -27674,7 +27987,7 @@ and fatal errors in the local language.
 @itemize @value{BULLET}
 @item
 Internationalization means writing a program such that it can use multiple
-languages without requiring source-code changes.  Localization means
+languages without requiring source code changes.  Localization means
 providing the data necessary for an internationalized program to work
 in a particular language.
 
@@ -27691,9 +28004,9 @@ file, and the @file{.po} files are compiled into @file{.gmo} files for
 use at runtime.
 
 @item
-You can use position specifications with @code{sprintf()} and
+You can use positional specifications with @code{sprintf()} and
 @code{printf} to rearrange the placement of argument values in formatted
-strings and output. This is useful for the translations of format
+strings and output. This is useful for the translation of format
 control strings.
 
 @item
@@ -27706,7 +28019,6 @@ a number of translations for its messages.
 
 @end itemize
 
-@c ENDOFRANGE inloc
 
 @node Debugger
 @chapter Debugging @command{awk} Programs
@@ -27735,7 +28047,7 @@ how to use @command{gawk} for debugging your program is easy.
 @end menu
 
 @node Debugging
-@section Introduction to The @command{gawk} Debugger
+@section Introduction to the @command{gawk} Debugger
 
 This @value{SECTION} introduces debugging in general and begins
 the discussion of debugging in @command{gawk}.
@@ -27750,11 +28062,10 @@ the discussion of debugging in @command{gawk}.
 @subsection Debugging in General
 
 (If you have used debuggers in other languages, you may want to skip
-ahead to the next section on the specific features of the @command{awk}
-debugger.)
+ahead to @ref{Awk Debugging}.)
 
-Of course, a debugging program cannot remove bugs for you, since it has
-no way of knowing what you or your users consider a ``bug'' and what is a
+Of course, a debugging program cannot remove bugs for you, because it has
+no way of knowing what you or your users consider a ``bug'' versus a
 ``feature.''  (Sometimes, we humans have a hard time with this ourselves.)
 In that case, what can you expect from such a tool?  The answer to that
 depends on the language being debugged, but in general, you can expect at
@@ -27775,7 +28086,7 @@ having to change your source files.
 @item
 The chance to see the values of data in the program at any point in
 execution, and also to change that data on the fly, to see how that
-affects what happens afterwards.  (This often includes the ability
+affects what happens afterward.  (This often includes the ability
 to look at internal data structures besides the variables you actually
 defined in your code.)
 
@@ -27790,16 +28101,16 @@ is going wrong (or, for that matter, to better comprehend a perfectly
 functional program that you or someone else wrote).
 
 @node Debugging Terms
-@subsection Additional Debugging Concepts
+@subsection Debugging Concepts
 
 Before diving in to the details, we need to introduce several
 important concepts that apply to just about all debuggers.
 The following list defines terms used throughout the rest of
-this @value{CHAPTER}.
+this @value{CHAPTER}:
 
 @table @dfn
 @cindex stack frame
-@item Stack Frame
+@item Stack frame
 Programs generally call functions during the course of their execution.
 One function can call another, or a function can call itself (recursion).
 You can view the chain of called functions (main program calls A, which
@@ -27834,7 +28145,7 @@ as many breakpoints as you like.
 A watchpoint is similar to a breakpoint.  The difference is that
 breakpoints are oriented around the code: stop when a certain point in the
 code is reached.  A watchpoint, however, specifies that program execution
-should stop when a @emph{data value} is changed.  This is useful, since
+should stop when a @emph{data value} is changed.  This is useful, as
 sometimes it happens that a variable receives an erroneous value, and it's
 hard to track down where this happens just by looking at the code.
 By using a watchpoint, you can stop whenever a variable is assigned to,
@@ -27842,26 +28153,26 @@ and usually find the errant code quite quickly.
 @end table
 
 @node Awk Debugging
-@subsection Awk Debugging
+@subsection @command{awk} Debugging
 
 Debugging an @command{awk} program has some specific aspects that are
-not shared with other programming languages.
+not shared with programs written in other languages.
 
 First of all, the fact that @command{awk} programs usually take input
-line-by-line from a file or files and operate on those lines using specific
+line by line from a file or files and operate on those lines using specific
 rules makes it especially useful to organize viewing the execution of
 the program in terms of these rules.  As we will see, each @command{awk}
 rule is treated almost like a function call, with its own specific block
 of instructions.
 
-In addition, since @command{awk} is by design a very concise language,
+In addition, because @command{awk} is by design a very concise language,
 it is easy to lose sight of everything that is going on ``inside''
 each line of @command{awk} code.  The debugger provides the opportunity
 to look at the individual primitive instructions carried out
 by the higher-level @command{awk} commands.
 
 @node Sample Debugging Session
-@section Sample Debugging Session
+@section Sample @command{gawk} Debugging Session
 @cindex sample debugging session
 
 In order to illustrate the use of @command{gawk} as a debugger, let's look at a sample
@@ -27879,9 +28190,9 @@ as our example.
 @cindex starting the debugger
 @cindex debugger, how to start
 
-Starting the debugger is almost exactly like running @command{gawk},
-except you have to pass an additional option @option{--debug} or the
-corresponding short option @option{-D}.  The file(s) containing the
+Starting the debugger is almost exactly like running @command{gawk} normally,
+except you have to pass an additional option, @option{--debug}, or the
+corresponding short option, @option{-D}.  The file(s) containing the
 program and any supporting code are given on the command line as arguments
 to one or more @option{-f} options. (@command{gawk} is not designed
 to debug command-line programs, only programs contained in files.)
@@ -27894,10 +28205,11 @@ $ @kbd{gawk -D -f getopt.awk -f join.awk -f uniq.awk -1 inputfile}
 @noindent
 where both @file{getopt.awk} and @file{uniq.awk} are in @env{$AWKPATH}.
 (Experienced users of GDB or similar debuggers should note that
-this syntax is slightly different from what they are used to.
+this syntax is slightly different from what you are used to.
 With the @command{gawk} debugger, you give the arguments for running the program
 in the command line to the debugger rather than as part of the @code{run}
 command at the debugger prompt.)
+The @option{-1} is an option to @file{uniq.awk}.
 
 Instead of immediately running the program on @file{inputfile}, as
 @command{gawk} would ordinarily do, the debugger merely loads all
@@ -27980,7 +28292,7 @@ gawk> @kbd{bt}
 @end example
 
 This tells us that @code{are_equal()} was called by the main program at
-line 88 of @file{uniq.awk}.  (This is not a big surprise, since this
+line 88 of @file{uniq.awk}.  (This is not a big surprise, because this
 is the only call to @code{are_equal()} in the program, but in more complex
 programs, knowing who called a function and with what parameters can be
 the key to finding the source of the problem.)
@@ -27997,7 +28309,7 @@ gawk> @kbd{p n}
 @end example
 
 @noindent
-In this case, @code{n} is an uninitialized local variable, since the
+In this case, @code{n} is an uninitialized local variable, because the
 function was called without arguments (@pxref{Function Calls}).
 
 A more useful variable to display might be the current record:
@@ -28008,8 +28320,8 @@ gawk> @kbd{p $0}
 @end example
 
 @noindent
-This might be a bit puzzling at first since this is the second line of
-our test input above.  Let's look at @code{NR}:
+This might be a bit puzzling at first, as this is the second line of
+our test input.  Let's look at @code{NR}:
 
 @example
 gawk> @kbd{p NR}
@@ -28047,10 +28359,10 @@ gawk> @kbd{n}
 @end example
 
 This tells us that @command{gawk} is now ready to execute line 66, which
-decides whether to give the lines the special ``field skipping'' treatment
+decides whether to give the lines the special ``field-skipping'' treatment
 indicated by the @option{-1} command-line option.  (Notice that we skipped
-from where we were before at line 63 to here, since the condition in line 63
-@samp{if (fcount == 0 && charcount == 0)} was false.)
+from where we were before, at line 63, to here, because the condition
+in line 63, @samp{if (fcount == 0 && charcount == 0)}, was false.)
 
 Continuing to step, we now get to the splitting of the current and
 last records:
@@ -28079,7 +28391,7 @@ gawk> @kbd{p n m alast aline}
 
 This is kind of disappointing, though.  All we found out is that there
 are five elements in @code{alast}; @code{m} and @code{aline} don't have
-values yet since we are at line 68 but haven't executed it yet.
+values because we are at line 68 but haven't executed it yet.
 This information is useful enough (we now know that
 none of the words were accidentally left out), but what if we want to see
 inside the array?
@@ -28124,7 +28436,7 @@ gawk> @kbd{n}
 
 Well, here we are at our error (sorry to spoil the suspense).  What we
 had in mind was to join the fields starting from the second one to make
-the virtual record to compare, and if the first field was numbered zero,
+the virtual record to compare, and if the first field were numbered zero,
 this would work.  Let's look at what we've got:
 
 @example
@@ -28133,7 +28445,7 @@ gawk> @kbd{p cline clast}
 @print{} clast = "awk is a wonderful program!"
 @end example
 
-Hey, those look pretty familiar!  They're just our original, unaltered,
+Hey, those look pretty familiar!  They're just our original, unaltered
 input records.  A little thinking (the human brain is still the best
 debugging tool), and we realize that we were off by one!
 
@@ -28183,13 +28495,14 @@ Miscellaneous
 @end itemize
 
 Each of these are discussed in the following subsections.
-In the following descriptions, commands which may be abbreviated
+In the following descriptions, commands that may be abbreviated
 show the abbreviation on a second description line.
 A debugger command name may also be truncated if that partial
 name is unambiguous. The debugger has the built-in capability to
-automatically repeat the previous command just by hitting @key{Enter}.
-This works for the commands @code{list}, @code{next}, @code{nexti}, @code{step}, @code{stepi}
-and @code{continue} executed without any argument.
+automatically repeat the previous command just by hitting @kbd{Enter}.
+This works for the commands @code{list}, @code{next}, @code{nexti},
+@code{step}, @code{stepi}, and @code{continue} executed without any
+argument.
 
 @menu
 * Breakpoint Control::          Control of Breakpoints.
@@ -28204,9 +28517,9 @@ and @code{continue} executed without any argument.
 @node Breakpoint Control
 @subsection Control of Breakpoints
 
-As we saw above, the first thing you probably want to do in a debugging
-session is to get your breakpoints set up, since otherwise your program
-will just run as if it was not under the debugger.  The commands for
+As we saw earlier, the first thing you probably want to do in a debugging
+session is to get your breakpoints set up, because your program
+will otherwise just run as if it was not under the debugger.  The commands for
 controlling breakpoints are:
 
 @table @asis
@@ -28236,7 +28549,7 @@ Set a breakpoint at entry to (the first instruction of)
 function @var{function}.
 @end table
 
-Each breakpoint is assigned a number which can be used to delete it from
+Each breakpoint is assigned a number that can be used to delete it from
 the breakpoint list using the @code{delete} command.
 
 With a breakpoint, you may also supply a condition.  This is an
@@ -28272,12 +28585,13 @@ Delete breakpoint(s) set at entry to function @var{function}.
 @cindex breakpoint condition
 @item @code{condition} @var{n} @code{"@var{expression}"}
 Add a condition to existing breakpoint or watchpoint @var{n}. The
-condition is an @command{awk} expression that the debugger evaluates
+condition is an @command{awk} expression @emph{enclosed in double quotes}
+that the debugger evaluates
 whenever the breakpoint or watchpoint is reached. If the condition is true, then
 the debugger stops execution and prompts for a command. Otherwise,
 the debugger continues executing the program. If the condition expression is
-not specified, any existing condition is removed; i.e., the breakpoint or
-watchpoint is made unconditional. 
+not specified, any existing condition is removed (i.e., the breakpoint or
+watchpoint is made unconditional).
 
 @cindex debugger commands, @code{d} (@code{delete})
 @cindex debugger commands, @code{delete}
@@ -28287,7 +28601,7 @@ watchpoint is made unconditional.
 @cindex breakpoint, delete by number
 @item @code{delete} [@var{n1 n2} @dots{}] [@var{n}--@var{m}]
 @itemx @code{d} [@var{n1 n2} @dots{}] [@var{n}--@var{m}]
-Delete specified breakpoints or a range of breakpoints. Deletes
+Delete specified breakpoints or a range of breakpoints. Delete
 all defined breakpoints if no argument is supplied.
 
 @cindex debugger commands, @code{disable}
@@ -28296,7 +28610,7 @@ all defined breakpoints if no argument is supplied.
 @cindex breakpoint, how to disable or enable
 @item @code{disable} [@var{n1 n2} @dots{} | @var{n}--@var{m}]
 Disable specified breakpoints or a range of breakpoints. Without
-any argument, disables all breakpoints.
+any argument, disable all breakpoints.
 
 @cindex debugger commands, @code{e} (@code{enable})
 @cindex debugger commands, @code{enable}
@@ -28306,18 +28620,18 @@ any argument, disables all breakpoints.
 @item @code{enable} [@code{del} | @code{once}] [@var{n1 n2} @dots{}] [@var{n}--@var{m}]
 @itemx @code{e} [@code{del} | @code{once}] [@var{n1 n2} @dots{}] [@var{n}--@var{m}]
 Enable specified breakpoints or a range of breakpoints. Without
-any argument, enables all breakpoints.
-Optionally, you can specify how to enable the breakpoint:
+any argument, enable all breakpoints.
+Optionally, you can specify how to enable the breakpoints:
 
 @c nested table
 @table @code
 @item del
-Enable the breakpoint(s) temporarily, then delete it when
-the program stops at the breakpoint.
+Enable the breakpoints temporarily, then delete each one when
+the program stops at it.
 
 @item once
-Enable the breakpoint(s) temporarily, then disable it when
-the program stops at the breakpoint.
+Enable the breakpoints temporarily, then disable each one when
+the program stops at it.
 @end table
 
 @cindex debugger commands, @code{ignore}
@@ -28385,7 +28699,7 @@ gawk>
 @item @code{continue} [@var{count}]
 @itemx @code{c} [@var{count}]
 Resume program execution. If continued from a breakpoint and @var{count} is
-specified, ignores the breakpoint at that location the next @var{count} times
+specified, ignore the breakpoint at that location the next @var{count} times
 before stopping.
 
 @cindex debugger commands, @code{finish}
@@ -28418,7 +28732,7 @@ Execute one (or @var{count}) instruction(s), stepping over function calls.
 @item @code{return} [@var{value}]
 Cancel execution of a function call. If @var{value} (either a string or a
 number) is specified, it is used as the function's return value. If used in a
-frame other than the innermost one (the currently executing function, i.e.,
+frame other than the innermost one (the currently executing function; i.e.,
 frame number 0), discard all inner frames in addition to the selected one,
 and the caller of that frame becomes the innermost frame.
 
@@ -28439,7 +28753,7 @@ automatic display variables, and debugger options.
 @item @code{step} [@var{count}]
 @itemx @code{s} [@var{count}]
 Continue execution until control reaches a different source line in the
-current stack frame. @code{step} steps inside any function called within
+current stack frame, stepping inside any function called within
 the line.  If the argument @var{count} is supplied, steps that many times before
 stopping, unless it encounters a breakpoint or watchpoint.
 
@@ -28460,7 +28774,7 @@ see the output shown under @code{dump} in @ref{Miscellaneous Debugger Commands}.
 @item @code{until} [[@var{filename}@code{:}]@var{n} | @var{function}]
 @itemx @code{u} [[@var{filename}@code{:}]@var{n} | @var{function}]
 Without any argument, continue execution until a line past the current
-line in current stack frame is reached. With an argument,
+line in the current stack frame is reached. With an argument,
 continue execution until the specified location is reached, or the current
 stack frame returns.
 @end table
@@ -28484,7 +28798,7 @@ gawk> @kbd{display x}
 @end example
 
 @noindent
-displays the assigned item number, the variable name and its current value.
+This displays the assigned item number, the variable name, and its current value.
 If the display variable refers to a function parameter, it is silently
 deleted from the list as soon as the execution reaches a context where
 no such variable of the given name exists.
@@ -28524,7 +28838,7 @@ gawk> @kbd{print $3}
 @noindent
 This prints the third field in the input record (if the specified field does not
 exist, it prints @samp{Null field}). A variable can be an array element, with
-the subscripts being constant values. To print the contents of an array,
+the subscripts being constant string values. To print the contents of an array,
 prefix the name of the array with the @samp{@@} symbol:
 
 @example
@@ -28552,7 +28866,7 @@ or field.
 String values must be enclosed between double quotes (@code{"}@dots{}@code{"}).
 
 You can also set special @command{awk} variables, such as @code{FS},
-@code{NF}, @code{NR}, etc.
+@code{NF}, @code{NR}, and so on.
 
 @cindex debugger commands, @code{w} (@code{watch})
 @cindex debugger commands, @code{watch}
@@ -28564,7 +28878,7 @@ You can also set special @command{awk} variables, such as @code{FS},
 Add variable @var{var} (or field @code{$@var{n}}) to the watch list.
 The debugger then stops whenever
 the value of the variable or field changes. Each watched item is assigned a
-number which can be used to delete it from the watch list using the
+number that can be used to delete it from the watch list using the
 @code{unwatch} command.
 
 With a watchpoint, you may also supply a condition.  This is an
@@ -28590,27 +28904,33 @@ watch list.
 @end table
 
 @node Execution Stack
-@subsection Dealing with the Stack
+@subsection Working with the Stack
 
-Whenever you run a program which contains any function calls,
+Whenever you run a program that contains any function calls,
 @command{gawk} maintains a stack of all of the function calls leading up
 to where the program is right now.  You can see how you got to where you are,
 and also move around in the stack to see what the state of things was in the
-functions which called the one you are in.  The commands for doing this are:
+functions that called the one you are in.  The commands for doing this are:
 
 @table @asis
 @cindex debugger commands, @code{bt} (@code{backtrace})
 @cindex debugger commands, @code{backtrace}
+@cindex debugger commands, @code{where} (@code{backtrace})
 @cindex @code{backtrace} debugger command
 @cindex @code{bt} debugger command (alias for @code{backtrace})
+@cindex @code{where} debugger command
+@cindex @code{where} debugger command (alias for @code{backtrace})
 @cindex call stack, display in debugger
 @cindex traceback, display in debugger
 @item @code{backtrace} [@var{count}]
 @itemx @code{bt} [@var{count}]
+@itemx @code{where} [@var{count}]
 Print a backtrace of all function calls (stack frames), or innermost @var{count}
 frames if @var{count} > 0. Print the outermost @var{count} frames if
 @var{count} < 0.  The backtrace displays the name and arguments to each
 function, the source @value{FN}, and the line number.
+The alias @code{where} for @code{backtrace} is provided for longtime
+GDB users who may be used to that command.
 
 @cindex debugger commands, @code{down}
 @cindex @code{down} debugger command
@@ -28625,8 +28945,8 @@ Then select and print the frame.
 @item @code{frame} [@var{n}]
 @itemx @code{f} [@var{n}]
 Select and print stack frame @var{n}.  Frame 0 is the currently executing,
-or @dfn{innermost}, frame (function call), frame 1 is the frame that
-called the innermost one. The highest numbered frame is the one for the
+or @dfn{innermost}, frame (function call); frame 1 is the frame that
+called the innermost one. The highest-numbered frame is the one for the
 main program.  The printed information consists of the frame number,
 function and argument names, source file, and the source line.
 
@@ -28638,11 +28958,11 @@ Then select and print the frame.
 @end table
 
 @node Debugger Info
-@subsection Obtaining Information about the Program and the Debugger State
+@subsection Obtaining Information About the Program and the Debugger State
 
 Besides looking at the values of variables, there is often a need to get
 other sorts of information about the state of your program and of the
-debugging environment itself.  The @command{gawk} debugger has one command which
+debugging environment itself.  The @command{gawk} debugger has one command that
 provides this information, appropriately called @code{info}.  @code{info}
 is used with one of a number of arguments that tell it exactly what
 you want to know:
@@ -28660,7 +28980,7 @@ The value for @var{what} should be one of the following:
 @table @code
 @item args
 @cindex show function arguments, in debugger
-Arguments of the selected frame.
+List arguments of the selected frame.
 
 @item break
 @cindex show breakpoints
@@ -28672,7 +28992,7 @@ List all items in the automatic display list.
 
 @item frame
 @cindex describe call stack frame, in debugger
-Description of the selected stack frame.
+Give a description of the selected stack frame.
 
 @item functions
 @cindex list function definitions, in debugger
@@ -28681,11 +29001,11 @@ line numbers.
 
 @item locals
 @cindex show local variables, in debugger
-Local variables of the selected frame.
+List local variables of the selected frame.
 
 @item source
 @cindex show name of current source file, in debugger
-The name of the current source file. Each time the program stops, the
+Print the name of the current source file. Each time the program stops, the
 current source file is the file containing the current instruction.
 When the debugger first starts, the current source file is the first file
 included via the @option{-f} option. The
@@ -28730,12 +29050,12 @@ The available options are:
 @table @asis
 @item @code{history_size}
 @cindex debugger history size
-The maximum number of lines to keep in the history file @file{./.gawk_history}.
-The default is 100.
+Set the maximum number of lines to keep in the history file
+@file{./.gawk_history}.  The default is 100.
 
 @item @code{listsize}
 @cindex debugger default list amount
-The number of lines that @code{list} prints. The default is 15.
+Specify the number of lines that @code{list} prints. The default is 15.
 
 @item @code{outfile}
 @cindex redirect @command{gawk} output, in debugger
@@ -28745,7 +29065,7 @@ standard output.
 
 @item @code{prompt}
 @cindex debugger prompt
-The debugger prompt. The default is @samp{@w{gawk> }}.
+Change the debugger prompt. The default is @samp{@w{gawk> }}.
 
 @item @code{save_history} [@code{on} | @code{off}]
 @cindex debugger history file
@@ -28756,7 +29076,7 @@ The default is @code{on}.
 @cindex save debugger options
 Save current options to file @file{./.gawkrc} upon exit.
 The default is @code{on}.
-Options are read back in to the next session upon startup.
+Options are read back into the next session upon startup.
 
 @item @code{trace} [@code{on} | @code{off}]
 @cindex instruction tracing, in debugger
@@ -28779,7 +29099,7 @@ command in the file. Also, the list of commands may include additional
 @code{source} commands; however, the @command{gawk} debugger will not source the
 same file more than once in order to avoid infinite recursion.
 
-In addition to, or instead of the @code{source} command, you can use
+In addition to, or instead of, the @code{source} command, you can use
 the @option{-D @var{file}} or @option{--debug=@var{file}} command-line
 options to execute commands from a file non-interactively
 (@pxref{Options}).
@@ -28788,68 +29108,69 @@ options to execute commands from a file non-interactively
 @node Miscellaneous Debugger Commands
 @subsection Miscellaneous Commands
 
-There are a few more commands which do not fit into the
+There are a few more commands that do not fit into the
 previous categories, as follows:
 
 @table @asis
 @cindex debugger commands, @code{dump}
 @cindex @code{dump} debugger command
 @item @code{dump} [@var{filename}]
-Dump bytecode of the program to standard output or to the file
+Dump byte code of the program to standard output or to the file
 named in @var{filename}.  This prints a representation of the internal
-instructions which @command{gawk} executes to implement the @command{awk}
+instructions that @command{gawk} executes to implement the @command{awk}
 commands in a program.  This can be very enlightening, as the following
 partial dump of Davide Brini's obfuscated code
 (@pxref{Signature Program}) demonstrates:
 
+@c FIXME: This will need updating if num-handler branch is ever merged in.
 @smallexample
 gawk> @kbd{dump}
 @print{}        # BEGIN
-@print{} 
-@print{} [     1:0xfcd340] Op_rule             : [in_rule = BEGIN] [source_file = brini.awk]
-@print{} [     1:0xfcc240] Op_push_i           : "~" [MALLOC|STRING|STRCUR]
-@print{} [     1:0xfcc2a0] Op_push_i           : "~" [MALLOC|STRING|STRCUR]
-@print{} [     1:0xfcc280] Op_match            : 
-@print{} [     1:0xfcc1e0] Op_store_var        : O
-@print{} [     1:0xfcc2e0] Op_push_i           : "==" [MALLOC|STRING|STRCUR]
-@print{} [     1:0xfcc340] Op_push_i           : "==" [MALLOC|STRING|STRCUR]
-@print{} [     1:0xfcc320] Op_equal            : 
-@print{} [     1:0xfcc200] Op_store_var        : o
-@print{} [     1:0xfcc380] Op_push             : o
-@print{} [     1:0xfcc360] Op_plus_i           : 0 [MALLOC|NUMCUR|NUMBER]
-@print{} [     1:0xfcc220] Op_push_lhs         : o [do_reference = true]
-@print{} [     1:0xfcc300] Op_assign_plus      : 
-@print{} [      :0xfcc2c0] Op_pop              : 
-@print{} [     1:0xfcc400] Op_push             : O
-@print{} [     1:0xfcc420] Op_push_i           : "" [MALLOC|STRING|STRCUR]
-@print{} [      :0xfcc4a0] Op_no_op            : 
-@print{} [     1:0xfcc480] Op_push             : O
-@print{} [      :0xfcc4c0] Op_concat           : [expr_count = 3] [concat_flag = 0]
-@print{} [     1:0xfcc3c0] Op_store_var        : x
-@print{} [     1:0xfcc440] Op_push_lhs         : X [do_reference = true]
-@print{} [     1:0xfcc3a0] Op_postincrement    : 
-@print{} [     1:0xfcc4e0] Op_push             : x
-@print{} [     1:0xfcc540] Op_push             : o
-@print{} [     1:0xfcc500] Op_plus             : 
-@print{} [     1:0xfcc580] Op_push             : o
-@print{} [     1:0xfcc560] Op_plus             : 
-@print{} [     1:0xfcc460] Op_leq              : 
-@print{} [      :0xfcc5c0] Op_jmp_false        : [target_jmp = 0xfcc5e0]
-@print{} [     1:0xfcc600] Op_push_i           : "%c" [MALLOC|STRING|STRCUR]
-@print{} [      :0xfcc660] Op_no_op            : 
-@print{} [     1:0xfcc520] Op_assign_concat    : c
-@print{} [      :0xfcc620] Op_jmp              : [target_jmp = 0xfcc440]
-@print{} 
-@dots{} 
-@print{} 
+@print{}
+@print{} [  1:0xfcd340] Op_rule           : [in_rule = BEGIN] [source_file = brini.awk]
+@print{} [  1:0xfcc240] Op_push_i         : "~" [MALLOC|STRING|STRCUR]
+@print{} [  1:0xfcc2a0] Op_push_i         : "~" [MALLOC|STRING|STRCUR]
+@print{} [  1:0xfcc280] Op_match          :
+@print{} [  1:0xfcc1e0] Op_store_var      : O
+@print{} [  1:0xfcc2e0] Op_push_i         : "==" [MALLOC|STRING|STRCUR]
+@print{} [  1:0xfcc340] Op_push_i         : "==" [MALLOC|STRING|STRCUR]
+@print{} [  1:0xfcc320] Op_equal          :
+@print{} [  1:0xfcc200] Op_store_var      : o
+@print{} [  1:0xfcc380] Op_push           : o
+@print{} [  1:0xfcc360] Op_plus_i         : 0 [MALLOC|NUMCUR|NUMBER]
+@print{} [  1:0xfcc220] Op_push_lhs       : o [do_reference = true]
+@print{} [  1:0xfcc300] Op_assign_plus    :
+@print{} [   :0xfcc2c0] Op_pop            :
+@print{} [  1:0xfcc400] Op_push           : O
+@print{} [  1:0xfcc420] Op_push_i         : "" [MALLOC|STRING|STRCUR]
+@print{} [   :0xfcc4a0] Op_no_op          :
+@print{} [  1:0xfcc480] Op_push           : O
+@print{} [   :0xfcc4c0] Op_concat         : [expr_count = 3] [concat_flag = 0]
+@print{} [  1:0xfcc3c0] Op_store_var      : x
+@print{} [  1:0xfcc440] Op_push_lhs       : X [do_reference = true]
+@print{} [  1:0xfcc3a0] Op_postincrement  :
+@print{} [  1:0xfcc4e0] Op_push           : x
+@print{} [  1:0xfcc540] Op_push           : o
+@print{} [  1:0xfcc500] Op_plus           :
+@print{} [  1:0xfcc580] Op_push           : o
+@print{} [  1:0xfcc560] Op_plus           :
+@print{} [  1:0xfcc460] Op_leq            :
+@print{} [   :0xfcc5c0] Op_jmp_false      : [target_jmp = 0xfcc5e0]
+@print{} [  1:0xfcc600] Op_push_i         : "%c" [MALLOC|STRING|STRCUR]
+@print{} [   :0xfcc660] Op_no_op          :
+@print{} [  1:0xfcc520] Op_assign_concat  : c
+@print{} [   :0xfcc620] Op_jmp            : [target_jmp = 0xfcc440]
+@print{}
+@dots{}
+@print{}
 @print{} [     2:0xfcc5a0] Op_K_printf         : [expr_count = 17] [redir_type = ""]
-@print{} [      :0xfcc140] Op_no_op            : 
-@print{} [      :0xfcc1c0] Op_atexit           : 
-@print{} [      :0xfcc640] Op_stop             : 
-@print{} [      :0xfcc180] Op_no_op            : 
-@print{} [      :0xfcd150] Op_after_beginfile  : 
-@print{} [      :0xfcc160] Op_no_op            : 
-@print{} [      :0xfcc1a0] Op_after_endfile    : 
+@print{} [      :0xfcc140] Op_no_op            :
+@print{} [      :0xfcc1c0] Op_atexit           :
+@print{} [      :0xfcc640] Op_stop             :
+@print{} [      :0xfcc180] Op_no_op            :
+@print{} [      :0xfcd150] Op_after_beginfile  :
+@print{} [      :0xfcc160] Op_no_op            :
+@print{} [      :0xfcc1a0] Op_after_endfile    :
 gawk>
 @end smallexample
 
@@ -28875,7 +29196,7 @@ are as follows:
 
 @c nested table
 @table @asis
-@item @code{-}
+@item @code{-} (Minus)
 Print lines before the lines last printed.
 
 @item @code{+}
@@ -28893,7 +29214,7 @@ Print lines centered around line number @var{n} in
 source file @var{filename}. This command may change the current source file.
 
 @item @var{function}
-Print lines centered around beginning of the
+Print lines centered around the beginning of the
 function @var{function}. This command may change the current source file.
 @end table
 
@@ -28905,16 +29226,16 @@ function @var{function}. This command may change the current source file.
 @item @code{quit}
 @itemx @code{q}
 Exit the debugger.  Debugging is great fun, but sometimes we all have
-to tend to other obligations in life, and sometimes we find the bug,
-and are free to go on to the next one!  As we saw above, if you are
-running a program, the debugger warns you if you accidentally type
+to tend to other obligations in life, and sometimes we find the bug
+and are free to go on to the next one!  As we saw earlier, if you are
+running a program, the debugger warns you when you type
 @samp{q} or @samp{quit}, to make sure you really want to quit.
 
 @cindex debugger commands, @code{trace}
 @cindex @code{trace} debugger command
 @item @code{trace} [@code{on} | @code{off}]
-Turn on or off a continuous printing of instructions which are about to
-be executed, along with printing the @command{awk} line which they
+Turn on or off continuous printing of the instructions that are about to
+be executed, along with the @command{awk} lines they
 implement.  The default is @code{off}.
 
 It is to be hoped that most of the ``opcodes'' in these instructions are
@@ -28930,7 +29251,7 @@ fairly self-explanatory, and using @code{stepi} and @code{nexti} while
 
 If @command{gawk} is compiled with
 @uref{http://cnswww.cns.cwru.edu/php/chet/readline/readline.html,
-the @code{readline} library}, you can take advantage of that library's
+the GNU Readline library}, you can take advantage of that library's
 command completion and history expansion features. The following types
 of completion are available:
 
@@ -28963,11 +29284,11 @@ and
 @end table
 
 @node Limitations
-@section Limitations and Future Plans
+@section Limitations
 
 We hope you find the @command{gawk} debugger useful and enjoyable to work with,
 but as with any program, especially in its early releases, it still has
-some limitations.  A few which are worth being aware of are:
+some limitations.  A few that it's worth being aware of are:
 
 @itemize @value{BULLET}
 @item
@@ -28983,13 +29304,13 @@ If you perused the dump of opcodes in @ref{Miscellaneous Debugger Commands}
 (or if you are already familiar with @command{gawk} internals),
 you will realize that much of the internal manipulation of data
 in @command{gawk}, as in many interpreters, is done on a stack.
-@code{Op_push}, @code{Op_pop}, etc., are the ``bread and butter'' of
+@code{Op_push}, @code{Op_pop}, and the like are the ``bread and butter'' of
 most @command{gawk} code.
 
 Unfortunately, as of now, the @command{gawk}
 debugger does not allow you to examine the stack's contents.
 That is, the intermediate results of expression evaluation are on the
-stack, but cannot be printed.  Rather, only variables which are defined
+stack, but cannot be printed.  Rather, only variables that are defined
 in the program can be printed.  Of course, a workaround for
 this is to use more explicit variables at the debugging stage and then
 change back to obscure, perhaps more optimal code later.
@@ -28997,22 +29318,24 @@ change back to obscure, perhaps more optimal code later.
 @item
 There is no way to look ``inside'' the process of compiling
 regular expressions to see if you got it right.  As an @command{awk}
-programmer, you are expected to know what @code{/[^[:alnum:][:blank:]]/}
-means.
+programmer, you are expected to know the meaning of
+@code{/[^[:alnum:][:blank:]]/}.
 
 @item
 The @command{gawk} debugger is designed to be used by running a program (with all its
 parameters) on the command line, as described in @ref{Debugger Invocation}.
-There is no way (as of now) to attach or ``break in'' to a running program.
-This seems reasonable for a language which is used mainly for quickly
+There is no way (as of now) to attach or ``break into'' a running program.
+This seems reasonable for a language that is used mainly for quickly
 executing, short programs.
 
 @item
-The @command{gawk} debugger only accepts source supplied with the @option{-f} option.
+The @command{gawk} debugger only accepts source code supplied with the @option{-f} option.
 @end itemize
 
+@ignore
 Look forward to a future release when these and other missing features may
 be added, and of course feel free to try to add them yourself!
+@end ignore
 
 @node Debugging Summary
 @section Summary
@@ -29020,8 +29343,8 @@ be added, and of course feel free to try to add them yourself!
 @itemize @value{BULLET}
 @item
 Programs rarely work correctly the first time.  Finding bugs
-is @dfn{debugging} and a program that helps you find bugs is a
-@dfn{debugger}.  @command{gawk} has a built-in debugger that works very
+is called debugging, and a program that helps you find bugs is a
+debugger.  @command{gawk} has a built-in debugger that works very
 similarly to the GNU Debugger, GDB.
 
 @item
@@ -29041,27 +29364,26 @@ breakpoints, execution, viewing and changing data, working with the stack,
 getting information, and other tasks.
 
 @item
-If the @code{readline} library is available when @command{gawk} is
+If the GNU Readline library is available when @command{gawk} is
 compiled, it is used by the debugger to provide command-line history
 and editing.
 
 @end itemize
 
 @node Arbitrary Precision Arithmetic
-@chapter Arithmetic and Arbitrary Precision Arithmetic with @command{gawk}
+@chapter Arithmetic and Arbitrary-Precision Arithmetic with @command{gawk}
 @cindex arbitrary precision
 @cindex multiple precision
 @cindex infinite precision
 @cindex floating-point, numbers@comma{} arbitrary precision
 
 This @value{CHAPTER} introduces some basic concepts relating to
-how computers do arithmetic and briefly lists the features in
-@command{gawk} for performing arbitrary precision floating point
-computations.  It then proceeds to describe floating-point arithmetic,
+how computers do arithmetic and defines some important terms.
+It then proceeds to describe floating-point arithmetic,
 which is what @command{awk} uses for all its computations, including a
-discussion of arbitrary precision floating point arithmetic, which is
+discussion of arbitrary-precision floating-point arithmetic, which is
 a feature available only in @command{gawk}. It continues on to present
-arbitrary precision integers, and concludes with a description of some
+arbitrary-precision integers, and concludes with a description of some
 points where @command{gawk} and the POSIX standard are not quite in
 agreement.
 
@@ -29106,7 +29428,7 @@ paper and pencil (and/or a calculator). In theory, numbers can have an
 arbitrary number of digits on either side (or both sides) of the decimal
 point, and the results of a computation are always exact.
 
-Some modern system can do decimal arithmetic in hardware, but usually you
+Some modern systems can do decimal arithmetic in hardware, but usually you
 need a special software library to provide access to these instructions.
 There are also libraries that do decimal arithmetic entirely in software.
 
@@ -29124,52 +29446,82 @@ The disadvantage is that their range is limited.
 @cindex integers, unsigned
 In computers, integer values come in two flavors: @dfn{signed} and
 @dfn{unsigned}.  Signed values may be negative or positive, whereas
-unsigned values are always positive (that is, greater than or equal
-to zero).
+unsigned values are always greater than or equal
+to zero.
 
 In computer systems, integer arithmetic is exact, but the possible
 range of values is limited.  Integer arithmetic is generally faster than
-floating point arithmetic.
+floating-point arithmetic.
 
-@item Floating point arithmetic
+@item Floating-point arithmetic
 Floating-point numbers represent what were called in school ``real''
-numbers; i.e., those that have a fractional part, such as 3.1415927.
+numbers (i.e., those that have a fractional part, such as 3.1415927).
 The advantage to floating-point numbers is that they can represent a
 much larger range of values than can integers.  The disadvantage is that
 there are numbers that they cannot represent exactly.
 
-Modern systems support floating point arithmetic in hardware, with a
+Modern systems support floating-point arithmetic in hardware, with a
 limited range of values.  There are software libraries that allow
-the use of arbitrary precision floating point calculations.
+the use of arbitrary-precision floating-point calculations.
 
-POSIX @command{awk} uses @dfn{double precision} floating-point numbers, which
-can hold more digits than @dfn{single precision} floating-point numbers.
-@command{gawk} has facilities for performing arbitrary precision floating
-point arithmetic, which we describe in more detail shortly.
+POSIX @command{awk} uses @dfn{double-precision} floating-point numbers, which
+can hold more digits than @dfn{single-precision} floating-point numbers.
+@command{gawk} has facilities for performing arbitrary-precision
+floating-point arithmetic, which we describe in more detail shortly.
 @end table
 
-Computers work with integer and floating point values of different
-ranges. Integer values are usually either 32 or 64 bits in size.  Single
-precision floating point values occupy 32 bits, whereas double precision
-floating point values occupy 64 bits.  Floating point values are always
-signed. The possible ranges of values are shown in the following table.
+Computers work with integer and floating-point values of different
+ranges. Integer values are usually either 32 or 64 bits in size.
+Single-precision floating-point values occupy 32 bits, whereas double-precision
+floating-point values occupy 64 bits.  Floating-point values are always
+signed. The possible ranges of values are shown in @ref{table-numeric-ranges}.
 
+@float Table,table-numeric-ranges
+@caption{Value ranges for different numeric representations}
 @multitable @columnfractions .34 .33 .33
-@headitem Numeric representation @tab Miniumum value @tab Maximum value
+@headitem Numeric representation @tab Minimum value @tab Maximum value
 @item 32-bit signed integer @tab @minus{}2,147,483,648 @tab 2,147,483,647
 @item 32-bit unsigned integer @tab 0 @tab 4,294,967,295
 @item 64-bit signed integer @tab @minus{}9,223,372,036,854,775,808 @tab 9,223,372,036,854,775,807
 @item 64-bit unsigned integer @tab 0 @tab 18,446,744,073,709,551,615
-@item Single precision floating point (approximate) @tab @code{1.175494e-38} @tab @code{3.402823e+38}
-@item Double precision floating point (approximate) @tab @code{2.225074e-308} @tab @code{1.797693e+308}
+@iftex
+@item Single-precision floating point (approximate) @tab @math{1.175494^{-38}} @tab @math{3.402823^{38}}
+@item Double-precision floating point (approximate) @tab @math{2.225074^{-308}} @tab @math{1.797693^{308}}
+@end iftex
+@ifnottex
+@ifnotdocbook
+@item Single-precision floating point (approximate) @tab 1.175494e-38 @tab 3.402823e38
+@item Double-precision floating point (approximate) @tab 2.225074e-308 @tab 1.797693e308
+@end ifnotdocbook
+@end ifnottex
+@ifdocbook
+@item Single-precision floating point (approximate) @tab
+@c FIXME: Use @sup here for superscript
+@docbook
+1.175494<superscript>-38</superscript>
+@end docbook
+@tab
+@docbook
+3.402823<superscript>38</superscript>
+@end docbook
+@item Double-precision floating point (approximate) @tab
+@docbook
+2.225074<superscript>-308</superscript>
+@end docbook
+@tab
+@docbook
+1.797693<superscript>308</superscript>
+@end docbook
+@end ifdocbook
 @end multitable
+@end float
 
 @node Math Definitions
-@section Other Stuff To Know
+@section Other Stuff to Know
 
 The rest of this @value{CHAPTER} uses a number of terms. Here are some
 informal definitions that should help you work your way through the material
-here.
+here:
 
 @table @dfn
 @item Accuracy
@@ -29190,14 +29542,12 @@ A special value representing infinity. Operations involving another
 number and infinity produce infinity.
 
 @item NaN
-``Not A Number.''@footnote{Thanks
-to Michael Brennan for this description, which I have paraphrased, and
-for the examples}.
-A special value that results from attempting a
-calculation that has no answer as a real number.  In such a case,
-programs can either receive a floating-point exception, or get @code{NaN}
-back as the result. The IEEE 754 standard recommends that systems return
-@code{NaN}. Some examples:
+``Not a number.''@footnote{Thanks to Michael Brennan for this description,
+which we have paraphrased, and for the examples.} A special value that
+results from attempting a calculation that has no answer as a real number.
+In such a case, programs can either receive a floating-point exception,
+or get @code{NaN} back as the result. The IEEE 754 standard recommends
+that systems return @code{NaN}. Some examples:
 
 @table @code
 @item sqrt(-1)
@@ -29235,8 +29585,8 @@ formula:
 @end display
 
 @noindent
-Here, @var{prec} denotes the binary precision
-(measured in bits) and @var{dps} (short for decimal places)
+Here, @emph{prec} denotes the binary precision
+(measured in bits) and @emph{dps} (short for decimal places)
 is the decimal digits.
 
 @item Rounding mode
@@ -29244,7 +29594,7 @@ How numbers are rounded up or down when necessary.
 More details are provided later.
 
 @item Significand
-A floating point value consists the significand multiplied by 10
+A floating-point value consists of the significand multiplied by 10
 to the power of the exponent. For example, in @code{1.2345e67},
 the significand is @code{1.2345}.
 
@@ -29262,19 +29612,19 @@ on some of those terms.
 On modern systems, floating-point hardware uses the representation and
 operations defined by the IEEE 754 standard.
 Three of the standard IEEE 754 types are 32-bit single precision,
-64-bit double precision and 128-bit quadruple precision.
+64-bit double precision, and 128-bit quadruple precision.
 The standard also specifies extended precision formats
 to allow greater precisions and larger exponent ranges.
-(@command{awk} uses only the 64-bit double precision format.)
+(@command{awk} uses only the 64-bit double-precision format.)
 
 @ref{table-ieee-formats} lists the precision and exponent
-field values for the basic IEEE 754 binary formats:
+field values for the basic IEEE 754 binary formats.
 
 @float Table,table-ieee-formats
-@caption{Basic IEEE Format Context Values}
+@caption{Basic IEEE format values}
 @multitable @columnfractions .20 .20 .20 .20 .20
-@headitem Name @tab Total bits @tab Precision @tab emin @tab emax
-@item Single @tab 32 @tab 24 @tab @minus{}126 @tab +127 
+@headitem Name @tab Total bits @tab Precision @tab Minimum exponent @tab Maximum exponent
+@item Single @tab 32 @tab 24 @tab @minus{}126 @tab +127
 @item Double @tab 64 @tab 53 @tab @minus{}1022 @tab +1023
 @item Quadruple @tab 128 @tab 113 @tab @minus{}16382 @tab +16383
 @end multitable
@@ -29286,19 +29636,19 @@ one extra bit of significand.
 @end quotation
 
 @node MPFR features
-@section Arbitrary Precison Arithmetic Features In @command{gawk}
+@section Arbitrary-Precision Arithmetic Features in @command{gawk}
 
-By default, @command{gawk} uses the double precision floating point values
+By default, @command{gawk} uses the double-precision floating-point values
 supplied by the hardware of the system it runs on.  However, if it was
-compiled to do, @command{gawk} uses the @uref{http://www.mpfr.org, GNU
-MPFR} and @uref{http://gmplib.org, GNU MP} (GMP) libraries for arbitrary
-precision arithmetic on numbers.  You can see if MPFR support is available
-like so:
+compiled to do so, @command{gawk} uses the @uref{http://www.mpfr.org,
+GNU MPFR} and @uref{http://gmplib.org, GNU MP} (GMP) libraries for
+arbitrary-precision arithmetic on numbers.  You can see if MPFR support
+is available like so:
 
 @example
 $ @kbd{gawk --version}
-@print{} GNU Awk 4.1.1, API: 1.1 (GNU MPFR 3.1.0-p3, GNU MP 5.0.2)
-@print{} Copyright (C) 1989, 1991-2014 Free Software Foundation.
+@print{} GNU Awk 4.1.2, API: 1.1 (GNU MPFR 3.1.0-p3, GNU MP 5.0.2)
+@print{} Copyright (C) 1989, 1991-2015 Free Software Foundation.
 @dots{}
 @end example
 
@@ -29317,26 +29667,27 @@ results.  With the @option{-M} command-line option,
 all floating-point arithmetic operators and numeric functions
 can yield results to any desired precision level supported by MPFR.
 
-Two built-in variables, @code{PREC} and @code{ROUNDMODE},
+Two predefined variables, @code{PREC} and @code{ROUNDMODE},
 provide control over the working precision and the rounding mode.
 The precision and the rounding mode are set globally for every operation
 to follow.
-@xref{Auto-set}, for more information.
+@DBXREF{Setting precision} and @DBREF{Setting the rounding mode}
+for more information.
 
 @node FP Math Caution
-@section Floating Point Arithmetic: Caveat Emptor!
+@section Floating-Point Arithmetic: Caveat Emptor!
 
 @quotation
 @i{Math class is tough!}
 @author Teen Talk Barbie, July 1992
 @end quotation
 
-This @value{SECTION} provides a high level overview of the issues
+This @value{SECTION} provides a high-level overview of the issues
 involved when doing lots of floating-point arithmetic.@footnote{There
 is a very nice @uref{http://www.validlab.com/goldberg/paper.pdf,
 paper on floating-point arithmetic} by David Goldberg, ``What Every
-Computer Scientist Should Know About Floating-point Arithmetic,''
-@cite{ACM Computing Surveys} @strong{23}, 1 (1991-03), 5-48.  This is
+Computer Scientist Should Know About Floating-Point Arithmetic,''
+@cite{ACM Computing Surveys} @strong{23}, 1 (1991-03): 5-48.  This is
 worth reading if you are interested in the details, but it does require
 a background in computer science.}
 The discussion applies to both hardware and arbitrary-precision
@@ -29357,17 +29708,17 @@ rely just on what we tell you.
 @end menu
 
 @node Inexactness of computations
-@subsection Floating Point Arithmetic Is Not Exact
+@subsection Floating-Point Arithmetic Is Not Exact
 
 Binary floating-point representations and arithmetic are inexact.
 Simple values like 0.1 cannot be precisely represented using
 binary floating-point numbers, and the limited precision of
 floating-point numbers means that slight changes in
 the order of operations or the precision of intermediate storage
-can change the result. To make matters worse, with arbitrary precision
-floating-point, you can set the precision before starting a computation,
-but then you cannot be sure of the number of significant decimal places
-in the final result.
+can change the result. To make matters worse, with arbitrary-precision
+floating-point arithmetic, you can set the precision before starting a
+computation, but then you cannot be sure of the number of significant
+decimal places in the final result.
 
 @menu
 * Inexact representation::      Numbers are not exactly represented.
@@ -29389,7 +29740,7 @@ y = 0.425
 
 Unlike the number in @code{y}, the number stored in @code{x}
 is exactly representable
-in binary since it can be written as a finite sum of one or
+in binary because it can be written as a finite sum of one or
 more fractions whose denominators are all powers of two.
 When @command{gawk} reads a floating-point number from
 program source, it automatically rounds that number to whatever
@@ -29405,7 +29756,7 @@ $ @kbd{gawk 'BEGIN @{ x = 0.875; y = 0.425}
 
 Often the error is so small you do not even notice it, and if you do,
 you can always specify how much precision you would like in your output.
-Usually this is a format string like @code{"%.15g"}, which when
+Usually this is a format string like @code{"%.15g"}, which, when
 used in the previous example, produces an output identical to the input.
 
 @node Comparing FP Values
@@ -29415,7 +29766,7 @@ Because the underlying representation can be a little bit off from the exact val
 comparing floating-point values to see if they are exactly equal is generally a bad idea.
 Here is an example where it does not work like you would expect:
 
-@example 
+@example
 $ @kbd{gawk 'BEGIN @{ print (0.1 + 12.2 == 12.3) @}'}
 @print{} 0
 @end example
@@ -29424,7 +29775,7 @@ The general wisdom when comparing floating-point values is to see if
 they are within some small range of each other (called a @dfn{delta},
 or @dfn{tolerance}).
 You have to decide how small a delta is important to you. Code to do
-this looks something like this:
+this looks something like the following:
 
 @example
 delta = 0.00001                 # for example
@@ -29435,12 +29786,16 @@ else
     # not ok
 @end example
 
+@noindent
+(We assume that you have a simple absolute value function named
+@code{abs()} defined elsewhere in your program.)
+
 @node Errors accumulate
 @subsubsection Errors Accumulate
 
 The loss of accuracy during a single computation with floating-point
 numbers usually isn't enough to worry about. However, if you compute a
-value which is the result of a sequence of floating point operations,
+value that is the result of a sequence of floating-point operations,
 the error can accumulate and greatly affect the computation itself.
 Here is an attempt to compute the value of @value{PI} using one of its
 many series representations:
@@ -29486,23 +29841,23 @@ $ @kbd{gawk 'BEGIN @{}
 @end example
 
 @node Getting Accuracy
-@subsection Getting The Accuracy You Need
+@subsection Getting the Accuracy You Need
 
-Can arbitrary precision arithmetic give exact results? There are
+Can arbitrary-precision arithmetic give exact results? There are
 no easy answers. The standard rules of algebra often do not apply
 when using floating-point arithmetic.
 Among other things, the distributive and associative laws
 do not hold completely, and order of operation may be important
-for your computation. Rounding error, cumulative precision loss
+for your computation. Rounding error, cumulative precision loss,
 and underflow are often troublesome.
 
 When @command{gawk} tests the expressions @samp{0.1 + 12.2} and
-@samp{12.3} for equality using the machine double precision arithmetic,
+@samp{12.3} for equality using the machine double-precision arithmetic,
 it decides that they are not equal!  (@xref{Comparing FP Values}.)
 You can get the result you want by increasing the precision; 56 bits in
 this case does the job:
 
-@example 
+@example
 $ @kbd{gawk -M -v PREC=56 'BEGIN @{ print (0.1 + 12.2 == 12.3) @}'}
 @print{} 1
 @end example
@@ -29511,7 +29866,7 @@ If adding more bits is good, perhaps adding even more bits of
 precision is better?
 Here is what happens if we use an even larger value of @code{PREC}:
 
-@example 
+@example
 $ @kbd{gawk -M -v PREC=201 'BEGIN @{ print (0.1 + 12.2 == 12.3) @}'}
 @print{} 0
 @end example
@@ -29520,20 +29875,21 @@ This is not a bug in @command{gawk} or in the MPFR library.
 It is easy to forget that the finite number of bits used to store the value
 is often just an approximation after proper rounding.
 The test for equality succeeds if and only if @emph{all} bits in the two operands
-are exactly the same. Since this is not necessarily true after floating-point
-computations with a particular precision and effective rounding rule,
+are exactly the same. Because this is not necessarily true after floating-point
+computations with a particular precision and effective rounding mode,
 a straight test for equality may not work. Instead, compare the
 two numbers to see if they are within the desirable delta of each other.
 
 In applications where 15 or fewer decimal places suffice,
-hardware double precision arithmetic can be adequate, and is usually much faster.
+hardware double-precision arithmetic can be adequate, and is usually much faster.
 But you need to keep in mind that every floating-point operation
-can suffer a new rounding error with catastrophic consequences as illustrated
+can suffer a new rounding error with catastrophic consequences, as illustrated
 by our earlier attempt to compute the value of @value{PI}.
 Extra precision can greatly enhance the stability and the accuracy
 of your computation in such cases.
 
-Repeated addition is not necessarily equivalent to multiplication
+Additionally, you should understand that
+repeated addition is not necessarily equivalent to multiplication
 in floating-point arithmetic. In the example in
 @ref{Errors accumulate}:
 
@@ -29552,9 +29908,9 @@ an arbitrarily large value for @code{PREC}. Reformulation of
 the problem at hand is often the correct approach in such situations.
 
 @node Try To Round
-@subsection Try A Few Extra Bits of Precision and Rounding
+@subsection Try a Few Extra Bits of Precision and Rounding
 
-Instead of arbitrary precision floating-point arithmetic,
+Instead of arbitrary-precision floating-point arithmetic,
 often all you need is an adjustment of your logic
 or a different order for the operations in your calculation.
 The stability and the accuracy of the computation of @value{PI}
@@ -29566,7 +29922,7 @@ simple algebraic transformation:
 @end example
 
 @noindent
-After making this, change the program converges to
+After making this change, the program converges to
 @value{PI} in under 30 iterations:
 
 @example
@@ -29582,26 +29938,26 @@ $ @kbd{gawk -f pi2.awk}
 @end example
 
 @node Setting precision
-@subsection Setting The Precision
+@subsection Setting the Precision
 
 @command{gawk} uses a global working precision; it does not keep track of
 the precision or accuracy of individual numbers. Performing an arithmetic
 operation or calling a built-in function rounds the result to the current
 working precision. The default working precision is 53 bits, which you can
-modify using the built-in variable @code{PREC}. You can also set the
+modify using the predefined variable @code{PREC}. You can also set the
 value to one of the predefined case-insensitive strings
 shown in @ref{table-predefined-precision-strings},
 to emulate an IEEE 754 binary format.
 
 @float Table,table-predefined-precision-strings
-@caption{Predefined Precision Strings For @code{PREC}}
+@caption{Predefined precision strings for @code{PREC}}
 @multitable {@code{"double"}} {12345678901234567890123456789012345}
-@headitem @code{PREC} @tab IEEE 754 Binary Format
-@item @code{"half"} @tab 16-bit half-precision.
-@item @code{"single"} @tab Basic 32-bit single precision.
-@item @code{"double"} @tab Basic 64-bit double precision.
-@item @code{"quad"} @tab Basic 128-bit quadruple precision.
-@item @code{"oct"} @tab 256-bit octuple precision.
+@headitem @code{PREC} @tab IEEE 754 binary format
+@item @code{"half"} @tab 16-bit half-precision
+@item @code{"single"} @tab Basic 32-bit single precision
+@item @code{"double"} @tab Basic 64-bit double precision
+@item @code{"quad"} @tab Basic 128-bit quadruple precision
+@item @code{"oct"} @tab 256-bit octuple precision
 @end multitable
 @end float
 
@@ -29620,7 +29976,7 @@ Be wary of floating-point constants! When reading a floating-point
 constant from program source code, @command{gawk} uses the default
 precision (that of a C @code{double}), unless overridden by an assignment
 to the special variable @code{PREC} on the command line, to store it
-internally as a MPFR number.  Changing the precision using @code{PREC}
+internally as an MPFR number.  Changing the precision using @code{PREC}
 in the program text does @emph{not} change the precision of a constant.
 
 If you need to represent a floating-point constant at a higher precision
@@ -29628,11 +29984,10 @@ than the default and cannot use a command-line assignment to @code{PREC},
 you should either specify the constant as a string, or as a rational
 number, whenever possible. The following example illustrates the
 differences among various ways to print a floating-point constant:
-@end quotation
 
 @example
 $ @kbd{gawk -M 'BEGIN @{ PREC = 113; printf("%0.25f\n", 0.1) @}'}
-@print{} 0.1000000000000000055511151 
+@print{} 0.1000000000000000055511151
 $ @kbd{gawk -M -v PREC=113 'BEGIN @{ printf("%0.25f\n", 0.1) @}'}
 @print{} 0.1000000000000000000000000
 $ @kbd{gawk -M 'BEGIN @{ PREC = 113; printf("%0.25f\n", "0.1") @}'}
@@ -29640,22 +29995,23 @@ $ @kbd{gawk -M 'BEGIN @{ PREC = 113; printf("%0.25f\n", "0.1") @}'}
 $ @kbd{gawk -M 'BEGIN @{ PREC = 113; printf("%0.25f\n", 1/10) @}'}
 @print{} 0.1000000000000000000000000
 @end example
+@end quotation
 
 @node Setting the rounding mode
-@subsection Setting The Rounding Mode
+@subsection Setting the Rounding Mode
 
 The @code{ROUNDMODE} variable provides
-program level control over the rounding mode.
+program-level control over the rounding mode.
 The correspondence between @code{ROUNDMODE} and the IEEE
 rounding modes is shown in @ref{table-gawk-rounding-modes}.
 
 @float Table,table-gawk-rounding-modes
-@caption{@command{gawk} Rounding Modes}
+@caption{@command{gawk} rounding modes}
 @multitable @columnfractions .45 .30 .25
-@headitem Rounding Mode @tab IEEE Name @tab @code{ROUNDMODE}
+@headitem Rounding mode @tab IEEE name @tab @code{ROUNDMODE}
 @item Round to nearest, ties to even @tab @code{roundTiesToEven} @tab @code{"N"} or @code{"n"}
-@item Round toward plus Infinity @tab @code{roundTowardPositive} @tab @code{"U"} or @code{"u"}
-@item Round toward negative Infinity @tab @code{roundTowardNegative} @tab @code{"D"} or @code{"d"}
+@item Round toward positive infinity @tab @code{roundTowardPositive} @tab @code{"U"} or @code{"u"}
+@item Round toward negative infinity @tab @code{roundTowardNegative} @tab @code{"D"} or @code{"d"}
 @item Round toward zero @tab @code{roundTowardZero} @tab @code{"Z"} or @code{"z"}
 @item Round to nearest, ties away from zero @tab @code{roundTiesToAway} @tab @code{"A"} or @code{"a"}
 @end multitable
@@ -29665,7 +30021,7 @@ rounding modes is shown in @ref{table-gawk-rounding-modes}.
 selects the IEEE 754 rounding mode @code{roundTiesToEven}.
 In @ref{table-gawk-rounding-modes}, the value @code{"A"} selects
 @code{roundTiesToAway}.  This is only available if your version of the
-MPFR library supports it; otherwise setting @code{ROUNDMODE} to @code{"A"}
+MPFR library supports it; otherwise, setting @code{ROUNDMODE} to @code{"A"}
 has no effect.
 
 The default mode @code{roundTiesToEven} is the most preferred,
@@ -29716,8 +30072,8 @@ distributes upward and downward rounds of exact halves, which might
 cause any accumulating round-off error to cancel itself out. This is the
 default rounding mode for IEEE 754 computing functions and operators.
 
-The other rounding modes are rarely used.  Round toward positive infinity
-(@code{roundTowardPositive}) and round toward negative infinity
+The other rounding modes are rarely used.  Rounding toward positive infinity
+(@code{roundTowardPositive}) and toward negative infinity
 (@code{roundTowardNegative}) are often used to implement interval
 arithmetic, where you adjust the rounding mode to calculate upper and
 lower bounds for the range of output. The @code{roundTowardZero} mode can
@@ -29736,14 +30092,14 @@ accumulation of round-off error, look for a significant difference in
 output when you change the rounding mode to be sure.
 
 @node Arbitrary Precision Integers
-@section Arbitrary Precision Integer Arithmetic with @command{gawk}
+@section Arbitrary-Precision Integer Arithmetic with @command{gawk}
 @cindex integers, arbitrary precision
 @cindex arbitrary precision integers
 
 When given the @option{-M} option,
-@command{gawk} performs all integer arithmetic using GMP arbitrary
-precision integers.  Any number that looks like an integer in a source
-or @value{DF} is stored as an arbitrary precision integer.  The size
+@command{gawk} performs all integer arithmetic using GMP arbitrary-precision
+integers.  Any number that looks like an integer in a source
+or @value{DF} is stored as an arbitrary-precision integer.  The size
 of the integer is limited only by the available memory.  For example,
 the following computes
 @iftex
@@ -29758,33 +30114,34 @@ the following computes
 5<superscript>4<superscript>3<superscript>2</superscript></superscript></superscript>, @c
 @end docbook
 the result of which is beyond the
-limits of ordinary hardware double-precision floating point values:
+limits of ordinary hardware double-precision floating-point values:
+@c FIXME: Use @sup here for superscript
 
 @example
 $ @kbd{gawk -M 'BEGIN @{}
 >   @kbd{x = 5^4^3^2}
->   @kbd{print "# of digits =", length(x)}
+>   @kbd{print "number of digits =", length(x)}
 >   @kbd{print substr(x, 1, 20), "...", substr(x, length(x) - 19, 20)}
 > @kbd{@}'}
-@print{} # of digits = 183231
+@print{} number of digits = 183231
 @print{} 62060698786608744707 ... 92256259918212890625
 @end example
 
-If instead you were to compute the same value using arbitrary precision
+If instead you were to compute the same value using arbitrary-precision
 floating-point values, the precision needed for correct output (using
 the formula
 @iftex
-@math{prec = 3.322 @cdot dps}),
+@math{prec = 3.322 @cdot dps})
 would be @math{3.322 @cdot 183231},
 @end iftex
 @ifnottex
 @ifnotdocbook
-@samp{prec = 3.322 * dps}),
+@samp{prec = 3.322 * dps})
 would be 3.322 x 183231,
 @end ifnotdocbook
 @end ifnottex
 @docbook
-<emphasis>prec</emphasis> = 3.322 &sdot; <emphasis>dps</emphasis>),
+<emphasis>prec</emphasis> = 3.322 &sdot; <emphasis>dps</emphasis>)
 would be
 <emphasis>prec</emphasis> = 3.322 &sdot; 183231, @c
 @end docbook
@@ -29815,14 +30172,14 @@ floating-point results exactly. You can either increase the precision
 @samp{2.0} with an integer, to perform all computations using integer
 arithmetic to get the correct output.
 
-Sometimes @command{gawk} must implicitly convert an arbitrary precision
-integer into an arbitrary precision floating-point value.  This is
+Sometimes @command{gawk} must implicitly convert an arbitrary-precision
+integer into an arbitrary-precision floating-point value.  This is
 primarily because the MPFR library does not always provide the relevant
-interface to process arbitrary precision integers or mixed-mode numbers
+interface to process arbitrary-precision integers or mixed-mode numbers
 as needed by an operation or function.  In such a case, the precision is
 set to the minimum value necessary for exact conversion, and the working
 precision is not used for this purpose.  If this is not what you need or
-want, you can employ a subterfuge, and convert the integer to floating
+want, you can employ a subterfuge and convert the integer to floating
 point first, like this:
 
 @example
@@ -29836,7 +30193,7 @@ to begin with:
 gawk -M 'BEGIN @{ n = 13.0; print n % 2.0 @}'
 @end example
 
-Note that for the particular example above, it is likely best
+Note that for this particular example, it is likely best
 to just use the following:
 
 @example
@@ -29848,27 +30205,30 @@ When dividing two arbitrary precision integers with either
 precision floating point value (unless the denominator evenly
 divides into the numerator).  In order to do integer division
 or remainder with arbitrary precision integers, use the built-in
-@code{div()} function (@pxref{Numeric Functions}).
+@code{intdiv()} function (@pxref{Numeric Functions}).
 
-You can simulate the @code{div()} function in standard @command{awk}
+You can simulate the @code{intdiv()} function in standard @command{awk}
 using this user-defined function:
 
 @example
-@c file eg/lib/div.awk
-# div --- do integer division
+@c file eg/lib/intdiv.awk
+# intdiv --- do integer division
 
 @c endfile
 @ignore
-@c file eg/lib/div.awk
+@c file eg/lib/intdiv.awk
 #
 # Arnold Robbins, arnold@@skeeve.com, Public Domain
 # July, 2014
+#
+# Name changed from div() to intdiv()
+# April, 2015
 
 @c endfile
 
 @end ignore
-@c file eg/lib/div.awk
-function div(numerator, denominator, result,    i)
+@c file eg/lib/intdiv.awk
+function intdiv(numerator, denominator, result)
 @{
     split("", result)
 
@@ -29882,10 +30242,84 @@ function div(numerator, denominator, result,    i)
 @c endfile
 @end example
 
+The following example program, contributed by Katie Wasserman,
+uses @code{intdiv()} to
+compute the digits of @value{PI} to as many places as you
+choose to set:
+
+@example
+@c file eg/prog/pi.awk
+# pi.awk --- compute the digits of pi
+@c endfile
+@c endfile
+@ignore
+@c file eg/prog/pi.awk
+#
+# Katie Wasserman, katie@@wass.net
+# August 2014
+@c endfile
+@end ignore
+@c file eg/prog/pi.awk
+
+BEGIN @{
+    digits = 100000
+    two = 2 * 10 ^ digits
+    pi = two
+    for (m = digits * 4; m > 0; --m) @{
+        d = m * 2 + 1
+        x = pi * m
+        intdiv(x, d, result)
+        pi = result["quotient"]
+        pi = pi + two
+    @}
+    print pi
+@}
+@c endfile
+@end example
+
+@ignore
+Date: Wed, 20 Aug 2014 10:19:11 -0400
+To: arnold@skeeve.com
+From: Katherine Wasserman <katie@wass.net>
+Subject: Re: computation of digits of pi?
+
+Arnold,
+
+>The program that you sent to compute the digits of pi using div(). Is
+>that some standard algorithm that every math student knows? If so,
+>what's it called?
+
+It's not that well known but it's not that obscure either
+
+It's Euler's modification to Newton's method for calculating pi.
+
+Take a look at lines (23) - (25)  here: http://mathworld.wolfram.com/PiFormulas.htm
+
+The algorithm I wrote simply expands the multiply by 2 and works from the innermost expression outwards.  I used this to program HP calculators because it's quite easy to modify for tiny memory devices with smallish word sizes.   
+
+http://www.hpmuseum.org/cgi-sys/cgiwrap/hpmuseum/articles.cgi?read=899
+
+-Katie
+@end ignore
+
+When asked about the algorithm used, Katie replied:
+
+@quotation
+It's not that well known but it's not that obscure either.
+It's Euler's modification to Newton's method for calculating pi.
+Take a look at lines (23) - (25) here: @uref{http://mathworld.wolfram.com/PiFormulas.html}.
+
+The algorithm I wrote simply expands the multiply by 2 and works from
+the innermost expression outwards.  I used this to program HP calculators
+because it's quite easy to modify for tiny memory devices with smallish
+word sizes. See
+@uref{http://www.hpmuseum.org/cgi-sys/cgiwrap/hpmuseum/articles.cgi?read=899}.
+@end quotation
+
 @node POSIX Floating Point Problems
 @section Standards Versus Existing Practice
 
-Historically, @command{awk} has converted any non-numeric looking string
+Historically, @command{awk} has converted any nonnumeric-looking string
 to the numeric value zero, when required.  Furthermore, the original
 definition of the language and the original POSIX standards specified that
 @command{awk} only understands decimal numbers (base 10), and not octal
@@ -29897,13 +30331,13 @@ should support additional features.  These features are:
 
 @itemize @value{BULLET}
 @item
-Interpretation of floating point data values specified in hexadecimal
+Interpretation of floating-point data values specified in hexadecimal
 notation (e.g., @code{0xDEADBEEF}). (Note: data values, @emph{not}
 source code constants.)
 
 @item
-Support for the special IEEE 754 floating point values ``Not A Number''
-(NaN), positive Infinity (``inf'') and negative Infinity (``@minus{}inf'').
+Support for the special IEEE 754 floating-point values ``not a number''
+(NaN), positive infinity (``inf''), and negative infinity (``@minus{}inf'').
 In particular, the format for these values is as specified by the ISO 1999
 C standard, which ignores case and can allow implementation-dependent additional
 characters after the @samp{nan} and allow either @samp{inf} or @samp{infinity}.
@@ -29914,8 +30348,8 @@ practice:
 
 @itemize @value{BULLET}
 @item
-The @command{gawk} maintainer feels that supporting hexadecimal floating
-point values, in particular, is ugly, and was never intended by the
+The @command{gawk} maintainer feels that supporting hexadecimal
+floating-point values, in particular, is ugly, and was never intended by the
 original designers to be part of the language.
 
 @item
@@ -29923,22 +30357,22 @@ Allowing completely alphabetic strings to have valid numeric
 values is also a very severe departure from historical practice.
 @end itemize
 
-The second problem is that the @code{gawk} maintainer feels that this
-interpretation of the standard, which requires a certain amount of
+The second problem is that the @command{gawk} maintainer feels that this
+interpretation of the standard, which required a certain amount of
 ``language lawyering'' to arrive at in the first place, was not even
-intended by the standard developers.  In other words, ``we see how you
+intended by the standard developers.  In other words, ``We see how you
 got where you are, but we don't think that that's where you want to be.''
 
-Recognizing the above issues, but attempting to provide compatibility
+Recognizing these issues, but attempting to provide compatibility
 with the earlier versions of the standard,
 the 2008 POSIX standard added explicit wording to allow, but not require,
-that @command{awk} support hexadecimal floating point values and
-special values for ``Not A Number'' and infinity.
+that @command{awk} support hexadecimal floating-point values and
+special values for ``not a number'' and infinity.
 
 Although the @command{gawk} maintainer continues to feel that
 providing those features is inadvisable,
 nevertheless, on systems that support IEEE floating point, it seems
-reasonable to provide @emph{some} way to support NaN and Infinity values.
+reasonable to provide @emph{some} way to support NaN and infinity values.
 The solution implemented in @command{gawk} is as follows:
 
 @itemize @value{BULLET}
@@ -29958,7 +30392,7 @@ $ @kbd{echo 0xDeadBeef | gawk --posix '@{ print $1 + 0 @}'}
 @end example
 
 @item
-Without @option{--posix}, @command{gawk} interprets the four strings
+Without @option{--posix}, @command{gawk} interprets the four string values
 @samp{+inf},
 @samp{-inf},
 @samp{+nan},
@@ -29980,7 +30414,7 @@ $ @kbd{echo 0xDeadBeef | gawk '@{ print $1 + 0 @}'}
 @end example
 
 @command{gawk} ignores case in the four special values.
-Thus @samp{+nan} and @samp{+NaN} are the same.
+Thus, @samp{+nan} and @samp{+NaN} are the same.
 @end itemize
 
 @node Floating point summary
@@ -29989,13 +30423,13 @@ Thus @samp{+nan} and @samp{+NaN} are the same.
 @itemize @value{BULLET}
 @item
 Most computer arithmetic is done using either integers or floating-point
-values.  The default for @command{awk} is to use double-precision
+values.  Standard @command{awk} uses double-precision
 floating-point values.
 
 @item
-In the early 1990's, Barbie mistakenly said ``Math class is tough!''
-While math isn't tough, floating-point arithmetic isn't the same
-as pencil and paper math, and care must be taken:
+In the early 1990s Barbie mistakenly said, ``Math class is tough!''
+Although math isn't tough, floating-point arithmetic isn't the same
+as pencil-and-paper math, and care must be taken:
 
 @c nested list
 @itemize @value{MINUS}
@@ -30027,12 +30461,12 @@ arithmetic. Use @code{PREC} to set the precision in bits, and
 
 @item
 With @option{-M}, @command{gawk} performs
-arbitrary precision integer arithmetic using the GMP library.
-This is faster and more space efficient than using MPFR for
+arbitrary-precision integer arithmetic using the GMP library.
+This is faster and more space-efficient than using MPFR for
 the same calculations.
 
 @item
-There are several ``dark corners'' with respect to floating-point
+There are several areas with respect to floating-point
 numbers where @command{gawk} disagrees with the POSIX standard.
 It pays to be aware of them.
 
@@ -30040,7 +30474,7 @@ It pays to be aware of them.
 Overall, there is no need to be unduly suspicious about the results from
 floating-point arithmetic. The lesson to remember is that floating-point
 arithmetic is always more complex than arithmetic using pencil and
-paper. In order to take advantage of the power of computer floating-point,
+paper. In order to take advantage of the power of floating-point arithmetic,
 you need to know its limitations and work within them. For most casual
 use of floating-point arithmetic, you will often get the expected result
 if you simply round the display of your final results to the correct number
@@ -30082,7 +30516,7 @@ When @option{--sandbox} is specified, extensions are disabled
 * Finding Extensions::          How @command{gawk} finds compiled extensions.
 * Extension Example::           Example C code for an extension.
 * Extension Samples::           The sample extensions that ship with
-                                @code{gawk}.
+                                @command{gawk}.
 * gawkextlib::                  The @code{gawkextlib} project.
 * Extension summary::           Extension summary.
 * Extension Exercises::         Exercises.
@@ -30101,15 +30535,15 @@ Extensions are useful because they allow you (of course) to extend
 @command{gawk}'s functionality. For example, they can provide access to
 system calls (such as @code{chdir()} to change directory) and to other
 C library routines that could be of use.  As with most software,
-``the sky is the limit;'' if you can imagine something that you might
+``the sky is the limit''; if you can imagine something that you might
 want to do and can write in C or C++, you can write an extension to do it!
 
-Extensions are written in C or C++, using the @dfn{Application Programming
-Interface} (API) defined for this purpose by the @command{gawk}
+Extensions are written in C or C++, using the @dfn{application programming
+interface} (API) defined for this purpose by the @command{gawk}
 developers.  The rest of this @value{CHAPTER} explains
 the facilities that the API provides and how to use
-them, and presents a small sample extension.  In addition, it documents
-the sample extensions included in the @command{gawk} distribution,
+them, and presents a small example extension.  In addition, it documents
+the sample extensions included in the @command{gawk} distribution
 and describes the @code{gawkextlib} project.
 @ifclear FOR_PRINT
 @xref{Extension Design}, for a discussion of the extension mechanism
@@ -30124,10 +30558,14 @@ goals and design.
 @node Plugin License
 @section Extension Licensing
 
-Every dynamic extension should define the global symbol
-@code{plugin_is_GPL_compatible} to assert that it has been licensed under
-a GPL-compatible license.  If this symbol does not exist, @command{gawk}
-emits a fatal error and exits when it tries to load your extension.
+Every dynamic extension must be distributed under a license that is
+compatible with the GNU GPL (@pxref{Copying}).
+
+In order for the extension to tell @command{gawk} that it is
+properly licensed, the extension must define the global symbol
+@code{plugin_is_GPL_compatible}.  If this symbol does not exist,
+@command{gawk} emits a fatal error and exits when it tries to load
+your extension.
 
 The declared type of the symbol should be @code{int}.  It does not need
 to be in any allocated section, though.  The code merely asserts that
@@ -30138,11 +30576,11 @@ int plugin_is_GPL_compatible;
 @end example
 
 @node Extension Mechanism Outline
-@section At A High Level How It Works
+@section How It Works at a High Level
 
 Communication between
 @command{gawk} and an extension is two-way.  First, when an extension
-is loaded, it is passed a pointer to a @code{struct} whose fields are
+is loaded, @command{gawk} passes it a pointer to a @code{struct} whose fields are
 function pointers.
 @ifnotdocbook
 This is shown in @ref{figure-load-extension}.
@@ -30153,22 +30591,22 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-load-extension"/>}.
 
 @ifnotdocbook
 @float Figure,figure-load-extension
-@caption{Loading The Extension}
+@caption{Loading the extension}
 @c FIXME: One day, it should not be necessary to have two cases,
 @c but rather just the one without the "txt" final argument.
 @c This applies to the other figures as well.
 @ifinfo
-@center @image{api-figure1, , , Loading The Extension, txt}
+@center @image{api-figure1, , , Loading the extension, txt}
 @end ifinfo
 @ifnotinfo
-@center @image{api-figure1, , , Loading The Extension}
+@center @image{api-figure1, , , Loading the extension}
 @end ifnotinfo
 @end float
 @end ifnotdocbook
 
 @docbook
 <figure id="figure-load-extension" float="0">
-<title>Loading The Extension</title>
+<title>Loading the extension</title>
 <mediaobject>
 <imageobject role="web"><imagedata fileref="api-figure1.png" format="PNG"/></imageobject>
 </mediaobject>
@@ -30178,29 +30616,29 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-load-extension"/>}.
 The extension can call functions inside @command{gawk} through these
 function pointers, at runtime, without needing (link-time) access
 to @command{gawk}'s symbols.  One of these function pointers is to a
-function for ``registering'' new built-in functions.
+function for ``registering'' new functions.
 @ifnotdocbook
-This is shown in @ref{figure-load-new-function}.
+This is shown in @ref{figure-register-new-function}.
 @end ifnotdocbook
 @ifdocbook
-This is shown in @inlineraw{docbook, <xref linkend="figure-load-new-function"/>}.
+This is shown in @inlineraw{docbook, <xref linkend="figure-register-new-function"/>}.
 @end ifdocbook
 
 @ifnotdocbook
-@float Figure,figure-load-new-function
-@caption{Loading The New Function}
+@float Figure,figure-register-new-function
+@caption{Registering a new function}
 @ifinfo
-@center @image{api-figure2, , , Loading The New Function, txt}
+@center @image{api-figure2, , , Registering a new Function, txt}
 @end ifinfo
 @ifnotinfo
-@center @image{api-figure2, , , Loading The New Function}
+@center @image{api-figure2, , , Registering a new Function}
 @end ifnotinfo
 @end float
 @end ifnotdocbook
 
 @docbook
-<figure id="figure-load-new-function" float="0">
-<title>Loading The New Function</title>
+<figure id="figure-register-new-function" float="0">
+<title>Registering a new function</title>
 <mediaobject>
 <imageobject role="web"><imagedata fileref="api-figure2.png" format="PNG"/></imageobject>
 </mediaobject>
@@ -30221,7 +30659,7 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-call-new-function"/>}
 
 @ifnotdocbook
 @float Figure,figure-call-new-function
-@caption{Calling The New Function}
+@caption{Calling the new function}
 @ifinfo
 @center @image{api-figure3, , , Calling the new function, txt}
 @end ifinfo
@@ -30233,7 +30671,7 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-call-new-function"/>}
 
 @docbook
 <figure id="figure-call-new-function" float="0">
-<title>Calling The New Function</title>
+<title>Calling the new function</title>
 <mediaobject>
 <imageobject role="web"><imagedata fileref="api-figure3.png" format="PNG"/></imageobject>
 </mediaobject>
@@ -30250,15 +30688,15 @@ and understandable.
 
 Although all of this sounds somewhat complicated, the result is that
 extension code is quite straightforward to write and to read. You can
-see this in the sample extensions @file{filefuncs.c} (@pxref{Extension
-Example}) and also the @file{testext.c} code for testing the APIs.
+see this in the sample extension @file{filefuncs.c} (@pxref{Extension
+Example}) and also in the @file{testext.c} code for testing the APIs.
 
 Some other bits and pieces:
 
 @itemize @value{BULLET}
 @item
 The API provides access to @command{gawk}'s @code{do_@var{xxx}} values,
-reflecting command-line options, like @code{do_lint}, @code{do_profiling}
+reflecting command-line options, like @code{do_lint}, @code{do_profiling},
 and so on (@pxref{Extension API Variables}).
 These are informational: an extension cannot affect their values
 inside @command{gawk}.  In addition, attempting to assign to them
@@ -30269,10 +30707,9 @@ The API also provides major and minor version numbers, so that an
 extension can check if the @command{gawk} it is loaded with supports the
 facilities it was compiled with.  (Version mismatches ``shouldn't''
 happen, but we all know how @emph{that} goes.)
-@xref{Extension Versioning}, for details.
+@DBXREF{Extension Versioning} for details.
 @end itemize
 
-
 @node Extension API Description
 @section API Description
 @cindex extension API
@@ -30285,17 +30722,18 @@ This (rather large) @value{SECTION} describes the API in detail.
 @menu
 * Extension API Functions Introduction:: Introduction to the API functions.
 * General Data Types::                   The data types.
-* Requesting Values::                    How to get a value.
 * Memory Allocation Functions::          Functions for allocating memory.
 * Constructor Functions::                Functions for creating values.
 * Registration Functions::               Functions to register things with
                                          @command{gawk}.
 * Printing Messages::                    Functions for printing messages.
 * Updating @code{ERRNO}::                Functions for updating @code{ERRNO}.
+* Requesting Values::                    How to get a value.
 * Accessing Parameters::                 Functions for accessing parameters.
 * Symbol Table Access::                  Functions for accessing global
                                          variables.
 * Array Manipulation::                   Functions for working with arrays.
+* Redirection API::                      How to access and manipulate redirections.
 * Extension API Variables::              Variables provided by the API.
 * Extension API Boilerplate::            Boilerplate code for using the API.
 @end menu
@@ -30303,29 +30741,35 @@ This (rather large) @value{SECTION} describes the API in detail.
 @node Extension API Functions Introduction
 @subsection Introduction
 
-Access to facilities within @command{gawk} are made available
+Access to facilities within @command{gawk} is achieved
 by calling through function pointers passed into your extension.
 
 API function pointers are provided for the following kinds of operations:
 
 @itemize @value{BULLET}
 @item
+Allocating, reallocating, and releasing memory.
+
+@item
 Registration functions. You may register:
+
+@c nested list
 @itemize @value{MINUS}
 @item
-extension functions,
+Extension functions
 @item
-exit callbacks,
+Exit callbacks
 @item
-a version string,
+A version string
 @item
-input parsers,
+Input parsers
 @item
-output wrappers,
+Output wrappers
 @item
-and two-way processors.
+Two-way processors
 @end itemize
-All of these are discussed in detail, later in this @value{CHAPTER}.
+
+All of these are discussed in detail later in this @value{CHAPTER}.
 
 @item
 Printing fatal, warning, and ``lint'' warning messages.
@@ -30342,9 +30786,6 @@ Symbol table access: retrieving a global variable, creating one,
 or changing one.
 
 @item
-Allocating, reallocating, and releasing memory.
-
-@item
 Creating and releasing cached values; this provides an
 efficient way to use values for multiple variables and
 can be a big performance win.
@@ -30366,20 +30807,25 @@ Creating a new array
 Clearing an array
 
 @item
-Flattening an array for easy C style looping over all its indices and elements
+Flattening an array for easy C-style looping over all its indices and elements
 @end itemize
+
+@item
+Accessing and manipulating redirections.
+
 @end itemize
 
 Some points about using the API:
 
 @itemize @value{BULLET}
 @item
-The following types and/or macros and/or functions are referenced
+The following types, macros, and/or functions are referenced
 in @file{gawkapi.h}.  For correct use, you must therefore include the
 corresponding standard header file @emph{before} including @file{gawkapi.h}:
 
+@c FIXME: Make this is a float at some point.
 @multitable {@code{memset()}, @code{memcpy()}} {@code{<sys/types.h>}}
-@headitem C Entity @tab Header File
+@headitem C entity @tab Header file
 @item @code{EOF} @tab @code{<stdio.h>}
 @item Values for @code{errno} @tab @code{<errno.h>}
 @item @code{FILE} @tab @code{<stdio.h>}
@@ -30388,7 +30834,7 @@ corresponding standard header file @emph{before} including @file{gawkapi.h}:
 @item @code{memset()} @tab @code{<string.h>}
 @item @code{size_t} @tab @code{<sys/types.h>}
 @item @code{struct stat} @tab @code{<sys/stat.h>}
-@end multitable 
+@end multitable
 
 Due to portability concerns, especially to systems that are not
 fully standards-compliant, it is your responsibility
@@ -30405,35 +30851,35 @@ Doing so, however, is poor coding practice.
 Although the API only uses ISO C 90 features, there is an exception; the
 ``constructor'' functions use the @code{inline} keyword. If your compiler
 does not support this keyword, you should either place
-@samp{-Dinline=''} on your command line, or use the GNU Autotools and include a
+@samp{-Dinline=''} on your command line or use the GNU Autotools and include a
 @file{config.h} file in your extensions.
 
 @item
 All pointers filled in by @command{gawk} point to memory
 managed by @command{gawk} and should be treated by the extension as
 read-only.  Memory for @emph{all} strings passed into @command{gawk}
-from the extension @emph{must} come from calling the API-provided function
-pointers @code{api_malloc()}, @code{api_calloc()} or @code{api_realloc()},
+from the extension @emph{must} come from calling one of
+@code{gawk_malloc()}, @code{gawk_calloc()}, or @code{gawk_realloc()},
 and is managed by @command{gawk} from then on.
 
 @item
 The API defines several simple @code{struct}s that map values as seen
 from @command{awk}.  A value can be a @code{double}, a string, or an
 array (as in multidimensional arrays, or when creating a new array).
-String values maintain both pointer and length since embedded @value{NUL}
+String values maintain both pointer and length, because embedded @sc{nul}
 characters are allowed.
 
 @quotation NOTE
 By intent, strings are maintained using the current multibyte encoding (as
 defined by @env{LC_@var{xxx}} environment variables) and not using wide
 characters.  This matches how @command{gawk} stores strings internally
-and also how characters are likely to be input and output from files.
+and also how characters are likely to be input into and output from files.
 @end quotation
 
 @item
 When retrieving a value (such as a parameter or that of a global variable
 or array element), the extension requests a specific type (number, string,
-scalars, value cookie, array, or ``undefined'').  When the request is
+scalar, value cookie, array, or ``undefined'').  When the request is
 ``undefined,'' the returned value will have the real underlying type.
 
 However, if the request and actual type don't match, the access function
@@ -30445,14 +30891,14 @@ so that the extension can, e.g., print an error message
 @c The table there should be presented here
 @end itemize
 
-While you may call the API functions by using the function pointers
-directly, the interface is not so pretty. To make extension code look
+You may call the API functions by using the function pointers
+directly, but the interface is not so pretty. To make extension code look
 more like regular code, the @file{gawkapi.h} header file defines several
 macros that you should use in your code.  This @value{SECTION} presents
 the macros as if they were functions.
 
 @node General Data Types
-@subsection General Purpose Data Types
+@subsection General-Purpose Data Types
 
 @cindex Robbins, Arnold
 @cindex Ramey, Chet
@@ -30467,9 +30913,12 @@ can accommodate both love and hate.}
 @author Chet Ramey
 @end quotation
 
-The extension API defines a number of simple types and structures for general
-purpose use. Additional, more specialized, data structures are introduced
-in subsequent @value{SECTION}s, together with the functions that use them.
+The extension API defines a number of simple types and structures for
+general-purpose use. Additional, more specialized, data structures are
+introduced in subsequent @value{SECTION}s, together with the functions
+that use them.
+
+The general-purpose types and structures are as follows:
 
 @table @code
 @item typedef void *awk_ext_id_t;
@@ -30487,7 +30936,7 @@ while allowing @command{gawk} to use them as it needs to.
 @itemx @ @ @ @ awk_false = 0,
 @itemx @ @ @ @ awk_true
 @itemx @} awk_bool_t;
-A simple boolean type.
+A simple Boolean type.
 
 @item typedef struct awk_string @{
 @itemx @ @ @ @ char *str;@ @ @ @ @ @ /* data */
@@ -30496,8 +30945,9 @@ A simple boolean type.
 This represents a mutable string. @command{gawk}
 owns the memory pointed to if it supplied
 the value. Otherwise, it takes ownership of the memory pointed to.
-@strong{Such memory must come from calling the API-provided function
-pointers @code{api_malloc()}, @code{api_calloc()}, or @code{api_realloc()}!}
+@emph{Such memory must come from calling one of the
+@code{gawk_malloc()}, @code{gawk_calloc()}, or
+@code{gawk_realloc()} functions!}
 
 As mentioned earlier, strings are maintained using the current
 multibyte encoding.
@@ -30523,7 +30973,7 @@ It is used in the following @code{struct}.
 @itemx @ @ @ @ @ @ @ @ awk_value_cookie_t@ vc;
 @itemx @ @ @ @ @} u;
 @itemx @} awk_value_t;
-An ``@command{awk} value.''  
+An ``@command{awk} value.''
 The @code{val_type} member indicates what kind of value the
 @code{union} holds, and each member is of the appropriate type.
 
@@ -30532,17 +30982,18 @@ The @code{val_type} member indicates what kind of value the
 @itemx #define array_cookie@ @ @ u.a
 @itemx #define scalar_cookie@ @ u.scl
 @itemx #define value_cookie@ @ @ u.vc
-These macros make accessing the fields of the @code{awk_value_t} more
+Using these macros makes accessing the fields of the @code{awk_value_t} more
 readable.
 
 @item typedef void *awk_scalar_t;
-Scalars can be represented as an opaque type. These values are obtained from
-@command{gawk} and then passed back into it. This is discussed in a general fashion below,
-and in more detail in @ref{Symbol table by cookie}.
+Scalars can be represented as an opaque type. These values are obtained
+from @command{gawk} and then passed back into it. This is discussed
+in a general fashion in the text following this list, and in more detail in
+@ref{Symbol table by cookie}.
 
 @item typedef void *awk_value_cookie_t;
 A ``value cookie'' is an opaque type representing a cached value.
-This is also discussed in a general fashion below,
+This is also discussed in a general fashion in the text following this list,
 and in more detail in @ref{Cached values}.
 
 @end table
@@ -30552,9 +31003,9 @@ Scalar values in @command{awk} are either numbers or strings. The
 indicates what is in the @code{union}.
 
 Representing numbers is easy---the API uses a C @code{double}.  Strings
-require more work. Since @command{gawk} allows embedded @value{NUL} bytes
+require more work. Because @command{gawk} allows embedded @sc{nul} bytes
 in string values, a string must be represented as a pair containing a
-data-pointer and length. This is the @code{awk_string_t} type.
+data pointer and length. This is the @code{awk_string_t} type.
 
 Identifiers (i.e., the names of global variables) can be associated
 with either scalar values or with arrays.  In addition, @command{gawk}
@@ -30565,14 +31016,14 @@ itself be an array.  Discussion of arrays is delayed until
 The various macros listed earlier make it easier to use the elements
 of the @code{union} as if they were fields in a @code{struct}; this
 is a common coding practice in C.  Such code is easier to write and to
-read, however it remains @emph{your} responsibility to make sure that
+read, but it remains @emph{your} responsibility to make sure that
 the @code{val_type} member correctly reflects the type of the value in
-the @code{awk_value_t}.
+the @code{awk_value_t} struct.
 
 Conceptually, the first three members of the @code{union} (number, string,
 and array) are all that is needed for working with @command{awk} values.
-However, since the API provides routines for accessing and changing
-the value of global scalar variables only by using the variable's name,
+However, because the API provides routines for accessing and changing
+the value of a global scalar variable only by using the variable's name,
 there is a performance penalty: @command{gawk} must find the variable
 each time it is accessed and changed.  This turns out to be a real issue,
 not just a theoretical one.
@@ -30590,160 +31041,19 @@ See also the entry for ``Cookie'' in the @ref{Glossary}.
 object for that variable, and then use
 the cookie for getting the variable's value or for changing the variable's
 value.
-This is the @code{awk_scalar_t} type and @code{scalar_cookie} macro.
+The @code{awk_scalar_t} type holds a scalar cookie, and the
+@code{scalar_cookie} macro provides access to the value of that type
+in the @code{awk_value_t} struct.
 Given a scalar cookie, @command{gawk} can directly retrieve or
-modify the value, as required, without having to first find it.
+modify the value, as required, without having to find it first.
 
 The @code{awk_value_cookie_t} type and @code{value_cookie} macro are similar.
 If you know that you wish to
 use the same numeric or string @emph{value} for one or more variables,
 you can create the value once, retaining a @dfn{value cookie} for it,
 and then pass in that value cookie whenever you wish to set the value of a
-variable.  This saves both storage space within the running @command{gawk}
-process as well as the time needed to create the value.
-
-@node Requesting Values
-@subsection Requesting Values
-
-All of the functions that return values from @command{gawk}
-work in the same way. You pass in an @code{awk_valtype_t} value
-to indicate what kind of value you expect.  If the actual value
-matches what you requested, the function returns true and fills
-in the @code{awk_value_t} result.
-Otherwise, the function returns false, and the @code{val_type}
-member indicates the type of the actual value.  You may then
-print an error message, or reissue the request for the actual
-value type, as appropriate.  This behavior is summarized in
-@ref{table-value-types-returned}.
-
-@c FIXME: Try to do this with spans...
-
-@float Table,table-value-types-returned
-@caption{API Value Types Returned}
-@docbook
-<informaltable>
-<tgroup cols="2">
-  <colspec colwidth="50*"/><colspec colwidth="50*"/>
-  <thead>
-    <row><entry></entry><entry><para>Type of Actual Value:</para></entry></row>
-  </thead>
-  <tbody>
-    <row><entry></entry><entry></entry></row>
-  </tbody>
-</tgroup>
-<tgroup cols="6">
-  <colspec colwidth="16.6*"/>
-  <colspec colwidth="16.6*"/>
-  <colspec colwidth="19.8*"/>
-  <colspec colwidth="15*"/>
-  <colspec colwidth="15*"/>
-  <colspec colwidth="16.6*"/>
-  <thead>
-    <row>
-      <entry></entry>
-      <entry></entry>
-      <entry><para>String</para></entry>
-      <entry><para>Number</para></entry>
-      <entry><para>Array</para></entry>
-      <entry><para>Undefined</para></entry>
-    </row>
-  </thead>
-  <tbody>
-    <row>
-      <entry></entry>
-      <entry><para><emphasis role="bold">String</emphasis></para></entry>
-      <entry><para>String</para></entry>
-      <entry><para>String</para></entry>
-      <entry><para>false</para></entry>
-      <entry><para>false</para></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry><para><emphasis role="bold">Number</emphasis></para></entry>
-      <entry><para>Number if can be converted, else false</para></entry>
-      <entry><para>Number</para></entry>
-      <entry><para>false</para></entry>
-      <entry><para>false</para></entry>
-    </row>
-    <row>
-      <entry><para><emphasis role="bold">Type</emphasis></para></entry>
-      <entry><para><emphasis role="bold">Array</emphasis></para></entry>
-      <entry><para>false</para></entry>
-      <entry><para>false</para></entry>
-      <entry><para>Array</para></entry>
-      <entry><para>false</para></entry>
-    </row>
-    <row>
-      <entry><para><emphasis role="bold">Requested:</emphasis></para></entry>
-      <entry><para><emphasis role="bold">Scalar</emphasis></para></entry>
-      <entry><para>Scalar</para></entry>
-      <entry><para>Scalar</para></entry>
-      <entry><para>false</para></entry>
-      <entry><para>false</para></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry><para><emphasis role="bold">Undefined</emphasis></para></entry>
-      <entry><para>String</para></entry>
-      <entry><para>Number</para></entry>
-      <entry><para>Array</para></entry>
-      <entry><para>Undefined</para></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry><para><emphasis role="bold">Value Cookie</emphasis></para></entry>
-      <entry><para>false</para></entry>
-      <entry><para>false</para></entry>
-      <entry><para>false</para>
-      </entry><entry><para>false</para></entry>
-    </row>
-  </tbody>
-</tgroup>
-</informaltable>
-@end docbook
-
-@ifnotplaintext
-@ifnotdocbook
-@multitable @columnfractions .50 .50
-@headitem @tab Type of Actual Value:
-@end multitable
-@multitable @columnfractions .166 .166 .198 .15 .15 .166
-@headitem @tab @tab String @tab Number @tab Array @tab Undefined
-@item @tab @b{String} @tab String @tab String @tab false @tab false
-@item @tab @b{Number} @tab Number if can be converted, else false @tab Number @tab false @tab false
-@item @b{Type} @tab @b{Array} @tab false @tab false @tab Array @tab false
-@item @b{Requested:} @tab @b{Scalar} @tab Scalar @tab Scalar @tab false @tab false
-@item @tab @b{Undefined} @tab String @tab Number @tab Array @tab Undefined
-@item @tab @b{Value Cookie} @tab false @tab false @tab false @tab false
-@end multitable
-@end ifnotdocbook
-@end ifnotplaintext
-@ifplaintext
-@example
-                        +-------------------------------------------------+
-                        |                Type of Actual Value:            |
-                        +------------+------------+-----------+-----------+
-                        |   String   |   Number   | Array     | Undefined |
-+-----------+-----------+------------+------------+-----------+-----------+
-|           | String    |   String   |   String   | false     | false     |
-|           |-----------+------------+------------+-----------+-----------+
-|           | Number    | Number if  |   Number   | false     | false     |
-|           |           | can be     |            |           |           |
-|           |           | converted, |            |           |           |
-|           |           | else false |            |           |           |
-|           |-----------+------------+------------+-----------+-----------+
-|   Type    | Array     |   false    |   false    | Array     | false     |
-| Requested |-----------+------------+------------+-----------+-----------+
-|           | Scalar    |   Scalar   |   Scalar   | false     | false     |
-|           |-----------+------------+------------+-----------+-----------+
-|           | Undefined |  String    |   Number   | Array     | Undefined |
-|           |-----------+------------+------------+-----------+-----------+
-|           | Value     |   false    |   false    | false     | false     |
-|           | Cookie    |            |            |           |           |
-+-----------+-----------+------------+------------+-----------+-----------+
-@end example
-@end ifplaintext
-@end float
+variable.  This saves storage space within the running @command{gawk}
+process and reduces the time needed to create the value.
 
 @node Memory Allocation Functions
 @subsection Memory Allocation Functions and Convenience Macros
@@ -30753,39 +31063,41 @@ value type, as appropriate.  This behavior is summarized in
 The API provides a number of @dfn{memory allocation} functions for
 allocating memory that can be passed to @command{gawk}, as well as a number of
 convenience macros.
+This @value{SUBSECTION} presents them all as function prototypes, in
+the way that extension code would use them:
 
 @table @code
 @item void *gawk_malloc(size_t size);
-Call @command{gawk}-provided @code{api_malloc()} to allocate storage that may
+Call the correct version of @code{malloc()} to allocate storage that may
 be passed to @command{gawk}.
 
 @item void *gawk_calloc(size_t nmemb, size_t size);
-Call @command{gawk}-provided @code{api_calloc()} to allocate storage that may
+Call the correct version of @code{calloc()} to allocate storage that may
 be passed to @command{gawk}.
 
 @item void *gawk_realloc(void *ptr, size_t size);
-Call @command{gawk}-provided @code{api_realloc()} to allocate storage that may
+Call the correct version of @code{realloc()} to allocate storage that may
 be passed to @command{gawk}.
 
 @item void gawk_free(void *ptr);
-Call @command{gawk}-provided @code{api_free()} to release storage that was
-allocated with @code{gawk_malloc()}, @code{gawk_calloc()} or @code{gawk_realloc()}.
+Call the correct version of @code{free()} to release storage that was
+allocated with @code{gawk_malloc()}, @code{gawk_calloc()}, or @code{gawk_realloc()}.
 @end table
 
 The API has to provide these functions because it is possible
 for an extension to be compiled and linked against a different
 version of the C library than was used for the @command{gawk}
-executable.@footnote{This is more common on MS-Windows systems, but
+executable.@footnote{This is more common on MS-Windows systems, but it
 can happen on Unix-like systems as well.} If @command{gawk} were
 to use its version of @code{free()} when the memory came from an
 unrelated version of @code{malloc()}, unexpected behavior would
 likely result.
 
 Two convenience macros may be used for allocating storage
-from the API-provided function pointers @code{api_malloc()} and
-@code{api_realloc()}. If the allocation fails, they cause @command{gawk}
+from @code{gawk_malloc()} and
+@code{gawk_realloc()}. If the allocation fails, they cause @command{gawk}
 to exit with a fatal error message.  They should be used as if they were
-procedure calls that do not return a value.
+procedure calls that do not return a value:
 
 @table @code
 @item #define emalloc(pointer, type, size, message) @dots{}
@@ -30797,7 +31109,8 @@ The arguments to this macro are as follows:
 The pointer variable to point at the allocated storage.
 
 @item type
-The type of the pointer variable, used to create a cast for the call to @code{api_malloc()}.
+The type of the pointer variable.  This is used to create a cast for
+the call to @code{gawk_malloc()}.
 
 @item size
 The total number of bytes to be allocated.
@@ -30821,8 +31134,8 @@ make_malloced_string(message, strlen(message), & result);
 @end example
 
 @item #define erealloc(pointer, type, size, message) @dots{}
-This is like @code{emalloc()}, but it calls @code{api_realloc()},
-instead of @code{api_malloc()}.
+This is like @code{emalloc()}, but it calls @code{gawk_realloc()}
+instead of @code{gawk_malloc()}.
 The arguments are the same as for the @code{emalloc()} macro.
 @end table
 
@@ -30832,32 +31145,32 @@ The arguments are the same as for the @code{emalloc()} macro.
 The API provides a number of @dfn{constructor} functions for creating
 string and numeric values, as well as a number of convenience macros.
 This @value{SUBSECTION} presents them all as function prototypes, in
-the way that extension code would use them.
+the way that extension code would use them:
 
 @table @code
 @item static inline awk_value_t *
-@itemx make_const_string(const char *string, size_t length, awk_value_t *result)
+@itemx make_const_string(const char *string, size_t length, awk_value_t *result);
 This function creates a string value in the @code{awk_value_t} variable
 pointed to by @code{result}. It expects @code{string} to be a C string constant
 (or other string data), and automatically creates a @emph{copy} of the data
 for storage in @code{result}. It returns @code{result}.
 
 @item static inline awk_value_t *
-@itemx make_malloced_string(const char *string, size_t length, awk_value_t *result)
+@itemx make_malloced_string(const char *string, size_t length, awk_value_t *result);
 This function creates a string value in the @code{awk_value_t} variable
 pointed to by @code{result}. It expects @code{string} to be a @samp{char *}
-value pointing to data previously obtained from the api-provided functions @code{api_malloc()}, @code{api_calloc()} or @code{api_realloc()}. The idea here
+value pointing to data previously obtained from @code{gawk_malloc()}, @code{gawk_calloc()}, or @code{gawk_realloc()}. The idea here
 is that the data is passed directly to @command{gawk}, which assumes
 responsibility for it. It returns @code{result}.
 
 @item static inline awk_value_t *
-@itemx make_null_string(awk_value_t *result)
+@itemx make_null_string(awk_value_t *result);
 This specialized function creates a null string (the ``undefined'' value)
 in the @code{awk_value_t} variable pointed to by @code{result}.
 It returns @code{result}.
 
 @item static inline awk_value_t *
-@itemx make_number(double num, awk_value_t *result)
+@itemx make_number(double num, awk_value_t *result);
 This function simply creates a numeric value in the @code{awk_value_t} variable
 pointed to by @code{result}.
 @end table
@@ -30897,21 +31210,22 @@ The fields are:
 @table @code
 @item const char *name;
 The name of the new function.
-@command{awk} level code calls the function by this name.
+@command{awk}-level code calls the function by this name.
 This is a regular C string.
 
 Function names must obey the rules for @command{awk}
-identifiers. That is, they must begin with either a letter
+identifiers. That is, they must begin with either an English letter
 or an underscore, which may be followed by any number of
 letters, digits, and underscores.
 Letter case in function names is significant.
 
 @item awk_value_t *(*function)(int num_actual_args, awk_value_t *result);
-This is a pointer to the C function that provides the desired
+This is a pointer to the C function that provides the extension's
 functionality.
-The function must fill in the result with either a number
+The function must fill in @code{*result} with either a number
 or a string. @command{gawk} takes ownership of any string memory.
-As mentioned earlier, string memory @strong{must} come from the api-provided functions @code{api_malloc()}, @code{api_calloc()} or @code{api_realloc()}.
+As mentioned earlier, string memory @emph{must} come from one of
+@code{gawk_malloc()}, @code{gawk_calloc()}, or @code{gawk_realloc()}.
 
 The @code{num_actual_args} argument tells the C function how many
 actual parameters were passed from the calling @command{awk} code.
@@ -30922,7 +31236,7 @@ This is for the convenience of the calling code inside @command{gawk}.
 @item size_t num_expected_args;
 This is the number of arguments the function expects to receive.
 Each extension function may decide what to do if the number of
-arguments isn't what it expected.  Following @command{awk} functions, it
+arguments isn't what it expected.  As with real @command{awk} functions, it
 is likely OK to ignore extra arguments.
 @end table
 
@@ -30946,7 +31260,7 @@ Such functions are useful if you have general ``cleanup'' tasks
 that should be performed in your extension (such as closing database
 connections or other resource deallocations).
 You can register such
-a function with @command{gawk} using the following function.
+a function with @command{gawk} using the following function:
 
 @table @code
 @item void awk_atexit(void (*funcp)(void *data, int exit_status),
@@ -30962,24 +31276,25 @@ The @code{exit_status} parameter is the exit status value that
 @command{gawk} intends to pass to the @code{exit()} system call.
 
 @item arg0
-A pointer to private data which @command{gawk} saves in order to pass to
+A pointer to private data that @command{gawk} saves in order to pass to
 the function pointed to by @code{funcp}.
 @end table
 @end table
 
-Exit callback functions are called in Last-In-First-Out (LIFO) order---that is, in
-the reverse order in which they are registered with @command{gawk}.
+Exit callback functions are called in last-in, first-out (LIFO)
+order---that is, in the reverse order in which they are registered with
+@command{gawk}.
 
 @node Extension Version String
 @subsubsection Registering An Extension Version String
 
-You can register a version string which indicates the name and
-version of your extension, with @command{gawk}, as follows:
+You can register a version string that indicates the name and
+version of your extension with @command{gawk}, as follows:
 
 @table @code
 @item void register_ext_version(const char *version);
 Register the string pointed to by @code{version} with @command{gawk}.
-@command{gawk} does @emph{not} copy the @code{version} string, so
+Note that @command{gawk} does @emph{not} copy the @code{version} string, so
 it should not be changed.
 @end table
 
@@ -30996,7 +31311,7 @@ of @code{RS} to find the end of the record, and then uses @code{FS}
 Additionally, it sets the value of @code{RT} (@pxref{Built-in Variables}).
 
 If you want, you can provide your own custom input parser.  An input
-parser's job is to return a record to the @command{gawk} record processing
+parser's job is to return a record to the @command{gawk} record-processing
 code, along with indicators for the value and length of the data to be
 used for @code{RT}, if any.
 
@@ -31004,19 +31319,19 @@ To provide an input parser, you must first provide two functions
 (where @var{XXX} is a prefix name for your extension):
 
 @table @code
-@item awk_bool_t @var{XXX}_can_take_file(const awk_input_buf_t *iobuf)
+@item awk_bool_t @var{XXX}_can_take_file(const awk_input_buf_t *iobuf);
 This function examines the information available in @code{iobuf}
 (which we discuss shortly).  Based on the information there, it
 decides if the input parser should be used for this file.
 If so, it should return true. Otherwise, it should return false.
 It should not change any state (variable values, etc.) within @command{gawk}.
 
-@item awk_bool_t @var{XXX}_take_control_of(awk_input_buf_t *iobuf)
+@item awk_bool_t @var{XXX}_take_control_of(awk_input_buf_t *iobuf);
 When @command{gawk} decides to hand control of the file over to the
 input parser, it calls this function.  This function in turn must fill
-in certain fields in the @code{awk_input_buf_t} structure, and ensure
+in certain fields in the @code{awk_input_buf_t} structure and ensure
 that certain conditions are true.  It should then return true. If an
-error of some kind occurs, it should not fill in any fields, and should
+error of some kind occurs, it should not fill in any fields and should
 return false; then @command{gawk} will not use the input parser.
 The details are presented shortly.
 @end table
@@ -31061,7 +31376,7 @@ appropriately.
 @item
 When your extension is loaded, register your input parser with
 @command{gawk} using the @code{register_input_parser()} API function
-(described below).
+(described next).
 @end enumerate
 
 An @code{awk_input_buf_t} looks like this:
@@ -31091,7 +31406,7 @@ The name of the file.
 
 @item int fd;
 A file descriptor for the file.  If @command{gawk} was able to
-open the file, then @code{fd} will @emph{not} be equal to 
+open the file, then @code{fd} will @emph{not} be equal to
 @code{INVALID_HANDLE}. Otherwise, it will.
 
 @item struct stat sbuf;
@@ -31105,15 +31420,15 @@ The decision can be made based upon @command{gawk} state (the value
 of a variable defined previously by the extension and set by
 @command{awk} code), the name of the
 file, whether or not the file descriptor is valid, the information
-in the @code{struct stat}, or any combination of the above.
+in the @code{struct stat}, or any combination of these factors.
 
 Once @code{@var{XXX}_can_take_file()} has returned true, and
 @command{gawk} has decided to use your input parser, it calls
-@code{@var{XXX}_take_control_of()}.  That function then fills one of
+@code{@var{XXX}_take_control_of()}.  That function then fills
 either the @code{get_record} field or the @code{read_func} field in
 the @code{awk_input_buf_t}.  It must also ensure that @code{fd} is @emph{not}
-set to @code{INVALID_HANDLE}.  All of the fields that may be filled by
-@code{@var{XXX}_take_control_of()} are as follows:
+set to @code{INVALID_HANDLE}.  The following list describes the fields that
+may be filled by @code{@var{XXX}_take_control_of()}:
 
 @table @code
 @item void *opaque;
@@ -31128,24 +31443,24 @@ is not required to use this pointer.
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ size_t *rt_len);
 This function pointer should point to a function that creates the input
 records.  Said function is the core of the input parser.  Its behavior
-is described below.
+is described in the text following this list.
 
 @item ssize_t (*read_func)();
-This function pointer should point to function that has the
+This function pointer should point to a function that has the
 same behavior as the standard POSIX @code{read()} system call.
 It is an alternative to the @code{get_record} pointer.  Its behavior
-is also described below.
+is also described in the text following this list.
 
 @item void (*close_func)(struct awk_input *iobuf);
 This function pointer should point to a function that does
-the ``tear down.'' It should release any resources allocated by
+the ``teardown.'' It should release any resources allocated by
 @code{@var{XXX}_take_control_of()}.  It may also close the file. If it
 does so, it should set the @code{fd} field to @code{INVALID_HANDLE}.
 
 If @code{fd} is still not @code{INVALID_HANDLE} after the call to this
 function, @command{gawk} calls the regular @code{close()} system call.
 
-Having a ``tear down'' function is optional. If your input parser does
+Having a ``teardown'' function is optional. If your input parser does
 not need it, do not set this field.  Then, @command{gawk} calls the
 regular @code{close()} system call on the file descriptor, so it should
 be valid.
@@ -31156,7 +31471,7 @@ input records.  The parameters are as follows:
 
 @table @code
 @item char **out
-This is a pointer to a @code{char *} variable which is set to point
+This is a pointer to a @code{char *} variable that is set to point
 to the record.  @command{gawk} makes its own copy of the data, so
 the extension must manage this storage.
 
@@ -31175,8 +31490,8 @@ If the concept of a ``record terminator'' makes sense, then
 @code{*rt_start} should be set to point to the data to be used for
 @code{RT}, and @code{*rt_len} should be set to the length of the
 data. Otherwise, @code{*rt_len} should be set to zero.
-@code{gawk} makes its own copy of this data, so the
-extension must manage the storage.
+@command{gawk} makes its own copy of this data, so the
+extension must manage this storage.
 @end table
 
 The return value is the length of the buffer pointed to by
@@ -31209,19 +31524,19 @@ set this field explicitly.
 You must choose one method or the other: either a function that
 returns a record, or one that returns raw data.  In particular,
 if you supply a function to get a record, @command{gawk} will
-call it, and never call the raw read function.
+call it, and will never call the raw read function.
 @end quotation
 
 @command{gawk} ships with a sample extension that reads directories,
-returning records for each entry in the directory (@pxref{Extension
+returning records for each entry in a directory (@pxref{Extension
 Sample Readdir}).  You may wish to use that code as a guide for writing
 your own input parser.
 
 When writing an input parser, you should think about (and document)
 how it is expected to interact with @command{awk} code.  You may want
-it to always be called, and take effect as appropriate (as the
+it to always be called, and to take effect as appropriate (as the
 @code{readdir} extension does).  Or you may want it to take effect
-based upon the value of an @code{awk} variable, as the XML extension
+based upon the value of an @command{awk} variable, as the XML extension
 from the @code{gawkextlib} project does (@pxref{gawkextlib}).
 In the latter case, code in a @code{BEGINFILE} section
 can look at @code{FILENAME} and @code{ERRNO} to decide whether or
@@ -31272,7 +31587,7 @@ values, etc.) within @command{gawk}.
 The function pointed to by this field is called when @command{gawk}
 decides to let the output wrapper take control of the file. It should
 fill in appropriate members of the @code{awk_output_buf_t} structure,
-as described below, and return true if successful, false otherwise.
+as described next, and return true if successful, false otherwise.
 
 @item awk_const struct output_wrapper *awk_const next;
 This is for use by @command{gawk};
@@ -31329,7 +31644,7 @@ a pointer to any private data associated with the file.
 These pointers should be set to point to functions that perform
 the equivalent function as the @code{<stdio.h>} functions do, if appropriate.
 @command{gawk} uses these function pointers for all output.
-@command{gawk} initializes the pointers to point to internal, ``pass through''
+@command{gawk} initializes the pointers to point to internal ``pass-through''
 functions that just call the regular @code{<stdio.h>} functions, so an
 extension only needs to redefine those functions that are appropriate for
 what it does.
@@ -31340,7 +31655,7 @@ upon the @code{name} and @code{mode} fields, and any additional state
 (such as @command{awk} variable values) that is appropriate.
 
 When @command{gawk} calls @code{@var{XXX}_take_control_of()}, that function should fill
-in the other fields, as appropriate, except for @code{fp}, which it should just
+in the other fields as appropriate, except for @code{fp}, which it should just
 use normally.
 
 You register your output wrapper with the following function:
@@ -31380,14 +31695,14 @@ The fields are as follows:
 The name of the two-way processor.
 
 @item awk_bool_t (*can_take_two_way)(const char *name);
-This function returns true if it wants to take over two-way I/O for this @value{FN}.
+The function pointed to by this field should return true if it wants to take over two-way I/O for this @value{FN}.
 It should not change any state (variable
 values, etc.) within @command{gawk}.
 
 @item awk_bool_t (*take_control_of)(const char *name,
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ awk_input_buf_t *inbuf,
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ awk_output_buf_t *outbuf);
-This function should fill in the @code{awk_input_buf_t} and
+The function pointed to by this field should fill in the @code{awk_input_buf_t} and
 @code{awk_outut_buf_t} structures pointed to by @code{inbuf} and
 @code{outbuf}, respectively.  These structures were described earlier.
 
@@ -31415,9 +31730,9 @@ Register the two-way processor pointed to by @code{two_way_processor} with
 @cindex messages from extensions
 
 You can print different kinds of warning messages from your
-extension, as described below.  Note that for these functions,
-you must pass in the extension id received from @command{gawk}
-when the extension was loaded.@footnote{Because the API uses only ISO C 90
+extension, as described here.  Note that for these functions,
+you must pass in the extension ID received from @command{gawk}
+when the extension was loaded:@footnote{Because the API uses only ISO C 90
 features, it cannot make use of the ISO C 99 variadic macro feature to hide
 that parameter. More's the pity.}
 
@@ -31455,10 +31770,148 @@ into a (possibly translated) string using the C @code{strerror()} function.
 Set @code{ERRNO} directly to the string value of @code{ERRNO}.
 @command{gawk} makes a copy of the value of @code{string}.
 
-@item void unset_ERRNO();
+@item void unset_ERRNO(void);
 Unset @code{ERRNO}.
 @end table
 
+@node Requesting Values
+@subsection Requesting Values
+
+All of the functions that return values from @command{gawk}
+work in the same way. You pass in an @code{awk_valtype_t} value
+to indicate what kind of value you expect.  If the actual value
+matches what you requested, the function returns true and fills
+in the @code{awk_value_t} result.
+Otherwise, the function returns false, and the @code{val_type}
+member indicates the type of the actual value.  You may then
+print an error message or reissue the request for the actual
+value type, as appropriate.  This behavior is summarized in
+@ref{table-value-types-returned}.
+
+@float Table,table-value-types-returned
+@caption{API value types returned}
+@docbook
+<informaltable>
+<tgroup cols="6">
+  <colspec colwidth="16.6*"/>
+  <colspec colwidth="16.6*"/>
+  <colspec colwidth="19.8*" colname="c3"/>
+  <colspec colwidth="15*" colname="c4"/>
+  <colspec colwidth="15*" colname="c5"/>
+  <colspec colwidth="16.6*" colname="c6"/>
+  <spanspec spanname="hspan" namest="c3" nameend="c6" align="center"/>
+  <thead>
+    <row><entry></entry><entry spanname="hspan"><para>Type of Actual Value</para></entry></row>
+    <row>
+      <entry></entry>
+      <entry></entry>
+      <entry><para>String</para></entry>
+      <entry><para>Number</para></entry>
+      <entry><para>Array</para></entry>
+      <entry><para>Undefined</para></entry>
+    </row>
+  </thead>
+  <tbody>
+    <row>
+      <entry></entry>
+      <entry><para><emphasis role="bold">String</emphasis></para></entry>
+      <entry><para>String</para></entry>
+      <entry><para>String</para></entry>
+      <entry><para>False</para></entry>
+      <entry><para>False</para></entry>
+    </row>
+    <row>
+      <entry></entry>
+      <entry><para><emphasis role="bold">Number</emphasis></para></entry>
+      <entry><para>Number if can be converted, else false</para></entry>
+      <entry><para>Number</para></entry>
+      <entry><para>False</para></entry>
+      <entry><para>False</para></entry>
+    </row>
+    <row>
+      <entry><para><emphasis role="bold">Type</emphasis></para></entry>
+      <entry><para><emphasis role="bold">Array</emphasis></para></entry>
+      <entry><para>False</para></entry>
+      <entry><para>False</para></entry>
+      <entry><para>Array</para></entry>
+      <entry><para>False</para></entry>
+    </row>
+    <row>
+      <entry><para><emphasis role="bold">Requested</emphasis></para></entry>
+      <entry><para><emphasis role="bold">Scalar</emphasis></para></entry>
+      <entry><para>Scalar</para></entry>
+      <entry><para>Scalar</para></entry>
+      <entry><para>False</para></entry>
+      <entry><para>False</para></entry>
+    </row>
+    <row>
+      <entry></entry>
+      <entry><para><emphasis role="bold">Undefined</emphasis></para></entry>
+      <entry><para>String</para></entry>
+      <entry><para>Number</para></entry>
+      <entry><para>Array</para></entry>
+      <entry><para>Undefined</para></entry>
+    </row>
+    <row>
+      <entry></entry>
+      <entry><para><emphasis role="bold">Value cookie</emphasis></para></entry>
+      <entry><para>False</para></entry>
+      <entry><para>False</para></entry>
+      <entry><para>False</para>
+      </entry><entry><para>False</para></entry>
+    </row>
+  </tbody>
+</tgroup>
+</informaltable>
+@end docbook
+
+@ifnotplaintext
+@ifnotdocbook
+@multitable @columnfractions .50 .50
+@headitem @tab Type of Actual Value
+@end multitable
+@c 10/2014: Thanks to Karl Berry for this bit to reduce the space:
+@tex
+\vglue-1.1\baselineskip
+@end tex
+@multitable @columnfractions .166 .166 .198 .15 .15 .166
+@headitem @tab @tab String @tab Number @tab Array @tab Undefined
+@item @tab @b{String} @tab String @tab String @tab False @tab False
+@item @tab @b{Number} @tab Number if can be converted, else false @tab Number @tab False @tab False
+@item @b{Type} @tab @b{Array} @tab False @tab False @tab Array @tab False
+@item @b{Requested} @tab @b{Scalar} @tab Scalar @tab Scalar @tab False @tab False
+@item @tab @b{Undefined} @tab String @tab Number @tab Array @tab Undefined
+@item @tab @b{Value cookie} @tab False @tab False @tab False @tab False
+@end multitable
+@end ifnotdocbook
+@end ifnotplaintext
+@ifplaintext
+@example
+                        +-------------------------------------------------+
+                        |                Type of Actual Value:            |
+                        +------------+------------+-----------+-----------+
+                        |   String   |   Number   | Array     | Undefined |
++-----------+-----------+------------+------------+-----------+-----------+
+|           | String    |   String   |   String   | False     | False     |
+|           |-----------+------------+------------+-----------+-----------+
+|           | Number    | Number if  |   Number   | False     | False     |
+|           |           | can be     |            |           |           |
+|           |           | converted, |            |           |           |
+|           |           | else false |            |           |           |
+|           |-----------+------------+------------+-----------+-----------+
+|   Type    | Array     |   False    |   False    | Array     | False     |
+| Requested |-----------+------------+------------+-----------+-----------+
+|           | Scalar    |   Scalar   |   Scalar   | False     | False     |
+|           |-----------+------------+------------+-----------+-----------+
+|           | Undefined |  String    |   Number   | Array     | Undefined |
+|           |-----------+------------+------------+-----------+-----------+
+|           | Value     |   False    |   False    | False     | False     |
+|           | cookie    |            |            |           |           |
++-----------+-----------+------------+------------+-----------+-----------+
+@end example
+@end ifplaintext
+@end float
+
 @node Accessing Parameters
 @subsection Accessing and Updating Parameters
 
@@ -31470,17 +31923,17 @@ passed to your extension function. They are:
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ awk_valtype_t wanted,
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ awk_value_t *result);
 Fill in the @code{awk_value_t} structure pointed to by @code{result}
-with the @code{count}'th argument.  Return true if the actual
-type matches @code{wanted}, false otherwise.  In the latter
+with the @code{count}th argument.  Return true if the actual
+type matches @code{wanted}, and false otherwise.  In the latter
 case, @code{result@w{->}val_type} indicates the actual type
-(@pxref{table-value-types-returned}).  Counts are zero based---the first
+(@pxref{table-value-types-returned}).  Counts are zero-based---the first
 argument is numbered zero, the second one, and so on. @code{wanted}
 indicates the type of value expected.
 
 @item awk_bool_t set_argument(size_t count, awk_array_t array);
 Convert a parameter that was undefined into an array; this provides
-call-by-reference for arrays.  Return false if @code{count} is too big,
-or if the argument's type is not undefined.  @xref{Array Manipulation},
+call by reference for arrays.  Return false if @code{count} is too big,
+or if the argument's type is not undefined.  @DBXREF{Array Manipulation}
 for more information on creating arrays.
 @end table
 
@@ -31503,8 +31956,9 @@ allows you to create and release cached values.
 The following routines provide the ability to access and update
 global @command{awk}-level variables by name.  In compiler terminology,
 identifiers of different kinds are termed @dfn{symbols}, thus the ``sym''
-in the routines' names.  The data structure which stores information
+in the routines' names.  The data structure that stores information
 about symbols is termed a @dfn{symbol table}.
+The functions are as follows:
 
 @table @code
 @item awk_bool_t sym_lookup(const char *name,
@@ -31513,14 +31967,14 @@ about symbols is termed a @dfn{symbol table}.
 Fill in the @code{awk_value_t} structure pointed to by @code{result}
 with the value of the variable named by the string @code{name}, which is
 a regular C string.  @code{wanted} indicates the type of value expected.
-Return true if the actual type matches @code{wanted}, false otherwise
+Return true if the actual type matches @code{wanted}, and false otherwise.
 In the latter case, @code{result->val_type} indicates the actual type
 (@pxref{table-value-types-returned}).
 
 @item awk_bool_t sym_update(const char *name, awk_value_t *value);
 Update the variable named by the string @code{name}, which is a regular
 C string.  The variable is added to @command{gawk}'s symbol table
-if it is not there.  Return true if everything worked, false otherwise.
+if it is not there.  Return true if everything worked, and false otherwise.
 
 Changing types (scalar to array or vice versa) of an existing variable
 is @emph{not} allowed, nor may this routine be used to update an array.
@@ -31532,10 +31986,10 @@ An extension can look up the value of @command{gawk}'s special variables.
 However, with the exception of the @code{PROCINFO} array, an extension
 cannot change any of those variables.
 
-@quotation NOTE
+@quotation CAUTION
 It is possible for the lookup of @code{PROCINFO} to fail. This happens if
 the @command{awk} program being run does not reference @code{PROCINFO};
-in this case @command{gawk} doesn't bother to create the array and
+in this case, @command{gawk} doesn't bother to create the array and
 populate it.
 @end quotation
 
@@ -31547,21 +32001,21 @@ to a global variable or array. It is an optimization that
 avoids looking up variables in @command{gawk}'s symbol table every time
 access is needed. This was discussed earlier, in @ref{General Data Types}.
 
-The following functions let you work with scalar cookies.
+The following functions let you work with scalar cookies:
 
 @table @code
 @item awk_bool_t sym_lookup_scalar(awk_scalar_t cookie,
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ awk_valtype_t wanted,
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ awk_value_t *result);
 Retrieve the current value of a scalar cookie.
-Once you have obtained a scalar_cookie using @code{sym_lookup()}, you can
+Once you have obtained a scalar cookie using @code{sym_lookup()}, you can
 use this function to get its value more efficiently.
 Return false if the value cannot be retrieved.
 
 @item awk_bool_t sym_update_scalar(awk_scalar_t cookie, awk_value_t *value);
 Update the value associated with a scalar cookie.  Return false if
 the new value is not of type @code{AWK_STRING} or @code{AWK_NUMBER}.
-Here too, the built-in variables may not be updated.
+Here too, the predefined variables may not be updated.
 @end table
 
 It is not obvious at first glance how to work with scalar cookies or
@@ -31592,18 +32046,21 @@ do_magic(int nargs, awk_value_t *result)
 @noindent
 This code looks (and is) simple and straightforward. So what's the problem?
 
-Consider what happens if @command{awk}-level code associated with your
-extension calls the @code{magic()} function (implemented in C by @code{do_magic()}),
-once per record, while processing hundreds of thousands or millions of records.
-The @code{MAGIC_VAR} variable is looked up in the symbol table once or twice per function call!
+Well, consider what happens if @command{awk}-level code associated
+with your extension calls the @code{magic()} function (implemented in
+C by @code{do_magic()}), once per record, while processing hundreds
+of thousands or millions of records.  The @code{MAGIC_VAR} variable is
+looked up in the symbol table once or twice per function call!
 
-The symbol table lookup is really pure overhead; it is considerably more efficient
-to get a cookie that represents the variable, and use that to get the variable's
-value and update it as needed.@footnote{The difference is measurable and quite real. Trust us.}
+The symbol table lookup is really pure overhead; it is considerably
+more efficient to get a cookie that represents the variable, and use
+that to get the variable's value and update it as needed.@footnote{The
+difference is measurable and quite real. Trust us.}
 
-Thus, the way to use cookies is as follows.  First, install your extension's variable
-in @command{gawk}'s symbol table using @code{sym_update()}, as usual. Then get a
-scalar cookie for the variable using @code{sym_lookup()}:
+Thus, the way to use cookies is as follows.  First, install
+your extension's variable in @command{gawk}'s symbol table using
+@code{sym_update()}, as usual. Then get a scalar cookie for the variable
+using @code{sym_lookup()}:
 
 @example
 static awk_scalar_t magic_var_cookie;    /* cookie for MAGIC_VAR */
@@ -31616,7 +32073,7 @@ my_extension_init()
     /* install initial value */
     sym_update("MAGIC_VAR", make_number(42.0, & value));
 
-    /* get cookie */
+    /* get the cookie */
     sym_lookup("MAGIC_VAR", AWK_SCALAR, & value);
 
     /* save the cookie */
@@ -31658,14 +32115,15 @@ and carefully check the return values from the API functions.
 @subsubsection Creating and Using Cached Values
 
 The routines in this section allow you to create and release
-cached values.  As with scalar cookies, in theory, cached values
+cached values.  Like scalar cookies, in theory, cached values
 are not necessary. You can create numbers and strings using
 the functions in @ref{Constructor Functions}. You can then
 assign those values to variables using @code{sym_update()}
 or @code{sym_update_scalar()}, as you like.
 
 However, you can understand the point of cached values if you remember that
-@emph{every} string value's storage @emph{must} come from @code{api_malloc()}, @code{api_calloc()} or @code{api_realloc()}.
+@emph{every} string value's storage @emph{must} come from @code{gawk_malloc()},
+@code{gawk_calloc()}, or @code{gawk_realloc()}.
 If you have 20 variables, all of which have the same string value, you
 must create 20 identical copies of the string.@footnote{Numeric values
 are clearly less problematic, requiring only a C @code{double} to store.}
@@ -31676,11 +32134,11 @@ is what the routines in this section let you do.  The functions are as follows:
 
 @table @code
 @item awk_bool_t create_value(awk_value_t *value, awk_value_cookie_t *result);
-Create a cached string or numeric value from @code{value} for efficient later
-assignment.
-Only values of type @code{AWK_NUMBER} and @code{AWK_STRING} are allowed.  Any other type
-is rejected.  While @code{AWK_UNDEFINED} could be allowed, doing so would
-result in inferior performance.
+Create a cached string or numeric value from @code{value} for
+efficient later assignment.  Only values of type @code{AWK_NUMBER}
+and @code{AWK_STRING} are allowed.  Any other type is rejected.
+@code{AWK_UNDEFINED} could be allowed, but doing so would result in
+inferior performance.
 
 @item awk_bool_t release_value(awk_value_cookie_t vc);
 Release the memory associated with a value cookie obtained
@@ -31701,7 +32159,7 @@ my_extension_init()
     size_t long_string_len;
 
     /* code from earlier */
-    @dots{} 
+    @dots{}
     /* @dots{} fill in long_string and long_string_len @dots{} */
     make_malloced_string(long_string, long_string_len, & value);
     create_value(& value, & answer_cookie);    /* create cookie */
@@ -31731,12 +32189,12 @@ do_magic(int nargs, awk_value_t *result)
 @end example
 
 @noindent
-Using value cookies in this way saves considerable storage, since all of
+Using value cookies in this way saves considerable storage, as all of
 @code{VAR1} through @code{VAR100} share the same value.
 
 You might be wondering, ``Is this sharing problematic?
-What happens if @command{awk} code assigns a new value to @code{VAR1},
-are all the others be changed too?''
+What happens if @command{awk} code assigns a new value to @code{VAR1};
+are all the others changed too?''
 
 That's a great question. The answer is that no, it's not a problem.
 Internally, @command{gawk} uses @dfn{reference-counted strings}. This means
@@ -31753,7 +32211,7 @@ you should release any cached values that you created, using
 @subsection Array Manipulation
 @cindex array manipulation in extensions
 
-The primary data structure@footnote{Okay, the only data structure.} in @command{awk}
+The primary data structure@footnote{OK, the only data structure.} in @command{awk}
 is the associative array (@pxref{Arrays}).
 Extensions need to be able to manipulate @command{awk} arrays.
 The API provides a number of data structures for working with arrays,
@@ -31774,7 +32232,7 @@ both work with and create true arrays of arrays (@pxref{General Data Types}).
 @node Array Data Types
 @subsubsection Array Data Types
 
-The data types associated with arrays are listed below.
+The data types associated with arrays are as follows:
 
 @table @code
 @item typedef void *awk_array_t;
@@ -31791,7 +32249,7 @@ with the @code{<stdio.h>} library routines.
 @itemx @ @ @ @ struct awk_element *next;
 @itemx @ @ @ @ enum @{
 @itemx @ @ @ @ @ @ @ @ AWK_ELEMENT_DEFAULT = 0,@ @ /* set by gawk */
-@itemx @ @ @ @ @ @ @ @ AWK_ELEMENT_DELETE = 1@ @ @ @ /* set by extension if should be deleted */
+@itemx @ @ @ @ @ @ @ @ AWK_ELEMENT_DELETE = 1@ @ @ @ /* set by extension */
 @itemx @ @ @ @ @} flags;
 @itemx @ @ @ @ awk_value_t    index;
 @itemx @ @ @ @ awk_value_t    value;
@@ -31811,8 +32269,8 @@ an extension to create a linked list of new elements that can then be
 added to an array in a loop that traverses the list.
 
 @item enum @{ @dots{} @} flags;
-A set of flag values that convey information between @command{gawk}
-and the extension. Currently there is only one: @code{AWK_ELEMENT_DELETE}.
+A set of flag values that convey information between the extension
+and @command{gawk}.  Currently there is only one: @code{AWK_ELEMENT_DELETE}.
 Setting it causes @command{gawk} to delete the
 element from the original array upon release of the flattened array.
 
@@ -31823,8 +32281,8 @@ The index and value of the element, respectively.
 @end table
 
 @item typedef struct awk_flat_array @{
-@itemx @ @ @ @ awk_const void *awk_const opaque1;@ @ @ @ /* private data for use by gawk */
-@itemx @ @ @ @ awk_const void *awk_const opaque2;@ @ @ @ /* private data for use by gawk */
+@itemx @ @ @ @ awk_const void *awk_const opaque1;@ @ @ @ /* for use by gawk */
+@itemx @ @ @ @ awk_const void *awk_const opaque2;@ @ @ @ /* for use by gawk */
 @itemx @ @ @ @ awk_const size_t count;@ @ @ @ @ /* how many elements */
 @itemx @ @ @ @ awk_element_t elements[1];@ @ /* will be extended */
 @itemx @} awk_flat_array_t;
@@ -31839,11 +32297,11 @@ modify them.
 @node Array Functions
 @subsubsection Array Functions
 
-The following functions relate to individual array elements.
+The following functions relate to individual array elements:
 
 @table @code
 @item awk_bool_t get_element_count(awk_array_t a_cookie, size_t *count);
-For the array represented by @code{a_cookie}, return in @code{*count}
+For the array represented by @code{a_cookie}, place in @code{*count}
 the number of elements it contains. A subarray counts as a single element.
 Return false if there is an error.
 
@@ -31858,12 +32316,13 @@ Return false if @code{wanted} does not match the actual type or if
 @code{index} is not in the array (@pxref{table-value-types-returned}).
 
 The value for @code{index} can be numeric, in which case @command{gawk}
-converts it to a string. Using non-integral values is possible, but
+converts it to a string. Using nonintegral values is possible, but
 requires that you understand how such values are converted to strings
-(@pxref{Conversion}); thus using integral values is safest.
+(@pxref{Conversion}); thus, using integral values is safest.
 
-As with @emph{all} strings passed into @code{gawk} from an extension,
-the string value of @code{index} must come from the API-provided functions @code{api_malloc()}, @code{api_calloc()} or @code{api_realloc()} and
+As with @emph{all} strings passed into @command{gawk} from an extension,
+the string value of @code{index} must come from @code{gawk_malloc()},
+@code{gawk_calloc()}, or @code{gawk_realloc()}, and
 @command{gawk} releases the storage.
 
 @item awk_bool_t set_array_element(awk_array_t a_cookie,
@@ -31890,9 +32349,9 @@ not exist in the array.
 The following functions relate to arrays as a whole:
 
 @table @code
-@item awk_array_t create_array();
+@item awk_array_t create_array(void);
 Create a new array to which elements may be added.
-@xref{Creating Arrays}, for a discussion of how to
+@DBXREF{Creating Arrays} for a discussion of how to
 create a new array and add elements to it.
 
 @item awk_bool_t clear_array(awk_array_t a_cookie);
@@ -31907,13 +32366,19 @@ For the array represented by @code{a_cookie}, create an @code{awk_flat_array_t}
 structure and fill it in. Set the pointer whose address is passed as @code{data}
 to point to this structure.
 Return true upon success, or false otherwise.
-@xref{Flattening Arrays}, for a discussion of how to
+@ifset FOR_PRINT
+See the next section
+@end ifset
+@ifclear FOR_PRINT
+@xref{Flattening Arrays},
+@end ifclear
+for a discussion of how to
 flatten an array and work with it.
 
 @item awk_bool_t release_flattened_array(awk_array_t a_cookie,
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ awk_flat_array_t *data);
 When done with a flattened array, release the storage using this function.
-You must pass in both the original array cookie, and the address of
+You must pass in both the original array cookie and the address of
 the created @code{awk_flat_array_t} structure.
 The function returns true upon success, false otherwise.
 @end table
@@ -31921,12 +32386,13 @@ The function returns true upon success, false otherwise.
 @node Flattening Arrays
 @subsubsection Working With All The Elements of an Array
 
-To @dfn{flatten} an array is create a structure that
+To @dfn{flatten} an array is to create a structure that
 represents the full array in a fashion that makes it easy
-for C code to traverse the entire array.  Test code
+for C code to traverse the entire array.  Some of the code
 in @file{extension/testext.c} does this, and also serves
 as a nice example showing how to use the APIs.
 
+We walk through that part of the code one step at a time.
 First, the @command{gawk} script that drives the test extension:
 
 @example
@@ -31979,9 +32445,9 @@ dump_array_and_delete(int nargs, awk_value_t *result)
 @end example
 
 The function then proceeds in steps, as follows. First, retrieve
-the name of the array, passed as the first argument. Then
-retrieve the array itself. If either operation fails, print
-error messages and return:
+the name of the array, passed as the first argument, followed by
+the array itself. If either operation fails, print an
+error message and return:
 
 @example
     /* get argument named array as flat array and print it */
@@ -32017,7 +32483,7 @@ and print it:
 @end example
 
 The third step is to actually flatten the array, and then
-to double check that the count in the @code{awk_flat_array_t}
+to double-check that the count in the @code{awk_flat_array_t}
 is the same as the count just retrieved:
 
 @example
@@ -32038,7 +32504,7 @@ is the same as the count just retrieved:
 The fourth step is to retrieve the index of the element
 to be deleted, which was passed as the second argument.
 Remember that argument counts passed to @code{get_argument()}
-are zero-based, thus the second argument is numbered one:
+are zero-based, and thus the second argument is numbered one:
 
 @example
     if (! get_argument(1, AWK_STRING, & value3)) @{
@@ -32053,7 +32519,7 @@ element values. In addition, upon finding the element with the
 index that is supposed to be deleted, the function sets the
 @code{AWK_ELEMENT_DELETE} bit in the @code{flags} field
 of the element.  When the array is released, @command{gawk}
-traverses the flattened array, and deletes any elements which
+traverses the flattened array, and deletes any elements that
 have this flag bit set:
 
 @example
@@ -32065,8 +32531,7 @@ have this flag bit set:
             valrep2str(& flat_array->elements[i].value));
 
         if (strcmp(value3.str_value.str,
-                   flat_array->elements[i].index.str_value.str)
-                   == 0) @{
+                   flat_array->elements[i].index.str_value.str) == 0) @{
             flat_array->elements[i].flags |= AWK_ELEMENT_DELETE;
             printf("dump_array_and_delete: marking element \"%s\" "
                    "for deletion\n",
@@ -32089,7 +32554,7 @@ code) once you have called @code{release_flattened_array()}:
     @}
 @end example
 
-Finally, since everything was successful, the function sets the
+Finally, because everything was successful, the function sets the
 return value to success, and returns:
 
 @example
@@ -32124,7 +32589,7 @@ code can access them and manipulate them.
 
 There are two important points about creating arrays from extension code:
 
-@enumerate 1
+@itemize @value{BULLET}
 @item
 You must install a new array into @command{gawk}'s symbol
 table immediately upon creating it.  Once you have done so,
@@ -32146,7 +32611,7 @@ using @code{sym_update()}, or install it as an element in a previously
 existing array using @code{set_array_element()}.  We show example code shortly.
 
 @item
-Due to gawk internals, after using @code{sym_update()} to install an array
+Due to @command{gawk} internals, after using @code{sym_update()} to install an array
 into @command{gawk}, you have to retrieve the array cookie from the value
 passed in to @command{sym_update()} before doing anything else with it, like so:
 
@@ -32166,11 +32631,13 @@ new_array = val.array_cookie;    /* YOU MUST DO THIS */
 
 If installing an array as a subarray, you must also retrieve the value
 of the array cookie after the call to @code{set_element()}.
-@end enumerate
+@end itemize
 
 The following C code is a simple test extension to create an array
 with two regular elements and with a subarray. The leading @code{#include}
-directives and boilerplate variable declarations are omitted for brevity.
+directives and boilerplate variable declarations
+(@pxref{Extension API Boilerplate})
+are omitted for brevity.
 The first step is to create a new array and then install it
 in the symbol table:
 
@@ -32283,7 +32750,7 @@ dl_load_func(func_table, testarray, "")
 @end ignore
 @end example
 
-Here is sample script that loads the extension
+Here is a sample script that loads the extension
 and then dumps the array:
 
 @example
@@ -32313,9 +32780,78 @@ $ @kbd{AWKLIBPATH=$PWD ./gawk -f subarray.awk}
 @end example
 
 @noindent
-(@xref{Finding Extensions}, for more information on the
+(@DBXREF{Finding Extensions} for more information on the
 @env{AWKLIBPATH} environment variable.)
 
+@node Redirection API
+@subsection Accessing and Manipulating Redirections
+
+The following function allows extensions to access and manipulate redirections.
+
+@table @code
+@item awk_bool_t get_file(const char *name,
+@itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ size_t name_len,
+@itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ const char *filetype,
+@itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ int fd,
+@itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ const awk_input_buf_t **ibufp,
+@itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ const awk_output_buf_t **obufp);
+Look up a file in @command{gawk}'s internal redirection table.
+If @code{name} is @code{NULL} or @code{name_len} is zero, return
+data for the currently open input file corresponding to @code{FILENAME}.
+(This does not access the @code{filetype} argument, so that may be undefined).  
+If the file is not already open, attempt to open it.
+The @code{filetype} argument must be zero-terminated and should be one of:
+
+@table @code
+@item ">"
+A file opened for output.
+
+@item ">>"
+A file opened for append.
+
+@item "<"
+A file opened for input.
+
+@item "|>"
+A pipe opened for output.
+
+@item "|<"
+A pipe opened for input.
+
+@item "|&"
+A two-way coprocess.
+@end table
+
+On error, return a @code{false} value.  Otherwise, return
+@code{true}, and return additional information about the redirection
+in the @code{ibufp} and @code{obufp} pointers.  For input
+redirections, the @code{*ibufp} value should be non-@code{NULL},
+and @code{*obufp} should be @code{NULL}.  For output redirections,
+the @code{*obufp} value should be non-@code{NULL}, and @code{*ibufp}
+should be @code{NULL}.  For two-way coprocesses, both values should
+be non-@code{NULL}.
+
+In the usual case, the extension is interested in @code{(*ibufp)->fd}
+and/or @code{fileno((*obufp)->fp)}.  If the file is not already
+open, and the @code{fd} argument is non-negative, @command{gawk}
+will use that file descriptor instead of opening the file in the
+usual way.  If @code{fd} is non-negative, but the file exists already,
+@command{gawk} ignores @code{fd} and returns the existing file.  It is
+the caller's responsibility to notice that neither the @code{fd} in
+the returned @code{awk_input_buf_t} nor the @code{fd} in the returned
+@code{awk_output_buf_t} matches the requested value.
+
+Note that supplying a file descriptor is currently @emph{not} supported
+for pipes.  However, supplying a file descriptor should work for input,
+output, append, and two-way (coprocess) sockets.  If @code{filetype}
+is two-way, @command{gawk} assumes that it is a socket!  Note that in
+the two-way case, the input and output file descriptors may differ.
+To check for success, you must check whether either matches.
+@end table
+
+It is anticipated that this API function will be used to implement I/O
+multiplexing and a socket library.
+
 @node Extension API Variables
 @subsection API Variables
 
@@ -32340,10 +32876,10 @@ The API versions are available at compile time as constants:
 
 @table @code
 @item GAWK_API_MAJOR_VERSION
-The major version of the API.
+The major version of the API
 
 @item GAWK_API_MINOR_VERSION
-The minor version of the API.
+The minor version of the API
 @end table
 
 The minor version increases when new functions are added to the API. Such
@@ -32361,14 +32897,14 @@ constant integers:
 
 @table @code
 @item api->major_version
-The major version of the running @command{gawk}.
+The major version of the running @command{gawk}
 
 @item api->minor_version
-The minor version of the running @command{gawk}.
+The minor version of the running @command{gawk}
 @end table
 
 It is up to the extension to decide if there are API incompatibilities.
-Typically a check like this is enough:
+Typically, a check like this is enough:
 
 @example
 if (api->major_version != GAWK_API_MAJOR_VERSION
@@ -32382,7 +32918,7 @@ if (api->major_version != GAWK_API_MAJOR_VERSION
 @end example
 
 Such code is included in the boilerplate @code{dl_load_func()} macro
-provided in @file{gawkapi.h} (discussed later, in
+provided in @file{gawkapi.h} (discussed in
 @ref{Extension API Boilerplate}).
 
 @node Extension API Informational Variables
@@ -32399,8 +32935,7 @@ whether the corresponding command-line options were enabled when
 This variable is true if @command{gawk} was invoked with @option{--debug} option.
 
 @item do_lint
-This variable is true if @command{gawk} was invoked with @option{--lint} option
-(@pxref{Options}).
+This variable is true if @command{gawk} was invoked with @option{--lint} option.
 
 @item do_mpfr
 This variable is true if @command{gawk} was invoked with @option{--bignum} option.
@@ -32416,7 +32951,7 @@ This variable is true if @command{gawk} was invoked with @option{--traditional}
 @end table
 
 The value of @code{do_lint} can change if @command{awk} code
-modifies the @code{LINT} built-in variable (@pxref{Built-in Variables}).
+modifies the @code{LINT} predefined variable (@pxref{Built-in Variables}).
 The others should not change during execution.
 
 @node Extension API Boilerplate
@@ -32425,12 +32960,12 @@ The others should not change during execution.
 As mentioned earlier (@pxref{Extension Mechanism Outline}), the function
 definitions as presented are really macros. To use these macros, your
 extension must provide a small amount of boilerplate code (variables and
-functions) towards the top of your source file, using pre-defined names
-as described below.  The boilerplate needed is also provided in comments
+functions) toward the top of your source file, using predefined names
+as described here.  The boilerplate needed is also provided in comments
 in the @file{gawkapi.h} header file:
 
 @example
-/* Boiler plate code: */
+/* Boilerplate code: */
 int plugin_is_GPL_compatible;
 
 static gawk_api_t *const api;
@@ -32449,12 +32984,12 @@ static awk_bool_t (*init_func)(void) = NULL;
 /* OR: */
 
 static awk_bool_t
-init_my_module(void)
+init_my_extension(void)
 @{
     @dots{}
 @}
 
-static awk_bool_t (*init_func)(void) = init_my_module;
+static awk_bool_t (*init_func)(void) = init_my_extension;
 
 dl_load_func(func_table, some_name, "name_space_in_quotes")
 @end example
@@ -32489,7 +33024,7 @@ to @code{NULL}, or to point to a string giving the name and version of
 your extension.
 
 @item static awk_ext_func_t func_table[] = @{ @dots{} @};
-This is an array of one or more @code{awk_ext_func_t} structures
+This is an array of one or more @code{awk_ext_func_t} structures,
 as described earlier (@pxref{Extension Functions}).
 It can then be looped over for multiple calls to
 @code{add_ext_func()}.
@@ -32497,8 +33032,8 @@ It can then be looped over for multiple calls to
 @c Use @var{OR} for docbook
 @item static awk_bool_t (*init_func)(void) = NULL;
 @itemx @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @var{OR}
-@itemx static awk_bool_t init_my_module(void) @{ @dots{} @}
-@itemx static awk_bool_t (*init_func)(void) = init_my_module;
+@itemx static awk_bool_t init_my_extension(void) @{ @dots{} @}
+@itemx static awk_bool_t (*init_func)(void) = init_my_extension;
 If you need to do some initialization work, you should define a
 function that does it (creates variables, opens files, etc.)
 and then define the @code{init_func} pointer to point to your
@@ -32514,7 +33049,7 @@ This macro expands to a @code{dl_load()} function that performs
 all the necessary initializations.
 @end table
 
-The point of the all the variables and arrays is to let the
+The point of all the variables and arrays is to let the
 @code{dl_load()} function (from the @code{dl_load_func()}
 macro) do all the standard work. It does the following:
 
@@ -32549,7 +33084,7 @@ Compiled extensions have to be installed in a directory where
 built in the default fashion, the directory in which to find
 extensions is @file{/usr/local/lib/gawk}.  You can also specify a search
 path with a list of directories to search for compiled extensions.
-@xref{AWKLIBPATH Variable}, for more information.
+@DBXREF{AWKLIBPATH Variable} for more information.
 
 @node Extension Example
 @section Example: Some File Functions
@@ -32557,7 +33092,7 @@ path with a list of directories to search for compiled extensions.
 
 @quotation
 @i{No matter where you go, there you are.}
-@author Buckaroo Bonzai
+@author Buckaroo Banzai
 @end quotation
 
 @c It's enough to show chdir and stat, no need for fts
@@ -32565,8 +33100,8 @@ path with a list of directories to search for compiled extensions.
 Two useful functions that are not in @command{awk} are @code{chdir()} (so
 that an @command{awk} program can change its directory) and @code{stat()}
 (so that an @command{awk} program can gather information about a file).
-This @value{SECTION} implements these functions for @command{gawk}
-in an extension.
+In order to illustrate the API in action, this @value{SECTION} implements
+these functions for @command{gawk} in an extension.
 
 @menu
 * Internal File Description::   What the new functions will do.
@@ -32588,8 +33123,7 @@ straightforward. It takes one argument, the new directory to change to:
 newdir = "/home/arnold/funstuff"
 ret = chdir(newdir)
 if (ret < 0) @{
-    printf("could not change to %s: %s\n",
-                   newdir, ERRNO) > "/dev/stderr"
+    printf("could not change to %s: %s\n", newdir, ERRNO) > "/dev/stderr"
     exit 1
 @}
 @dots{}
@@ -32621,7 +33155,7 @@ the @code{stat()} fails.  It fills in the following elements:
 
 @table @code
 @item "name"
-The name of the file that was @code{stat()}'ed.
+The name of the file that was @code{stat()}ed.
 
 @item "dev"
 @itemx "ino"
@@ -32677,7 +33211,7 @@ interprocess communications).
 The file is a directory.
 
 @item "fifo"
-The file is a named-pipe (also known as a FIFO).
+The file is a named pipe (also known as a FIFO).
 
 @item "file"
 The file is just a regular file.
@@ -32700,7 +33234,7 @@ For some other systems, @dfn{a priori} knowledge is used to provide
 a value. Where no value can be determined, it defaults to 512.
 @end table
 
-Several additional elements may be present depending upon the operating
+Several additional elements may be present, depending upon the operating
 system and the type of the file.  You can test for them in your @command{awk}
 program by using the @code{in} operator
 (@pxref{Reference to Elements}):
@@ -32730,10 +33264,10 @@ edited slightly for presentation.  See @file{extension/filefuncs.c}
 in the @command{gawk} distribution for the complete version.}
 
 The file includes a number of standard header files, and then includes
-the @file{gawkapi.h} header file which provides the API definitions.
-Those are followed by the necessary variable declarations 
+the @file{gawkapi.h} header file, which provides the API definitions.
+Those are followed by the necessary variable declarations
 to make use of the API macros and boilerplate code
-(@pxref{Extension API Boilerplate}).
+(@pxref{Extension API Boilerplate}):
 
 @example
 #ifdef HAVE_CONFIG_H
@@ -32771,13 +33305,13 @@ int plugin_is_GPL_compatible;
 @cindex programming conventions, @command{gawk} extensions
 By convention, for an @command{awk} function @code{foo()}, the C function
 that implements it is called @code{do_foo()}.  The function should have
-two arguments: the first is an @code{int} usually called @code{nargs},
+two arguments. The first is an @code{int}, usually called @code{nargs},
 that represents the number of actual arguments for the function.
-The second is a pointer to an @code{awk_value_t}, usually named
-@code{result}.
+The second is a pointer to an @code{awk_value_t} structure, usually named
+@code{result}:
 
 @example
-/*  do_chdir --- provide dynamically loaded chdir() builtin for gawk */
+/*  do_chdir --- provide dynamically loaded chdir() function for gawk */
 
 static awk_value_t *
 do_chdir(int nargs, awk_value_t *result)
@@ -32794,13 +33328,13 @@ do_chdir(int nargs, awk_value_t *result)
 @end example
 
 The @code{newdir}
-variable represents the new directory to change to, retrieved
+variable represents the new directory to change to, which is retrieved
 with @code{get_argument()}.  Note that the first argument is
 numbered zero.
 
 If the argument is retrieved successfully, the function calls the
 @code{chdir()} system call. If the @code{chdir()} fails, @code{ERRNO}
-is updated.
+is updated:
 
 @example
     if (get_argument(0, AWK_STRING, & newdir)) @{
@@ -32819,7 +33353,7 @@ Finally, the function returns the return value to the @command{awk} level:
 
 The @code{stat()} extension is more involved.  First comes a function
 that turns a numeric mode into a printable representation
-(e.g., 644 becomes @samp{-rw-r--r--}). This is omitted here for brevity:
+(e.g., octal @code{0644} becomes @samp{-rw-r--r--}). This is omitted here for brevity:
 
 @example
 /* format_mode --- turn a stat mode field into something readable */
@@ -32875,9 +33409,9 @@ array_set_numeric(awk_array_t array, const char *sub, double num)
 
 The following function does most of the work to fill in
 the @code{awk_array_t} result array with values obtained
-from a valid @code{struct stat}. It is done in a separate function
+from a valid @code{struct stat}. This work is done in a separate function
 to support the @code{stat()} function for @command{gawk} and also
-to support the @code{fts()} extension which is included in
+to support the @code{fts()} extension, which is included in
 the same file but whose code is not shown here
 (@pxref{Extension Sample File Functions}).
 
@@ -32986,13 +33520,22 @@ for success:
         @}
     @}
 
-    array_set(array, "type", make_const_string(type, strlen(type), &tmp));
+    array_set(array, "type", make_const_string(type, strlen(type), & tmp));
 
     return 0;
 @}
 @end example
 
-Finally, here is the @code{do_stat()} function. It starts with
+The third argument to @code{stat()} was not discussed previously. This
+argument is optional. If present, it causes @code{do_stat()} to use
+the @code{stat()} system call instead of the @code{lstat()} system
+call.  This is done by using a function pointer: @code{statfunc}.
+@code{statfunc} is initialized to point to @code{lstat()} (instead
+of @code{stat()}) to get the file information, in case the file is a
+symbolic link. However, if the third argument is included, @code{statfunc}
+is set to point to @code{stat()}, instead.
+
+Here is the @code{do_stat()} function, which starts with
 variable declarations and argument checking:
 
 @ignore
@@ -33023,16 +33566,10 @@ do_stat(int nargs, awk_value_t *result)
     @}
 @end example
 
-The third argument to @code{stat()} was not discussed previously. This argument
-is optional. If present, it causes @code{stat()} to use the @code{stat()}
-system call instead of the @code{lstat()} system call.
-
 Then comes the actual work. First, the function gets the arguments.
-Next, it gets the information for the file.
-The code use @code{lstat()} (instead of @code{stat()})
-to get the file information,
-in case the file is a symbolic link.
-If there's an error, it sets @code{ERRNO} and returns:
+Next, it gets the information for the file.  If the called function
+(@code{lstat()} or @code{stat()}) returns an error, the code sets
+@code{ERRNO} and returns:
 
 @example
     /* file is first arg, array to hold results is second */
@@ -33052,7 +33589,7 @@ If there's an error, it sets @code{ERRNO} and returns:
     /* always empty out the array */
     clear_array(array);
 
-    /* stat the file, if error, set ERRNO and return */
+    /* stat the file; if error, set ERRNO and return */
     ret = statfunc(name, & sbuf);
     if (ret < 0) @{
         update_ERRNO_int(errno);
@@ -33061,7 +33598,7 @@ If there's an error, it sets @code{ERRNO} and returns:
 @end example
 
 The tedious work is done by @code{fill_stat_array()}, shown
-earlier.  When done, return the result from @code{fill_stat_array()}:
+earlier.  When done, the function returns the result from @code{fill_stat_array()}:
 
 @example
     ret = fill_stat_array(name, array, & sbuf);
@@ -33074,7 +33611,9 @@ Finally, it's necessary to provide the ``glue'' that loads the
 new function(s) into @command{gawk}.
 
 The @code{filefuncs} extension also provides an @code{fts()}
-function, which we omit here. For its sake there is an initialization
+function, which we omit here
+(@pxref{Extension Sample File Functions}).
+For its sake, there is an initialization
 function:
 
 @example
@@ -33113,7 +33652,7 @@ dl_load_func(func_table, filefuncs, "")
 And that's it!
 
 @node Using Internal File Ops
-@subsection Integrating The Extensions
+@subsection Integrating the Extensions
 
 @cindex @command{gawk}, interpreter@comma{} adding code to
 Now that the code is written, it must be possible to add it at
@@ -33122,9 +33661,9 @@ code must be compiled.  Assuming that the functions are in
 a file named @file{filefuncs.c}, and @var{idir} is the location
 of the @file{gawkapi.h} header file,
 the following steps@footnote{In practice, you would probably want to
-use the GNU Autotools---Automake, Autoconf, Libtool, and @command{gettext}---to
+use the GNU Autotools (Automake, Autoconf, Libtool, and @command{gettext}) to
 configure and build your libraries. Instructions for doing so are beyond
-the scope of this @value{DOCUMENT}. @xref{gawkextlib}, for WWW links to
+the scope of this @value{DOCUMENT}. @DBXREF{gawkextlib} for Internet links to
 the tools.} create a GNU/Linux shared library:
 
 @example
@@ -33132,7 +33671,7 @@ $ @kbd{gcc -fPIC -shared -DHAVE_CONFIG_H -c -O -g -I@var{idir} filefuncs.c}
 $ @kbd{gcc -o filefuncs.so -shared filefuncs.o}
 @end example
 
-Once the library exists, it is loaded by using the @code{@@load} keyword.
+Once the library exists, it is loaded by using the @code{@@load} keyword:
 
 @example
 # file testff.awk
@@ -33152,14 +33691,14 @@ BEGIN @{
     for (i in data)
         printf "data[\"%s\"] = %s\n", i, data[i]
     print "testff.awk modified:",
-        strftime("%m %d %y %H:%M:%S", data["mtime"])
+        strftime("%m %d %Y %H:%M:%S", data["mtime"])
 
     print "\nInfo for JUNK"
     ret = stat("JUNK", data)
     print "ret =", ret
     for (i in data)
         printf "data[\"%s\"] = %s\n", i, data[i]
-    print "JUNK modified:", strftime("%m %d %y %H:%M:%S", data["mtime"])
+    print "JUNK modified:", strftime("%m %d %Y %H:%M:%S", data["mtime"])
 @}
 @end example
 
@@ -33173,35 +33712,37 @@ $ @kbd{AWKLIBPATH=$PWD gawk -f testff.awk}
 @print{} Info for testff.awk
 @print{} ret = 0
 @print{} data["blksize"] = 4096
-@print{} data["mtime"] = 1350838628
+@print{} data["devbsize"] = 512
+@print{} data["mtime"] = 1412004710
 @print{} data["mode"] = 33204
 @print{} data["type"] = file
 @print{} data["dev"] = 2053
 @print{} data["gid"] = 1000
-@print{} data["ino"] = 1719496
-@print{} data["ctime"] = 1350838628
+@print{} data["ino"] = 10358899
+@print{} data["ctime"] = 1412004710
 @print{} data["blocks"] = 8
 @print{} data["nlink"] = 1
 @print{} data["name"] = testff.awk
-@print{} data["atime"] = 1350838632
+@print{} data["atime"] = 1412004716
 @print{} data["pmode"] = -rw-rw-r--
-@print{} data["size"] = 662
+@print{} data["size"] = 666
 @print{} data["uid"] = 1000
-@print{} testff.awk modified: 10 21 12 18:57:08
-@print{} 
+@print{} testff.awk modified: 09 29 2014 18:31:50
+@print{}
 @print{} Info for JUNK
 @print{} ret = -1
-@print{} JUNK modified: 01 01 70 02:00:00
+@print{} JUNK modified: 01 01 1970 02:00:00
 @end example
 
 @node Extension Samples
-@section The Sample Extensions In The @command{gawk} Distribution
+@section The Sample Extensions in the @command{gawk} Distribution
 @cindex extensions distributed with @command{gawk}
 
-This @value{SECTION} provides brief overviews of the sample extensions
+This @value{SECTION} provides a brief overview of the sample extensions
 that come in the @command{gawk} distribution. Some of them are intended
-for production use, such the @code{filefuncs}, @code{readdir} and @code{inplace} extensions.
-Others mainly provide example code that shows how to use the extension API.
+for production use (e.g., the @code{filefuncs}, @code{readdir}, and
+@code{inplace} extensions).  Others mainly provide example code that
+shows how to use the extension API.
 
 @menu
 * Extension Sample File Functions::   The file functions sample.
@@ -33216,34 +33757,34 @@ Others mainly provide example code that shows how to use the extension API.
 * Extension Sample Rev2way::          Reversing data sample two-way processor.
 * Extension Sample Read write array:: Serializing an array to a file.
 * Extension Sample Readfile::         Reading an entire file into a string.
-* Extension Sample API Tests::        Tests for the API.
 * Extension Sample Time::             An interface to @code{gettimeofday()}
                                       and @code{sleep()}.
+* Extension Sample API Tests::        Tests for the API.
 @end menu
 
 @node Extension Sample File Functions
-@subsection File Related Functions
+@subsection File-Related Functions
 
-The @code{filefuncs} extension provides three different functions, as follows:
+The @code{filefuncs} extension provides three different functions, as follows.
 The usage is:
 
 @table @asis
-@item @@load "filefuncs"
+@item @code{@@load "filefuncs"}
 This is how you load the extension.
 
 @cindex @code{chdir()} extension function
 @item @code{result = chdir("/some/directory")}
 The @code{chdir()} function is a direct hook to the @code{chdir()}
 system call to change the current directory.  It returns zero
-upon success or less than zero upon error.  In the latter case it updates
-@code{ERRNO}.
+upon success or a value less than zero upon error.
+In the latter case, it updates @code{ERRNO}.
 
 @cindex @code{stat()} extension function
 @item @code{result = stat("/some/path", statdata} [@code{, follow}]@code{)}
 The @code{stat()} function provides a hook into the
 @code{stat()} system call.
-It returns zero upon success or less than zero upon error.
-In the latter case it updates @code{ERRNO}.
+It returns zero upon success or a value less than zero upon error.
+In the latter case, it updates @code{ERRNO}.
 
 By default, it uses the @code{lstat()} system call.  However, if passed
 a third argument, it uses @code{stat()} instead.
@@ -33269,10 +33810,10 @@ array with information retrieved from the filesystem, as follows:
 @item @code{"major"} @tab @code{st_major} @tab Device files
 @item @code{"minor"} @tab @code{st_minor} @tab Device files
 @item @code{"blksize"} @tab @code{st_blksize} @tab All
-@item @code{"pmode"} @tab A human-readable version of the mode value, such as printed by
-@command{ls}.  For example, @code{"-rwxr-xr-x"} @tab All
+@item @code{"pmode"} @tab A human-readable version of the mode value, like that printed by
+@command{ls} (for example, @code{"-rwxr-xr-x"}) @tab All
 @item @code{"linkval"} @tab The value of the symbolic link @tab Symbolic links
-@item @code{"type"} @tab The type of the file as a string. One of
+@item @code{"type"} @tab The type of the file as a string---one of
 @code{"file"},
 @code{"blockdev"},
 @code{"chardev"},
@@ -33282,16 +33823,16 @@ array with information retrieved from the filesystem, as follows:
 @code{"symlink"},
 @code{"door"},
 or
-@code{"unknown"}.
-Not all systems support all file types. @tab All
+@code{"unknown"}
+(not all systems support all file types) @tab All
 @end multitable
 
 @cindex @code{fts()} extension function
 @item @code{flags = or(FTS_PHYSICAL, ...)}
 @itemx @code{result = fts(pathlist, flags, filedata)}
 Walk the file trees provided in @code{pathlist} and fill in the
-@code{filedata} array as described below.  @code{flags} is the bitwise
-OR of several predefined constant values, also described below.
+@code{filedata} array, as described next.  @code{flags} is the bitwise
+OR of several predefined values, also described in a moment.
 Return zero if there were no errors, otherwise return @minus{}1.
 @end table
 
@@ -33336,20 +33877,21 @@ Immediately follow a symbolic link named in @code{pathlist},
 whether or not @code{FTS_LOGICAL} is set.
 
 @item FTS_SEEDOT
-By default, the @code{fts()} routines do not return entries for @file{.} (dot)
-and @file{..} (dot-dot).  This option causes entries for dot-dot to also
-be included.  (The extension always includes an entry for dot,
-see below.)
+By default, the C library @code{fts()} routines do not return entries for
+@file{.} (dot) and @file{..} (dot-dot).  This option causes entries for
+dot-dot to also be included.  (The extension always includes an entry
+for dot; more on this in a moment.)
 
 @item FTS_XDEV
 During a traversal, do not cross onto a different mounted filesystem.
 @end table
 
 @item filedata
-The @code{filedata} array is first cleared.  Then, @code{fts()} creates
+The @code{filedata} array holds the results.
+@code{fts()} first clears it.  Then it creates
 an element in @code{filedata} for every element in @code{pathlist}.
 The index is the name of the directory or file given in @code{pathlist}.
-The element for this index is itself an array.  There are two cases.
+The element for this index is itself an array.  There are two cases:
 
 @c nested table
 @table @emph
@@ -33375,8 +33917,8 @@ contain an element named @code{"error"}, which is a string describing the error.
 
 @item The path is a directory
 In this case, the array contains one element for each entry in the
-directory.  If an entry is a file, that element is as for files, just
-described.  If the entry is a directory, that element is (recursively),
+directory.  If an entry is a file, that element is the same as for files, just
+described.  If the entry is a directory, that element is (recursively)
 an array describing the subdirectory.  If @code{FTS_SEEDOT} was provided
 in the flags, then there will also be an element named @code{".."}.  This
 element will be an array containing the data as provided by @code{stat()}.
@@ -33388,24 +33930,25 @@ for a file: @code{"path"}, @code{"stat"}, and @code{"error"}.
 @end table
 
 The @code{fts()} function returns zero if there were no errors.
-Otherwise it returns @minus{}1.
+Otherwise, it returns @minus{}1.
 
 @quotation NOTE
 The @code{fts()} extension does not exactly mimic the
 interface of the C library @code{fts()} routines, choosing instead to
-provide an interface that is based on associative arrays, which should
-be more comfortable to use from an @command{awk} program.  This includes the
-lack of a comparison function, since @command{gawk} already provides
-powerful array sorting facilities.  While an @code{fts_read()}-like
+provide an interface that is based on associative arrays, which is
+more comfortable to use from an @command{awk} program.  This includes the
+lack of a comparison function, because @command{gawk} already provides
+powerful array sorting facilities.  Although an @code{fts_read()}-like
 interface could have been provided, this felt less natural than simply
 creating a multidimensional array to represent the file hierarchy and
 its information.
 @end quotation
 
-See @file{test/fts.awk} in the @command{gawk} distribution for an example.
+See @file{test/fts.awk} in the @command{gawk} distribution for an example
+use of the @code{fts()} extension function.
 
 @node Extension Sample Fnmatch
-@subsection Interface To @code{fnmatch()}
+@subsection Interface to @code{fnmatch()}
 
 This extension provides an interface to the C library
 @code{fnmatch()} function.  The usage is:
@@ -33418,10 +33961,10 @@ This is how you load the extension.
 @item result = fnmatch(pattern, string, flags)
 The return value is zero on success, @code{FNM_NOMATCH}
 if the string did not match the pattern, or
-a different non-zero value if an error occurred.
+a different nonzero value if an error occurred.
 @end table
 
-Besides the @code{fnmatch()} function, the @code{fnmatch} extension
+In addition to the @code{fnmatch()} function, the @code{fnmatch} extension
 adds one constant (@code{FNM_NOMATCH}), and an array of flag values
 named @code{FNM}.
 
@@ -33429,17 +33972,17 @@ The arguments to @code{fnmatch()} are:
 
 @table @code
 @item pattern
-The @value{FN} wildcard to match.
+The @value{FN} wildcard to match
 
 @item string
-The @value{FN} string.
+The @value{FN} string
 
 @item flag
 Either zero, or the bitwise OR of one or more of the
-flags in the @code{FNM} array.
+flags in the @code{FNM} array
 @end table
 
-The flags are follows:
+The flags are as follows:
 
 @multitable @columnfractions .25 .75
 @headitem Array element @tab Corresponding flag defined by @code{fnmatch()}
@@ -33462,9 +34005,9 @@ if (fnmatch("*.a", "foo.c", flags) == FNM_NOMATCH)
 @end example
 
 @node Extension Sample Fork
-@subsection Interface To @code{fork()}, @code{wait()} and @code{waitpid()}
+@subsection Interface to @code{fork()}, @code{wait()}, and @code{waitpid()}
 
-The @code{fork} extension adds three functions, as follows.
+The @code{fork} extension adds three functions, as follows:
 
 @table @code
 @item @@load "fork"
@@ -33473,14 +34016,14 @@ This is how you load the extension.
 @cindex @code{fork()} extension function
 @item pid = fork()
 This function creates a new process. The return value is zero in the
-child and the process-ID number of the child in the parent, or @minus{}1
+child and the process ID number of the child in the parent, or @minus{}1
 upon error. In the latter case, @code{ERRNO} indicates the problem.
 In the child, @code{PROCINFO["pid"]} and @code{PROCINFO["ppid"]} are
 updated to reflect the correct values.
 
 @cindex @code{waitpid()} extension function
 @item ret = waitpid(pid)
-This function takes a numeric argument, which is the process-ID to
+This function takes a numeric argument, which is the process ID to
 wait for. The return value is that of the
 @code{waitpid()} system call.
 
@@ -33508,8 +34051,8 @@ else
 @subsection Enabling In-Place File Editing
 
 @cindex @code{inplace} extension
-The @code{inplace} extension emulates GNU @command{sed}'s @option{-i} option
-which performs ``in place'' editing of each input file.
+The @code{inplace} extension emulates GNU @command{sed}'s @option{-i} option,
+which performs ``in-place'' editing of each input file.
 It uses the bundled @file{inplace.awk} include file to invoke the extension
 properly:
 
@@ -33523,11 +34066,16 @@ properly:
 # Please set INPLACE_SUFFIX to make a backup copy.  For example, you may
 # want to set INPLACE_SUFFIX to .bak on the command line or in a BEGIN rule.
 
+# N.B. We call inplace_end() in the BEGINFILE and END rules so that any
+# actions in an ENDFILE rule will be redirected as expected.
+
 BEGINFILE @{
-    inplace_begin(FILENAME, INPLACE_SUFFIX)
+    if (_inplace_filename != "")
+        inplace_end(_inplace_filename, INPLACE_SUFFIX)
+    inplace_begin(_inplace_filename = FILENAME, INPLACE_SUFFIX)
 @}
 
-ENDFILE @{
+END @{
     inplace_end(FILENAME, INPLACE_SUFFIX)
 @}
 @end group
@@ -33542,6 +34090,10 @@ If @code{INPLACE_SUFFIX} is not an empty string, the original file is
 linked to a backup @value{FN} created by appending that suffix.  Finally,
 the temporary file is renamed to the original @value{FN}.
 
+The @code{_inplace_filename} variable serves to keep track of the
+current filename so as to not invoke @code{inplace_end()} before
+processing the first file.
+
 If any error occurs, the extension issues a fatal error to terminate
 processing immediately without damaging the original file.
 
@@ -33562,7 +34114,7 @@ $ @kbd{gawk -i inplace -v INPLACE_SUFFIX=.bak '@{ gsub(/foo/, "bar") @}}
 @subsection Character and Numeric values: @code{ord()} and @code{chr()}
 
 The @code{ordchr} extension adds two functions, named
-@code{ord()} and @code{chr()}, as follows.
+@code{ord()} and @code{chr()}, as follows:
 
 @table @code
 @item @@load "ordchr"
@@ -33605,14 +34157,14 @@ they are read, with each entry returned as a record.
 The record consists of three fields. The first two are the inode number and the
 @value{FN}, separated by a forward slash character.
 On systems where the directory entry contains the file type, the record
-has a third field (also separated by a slash) which is a single letter
-indicating the type of the file. The letters are file types are shown
-in @ref{table-readdir-file-types}.
+has a third field (also separated by a slash), which is a single letter
+indicating the type of the file. The letters and their corresponding file
+types are shown in @ref{table-readdir-file-types}.
 
 @float Table,table-readdir-file-types
-@caption{File Types Returned By @code{readdir()}}
+@caption{File types returned by the @code{readdir} extension}
 @multitable @columnfractions .1 .9
-@headitem Letter @tab File Type
+@headitem Letter @tab File type
 @item @code{b} @tab Block device
 @item @code{c} @tab Character device
 @item @code{d} @tab Directory
@@ -33640,14 +34192,14 @@ Here is an example:
 @@load "readdir"
 @dots{}
 BEGIN @{ FS = "/" @}
-@{ print "file name is", $2 @}
+@{ print "@value{FN} is", $2 @}
 @end example
 
 @node Extension Sample Revout
 @subsection Reversing Output
 
 The @code{revoutput} extension adds a simple output wrapper that reverses
-the characters in each output line.  It's main purpose is to show how to
+the characters in each output line.  Its main purpose is to show how to
 write an output wrapper, although it may be mildly amusing for the unwary.
 Here is an example:
 
@@ -33661,15 +34213,14 @@ BEGIN @{
 @}
 @end example
 
-The output from this program is:
-@samp{cinap t'nod}.
+The output from this program is @samp{cinap t'nod}.
 
 @node Extension Sample Rev2way
 @subsection Two-Way I/O Example
 
 The @code{revtwoway} extension adds a simple two-way processor that
 reverses the characters in each line sent to it for reading back by
-the @command{awk} program.  It's main purpose is to show how to write
+the @command{awk} program.  Its main purpose is to show how to write
 a two-way processor, although it may also be mildly amusing.
 The following example shows how to use it:
 
@@ -33696,12 +34247,15 @@ is:
 @samp{cinap t'nod}.
 
 @node Extension Sample Read write array
-@subsection Dumping and Restoring An Array
+@subsection Dumping and Restoring an Array
 
 The @code{rwarray} extension adds two functions,
 named @code{writea()} and @code{reada()}, as follows:
 
 @table @code
+@item @@load "rwarray"
+This is how you load the extension.
+
 @cindex @code{writea()} extension function
 @item ret = writea(file, array)
 This function takes a string argument, which is the name of the file
@@ -33714,12 +34268,12 @@ success, or zero upon failure.
 @code{reada()} is the inverse of @code{writea()};
 it reads the file named as its first argument, filling in
 the array named as the second argument. It clears the array first.
-Here too, the return value is one on success and zero upon failure.
+Here too, the return value is one on success, or zero upon failure.
 @end table
 
 The array created by @code{reada()} is identical to that written by
 @code{writea()} in the sense that the contents are the same. However,
-due to implementation issues, the array traversal order of the recreated
+due to implementation issues, the array traversal order of the re-created
 array is likely to be different from that of the original array.  As array
 traversal order in @command{awk} is by default undefined, this is (technically)
 not a problem.  If you need to guarantee a particular traversal
@@ -33727,7 +34281,7 @@ order, use the array sorting features in @command{gawk} to do so
 (@pxref{Array Sorting}).
 
 The file contains binary data.  All integral values are written in network
-byte order.  However, double precision floating-point values are written
+byte order.  However, double-precision floating-point values are written
 as native binary data.  Thus, arrays containing only string data can
 theoretically be dumped on systems with one byte order and restored on
 systems with a different one, but this has not been tried.
@@ -33743,7 +34297,7 @@ ret = reada("arraydump.bin", array)
 @end example
 
 @node Extension Sample Readfile
-@subsection Reading An Entire File
+@subsection Reading an Entire File
 
 The @code{readfile} extension adds a single function
 named @code{readfile()}, and an input parser:
@@ -33777,17 +34331,6 @@ if (contents == "" && ERRNO != "") @{
 @}
 @end example
 
-@node Extension Sample API Tests
-@subsection API Tests
-@cindex @code{testext} extension
-
-The @code{testext} extension exercises parts of the extension API that
-are not tested by the other samples.  The @file{extension/testext.c}
-file contains both the C code for the extension and @command{awk}
-test code inside C comments that run the tests. The testing framework
-extracts the @command{awk} code and runs the tests.  See the source file
-for more information.
-
 @node Extension Sample Time
 @subsection Extension Time Functions
 
@@ -33801,7 +34344,7 @@ This is how you load the extension.
 @cindex @code{gettimeofday()} extension function
 @item the_time = gettimeofday()
 Return the time in seconds that has elapsed since 1970-01-01 UTC as a
-floating point value.  If the time is unavailable on this platform, return
+floating-point value.  If the time is unavailable on this platform, return
 @minus{}1 and set @code{ERRNO}.  The returned time should have sub-second
 precision, but the actual precision may vary based on the platform.
 If the standard C @code{gettimeofday()} system call is available on this
@@ -33813,11 +34356,22 @@ it tries to use @code{GetSystemTimeAsFileTime()}.
 Attempt to sleep for @var{seconds} seconds.  If @var{seconds} is negative,
 or the attempt to sleep fails, return @minus{}1 and set @code{ERRNO}.
 Otherwise, return zero after sleeping for the indicated amount of time.
-Note that @var{seconds} may be a floating-point (non-integral) value.
+Note that @var{seconds} may be a floating-point (nonintegral) value.
 Implementation details: depending on platform availability, this function
 tries to use @code{nanosleep()} or @code{select()} to implement the delay.
 @end table
 
+@node Extension Sample API Tests
+@subsection API Tests
+@cindex @code{testext} extension
+
+The @code{testext} extension exercises parts of the extension API that
+are not tested by the other samples.  The @file{extension/testext.c}
+file contains both the C code for the extension and @command{awk}
+test code inside C comments that run the tests. The testing framework
+extracts the @command{awk} code and runs the tests.  See the source file
+for more information.
+
 @node gawkextlib
 @section The @code{gawkextlib} Project
 @cindex @code{gawkextlib}
@@ -33829,31 +34383,36 @@ project provides a number of @command{gawk} extensions, including one for
 processing XML files.  This is the evolution of the original @command{xgawk}
 (XML @command{gawk}) project.
 
-As of this writing, there are five extensions:
+As of this writing, there are seven extensions:
 
 @itemize @value{BULLET}
 @item
-XML parser extension, using the @uref{http://expat.sourceforge.net, Expat}
-XML parsing library.
+@code{errno} extension
 
 @item
-PDF extension.
+GD graphics library extension
 
 @item
-PostgreSQL extension.
+MPFR library extension
+(this provides access to a number of MPFR functions that @command{gawk}'s
+native MPFR support does not)
 
 @item
-GD graphics library extension.
+PDF extension
 
 @item
-MPFR library extension.
-This provides access to a number of MPFR functions which @command{gawk}'s
-native MPFR support does not.
-@end itemize
+PostgreSQL extension
 
-The @code{time} extension described earlier (@pxref{Extension Sample
-Time}) was originally from this project but has been moved in to the
-main @command{gawk} distribution.
+@item
+Redis extension
+
+@item
+Select extension
+
+@item
+XML parser extension, using the @uref{http://expat.sourceforge.net, Expat}
+XML parsing library
+@end itemize
 
 @cindex @command{git} utility
 You can check out the code for the @code{gawkextlib} project
@@ -33898,14 +34457,14 @@ make install                          @ii{Install the extensions}
 
 If you have installed @command{gawk} in the standard way, then you
 will likely not need the @option{--with-gawk} option when configuring
-@code{gawkextlib}.  You may also need to use the @command{sudo} utility
+@code{gawkextlib}.  You may need to use the @command{sudo} utility
 to install both @command{gawk} and @code{gawkextlib}, depending upon
 how your system works.
 
 If you write an extension that you wish to share with other
-@command{gawk} users, please consider doing so through the
+@command{gawk} users, consider doing so through the
 @code{gawkextlib} project.
-See the project's web site for more information.
+See the project's website for more information.
 
 @node Extension summary
 @section Summary
@@ -33913,7 +34472,7 @@ See the project's web site for more information.
 @itemize @value{BULLET}
 @item
 You can write extensions (sometimes called plug-ins) for @command{gawk}
-in C or C++ using the Application Programming Interface (API) defined
+in C or C++ using the application programming interface (API) defined
 by the @command{gawk} developers.
 
 @item
@@ -33923,20 +34482,20 @@ named @code{plugin_is_GPL_compatible}.
 
 @item
 Communication between @command{gawk} and an extension is two-way.
-@command{gawk} passes a @code{struct} to the extension which contains
+@command{gawk} passes a @code{struct} to the extension that contains
 various data fields and function pointers.  The extension can then call
 into @command{gawk} via the supplied function pointers to accomplish
 certain tasks.
 
 @item
 One of these tasks is to ``register'' the name and implementation of
-a new @command{awk}-level function with @command{gawk}.  The implementation
+new @command{awk}-level functions with @command{gawk}.  The implementation
 takes the form of a C function pointer with a defined signature.
 By convention, implementation functions are named @code{do_@var{XXXX}()}
 for some @command{awk}-level function @code{@var{XXXX}()}.
 
 @item
-The API is defined in a header file named @file{gawkpi.h}. You must include
+The API is defined in a header file named @file{gawkapi.h}. You must include
 a number of standard header files @emph{before} including it in your source file.
 
 @item
@@ -33944,44 +34503,44 @@ API function pointers are provided for the following kinds of operations:
 
 @itemize @value{BULLET}
 @item
-Registration functions. You may register
+Allocating, reallocating, and releasing memory
+
+@item
+Registration functions (you may register
 extension functions,
 exit callbacks,
 a version string,
 input parsers,
 output wrappers,
-and two-way processors.
+and two-way processors)
 
 @item
-Printing fatal, warning, and ``lint'' warning messages.
+Printing fatal, warning, and ``lint'' warning messages
 
 @item
-Updating @code{ERRNO}, or unsetting it.
+Updating @code{ERRNO}, or unsetting it
 
 @item
 Accessing parameters, including converting an undefined parameter into
-an array.
-
-@item
-Symbol table access: retrieving a global variable, creating one,
-or changing one.
+an array
 
 @item
-Allocating, reallocating, and releasing memory.
+Symbol table access (retrieving a global variable, creating one,
+or changing one)
 
 @item
 Creating and releasing cached values; this provides an
 efficient way to use values for multiple variables and
-can be a big performance win.
+can be a big performance win
 
 @item
-Manipulating arrays:
-retrieving, adding, deleting, and modifying elements;
+Manipulating arrays
+(retrieving, adding, deleting, and modifying elements;
 getting the count of elements in an array;
 creating a new array;
 clearing an array;
 and
-flattening an array for easy C style looping over all its indices and elements
+flattening an array for easy C-style looping over all its indices and elements)
 @end itemize
 
 @item
@@ -33989,7 +34548,7 @@ The API defines a number of standard data types for representing
 @command{awk} values, array elements, and arrays.
 
 @item
-The API provide convenience functions for constructing values.
+The API provides convenience functions for constructing values.
 It also provides memory management functions to ensure compatibility
 between memory allocated by @command{gawk} and memory allocated by an
 extension.
@@ -34001,7 +34560,7 @@ treated as read-only by the extension.
 @item
 @emph{All} memory passed from an extension to @command{gawk} must come from
 the API's memory allocation functions. @command{gawk} takes responsibility for
-the memory and will release it when appropriate.
+the memory and releases it when appropriate.
 
 @item
 The API provides information about the running version of @command{gawk} so
@@ -34010,15 +34569,15 @@ that loaded it.
 
 @item
 It is easiest to start a new extension by copying the boilerplate code
-described in this @value{CHAPTER}.  Macros in the @file{gawkapi.h} make
-this easier to do.
+described in this @value{CHAPTER}.  Macros in the @file{gawkapi.h} header
+file make this easier to do.
 
 @item
 The @command{gawk} distribution includes a number of small but useful
-sample extensions. The @code{gawkextlib} project includes several more,
-larger, extensions.  If you wish to write an extension and contribute it
+sample extensions. The @code{gawkextlib} project includes several more
+(larger) extensions.  If you wish to write an extension and contribute it
 to the community of @command{gawk} users, the @code{gawkextlib} project
-should be the place to do so.
+is the place to do so.
 
 @end itemize
 
@@ -34032,6 +34591,24 @@ Add functions to implement system calls such as @code{chown()},
 @code{chmod()}, and @code{umask()} to the file operations extension
 presented in @ref{Internal File Ops}.
 
+@c Idea from comp.lang.awk, February 2015
+@item
+Write an input parser that prints a prompt if the input is
+a from a ``terminal'' device.  You can use the @code{isatty()}
+function to tell if the input file is a terminal. (Hint: this function
+is usually expensive to call; try to call it just once.)
+The content of the prompt should come from a variable settable
+by @command{awk}-level code.
+You can write the prompt to stanard error. However,
+for best results, open a new file descriptor (or file pointer)
+on @file{/dev/tty} and print the prompt there, in case standard
+error has been redirected.
+
+Why is standard error a better
+choice than standard output for writing the prompt?
+Which reading mechanism should you replace, the one to get
+a record, or the one to read raw bytes?
+
 @item
 (Hard.)
 How would you provide namespaces in @command{gawk}, so that the
@@ -34060,34 +34637,34 @@ and the Glossary:
 @end ifclear
 
 @ifset FOR_PRINT
-Part IV contains two appendices and the license that
+Part IV contains three appendices, the last of which is the license that
 covers the @command{gawk} source code:
 @end ifset
 
 @itemize @value{BULLET}
 @item
-@ref{Language History}.
+@ref{Language History}
 
 @item
-@ref{Installation}.
+@ref{Installation}
 
 @ifclear FOR_PRINT
 @item
-@ref{Notes}.
+@ref{Notes}
 
 @item
-@ref{Basic Concepts}.
+@ref{Basic Concepts}
 
 @item
-@ref{Glossary}.
+@ref{Glossary}
 @end ifclear
 
 @item
-@ref{Copying}.
+@ref{Copying}
 
 @ifclear FOR_PRINT
 @item
-@ref{GNU Free Documentation License}.
+@ref{GNU Free Documentation License}
 @end ifclear
 @end itemize
 @end ifdocbook
@@ -34096,11 +34673,11 @@ covers the @command{gawk} source code:
 @appendix The Evolution of the @command{awk} Language
 
 This @value{DOCUMENT} describes the GNU implementation of @command{awk},
-which follows the POSIX specification.  Many long-time @command{awk}
+which follows the POSIX specification.  Many longtime @command{awk}
 users learned @command{awk} programming with the original @command{awk}
 implementation in Version 7 Unix.  (This implementation was the basis for
 @command{awk} in Berkeley Unix, through 4.3-Reno.  Subsequent versions
-of Berkeley Unix, and some systems derived from 4.4BSD-Lite, used various
+of Berkeley Unix, and, for a while, some systems derived from 4.4BSD-Lite, used various
 versions of @command{gawk} for their @command{awk}.)  This @value{CHAPTER}
 briefly describes the evolution of the @command{awk} language, with
 cross-references to other parts of the @value{DOCUMENT} where you can
@@ -34133,9 +34710,7 @@ online documentation}.
 
 @node V7/SVR3.1
 @appendixsec Major Changes Between V7 and SVR3.1
-@c STARTOFRANGE gawkv
 @cindex @command{awk}, versions of
-@c STARTOFRANGE gawkv1
 @cindex @command{awk}, versions of, changes between V7 and SVR3.1
 
 The @command{awk} language evolved considerably between the release of
@@ -34146,86 +34721,82 @@ cross-references to further details:
 @itemize @value{BULLET}
 @item
 The requirement for @samp{;} to separate rules on a line
-(@pxref{Statements/Lines}).
+(@pxref{Statements/Lines})
 
 @item
 User-defined functions and the @code{return} statement
-(@pxref{User-defined}).
+(@pxref{User-defined})
 
 @item
 The @code{delete} statement (@pxref{Delete}).
 
 @item
 The @code{do}-@code{while} statement
-(@pxref{Do Statement}).
+(@pxref{Do Statement})
 
 @item
 The built-in functions @code{atan2()}, @code{cos()}, @code{sin()}, @code{rand()}, and
-@code{srand()} (@pxref{Numeric Functions}).
+@code{srand()} (@pxref{Numeric Functions})
 
 @item
 The built-in functions @code{gsub()}, @code{sub()}, and @code{match()}
-(@pxref{String Functions}).
+(@pxref{String Functions})
 
 @item
 The built-in functions @code{close()} and @code{system()}
-(@pxref{I/O Functions}).
+(@pxref{I/O Functions})
 
 @item
 The @code{ARGC}, @code{ARGV}, @code{FNR}, @code{RLENGTH}, @code{RSTART},
-and @code{SUBSEP} built-in variables (@pxref{Built-in Variables}).
+and @code{SUBSEP} predefined variables (@pxref{Built-in Variables})
 
 @item
-Assignable @code{$0} (@pxref{Changing Fields}).
+Assignable @code{$0} (@pxref{Changing Fields})
 
 @item
 The conditional expression using the ternary operator @samp{?:}
-(@pxref{Conditional Exp}).
+(@pxref{Conditional Exp})
 
 @item
-The expression @samp{@var{index-variable} in @var{array}} outside of @code{for}
-statements (@pxref{Reference to Elements}).
+The expression @samp{@var{indx} in @var{array}} outside of @code{for}
+statements (@pxref{Reference to Elements})
 
 @item
 The exponentiation operator @samp{^}
 (@pxref{Arithmetic Ops}) and its assignment operator
-form @samp{^=} (@pxref{Assignment Ops}).
+form @samp{^=} (@pxref{Assignment Ops})
 
 @item
 C-compatible operator precedence, which breaks some old @command{awk}
-programs (@pxref{Precedence}).
+programs (@pxref{Precedence})
 
 @item
 Regexps as the value of @code{FS}
 (@pxref{Field Separators}) and as the
 third argument to the @code{split()} function
 (@pxref{String Functions}), rather than using only the first character
-of @code{FS}.
+of @code{FS}
 
 @item
 Dynamic regexps as operands of the @samp{~} and @samp{!~} operators
-(@pxref{Regexp Usage}).
+(@pxref{Computed Regexps})
 
 @item
 The escape sequences @samp{\b}, @samp{\f}, and @samp{\r}
-(@pxref{Escape Sequences}).
-(Some vendors have updated their old versions of @command{awk} to
-recognize @samp{\b}, @samp{\f}, and @samp{\r}, but this is not
-something you can rely on.)
+(@pxref{Escape Sequences})
 
 @item
 Redirection of input for the @code{getline} function
-(@pxref{Getline}).
+(@pxref{Getline})
 
 @item
 Multiple @code{BEGIN} and @code{END} rules
-(@pxref{BEGIN/END}).
+(@pxref{BEGIN/END})
 
 @item
 Multidimensional arrays
-(@pxref{Multidimensional}).
+(@pxref{Multidimensional})
 @end itemize
-@c ENDOFRANGE gawkv1
 
 @node SVR4
 @appendixsec Changes Between SVR3.1 and SVR4
@@ -34236,54 +34807,54 @@ The System V Release 4 (1989) version of Unix @command{awk} added these features
 
 @itemize @value{BULLET}
 @item
-The @code{ENVIRON} array (@pxref{Built-in Variables}).
+The @code{ENVIRON} array (@pxref{Built-in Variables})
 @c gawk and MKS awk
 
 @item
 Multiple @option{-f} options on the command line
-(@pxref{Options}).
+(@pxref{Options})
 @c MKS awk
 
 @item
 The @option{-v} option for assigning variables before program execution begins
-(@pxref{Options}).
+(@pxref{Options})
 @c GNU, Bell Laboratories & MKS together
 
 @item
-The @option{--} option for terminating command-line options.
+The @option{--} signal for terminating command-line options
 
 @item
 The @samp{\a}, @samp{\v}, and @samp{\x} escape sequences
-(@pxref{Escape Sequences}).
+(@pxref{Escape Sequences})
 @c GNU, for ANSI C compat
 
 @item
 A defined return value for the @code{srand()} built-in function
-(@pxref{Numeric Functions}).
+(@pxref{Numeric Functions})
 
 @item
 The @code{toupper()} and @code{tolower()} built-in string functions
 for case translation
-(@pxref{String Functions}).
+(@pxref{String Functions})
 
 @item
 A cleaner specification for the @samp{%c} format-control letter in the
 @code{printf} function
-(@pxref{Control Letters}).
+(@pxref{Control Letters})
 
 @item
 The ability to dynamically pass the field width and precision (@code{"%*.*d"})
-in the argument list of the @code{printf} function
-(@pxref{Control Letters}).
+in the argument list of @code{printf} and @code{sprintf()}
+(@pxref{Control Letters})
 
 @item
 The use of regexp constants, such as @code{/foo/}, as expressions, where
 they are equivalent to using the matching operator, as in @samp{$0 ~ /foo/}
-(@pxref{Using Constant Regexps}).
+(@pxref{Using Constant Regexps})
 
 @item
 Processing of escape sequences inside command-line variable assignments
-(@pxref{Assignment Options}).
+(@pxref{Assignment Options})
 @end itemize
 
 @node POSIX
@@ -34297,23 +34868,23 @@ introduced the following changes into the language:
 @itemize @value{BULLET}
 @item
 The use of @option{-W} for implementation-specific options
-(@pxref{Options}).
+(@pxref{Options})
 
 @item
 The use of @code{CONVFMT} for controlling the conversion of numbers
-to strings (@pxref{Conversion}).
+to strings (@pxref{Conversion})
 
 @item
 The concept of a numeric string and tighter comparison rules to go
-with it (@pxref{Typing and Comparison}).
+with it (@pxref{Typing and Comparison})
 
 @item
-The use of built-in variables as function parameter names is forbidden
-(@pxref{Definition Syntax}.
+The use of predefined variables as function parameter names is forbidden
+(@pxref{Definition Syntax})
 
 @item
 More complete documentation of many of the previously undocumented
-features of the language.
+features of the language
 @end itemize
 
 In 2012, a number of extensions that had been commonly available for
@@ -34322,25 +34893,24 @@ many years were finally added to POSIX. They are:
 @itemize @value{BULLET}
 @item
 The @code{fflush()} built-in function for flushing buffered output
-(@pxref{I/O Functions}).
+(@pxref{I/O Functions})
 
 @item
 The @code{nextfile} statement
-(@pxref{Nextfile Statement}).
+(@pxref{Nextfile Statement})
 
 @item
 The ability to delete all of an array at once with @samp{delete @var{array}}
-(@pxref{Delete}).
+(@pxref{Delete})
 
 @end itemize
 
-@xref{Common Extensions}, for a list of common extensions
+@DBXREF{Common Extensions} for a list of common extensions
 not permitted by the POSIX standard.
 
 The 2008 POSIX standard can be found online at
 @url{http://www.opengroup.org/onlinepubs/9699919799/}.
 
-@c ENDOFRANGE gawkv
 
 @node BTL
 @appendixsec Extensions in Brian Kernighan's @command{awk}
@@ -34354,43 +34924,40 @@ has made his version available via his home page
 (@pxref{Other Versions}).
 
 This @value{SECTION} describes common extensions that
-originally appeared in his version of @command{awk}.
+originally appeared in his version of @command{awk}:
 
 @itemize @value{BULLET}
 @item
 The @samp{**} and @samp{**=} operators
 (@pxref{Arithmetic Ops}
 and
-@ref{Assignment Ops}).
+@ref{Assignment Ops})
 
 @item
 The use of @code{func} as an abbreviation for @code{function}
-(@pxref{Definition Syntax}).
+(@pxref{Definition Syntax})
 
 @item
 The @code{fflush()} built-in function for flushing buffered output
-(@pxref{I/O Functions}).
+(@pxref{I/O Functions})
 
 @ignore
 @item
 The @code{SYMTAB} array, that allows access to @command{awk}'s internal symbol
 table. This feature was never documented for his @command{awk}, largely because
 it is somewhat shakily implemented. For instance, you cannot access arrays
-or array elements through it.
+or array elements through it
 @end ignore
 @end itemize
 
-@xref{Common Extensions}, for a full list of the extensions
+@DBXREF{Common Extensions} for a full list of the extensions
 available in his @command{awk}.
 
 @node POSIX/GNU
 @appendixsec Extensions in @command{gawk} Not in POSIX @command{awk}
 
-@c STARTOFRANGE fripls
 @cindex compatibility mode (@command{gawk}), extensions
-@c STARTOFRANGE exgnot
 @cindex extensions, in @command{gawk}, not in POSIX @command{awk}
-@c STARTOFRANGE posnot
 @cindex POSIX, @command{gawk} extensions not included in
 The GNU implementation, @command{gawk}, adds a large number of features.
 They can all be disabled with either the @option{--traditional} or
@@ -34404,12 +34971,12 @@ in the current version of @command{gawk}.
 @itemize @value{BULLET}
 
 @item
-Additional built-in variables:
+Additional predefined variables:
 
 @itemize @value{MINUS}
 @item
 The
-@code{ARGIND}
+@code{ARGIND},
 @code{BINMODE},
 @code{ERRNO},
 @code{FIELDWIDTHS},
@@ -34421,7 +34988,7 @@ The
 and
 @code{TEXTDOMAIN}
 variables
-(@pxref{Built-in Variables}).
+(@pxref{Built-in Variables})
 @end itemize
 
 @item
@@ -34429,15 +34996,15 @@ Special files in I/O redirections:
 
 @itemize @value{MINUS}
 @item
-The @file{/dev/stdin}, @file{/dev/stdout}, @file{/dev/stderr} and
+The @file{/dev/stdin}, @file{/dev/stdout}, @file{/dev/stderr}, and
 @file{/dev/fd/@var{N}} special @value{FN}s
-(@pxref{Special Files}).
+(@pxref{Special Files})
 
 @item
 The @file{/inet}, @file{/inet4}, and @samp{/inet6} special files for
 TCP/IP networking using @samp{|&} to specify which version of the
-IP protocol to use.
-(@pxref{TCP/IP Networking}).
+IP protocol to use
+(@pxref{TCP/IP Networking})
 @end itemize
 
 @item
@@ -34446,37 +35013,41 @@ Changes and/or additions to the language:
 @itemize @value{MINUS}
 @item
 The @samp{\x} escape sequence
-(@pxref{Escape Sequences}).
+(@pxref{Escape Sequences})
 
 @item
 Full support for both POSIX and GNU regexps
-(@pxref{Regexp}).
+(@pxref{Regexp})
 
 @item
 The ability for @code{FS} and for the third
 argument to @code{split()} to be null strings
-(@pxref{Single Character Fields}).
+(@pxref{Single Character Fields})
 
 @item
 The ability for @code{RS} to be a regexp
-(@pxref{Records}).
+(@pxref{Records})
 
 @item
 The ability to use octal and hexadecimal constants in @command{awk}
 program source code
-(@pxref{Nondecimal-numbers}).
+(@pxref{Nondecimal-numbers})
 
 @item
 The @samp{|&} operator for two-way I/O to a coprocess
-(@pxref{Two-way I/O}).
+(@pxref{Two-way I/O})
 
 @item
 Indirect function calls
-(@pxref{Indirect Calls}).
+(@pxref{Indirect Calls})
 
 @item
 Directories on the command line produce a warning and are skipped
-(@pxref{Command-line directories}).
+(@pxref{Command-line directories})
+
+@item
+Output with @code{print} and @code{printf} need not be fatal
+(@pxref{Nonfatal})
 @end itemize
 
 @item
@@ -34484,20 +35055,12 @@ New keywords:
 
 @itemize @value{MINUS}
 @item
-The @code{BEGINFILE} and @code{ENDFILE} special patterns.
-(@pxref{BEGINFILE/ENDFILE}).
-
-@item
-The ability to delete all of an array at once with @samp{delete @var{array}}
-(@pxref{Delete}).
-
-@item
-The @code{nextfile} statement
-(@pxref{Nextfile Statement}).
+The @code{BEGINFILE} and @code{ENDFILE} special patterns
+(@pxref{BEGINFILE/ENDFILE})
 
 @item
 The @code{switch} statement
-(@pxref{Switch Statement}).
+(@pxref{Switch Statement})
 @end itemize
 
 @item
@@ -34507,30 +35070,30 @@ Changes to standard @command{awk} functions:
 @item
 The optional second argument to @code{close()} that allows closing one end
 of a two-way pipe to a coprocess
-(@pxref{Two-way I/O}).
+(@pxref{Two-way I/O})
 
 @item
-POSIX compliance for @code{gsub()} and @code{sub()}.
+POSIX compliance for @code{gsub()} and @code{sub()} with @option{--posix}
 
 @item
 The @code{length()} function accepts an array argument
 and returns the number of elements in the array
-(@pxref{String Functions}).
+(@pxref{String Functions})
 
 @item
 The optional third argument to the @code{match()} function
 for capturing text-matching subexpressions within a regexp
-(@pxref{String Functions}).
+(@pxref{String Functions})
 
 @item
 Positional specifiers in @code{printf} formats for
 making translations easier
-(@pxref{Printf Ordering}).
+(@pxref{Printf Ordering})
 
 @item
 The @code{split()} function's additional optional fourth
-argument which is an array to hold the text of the field separators.
-(@pxref{String Functions}).
+argument, which is an array to hold the text of the field separators
+(@pxref{String Functions})
 @end itemize
 
 @item
@@ -34538,6 +35101,20 @@ Additional functions only in @command{gawk}:
 
 @itemize @value{MINUS}
 @item
+The @code{gensub()}, @code{patsplit()}, and @code{strtonum()} functions
+for more powerful text manipulation
+(@pxref{String Functions})
+
+@item
+The @code{asort()} and @code{asorti()} functions for sorting arrays
+(@pxref{Array Sorting})
+
+@item
+The @code{mktime()}, @code{systime()}, and @code{strftime()}
+functions for working with timestamps
+(@pxref{Time Functions})
+
+@item
 The
 @code{and()},
 @code{compl()},
@@ -34547,34 +35124,24 @@ The
 and
 @code{xor()}
 functions for bit manipulation
-(@pxref{Bitwise Functions}).
+(@pxref{Bitwise Functions})
 @c In 4.1, and(), or() and xor() grew the ability to take > 2 arguments
 
 @item
-The @code{asort()} and @code{asorti()} functions for sorting arrays
-(@pxref{Array Sorting}).
+The @code{isarray()} function to check if a variable is an array or not
+(@pxref{Type Functions})
 
 @item
-The @code{bindtextdomain()}, @code{dcgettext()} and @code{dcngettext()}
+The @code{bindtextdomain()}, @code{dcgettext()}, and @code{dcngettext()}
 functions for internationalization
-(@pxref{Programmer i18n}).
+(@pxref{Programmer i18n})
 
 @item
-The @code{fflush()} function from BWK @command{awk}
-(@pxref{I/O Functions}).
-
-@item
-The @code{gensub()}, @code{patsplit()}, and @code{strtonum()} functions
-for more powerful text manipulation
-(@pxref{String Functions}).
-
-@item
-The @code{mktime()}, @code{systime()}, and @code{strftime()}
-functions for working with timestamps
-(@pxref{Time Functions}).
+The @code{intdiv()} function for doing integer
+division and remainder
+(@pxref{Numeric Functions})
 @end itemize
 
-
 @item
 Changes and/or additions in the command-line options:
 
@@ -34582,12 +35149,12 @@ Changes and/or additions in the command-line options:
 @item
 The @env{AWKPATH} environment variable for specifying a path search for
 the @option{-f} command-line option
-(@pxref{Options}).
+(@pxref{Options})
 
 @item
 The @env{AWKLIBPATH} environment variable for specifying a path search for
 the @option{-l} command-line option
-(@pxref{Options}).
+(@pxref{Options})
 
 @item
 The
@@ -34616,7 +35183,7 @@ The
 and
 @option{-V}
 short options. Also, the
-ability to use GNU-style long-named options that start with @option{--}
+ability to use GNU-style long-named options that start with @option{--},
 and the
 @option{--assign},
 @option{--bignum},
@@ -34696,8 +35263,8 @@ GCC for VAX and Alpha has not been tested for a while.
 @end itemize
 
 @item
-Support for the following obsolete systems was removed from the code
-and the documentation for @command{gawk} @value{PVERSION} 4.1:
+Support for the following obsolete system was removed from the code
+for @command{gawk} @value{PVERSION} 4.1:
 
 @c nested table
 @itemize @value{MINUS}
@@ -34706,16 +35273,19 @@ Ultrix
 @end itemize
 
 @item
-@c FIXME: Verify the version here.
-Support for MirBSD was removed at @command{gawk} @value{PVERSION} 4.2.
+Support for the following systems was removed from the code
+for @command{gawk} @value{PVERSION} 4.2:
+
+@c nested table
+@itemize @value{MINUS}
+@item
+MirBSD
+@end itemize
 
 @end itemize
 
 @c XXX ADD MORE STUFF HERE
 
-@c ENDOFRANGE fripls
-@c ENDOFRANGE exgnot
-@c ENDOFRANGE posnot
 
 @c This does not need to be in the formal book.
 @ifclear FOR_PRINT
@@ -35297,11 +35867,11 @@ load @command{awk} library files.
 @item
 The @option{-l} and @option{--load} options load compiled dynamic extensions.
 
-@item 
+@item
 The @option{-M} and @option{--bignum} options enable MPFR.
 
 @item
-The @option{-o} only does pretty-printing.
+The @option{-o} option only does pretty-printing.
 
 @item
 The @option{-p} option is used for profiling.
@@ -35324,6 +35894,44 @@ with a minimum of two
 The dynamic extension interface was completely redone
 (@pxref{Dynamic Extensions}).
 
+@item
+Support for Ultrix was removed.
+
+@end itemize
+
+Version 4.2 introduced the following changes:
+
+@itemize @bullet
+@item
+Changes to @code{ENVIRON} are reflected into @command{gawk}'s
+environment and that of programs that it runs.
+@xref{Auto-set}.
+
+@item
+The @option{--pretty-print} option no longer runs the @command{awk}
+program too.
+@xref{Options}.
+
+@item
+The @command{igawk} program and its manual page are no longer
+installed when @command{gawk} is built.
+@xref{Igawk Program}.
+
+@item
+The @code{intdiv()} function.
+@xref{Numeric Functions}.
+
+@item
+The maximum number of hexdecimal digits in @samp{\x} escapes
+is now two.
+@xref{Escape Sequences}.
+
+@item
+Nonfatal output with @code{print} and @code{printf}.
+@xref{Nonfatal}.
+
+@item
+Support for MirBSD was removed.
 @end itemize
 
 @c XXX ADD MORE STUFF HERE
@@ -35334,33 +35942,29 @@ The dynamic extension interface was completely redone
 
 @cindex extensions, Brian Kernighan's @command{awk}
 @cindex extensions, @command{mawk}
-This @value{SECTION} summarizes the common extensions supported
+The following table summarizes the common extensions supported
 by @command{gawk}, Brian Kernighan's @command{awk}, and @command{mawk},
-the three most widely-used freely available versions of @command{awk}
+the three most widely used freely available versions of @command{awk}
 (@pxref{Other Versions}).
 
-@multitable {@file{/dev/stderr} special file} {BWK Awk} {Mawk} {GNU Awk}
-@headitem Feature @tab BWK Awk @tab Mawk @tab GNU Awk
-@item @samp{\x} Escape sequence @tab X @tab X @tab X
-@item @code{FS} as null string @tab X @tab X @tab X
-@item @file{/dev/stdin} special file @tab X @tab X @tab X
-@item @file{/dev/stdout} special file @tab X @tab X @tab X
-@item @file{/dev/stderr} special file @tab X @tab X @tab X
-@item @code{delete} without subscript @tab X @tab X @tab X
-@item @code{fflush()} function @tab X @tab X @tab X
-@item @code{length()} of an array @tab X @tab X @tab X
-@item @code{nextfile} statement @tab X @tab X @tab X
-@item @code{**} and @code{**=} operators @tab X @tab @tab X
-@item @code{func} keyword @tab X @tab @tab X
-@item @code{BINMODE} variable @tab @tab X @tab X
-@item @code{RS} as regexp @tab @tab X @tab X
-@item Time related functions @tab @tab X @tab X
+@multitable {@file{/dev/stderr} special file} {BWK @command{awk}} {@command{mawk}} {@command{gawk}} {Now standard}
+@headitem Feature @tab BWK @command{awk} @tab @command{mawk} @tab @command{gawk} @tab Now standard
+@item @samp{\x} escape sequence @tab X @tab X @tab X @tab
+@item @code{FS} as null string @tab X @tab X @tab X @tab
+@item @file{/dev/stdin} special file @tab X @tab X @tab X @tab
+@item @file{/dev/stdout} special file @tab X @tab X @tab X @tab
+@item @file{/dev/stderr} special file @tab X @tab X @tab X @tab
+@item @code{delete} without subscript @tab X @tab X @tab X @tab X
+@item @code{fflush()} function @tab X @tab X @tab X @tab X
+@item @code{length()} of an array @tab X @tab X @tab X @tab
+@item @code{nextfile} statement @tab X @tab X @tab X @tab X
+@item @code{**} and @code{**=} operators @tab X @tab @tab X @tab
+@item @code{func} keyword @tab X @tab @tab X @tab
+@item @code{BINMODE} variable @tab @tab X @tab X @tab
+@item @code{RS} as regexp @tab @tab X @tab X @tab
+@item Time-related functions @tab @tab X @tab X @tab
 @end multitable
 
-(Technically speaking, as of late 2012, @code{fflush()}, @samp{delete @var{array}},
-and @code{nextfile} are no longer extensions, since they have been added
-to POSIX.)
-
 @node Ranges and Locales
 @appendixsec Regexp Ranges and Locales: A Long Sad Story
 
@@ -35374,9 +35978,9 @@ the first character in the range and the last character in the range,
 inclusive.  Ordering was based on the numeric value of each character
 in the machine's native character set.  Thus, on ASCII-based systems,
 @samp{[a-z]} matched all the lowercase letters, and only the lowercase
-letters, since the numeric values for the letters from @samp{a} through
+letters, as the numeric values for the letters from @samp{a} through
 @samp{z} were contiguous.  (On an EBCDIC system, the range @samp{[a-z]}
-includes additional, non-alphabetic characters as well.)
+includes additional nonalphabetic characters as well.)
 
 Almost all introductory Unix literature explained range expressions
 as working in this fashion, and in particular, would teach that the
@@ -35385,8 +35989,8 @@ that @samp{[A-Z]} was the ``correct'' way to match uppercase letters.
 And indeed, this was true.@footnote{And Life was good.}
 
 The 1992 POSIX standard introduced the idea of locales (@pxref{Locales}).
-Since many locales include other letters besides the plain twenty-six
-letters of the American English alphabet, the POSIX standard added
+Because many locales include other letters besides the plain 26
+letters of the English alphabet, the POSIX standard added
 character classes (@pxref{Bracket Expressions}) as a way to match
 different kinds of characters besides the traditional ones in the ASCII
 character set.
@@ -35397,14 +36001,15 @@ In the @code{"C"} and @code{"POSIX"} locales, a range expression like
 But outside those locales, the ordering was defined to be based on
 @dfn{collation order}.
 
+What does that mean?
 In many locales, @samp{A} and @samp{a} are both less than @samp{B}.
 In other words, these locales sort characters in dictionary order,
 and @samp{[a-dx-z]} is typically not equivalent to @samp{[abcdxyz]};
-instead it might be equivalent to @samp{[ABCXYabcdxyz]}, for example.
+instead, it might be equivalent to @samp{[ABCXYabcdxyz]}, for example.
 
-This point needs to be emphasized: Much literature teaches that you should
+This point needs to be emphasized: much literature teaches that you should
 use @samp{[a-z]} to match a lowercase character.  But on systems with
-non-ASCII locales, this also matched all of the uppercase characters
+non-ASCII locales, this also matches all of the uppercase characters
 except @samp{A} or @samp{Z}!  This was a continuous cause of confusion, even well
 into the twenty-first century.
 
@@ -35418,7 +36023,7 @@ $ @kbd{echo something1234abc | gawk-3.1.8 '@{ sub("[A-Z]*$", ""); print @}'}
 @end example
 
 @noindent
-This output is unexpected, since the @samp{bc} at the end of
+This output is unexpected, as the @samp{bc} at the end of
 @samp{something1234abc} should not normally match @samp{[A-Z]*}.
 This result is due to the locale setting (and thus you may not see
 it on your system).
@@ -35429,13 +36034,13 @@ is perfectly valid in ASCII, but is not valid in many Unicode locales,
 such as @code{en_US.UTF-8}.
 
 Early versions of @command{gawk} used regexp matching code that was not
-locale aware, so ranges had their traditional interpretation.
+locale-aware, so ranges had their traditional interpretation.
 
 When @command{gawk} switched to using locale-aware regexp matchers,
 the problems began; especially as both GNU/Linux and commercial Unix
 vendors started implementing non-ASCII locales, @emph{and making them
 the default}.  Perhaps the most frequently asked question became something
-like ``why does @samp{[A-Z]} match lowercase letters?!?''
+like, ``Why does @samp{[A-Z]} match lowercase letters?!?''
 
 @cindex Berry, Karl
 This situation existed for close to 10 years, if not more, and
@@ -35445,7 +36050,7 @@ was in the user's locale.  During the development of @value{PVERSION} 4.0,
 he modified @command{gawk} to always treat ranges in the original,
 pre-POSIX fashion, unless @option{--posix} was used (@pxref{Options}).@footnote{And
 thus was born the Campaign for Rational Range Interpretation (or
-RRI). A number of GNU tools have either implemented this change,
+RRI). A number of GNU tools have already implemented this change,
 or will soon.  Thanks to Karl Berry for coining the phrase ``Rational
 Range Interpretation.''}
 
@@ -35459,9 +36064,10 @@ and
 
 By using this lovely technical term, the standard gives license
 to implementors to implement ranges in whatever way they choose.
-The @command{gawk} maintainer chose to apply the pre-POSIX meaning in all
-cases: the default regexp matching; with @option{--traditional} and with
-@option{--posix}; in all cases, @command{gawk} remains POSIX compliant.
+The @command{gawk} maintainer chose to apply the pre-POSIX meaning
+both with the default regexp matching and when @option{--traditional} or
+@option{--posix} are used.
+In all cases @command{gawk} remains POSIX-compliant.
 
 @node Contributors
 @appendixsec Major Contributors to @command{gawk}
@@ -35507,7 +36113,7 @@ to around 90 pages.
 Richard Stallman
 helped finish the implementation and the initial draft of this
 @value{DOCUMENT}.
-He is also the founder of the FSF and the GNU project.
+He is also the founder of the FSF and the GNU Project.
 
 @item
 @cindex Woods, John
@@ -35594,7 +36200,7 @@ the various PC platforms.
 @cindex Zoulas, Christos
 Christos Zoulas
 provided the @code{extension()}
-built-in function for dynamically adding new modules.
+built-in function for dynamically adding new functions.
 (This was obsoleted at @command{gawk} 4.1.)
 
 @item
@@ -35653,7 +36259,7 @@ Michael Benzinger contributed the initial code for @code{switch} statements.
 @cindex McPhee, Patrick
 Patrick T.J.@: McPhee contributed the code for dynamic loading in Windows32
 environments.
-(This is no longer supported)
+(This is no longer supported.)
 
 @item
 @cindex Wallin, Anders
@@ -35671,28 +36277,28 @@ John Haque made the following contributions:
 @itemize @value{MINUS}
 @item
 The modifications to convert @command{gawk}
-into a byte-code interpreter, including the debugger.
+into a byte-code interpreter, including the debugger
 
 @item
-The addition of true arrays of arrays.
+The addition of true arrays of arrays
 
 @item
-The additional modifications for support of arbitrary precision arithmetic.
+The additional modifications for support of arbitrary-precision arithmetic
 
 @item
 The initial text of
-@ref{Arbitrary Precision Arithmetic}.
+@ref{Arbitrary Precision Arithmetic}
 
 @item
 The work to merge the three versions of @command{gawk}
-into one, for the 4.1 release.
+into one, for the 4.1 release
 
 @item
-Improved array internals for arrays indexed by integers.
+Improved array internals for arrays indexed by integers
 
 @item
-The improved array sorting features were driven by John together
-with Pat Rankin.
+The improved array sorting features were also driven by John, together
+with Pat Rankin
 @end itemize
 
 @cindex Papadopoulos, Panos
@@ -35710,6 +36316,11 @@ The development of the extension API first released with
 Arnold Robbins and Andrew Schorr, with notable contributions from
 the rest of the development team.
 
+@cindex Malmberg, John E.
+@item
+John Malmberg contributed significant improvements to the
+OpenVMS port and the related documentation.
+
 @item
 @cindex Colombo, Antonio
 Antonio Giovanni Colombo rewrote a number of examples in the early
@@ -35728,10 +36339,10 @@ helping David Trueman, and as the primary maintainer since around 1994.
 @itemize @value{BULLET}
 @item
 The @command{awk} language has evolved over time. The first release
-was with V7 Unix circa 1978.  In 1987 for System V Release 3.1,
+was with V7 Unix, circa 1978.  In 1987, for System V Release 3.1,
 major additions, including user-defined functions, were made to the language.
 Additional changes were made for System V Release 4, in 1989.
-Since then, further minor changes happen under the auspices of the
+Since then, further minor changes have happened under the auspices of the
 POSIX standard.
 
 @item
@@ -35747,7 +36358,7 @@ options.
 The interaction of POSIX locales and regexp matching in @command{gawk} has been confusing over
 the years. Today, @command{gawk} implements Rational Range Interpretation, where
 ranges of the form @samp{[a-z]} match @emph{only} the characters numerically between
-@samp{a} through @samp{z} in the machine's native character set.  Usually this is ASCII
+@samp{a} through @samp{z} in the machine's native character set.  Usually this is ASCII,
 but it can be EBCDIC on IBM S/390 systems.
 
 @item
@@ -35762,16 +36373,14 @@ the appropriate credit where credit is due.
 
 @c last two commas are part of see also
 @cindex operating systems, See Also GNU/Linux@comma{} PC operating systems@comma{} Unix
-@c STARTOFRANGE gligawk
 @cindex @command{gawk}, installing
-@c STARTOFRANGE ingawk
 @cindex installing @command{gawk}
 This appendix provides instructions for installing @command{gawk} on the
 various platforms that are supported by the developers.  The primary
 developer supports GNU/Linux (and Unix), whereas the other ports are
 contributed.
-@xref{Bugs},
-for the electronic mail addresses of the people who did
+@DBXREF{Bugs}
+for the email addresses of the people who maintain
 the respective ports.
 
 @menu
@@ -35825,7 +36434,7 @@ wget http://ftp.gnu.org/gnu/gawk/gawk-@value{VERSION}.@value{PATCHLEVEL}.tar.gz
 
 The GNU software archive is mirrored around the world.
 The up-to-date list of mirror sites is available from
-@uref{http://www.gnu.org/order/ftp.html, the main FSF web site}.
+@uref{http://www.gnu.org/order/ftp.html, the main FSF website}.
 Try to use one of the mirrors; they
 will be less busy, and you can usually find one closer to your site.
 
@@ -35834,9 +36443,9 @@ will be less busy, and you can usually find one closer to your site.
 @command{gawk} is distributed as several @code{tar} files compressed with
 different compression programs: @command{gzip}, @command{bzip2},
 and @command{xz}. For simplicity, the rest of these instructions assume
-you are using the one compressed with the GNU Zip program, @code{gzip}.
+you are using the one compressed with the GNU Gzip program (@command{gzip}).
 
-Once you have the distribution (for example,
+Once you have the distribution (e.g.,
 @file{gawk-@value{VERSION}.@value{PATCHLEVEL}.tar.gz}),
 use @code{gzip} to expand the
 file and then use @code{tar} to extract it.  You can use the following
@@ -35874,7 +36483,6 @@ a local expert.
 
 @node Distribution contents
 @appendixsubsec Contents of the @command{gawk} Distribution
-@c STARTOFRANGE gawdis
 @cindex @command{gawk}, distribution
 
 The @command{gawk} distribution has a number of C source files,
@@ -35886,12 +36494,12 @@ operating systems:
 
 @table @asis
 @item Various @samp{.c}, @samp{.y}, and @samp{.h} files
-The actual @command{gawk} source code.
+These files contain the actual @command{gawk} source code.
 @end table
 
 @table @file
 @item ABOUT-NLS
-Information about GNU @command{gettext} and translations.
+A file containing information about GNU @command{gettext} and translations.
 
 @item AUTHORS
 A file with some information about the authorship of @command{gawk}.
@@ -35921,7 +36529,7 @@ An older list of changes to @command{gawk}.
 The GNU General Public License.
 
 @item POSIX.STD
-A description of behaviors in the POSIX standard for @command{awk} which
+A description of behaviors in the POSIX standard for @command{awk} that
 are left undefined, or where @command{gawk} may not comply fully, as well
 as a list of things that the POSIX standard should describe but does not.
 
@@ -35929,7 +36537,7 @@ as a list of things that the POSIX standard should describe but does not.
 @item doc/awkforai.txt
 Pointers to the original draft of
 a short article describing why @command{gawk} is a good language for
-Artificial Intelligence (AI) programming.
+artificial intelligence (AI) programming.
 
 @item doc/bc_notes
 A brief description of @command{gawk}'s ``byte code'' internals.
@@ -35972,10 +36580,10 @@ The generated Info file for this @value{DOCUMENT}.
 @item doc/gawkinet.texi
 The Texinfo source file for
 @ifinfo
-@inforef{Top, , General Introduction, gawkinet, TCP/IP Internetworking with @command{gawk}}.
+@inforef{Top, , General Introduction, gawkinet, @value{GAWKINETTITLE}}.
 @end ifinfo
 @ifnotinfo
-@cite{TCP/IP Internetworking with @command{gawk}}.
+@cite{@value{GAWKINETTITLE}}.
 @end ifnotinfo
 It should be processed with @TeX{}
 (via @command{texi2dvi} or @command{texi2pdf})
@@ -35984,7 +36592,7 @@ with @command{makeinfo} to produce an Info or HTML file.
 
 @item doc/gawkinet.info
 The generated Info file for
-@cite{TCP/IP Internetworking with @command{gawk}}.
+@cite{@value{GAWKINETTITLE}}.
 
 @item doc/igawk.1
 The @command{troff} source for a manual page describing the @command{igawk}
@@ -36046,6 +36654,12 @@ The source code, manual pages, and infrastructure files for
 the sample extensions included with @command{gawk}.
 @xref{Dynamic Extensions}, for more information.
 
+@item extras/*
+Additional non-essential files.  Currently, this directory contains some shell
+startup files to be installed in @file{/etc/profile.d} to aid in manipulating
+the @env{AWKPATH} and @env{AWKLIBPATH} environment variables.
+@xref{Shell Startup Files}, for more information.
+
 @item posix/*
 Files needed for building @command{gawk} on POSIX-compliant systems.
 
@@ -36054,11 +36668,11 @@ Files needed for building @command{gawk} under MS-Windows
 @ifclear FOR_PRINT
 and OS/2
 @end ifclear
-(@pxref{PC Installation}, for details).
+(@DBPXREF{PC Installation} for details).
 
 @item vms/*
 Files needed for building @command{gawk} under Vax/VMS and OpenVMS
-(@pxref{VMS Installation}, for details).
+(@DBPXREF{VMS Installation} for details).
 
 @item test/*
 A test suite for
@@ -36067,10 +36681,9 @@ directory to run your version of @command{gawk} against the test suite.
 If @command{gawk} successfully passes @samp{make check}, then you can
 be confident of a successful port.
 @end table
-@c ENDOFRANGE gawdis
 
 @node Unix Installation
-@appendixsec Compiling and Installing @command{gawk} on Unix-like Systems
+@appendixsec Compiling and Installing @command{gawk} on Unix-Like Systems
 
 Usually, you can compile and install @command{gawk} by typing only two
 commands.  However, if you use an unusual system, you may need
@@ -36078,30 +36691,30 @@ to configure @command{gawk} for your system yourself.
 
 @menu
 * Quick Installation::               Compiling @command{gawk} under Unix.
+* Shell Startup Files::              Shell convenience functions.
 * Additional Configuration Options:: Other compile-time options.
 * Configuration Philosophy::         How it's all supposed to work.
 @end menu
 
 @node Quick Installation
-@appendixsubsec Compiling @command{gawk} for Unix-like Systems
+@appendixsubsec Compiling @command{gawk} for Unix-Like Systems
 
 The normal installation steps should work on all modern commercial
 Unix-derived systems, GNU/Linux, BSD-based systems, and the Cygwin
 environment for MS-Windows.
 
 After you have extracted the @command{gawk} distribution, @command{cd}
-to @file{gawk-@value{VERSION}.@value{PATCHLEVEL}}.  Like most GNU software,
-@command{gawk} is configured
-automatically for your system by running the @command{configure} program.
-This program is a Bourne shell script that is generated automatically using
-GNU Autoconf.
+to @file{gawk-@value{VERSION}.@value{PATCHLEVEL}}.  As with most GNU
+software, you configure @command{gawk} for your system by running the
+@command{configure} program.  This program is a Bourne shell script that
+is generated automatically using GNU Autoconf.
 @ifnotinfo
 (The Autoconf software is
 described fully in
 @cite{Autoconf---Generating Automatic Configuration Scripts},
 which can be found online at
 @uref{http://www.gnu.org/software/autoconf/manual/index.html,
-the Free Software Foundation's web site}.)
+the Free Software Foundation's website}.)
 @end ifnotinfo
 @ifinfo
 (The Autoconf software is described fully starting with
@@ -36148,7 +36761,7 @@ run @samp{make check}.  All of the tests should succeed.
 If these steps do not work, or if any of the tests fail,
 check the files in the @file{README_d} directory to see if you've
 found a known problem.  If the failure is not described there,
-please send in a bug report (@pxref{Bugs}).
+send in a bug report (@pxref{Bugs}).
 
 Of course, once you've built @command{gawk}, it is likely that you will
 wish to install it.  To do so, you need to run the command @samp{make
@@ -36159,6 +36772,44 @@ is likely that you will be asked for your password, and you will have
 to have been set up previously as a user who is allowed to run the
 @command{sudo} command.
 
+@node Shell Startup Files
+@appendixsubsec Shell Startup Files
+
+The distribution contains shell startup files @file{gawk.sh} and
+@file{gawk.csh} containing functions to aid in manipulating
+the @env{AWKPATH} and @env{AWKLIBPATH} environment variables.
+On a Fedora system, these files should be installed in @file{/etc/profile.d};
+on other platforms, the appropriate location may be different.
+
+@table @command
+
+@cindex @command{gawkpath_default} shell function
+@item gawkpath_default
+Reset the @env{AWKPATH} environment variable to its default value.
+
+@cindex @command{gawkpath_prepend} shell function
+@item gawkpath_prepend
+Add the argument to the front of the @env{AWKPATH} environment variable.
+
+@cindex @command{gawkpath_append} shell function
+@item gawkpath_append
+Add the argument to the end of the @env{AWKPATH} environment variable.
+
+@cindex @command{gawklibpath_default} shell function
+@item gawklibpath_default
+Reset the @env{AWKLIBPATH} environment variable to its default value.
+
+@cindex @command{gawklibpath_prepend} shell function
+@item gawklibpath_prepend
+Add the argument to the front of the @env{AWKLIBPATH} environment variable.
+
+@cindex @command{gawklibpath_append} shell function
+@item gawklibpath_append
+Add the argument to the end of the @env{AWKLIBPATH} environment variable.
+
+@end table
+
+
 @node Additional Configuration Options
 @appendixsubsec Additional Configuration Options
 @cindex @command{gawk}, configuring, options
@@ -36180,7 +36831,7 @@ can be configured and compiled.
 @cindex @option{--disable-lint} configuration option
 @cindex configuration option, @code{--disable-lint}
 @item --disable-lint
-Disable all lint checking within @code{gawk}.  The
+Disable all lint checking within @command{gawk}.  The
 @option{--lint} and @option{--lint-old} options
 (@pxref{Options})
 are accepted, but silently do nothing.
@@ -36188,14 +36839,17 @@ Similarly, setting the @code{LINT} variable
 (@pxref{User-modified})
 has no effect on the running @command{awk} program.
 
-When used with GCC's automatic dead-code-elimination, this option
-cuts almost 200K bytes off the size of the @command{gawk}
-executable on GNU/Linux x86 systems.  Results on other systems and
+When used with the GNU Compiler Collection's (GCC's)
+automatic dead-code-elimination, this option
+cuts almost 23K bytes off the size of the @command{gawk}
+executable on GNU/Linux x86_64 systems.  Results on other systems and
 with other compilers are likely to vary.
 Using this option may bring you some slight performance improvement.
 
+@quotation CAUTION
 Using this option will cause some of the tests in the test suite
 to fail.  This option may be removed at a later date.
+@end quotation
 
 @cindex @option{--disable-nls} configuration option
 @cindex configuration option, @code{--disable-nls}
@@ -36212,7 +36866,7 @@ function for deficient systems.
 @end table
 
 Use the command @samp{./configure --help} to see the full list of
-options that @command{configure} supplies.
+options supplied by @command{configure}.
 
 @node Configuration Philosophy
 @appendixsubsec The Configuration Process
@@ -36246,19 +36900,19 @@ facts about your operating system.  For example, there may not be an
 @cindex @code{custom.h} file
 It is possible for your C compiler to lie to @command{configure}. It may
 do so by not exiting with an error when a library function is not
-available.  To get around this, edit the file @file{custom.h}.
+available.  To get around this, edit the @file{custom.h} file.
 Use an @samp{#ifdef} that is appropriate for your system, and either
 @code{#define} any constants that @command{configure} should have defined but
 didn't, or @code{#undef} any constants that @command{configure} defined and
-should not have.  @file{custom.h} is automatically included by
-@file{config.h}.
+should not have.  The @file{custom.h} file is automatically included by
+the @file{config.h} file.
 
 It is also possible that the @command{configure} program generated by
 Autoconf will not work on your system in some other fashion.
-If you do have a problem, the file @file{configure.ac} is the input for
+If you do have a problem, the @file{configure.ac} file is the input for
 Autoconf.  You may be able to change this file and generate a
 new version of @command{configure} that works on your system
-(@pxref{Bugs},
+(@DBPXREF{Bugs}
 for information on how to report problems in configuring @command{gawk}).
 The same mechanism may be used to send in updates to @file{configure.ac}
 and/or @file{custom.h}.
@@ -36283,7 +36937,8 @@ various non-Unix systems.
 
 @cindex PC operating systems@comma{} @command{gawk} on, installing
 @cindex operating systems, PC@comma{} @command{gawk} on, installing
-This @value{SECTION} covers installation and usage of @command{gawk} on x86 machines
+This @value{SECTION} covers installation and usage of @command{gawk}
+on Intel architecture machines
 @ifclear FOR_PRINT
 running MS-DOS, any version of MS-Windows, or OS/2.
 @end ifclear
@@ -36291,13 +36946,13 @@ running MS-DOS, any version of MS-Windows, or OS/2.
 running MS-DOS and any version of MS-Windows.
 @end ifset
 In this @value{SECTION}, the term ``Windows32''
-refers to any of Microsoft Windows-95/98/ME/NT/2000/XP/Vista/7/8.
+refers to any of Microsoft Windows 95/98/ME/NT/2000/XP/Vista/7/8.
 
 The limitations of MS-DOS (and MS-DOS shells under the other operating
-systems) has meant that various ``DOS extenders'' are often used with
+systems) have meant that various ``DOS extenders'' are often used with
 programs such as @command{gawk}.  The varying capabilities of Microsoft
 Windows 3.1 and Windows32 can add to the confusion.  For an overview
-of the considerations, please refer to @file{README_d/README.pc} in
+of the considerations, refer to @file{README_d/README.pc} in
 the distribution.
 
 @menu
@@ -36385,7 +37040,8 @@ MS-DOS and Windows32 versions.  A list of targets is printed if the
 build @command{gawk} using the DJGPP tools, enter @samp{make djgpp}.
 (The DJGPP tools needed for the build may be found at
 @uref{ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/}.)  To build a
-native MS-Windows binary of @command{gawk}, type @samp{make mingw32}.
+native MS-Windows binary of @command{gawk} using the MinGW tools,
+type @samp{make mingw32}.
 
 @ifclear FOR_PRINT
 @cindex compiling @command{gawk} with EMX for OS/2
@@ -36459,7 +37115,7 @@ Ancient OS/2 ports of GNU @command{make} are not able to handle
 the Makefiles of this package.  If you encounter any problems with
 @command{make}, try GNU Make 3.79.1 or later versions.  You should
 find the latest version on
-@uref{ftp://hobbes.nmsu.edu/pub/os2/}.@footnote{As of May, 2014,
+@uref{ftp://hobbes.nmsu.edu/pub/os2/}.@footnote{As of November 2014,
 this site is still there, but the author could not find a package
 for GNU Make.}
 @end quotation
@@ -36492,9 +37148,7 @@ multibyte functionality is not available.
 
 @node PC Using
 @appendixsubsubsec Using @command{gawk} on PC Operating Systems
-@c STARTOFRANGE opgawx
 @cindex operating systems, PC, @command{gawk} on
-@c STARTOFRANGE pcgawon
 @cindex PC operating systems, @command{gawk} on
 
 Under MS-DOS and MS-Windows, the Cygwin and MinGW environments support
@@ -36508,15 +37162,14 @@ EMX (OS/2 only) supports at least the @samp{|&} operator.
 @cindex search paths, for source files
 @cindex @command{gawk}, MS-DOS version of
 @cindex @command{gawk}, MS-Windows version of
-@cindex @code{;} (semicolon), @code{AWKPATH} variable and
-@cindex semicolon (@code{;}), @code{AWKPATH} variable and
+@cindex @code{;} (semicolon), @env{AWKPATH} variable and
+@cindex semicolon (@code{;}), @env{AWKPATH} variable and
 @cindex @env{AWKPATH} environment variable
 The MS-DOS and MS-Windows versions of @command{gawk} search for
 program files as described in @ref{AWKPATH Variable}.  However,
 semicolons (rather than colons) separate elements in the @env{AWKPATH}
 variable.  If @env{AWKPATH} is not set or is empty, then the default
-search path for MS-Windows and MS-DOS versions is
-@samp{@w{.;c:/lib/awk;c:/gnu/lib/awk}}.
+search path is @samp{@w{.;c:/lib/awk;c:/gnu/lib/awk}}.
 
 @ifclear FOR_PRINT
 @cindex @command{gawk}, OS/2 version of
@@ -36555,18 +37208,18 @@ Under MS-Windows, OS/2 and MS-DOS,
 Under MS-Windows and MS-DOS,
 @end ifset
 @command{gawk} (and many other text programs) silently
-translate end-of-line @samp{\r\n} to @samp{\n} on input and @samp{\n}
+translates end-of-line @samp{\r\n} to @samp{\n} on input and @samp{\n}
 to @samp{\r\n} on output.  A special @code{BINMODE} variable @value{COMMONEXT}
 allows control over these translations and is interpreted as follows:
 
 @itemize @value{BULLET}
 @item
-If @code{BINMODE} is @code{"r"}, or one,
+If @code{BINMODE} is @code{"r"} or one,
 then
 binary mode is set on read (i.e., no translations on reads).
 
 @item
-If @code{BINMODE} is @code{"w"}, or two,
+If @code{BINMODE} is @code{"w"} or two,
 then
 binary mode is set on write (i.e., no translations on writes).
 
@@ -36589,7 +37242,7 @@ Setting @code{BINMODE} for standard input or
 standard output is accomplished by using an
 appropriate @samp{-v BINMODE=@var{N}} option on the command line.
 @code{BINMODE} is set at the time a file or pipe is opened and cannot be
-changed mid-stream.
+changed midstream.
 
 The name @code{BINMODE} was chosen to match @command{mawk}
 (@pxref{Other Versions}).
@@ -36645,8 +37298,8 @@ moved into the @code{BEGIN} rule.
 
 @command{gawk} can be built and used ``out of the box'' under MS-Windows
 if you are using the @uref{http://www.cygwin.com, Cygwin environment}.
-This environment provides an excellent simulation of GNU/Linux, using the
-GNU tools, such as Bash, the GNU Compiler Collection (GCC), GNU Make,
+This environment provides an excellent simulation of GNU/Linux, using
+Bash, GCC, GNU Make,
 and other GNU programs.  Compilation and installation for Cygwin is the
 same as for a Unix system:
 
@@ -36654,7 +37307,7 @@ same as for a Unix system:
 tar -xvpzf gawk-@value{VERSION}.@value{PATCHLEVEL}.tar.gz
 cd gawk-@value{VERSION}.@value{PATCHLEVEL}
 ./configure
-make
+make && make check
 @end example
 
 When compared to GNU/Linux on the same system, the @samp{configure}
@@ -36665,15 +37318,15 @@ and then the @samp{make} proceeds as usual.
 @appendixsubsubsec Using @command{gawk} In The MSYS Environment
 
 In the MSYS environment under MS-Windows, @command{gawk} automatically
-uses binary mode for reading and writing files.  Thus there is no
+uses binary mode for reading and writing files.  Thus, there is no
 need to use the @code{BINMODE} variable.
 
 This can cause problems with other Unix-like components that have
 been ported to MS-Windows that expect @command{gawk} to do automatic
-translation of @code{"\r\n"}, since it won't.  Caveat Emptor!
+translation of @code{"\r\n"}, because it won't.
 
 @node VMS Installation
-@appendixsubsec How to Compile and Install @command{gawk} on Vax/VMS and OpenVMS
+@appendixsubsec Compiling and Installing @command{gawk} on Vax/VMS and OpenVMS
 
 @c based on material from Pat Rankin <rankin@eql.caltech.edu>
 @c now rankin@pactechdata.com
@@ -36729,19 +37382,19 @@ With ODS-5 volumes and extended parsing enabled, the case of the target
 parameter may need to be exact.
 
 @command{gawk} has been tested under VAX/VMS 7.3 and Alpha/VMS 7.3-1
-using Compaq C V6.4, and Alpha/VMS 7.3, Alpha/VMS 7.3-2, and IA64/VMS 8.3.
+using Compaq C V6.4, and under Alpha/VMS 7.3, Alpha/VMS 7.3-2, and IA64/VMS 8.3.
 The most recent builds used HP C V7.3 on Alpha VMS 8.3 and both
 Alpha and IA64 VMS 8.4 used HP C 7.3.@footnote{The IA64 architecture
 is also known as ``Itanium.''}
 
-@xref{VMS GNV}, for information on building
+@DBXREF{VMS GNV} for information on building
 @command{gawk} as a PCSI kit that is compatible with the GNV product.
 
 @node VMS Dynamic Extensions
 @appendixsubsubsec Compiling @command{gawk} Dynamic Extensions on VMS
 
 The extensions that have been ported to VMS can be built using one of
-the following commands.
+the following commands:
 
 @example
 $ @kbd{MMS/DESCRIPTION=[.vms]descrip.mms extensions}
@@ -36758,7 +37411,7 @@ $ @kbd{MMK/DESCRIPTION=[.vms]descrip.mms extensions}
 or a logical name to find the dynamic extensions.
 
 Dynamic extensions need to be compiled with the same compiler options for
-floating point, pointer size, and symbol name handling as were used
+floating-point, pointer size, and symbol name handling as were used
 to compile @command{gawk} itself.
 Alpha and Itanium should use IEEE floating point.  The pointer size is 32 bits,
 and the symbol name handling should be exact case with CRC shortening for
@@ -36777,8 +37430,8 @@ For VAX:
 /name=(as_is,short)
 @end example
 
-Compile time macros need to be defined before the first VMS-supplied
-header file is included.
+Compile-time macros need to be defined before the first VMS-supplied
+header file is included, as follows:
 
 @example
 #if (__CRTL_VER >= 70200000) && !defined (__VAX)
@@ -36794,6 +37447,11 @@ header file is included.
 #endif
 @end example
 
+If you are writing your own extensions to run on VMS, you must supply these
+definitions yourself. The @file{config.h} file created when building @command{gawk}
+on VMS does this for you; if instead you use that file or a similar one, then you
+must remember to include it before any VMS-supplied header files.
+
 @node VMS Installation Details
 @appendixsubsubsec Installing @command{gawk} on VMS
 
@@ -36819,7 +37477,7 @@ If your @command{gawk} was installed by a PCSI kit into the
 @file{GNV$GNU:[vms_help]gawk.hlp}.
 
 The PCSI kit also installs a @file{GNV$GNU:[vms_bin]gawk_verb.cld} file
-which can be used to add @command{gawk} and @command{awk} as DCL commands.
+that can be used to add @command{gawk} and @command{awk} as DCL commands.
 
 For just the current process you can use:
 
@@ -36828,7 +37486,7 @@ $ @kbd{set command gnv$gnu:[vms_bin]gawk_verb.cld}
 @end example
 
 Or the system manager can use @file{GNV$GNU:[vms_bin]gawk_verb.cld} to
-add the @command{gawk} and @command{awk} to the system wide @samp{DCLTABLES}.
+add the @command{gawk} and @command{awk} to the system-wide @samp{DCLTABLES}.
 
 The DCL syntax is documented in the @file{gawk.hlp} file.
 
@@ -36883,25 +37541,25 @@ Note that uppercase and mixed-case text must be quoted.
 The VMS port of @command{gawk} includes a @code{DCL}-style interface in addition
 to the original shell-style interface (see the help entry for details).
 One side effect of dual command-line parsing is that if there is only a
-single parameter (as in the quoted string program above), the command
+single parameter (as in the quoted string program), the command
 becomes ambiguous.  To work around this, the normally optional @option{--}
 flag is required to force Unix-style parsing rather than @code{DCL} parsing.  If any
 other dash-type options (or multiple parameters such as @value{DF}s to
 process) are present, there is no ambiguity and @option{--} can be omitted.
 
 @cindex exit status, of VMS
-The @code{exit} value is a Unix-style value and is encoded to a VMS exit
+The @code{exit} value is a Unix-style value and is encoded into a VMS exit
 status value when the program exits.
 
 The VMS severity bits will be set based on the @code{exit} value.
-A failure is indicated by 1 and VMS sets the @code{ERROR} status.
-A fatal error is indicated by 2 and VMS will set the @code{FATAL} status.
+A failure is indicated by 1, and VMS sets the @code{ERROR} status.
+A fatal error is indicated by 2, and VMS sets the @code{FATAL} status.
 All other values will have the @code{SUCCESS} status.  The exit value is
 encoded to comply with VMS coding standards and will have the
 @code{C_FACILITY_NO} of @code{0x350000} with the constant @code{0xA000}
 added to the number shifted over by 3 bits to make room for the severity codes.
 
-To extract the actual @command{gawk} exit code from the VMS status use:
+To extract the actual @command{gawk} exit code from the VMS status, use:
 
 @example
 unix_status = (vms_status .and. &x7f8) / 8
@@ -36911,7 +37569,7 @@ unix_status = (vms_status .and. &x7f8) / 8
 A C program that uses @code{exec()} to call @command{gawk} will get the original
 Unix-style exit value.
 
-Older versions of @command{gawk} treated a Unix exit code 0 as 1, a failure
+Older versions of @command{gawk} for VMS treated a Unix exit code 0 as 1, a failure
 as 2, a fatal error as 4, and passed all the other numbers through.
 This violated the VMS exit status coding requirements.
 
@@ -36920,7 +37578,7 @@ VAX/VMS floating point uses unbiased rounding. @xref{Round Function}.
 
 VMS reports time values in GMT unless one of the @code{SYS$TIMEZONE_RULE}
 or @code{TZ} logical names is set.  Older versions of VMS, such as VAX/VMS
-7.3 do not set these logical names.
+7.3, do not set these logical names.
 
 @c @cindex directory search
 @c @cindex path, search
@@ -36938,15 +37596,15 @@ translation and not a multitranslation @code{RMS} searchlist.
 
 The VMS GNV package provides a build environment similar to POSIX with ports
 of a collection of open source tools.  The @command{gawk} found in the GNV
-base kit is an older port.  Currently the GNV project is being reorganized
+base kit is an older port.  Currently, the GNV project is being reorganized
 to supply individual PCSI packages for each component.
 See @w{@uref{https://sourceforge.net/p/gnv/wiki/InstallingGNVPackages/}.}
 
 The normal build procedure for @command{gawk} produces a program that
 is suitable for use with GNV.
 
-The @file{vms/gawk_build_steps.txt} in the source documents the procedure
-for building a VMS PCSI kit that is compatible with GNV.
+The file @file{vms/gawk_build_steps.txt} in the distribution documents
+the procedure for building a VMS PCSI kit that is compatible with GNV.
 
 @ignore
 @c The VMS POSIX product, also known as POSIX for OpenVMS, is long defunct
@@ -36998,128 +37656,116 @@ $ @kbd{gawk :== $sys$common:[syshlp.examples.tcpip.snmp]gawk.exe}
 This is apparently @value{PVERSION} 2.15.6, which is extremely old. We
 recommend compiling and using the current version.
 
-@c ENDOFRANGE opgawx
-@c ENDOFRANGE pcgawon
 
 @node Bugs
 @appendixsec Reporting Problems and Bugs
-@cindex archeologists
+@cindex archaeologists
 @quotation
-@i{There is nothing more dangerous than a bored archeologist.}
-@author The Hitchhiker's Guide to the Galaxy
+@i{There is nothing more dangerous than a bored archaeologist.}
+@author Douglas Adams, @cite{The Hitchhiker's Guide to the Galaxy}
 @end quotation
 @c the radio show, not the book. :-)
 
-@c STARTOFRANGE dbugg
 @cindex debugging @command{gawk}, bug reports
-@c STARTOFRANGE tblgawb
 @cindex troubleshooting, @command{gawk}, bug reports
 If you have problems with @command{gawk} or think that you have found a bug,
-please report it to the developers; we cannot promise to do anything
+report it to the developers; we cannot promise to do anything,
 but we might well want to fix it.
 
-Before reporting a bug, make sure you have actually found a real bug.
-Carefully reread the documentation and see if it really says you can do
+Before reporting a bug, make sure you have really found a genuine bug.
+Carefully reread the documentation and see if it says you can do
 what you're trying to do.  If it's not clear whether you should be able
 to do something or not, report that too; it's a bug in the documentation!
 
 Before reporting a bug or trying to fix it yourself, try to isolate it
 to the smallest possible @command{awk} program and input @value{DF} that
-reproduces the problem.  Then send us the program and @value{DF},
+reproduce the problem.  Then send us the program and @value{DF},
 some idea of what kind of Unix system you're using,
 the compiler you used to compile @command{gawk}, and the exact results
 @command{gawk} gave you.  Also say what you expected to occur; this helps
 us decide whether the problem is really in the documentation.
 
-Please include the version number of @command{gawk} you are using.
+Make sure to include the version number of @command{gawk} you are using.
 You can get this information with the command @samp{gawk --version}.
 
 @cindex @code{bug-gawk@@gnu.org} bug reporting address
 @cindex email address for bug reports, @code{bug-gawk@@gnu.org}
 @cindex bug reports, email address, @code{bug-gawk@@gnu.org}
-Once you have a precise problem, send email to
+Once you have a precise problem description, send email to
 @EMAIL{bug-gawk@@gnu.org,bug-gawk at gnu dot org}.
 
-@cindex Robbins, Arnold
-The @command{gawk} maintainers subscribe to this address and
+The @command{gawk} maintainers subscribe to this address, and
 thus they will receive your bug report.
-If necessary, the primary maintainer can be reached directly at
-@EMAIL{arnold@@skeeve.com,arnold at skeeve dot com}.
-The bug reporting address is preferred since the
+Although you can send mail to the maintainers directly,
+the bug reporting address is preferred because the
 email list is archived at the GNU Project.
-@emph{All email should be in English. This is the only language
+@emph{All email must be in English. This is the only language
 understood in common by all the maintainers.}
 
 @cindex @code{comp.lang.awk} newsgroup
 @quotation CAUTION
 Do @emph{not} try to report bugs in @command{gawk} by
 posting to the Usenet/Internet newsgroup @code{comp.lang.awk}.
-While the @command{gawk} developers do occasionally read this newsgroup,
-there is no guarantee that we will see your posting.  The steps described
-above are the official recognized ways for reporting bugs.
+The @command{gawk} developers do occasionally read this newsgroup,
+but there is no guarantee that we will see your posting.  The steps described
+here are the only officially recognized way for reporting bugs.
 Really.
 @end quotation
 
 @quotation NOTE
 Many distributions of GNU/Linux and the various BSD-based operating systems
 have their own bug reporting systems.  If you report a bug using your distribution's
-bug reporting system, @emph{please} also send a copy to
+bug reporting system, you should also send a copy to
 @EMAIL{bug-gawk@@gnu.org,bug-gawk at gnu dot org}.
 
-This is for two reasons.  First, while some distributions forward
+This is for two reasons.  First, although some distributions forward
 bug reports ``upstream'' to the GNU mailing list, many don't, so there is a good
-chance that the @command{gawk}  maintainer won't even see the bug report!  Second,
-mail to the GNU list is archived, and having everything at the GNU project
-keeps things self-contained and not dependant on other web sites.
+chance that the @command{gawk}  maintainers won't even see the bug report!  Second,
+mail to the GNU list is archived, and having everything at the GNU Project
+keeps things self-contained and not dependent on other organizations.
 @end quotation
 
 Non-bug suggestions are always welcome as well.  If you have questions
 about things that are unclear in the documentation or are just obscure
-features, ask me; I will try to help you out, although I
-may not have the time to fix the problem.  You can send me electronic
-mail at the Internet address noted previously.
-
-If you find bugs in one of the non-Unix ports of @command{gawk}, please send
-an electronic mail message to the person who maintains that port.  They
-are named in the following list, as well as in the @file{README} file
-in the @command{gawk} distribution.  Information in the @file{README}
-file should be considered authoritative if it conflicts with this
-@value{DOCUMENT}.
+features, ask on the bug list; we will try to help you out if we can.
 
-The people maintaining the non-Unix ports of @command{gawk} are
-as follows:
+If you find bugs in one of the non-Unix ports of @command{gawk},
+send an email to the bug list, with a copy to the
+person who maintains that port.  The maintainers are named in the following list,
+as well as in the @file{README} file in the @command{gawk} distribution.
+Information in the @file{README} file should be considered authoritative
+if it conflicts with this @value{DOCUMENT}.
+
+The people maintaining the various @command{gawk} ports are:
 
 @c put the index entries outside the table, for docbook
-@cindex Deifik, Scott
-@cindex Zaretskii, Eli
 @cindex Buening, Andreas
-@cindex Rankin, Pat
+@cindex Deifik, Scott
 @cindex Malmberg, John
 @cindex Pitts, Dave
+@cindex Robbins, Arnold
+@cindex Zaretskii, Eli
 @multitable {MS-Windows with MinGW} {123456789012345678901234567890123456789001234567890}
-@item MS-DOS with DJGPP @tab Scott Deifik, @EMAIL{scottd.mail@@sbcglobal.net,scottd dot mail at sbcglobal dot net}.
+@item Unix and POSIX systems @tab Arnold Robbins, @EMAIL{arnold@@skeeve.com,arnold at skeeve dot com}
+
+@item MS-DOS with DJGPP @tab Scott Deifik, @EMAIL{scottd.mail@@sbcglobal.net,scottd dot mail at sbcglobal dot net}
 
-@item MS-Windows with MinGW @tab Eli Zaretskii, @EMAIL{eliz@@gnu.org,eliz at gnu dot org}.
+@item MS-Windows with MinGW @tab Eli Zaretskii, @EMAIL{eliz@@gnu.org,eliz at gnu dot org}
 
 @c Leave this in the print version on purpose.
 @c OS/2 is not mentioned anywhere else in the print version though.
-@item OS/2 @tab Andreas Buening, @EMAIL{andreas.buening@@nexgo.de,andreas dot buening at nexgo dot de}.
+@item OS/2 @tab Andreas Buening, @EMAIL{andreas.buening@@nexgo.de,andreas dot buening at nexgo dot de}
 
-@item VMS @tab Pat Rankin, @EMAIL{r.pat.rankin@@gmail.com,r.pat.rankin at gmail.com}, and
-John Malmberg, @EMAIL{wb8tyw@@qsl.net,wb8tyw at qsl.net}.
+@item VMS @tab John Malmberg, @EMAIL{wb8tyw@@qsl.net,wb8tyw at qsl.net}
 
-@item z/OS (OS/390) @tab Dave Pitts, @EMAIL{dpitts@@cozx.com,dpitts at cozx dot com}.
+@item z/OS (OS/390) @tab Dave Pitts, @EMAIL{dpitts@@cozx.com,dpitts at cozx dot com}
 @end multitable
 
-If your bug is also reproducible under Unix, please send a copy of your
-report to the @EMAIL{bug-gawk@@gnu.org,bug-gawk at gnu dot org} email
-list as well.
-@c ENDOFRANGE dbugg
-@c ENDOFRANGE tblgawb
+If your bug is also reproducible under Unix, send a copy of your
+report to the @EMAIL{bug-gawk@@gnu.org,bug-gawk at gnu dot org} email list as well.
 
 @node Other Versions
 @appendixsec Other Freely Available @command{awk} Implementations
-@c STARTOFRANGE awkim
 @cindex @command{awk}, implementations
 @ignore
 From: emory!amc.com!brennan (Michael Brennan)
@@ -37131,7 +37777,7 @@ Date: Wed, 4 Sep 1996 08:11:48 -0700 (PDT)
 @cindex Brennan, Michael
 @ifnotdocbook
 @quotation
-@i{It's kind of fun to put comments like this in your awk code.}@*
+@i{It's kind of fun to put comments like this in your awk code:}@*
 @ @ @ @ @ @ @code{// Do C++ comments work? answer: yes! of course}
 @author Michael Brennan
 @end quotation
@@ -37139,15 +37785,11 @@ Date: Wed, 4 Sep 1996 08:11:48 -0700 (PDT)
 
 @docbook
 <blockquote><attribution>Michael Brennan</attribution>
-<literallayout>
-<emphasis>It's kind of fun to put comments like this in your awk code.</emphasis>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<literal>// Do C++ comments work? answer: yes! of course</literal>
-</literallayout>
+<literallayout><emphasis>It's kind of fun to put comments like this in your awk code.</emphasis>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<literal>// Do C++ comments work? answer: yes! of course</literal></literallayout>
 </blockquote>
 @end docbook
 
-
-
 There are a number of other freely available @command{awk} implementations.
 This @value{SECTION} briefly describes where to get them:
 
@@ -37160,7 +37802,7 @@ This @value{SECTION} briefly describes where to get them:
 Brian Kernighan, one of the original designers of Unix @command{awk},
 has made his implementation of
 @command{awk} freely available.
-You can retrieve this version via the World Wide Web from
+You can retrieve this version via
 @uref{http://www.cs.princeton.edu/~bwk, his home page}.
 It is available in several archive formats:
 
@@ -37176,14 +37818,14 @@ It is available in several archive formats:
 @end table
 
 @cindex @command{git} utility
-You can also retrieve it from Git Hub:
+You can also retrieve it from GitHub:
 
 @example
 git clone git://github.com/onetrueawk/awk bwkawk
 @end example
 
 @noindent
-The above command creates a copy of the @uref{http://www.git-scm.com, Git}
+This command creates a copy of the @uref{http://git-scm.com, Git}
 repository in a directory named @file{bwkawk}.  If you leave that argument
 off the @command{git} command line, the repository copy is created in a
 directory named @file{awk}.
@@ -37191,9 +37833,13 @@ directory named @file{awk}.
 This version requires an ISO C (1990 standard) compiler; the C compiler
 from GCC (the GNU Compiler Collection) works quite nicely.
 
-@xref{Common Extensions},
+@DBXREF{Common Extensions}
 for a list of extensions in this @command{awk} that are not in POSIX @command{awk}.
 
+As a side note, Dan Bornstein has created a Git repository tracking
+all the versions of BWK @command{awk} that he could find. It's
+available at @uref{git://github.com/danfuzz/one-true-awk}.
+
 @cindex Brennan, Michael
 @cindex @command{mawk} utility
 @cindex source code, @command{mawk}
@@ -37223,7 +37869,7 @@ Once you have it,
 is similar to @command{gawk}'s
 (@pxref{Unix Installation}).
 
-@xref{Common Extensions},
+@DBXREF{Common Extensions}
 for a list of extensions in @command{mawk} that are not in POSIX @command{awk}.
 
 @cindex Sumner, Andrew
@@ -37232,7 +37878,7 @@ for a list of extensions in @command{mawk} that are not in POSIX @command{awk}.
 @item @command{awka}
 Written by Andrew Sumner,
 @command{awka} translates @command{awk} programs into C, compiles them,
-and links them with a library of functions that provides the core
+and links them with a library of functions that provide the core
 @command{awk} functionality.
 It also has a number of extensions.
 
@@ -37244,7 +37890,7 @@ To get @command{awka}, go to @url{http://sourceforge.net/projects/awka}.
 @c andrewsumner@@yahoo.net
 
 The project seems to be frozen; no new code changes have been made
-since approximately 2003.
+since approximately 2001.
 
 @cindex Beebe, Nelson H.F.@:
 @cindex @command{pawk} (profiling version of Brian Kernighan's @command{awk})
@@ -37252,18 +37898,18 @@ since approximately 2003.
 @item @command{pawk}
 Nelson H.F.@: Beebe at the University of Utah has modified
 BWK @command{awk} to provide timing and profiling information.
-It is different from @command{gawk} with the @option{--profile} option.
-(@pxref{Profiling}),
+It is different from @command{gawk} with the @option{--profile} option
+(@pxref{Profiling})
 in that it uses CPU-based profiling, not line-count
 profiling.  You may find it at either
 @uref{ftp://ftp.math.utah.edu/pub/pawk/pawk-20030606.tar.gz}
 or
 @uref{http://www.math.utah.edu/pub/pawk/pawk-20030606.tar.gz}.
 
-@item Busybox Awk
-@cindex Busybox Awk
-@cindex source code, Busybox Awk
-Busybox is a GPL-licensed program providing small versions of many
+@item BusyBox @command{awk}
+@cindex BusyBox Awk
+@cindex source code, BusyBox Awk
+BusyBox is a GPL-licensed program providing small versions of many
 applications within a single executable. It is aimed at embedded systems.
 It includes a full implementation of POSIX @command{awk}.  When building
 it, be careful not to do @samp{make install} as it will overwrite
@@ -37275,9 +37921,9 @@ information, see the @uref{http://busybox.net, project's home page}.
 @cindex source code, Solaris @command{awk}
 @item The OpenSolaris POSIX @command{awk}
 The versions of @command{awk} in @file{/usr/xpg4/bin} and
-@file{/usr/xpg6/bin} on Solaris are more-or-less POSIX-compliant.
+@file{/usr/xpg6/bin} on Solaris are more or less POSIX-compliant.
 They are based on the @command{awk} from Mortice Kern Systems for PCs.
-This author was able to make this code compile and work under GNU/Linux
+We were able to make this code compile and work under GNU/Linux
 with 1--2 hours of work.  Making it more generally portable (using
 GNU Autoconf and/or Automake) would take more work, and this
 has not been done, at least to our knowledge.
@@ -37285,8 +37931,8 @@ has not been done, at least to our knowledge.
 @cindex Illumos
 @cindex Illumos, POSIX-compliant @command{awk}
 @cindex source code, Illumos @command{awk}
-The source code used to be available from the OpenSolaris web site.
-However, that project was ended and the web site shut down.  Fortunately, the
+The source code used to be available from the OpenSolaris website.
+However, that project was ended and the website shut down.  Fortunately, the
 @uref{http://wiki.illumos.org/display/illumos/illumos+Home, Illumos project}
 makes this implementation available.  You can view the files one at a time from
 @uref{https://github.com/joyent/illumos-joyent/blob/master/usr/src/cmd/awk_xpg4}.
@@ -37305,7 +37951,7 @@ from POSIX @command{awk}.  More information is available on the
 @cindex libmawk
 @cindex source code, libmawk
 This is an embeddable @command{awk} interpreter derived from
-@command{mawk}. For more information see
+@command{mawk}. For more information, see
 @uref{http://repo.hu/projects/libmawk/}.
 
 @item @code{pawk}
@@ -37316,10 +37962,10 @@ features to Python. See @uref{https://github.com/alecthomas/pawk}
 for more information. (This is not related to Nelson Beebe's
 modified version of BWK @command{awk}, described earlier.)
 
-@item @w{QSE Awk}
-@cindex QSE Awk
-@cindex source code, QSE Awk
-This is an embeddable @command{awk} interpreter. For more information
+@item @w{QSE @command{awk}}
+@cindex QSE @command{awk}
+@cindex source code, QSE @command{awk}
+This is an embeddable @command{awk} interpreter. For more information,
 see @uref{http://code.google.com/p/qse/} and @uref{http://awk.info/?tools/qse}.
 
 @item @command{QTawk}
@@ -37334,19 +37980,19 @@ including the manual and a download link.
 The project may also be frozen; no new code changes have been made
 since approximately 2008.
 
-@item Other Versions
-See also the @uref{http://en.wikipedia.org/wiki/Awk_language#Versions_and_implementations,
-Wikipedia article}, for information on additional versions.
+@item Other versions
+See also the ``Versions and implementations'' section of the
+@uref{http://en.wikipedia.org/wiki/Awk_language#Versions_and_implementations,
+Wikipedia article} on @command{awk} for information on additional versions.
 
 @end table
-@c ENDOFRANGE awkim
 
 @node Installation summary
 @appendixsec Summary
 
 @itemize @value{BULLET}
 @item
-The @command{gawk} distribution is available from GNU project's main
+The @command{gawk} distribution is available from the GNU Project's main
 distribution site, @code{ftp.gnu.org}.  The canonical build recipe is:
 
 @example
@@ -37358,34 +38004,30 @@ cd gawk-@value{VERSION}.@value{PATCHLEVEL}
 
 @item
 @command{gawk} may be built on non-POSIX systems as well. The currently
-supported systems are MS-Windows using DJGPP, MSYS, MinGW and Cygwin,
+supported systems are MS-Windows using DJGPP, MSYS, MinGW, and Cygwin,
 @ifclear FOR_PRINT
 OS/2 using EMX,
 @end ifclear
 and both Vax/VMS and OpenVMS.
-Instructions for each system are included in this @value{CHAPTER}.
+Instructions for each system are included in this @value{APPENDIX}.
 
 @item
 Bug reports should be sent via email to @email{bug-gawk@@gnu.org}.
-Bug reports should be in English, and should include the version of @command{gawk},
-how it was compiled, and a short program and @value{DF} which demonstrate
+Bug reports should be in English and should include the version of @command{gawk},
+how it was compiled, and a short program and @value{DF} that demonstrate
 the problem.
 
 @item
 There are a number of other freely available @command{awk}
-implementations.  Many are POSIX compliant; others are less so.
+implementations.  Many are POSIX-compliant; others are less so.
 
 @end itemize
 
-@c ENDOFRANGE gligawk
-@c ENDOFRANGE ingawk
 
 @ifclear FOR_PRINT
 @node Notes
 @appendix Implementation Notes
-@c STARTOFRANGE gawii
 @cindex @command{gawk}, implementation issues
-@c STARTOFRANGE impis
 @cindex implementation issues, @command{gawk}
 
 This appendix contains information mainly of interest to implementers and
@@ -37461,7 +38103,7 @@ However, if you want to modify @command{gawk} and contribute back your
 changes, you will probably wish to work with the development version.
 To do so, you will need to access the @command{gawk} source code
 repository.  The code is maintained using the
-@uref{http://git-scm.com/, Git distributed version control system}.
+@uref{http://git-scm.com, Git distributed version control system}.
 You will need to install it if your system doesn't have it.
 Once you have done so, use the command:
 
@@ -37490,11 +38132,8 @@ that has a Git plug-in for working with Git repositories.
 @node Adding Code
 @appendixsubsec Adding New Features
 
-@c STARTOFRANGE adfgaw
 @cindex adding, features to @command{gawk}
-@c STARTOFRANGE fadgaw
 @cindex features, adding to @command{gawk}
-@c STARTOFRANGE gawadf
 @cindex @command{gawk}, features, adding
 You are free to add any new features you like to @command{gawk}.
 However, if you want your changes to be incorporated into the @command{gawk}
@@ -37504,7 +38143,7 @@ make it possible to include them:
 @enumerate 1
 @item
 Before building the new feature into @command{gawk} itself,
-consider writing it as an extension module
+consider writing it as an extension
 (@pxref{Dynamic Extensions}).
 If that's not possible, continue with the rest of the steps in this list.
 
@@ -37529,7 +38168,7 @@ for information on getting the latest version of @command{gawk}.)
 
 @item
 @ifnotinfo
-Follow the @uref{http://www.gnu.org/prep/standards/, @cite{GNU Coding Standards}}.
+Follow the @cite{GNU Coding Standards}.
 @end ifnotinfo
 @ifinfo
 See @inforef{Top, , Version, standards, GNU Coding Standards}.
@@ -37538,7 +38177,7 @@ This document describes how GNU software should be written. If you haven't
 read it, please do so, preferably @emph{before} starting to modify @command{gawk}.
 (The @cite{GNU Coding Standards} are available from
 the GNU Project's
-@uref{http://www.gnu.org/prep/standards_toc.html, web site}.
+@uref{http://www.gnu.org/prep/standards/, website}.
 Texinfo, Info, and DVI versions are also available.)
 
 @cindex @command{gawk}, coding style in
@@ -37661,9 +38300,6 @@ Although this sounds like a lot of work, please remember that while you
 may write the new code, I have to maintain it and support it. If it
 isn't possible for me to do that with a minimum of extra work, then I
 probably will not.
-@c ENDOFRANGE adfgaw
-@c ENDOFRANGE gawadf
-@c ENDOFRANGE fadgaw
 
 @node New Ports
 @appendixsubsec Porting @command{gawk} to a New Operating System
@@ -37749,7 +38385,7 @@ and
 @item
 Be willing to continue to maintain the port.
 Non-Unix operating systems are supported by volunteers who maintain
-the code needed to compile and run @command{gawk} on their systems. If noone
+the code needed to compile and run @command{gawk} on their systems. If no-one
 volunteers to maintain a port, it becomes unsupported and it may
 be necessary to remove it from the distribution.
 
@@ -37797,7 +38433,6 @@ coding style and brace layout that suits your taste.
 @node Derived Files
 @appendixsubsec Why Generated Files Are Kept In Git
 
-@c STARTOFRANGE gawkgit
 @cindex Git, use of for @command{gawk} source code
 @c From emails written March 22, 2012, to the gawk developers list.
 
@@ -37986,7 +38621,6 @@ wget http://git.savannah.gnu.org/cgit/gawk.git/snapshot/gawk-@var{branchname}.ta
 
 @noindent
 to retrieve a snapshot of the given branch.
-@c ENDOFRANGE gawkgit
 
 @node Future Extensions
 @appendixsec Probable Future Extensions
@@ -38235,7 +38869,7 @@ Pat Rankin suggested the solution that was adopted.
 @appendixsubsec Other Design Decisions
 
 As an arbitrary design decision, extensions can read the values of
-built-in variables and arrays (such as @code{ARGV} and @code{FS}), but cannot
+predefined variables and arrays (such as @code{ARGV} and @code{FS}), but cannot
 change them, with the exception of @code{PROCINFO}.
 
 The reason for this is to prevent an extension function from affecting
@@ -38367,13 +39001,10 @@ of @command{gawk}, but it @emph{will} be removed in the next major release.
 
 @end itemize
 
-@c ENDOFRANGE impis
-@c ENDOFRANGE gawii
 
 @node Basic Concepts
 @appendix Basic Programming Concepts
 @cindex programming, concepts
-@c STARTOFRANGE procon
 @cindex programming, concepts
 
 This @value{APPENDIX} attempts to define some of the basic concepts
@@ -38611,7 +39242,6 @@ standard for C.  This standard became an ISO standard in 1990.
 In 1999, a revised ISO C standard was approved and released.
 Where it makes sense, POSIX @command{awk} is compatible with 1999 ISO C.
 
-@c ENDOFRANGE procon
 
 @node Glossary
 @unnumbered Glossary
@@ -38623,6 +39253,13 @@ pattern matches an input record, @command{awk} executes the
 rule's action.  Actions are always enclosed in braces.
 (@xref{Action Overview}.)
 
+@cindex Ada programming language
+@cindex programming languages, Ada
+@item Ada
+A programming language originally defined by the U.S.@: Department of
+Defense for embedded programming. It was designed to enforce good
+Software Engineering practices.
+
 @cindex Spencer, Henry
 @cindex @command{sed} utility
 @cindex amazing @command{awk} assembler (@command{aaa})
@@ -38634,13 +39271,6 @@ microcomputers.  It is a good example of a program that would have been
 better written in another language.
 You can get it from @uref{http://awk.info/?awk100/aaa}.
 
-@cindex Ada programming language
-@cindex programming languages, Ada
-@item Ada
-A programming language originally defined by the U.S.@: Department of
-Defense for embedded programming. It was designed to enforce good
-Software Engineering practices.
-
 @cindex amazingly workable formatter (@command{awf})
 @cindex @command{awf} (amazingly workable formatter) program
 @item Amazingly Workable Formatter (@command{awf})
@@ -38662,6 +39292,21 @@ languages.
 These standards often become international standards as well. See also
 ``ISO.''
 
+@item Argument
+An argument can be two different things.  It can be an option or a
+@value{FN} passed to a command while invoking it from the command line, or
+it can be something passed to a @dfn{function} inside a program, e.g.
+inside @command{awk}.
+
+In the latter case, an argument can be passed to a function in two ways.
+Either it is given to the called function by value, i.e., a copy of the
+value of the variable is made available to the called function, but the
+original variable cannot be modified by the function itself; or it is
+given by reference, i.e., a pointer to the interested variable is passed to
+the function, which can then directly modify it. In @command{awk}
+scalars are passed by value, and arrays are passed by reference.
+See ``Pass By Value/Reference.''
+
 @item Array
 A grouping of multiple values under the same name.
 Most languages just provide sequential arrays.
@@ -38703,6 +39348,25 @@ The GNU version of the standard shell
 @end ifinfo
 See also ``Bourne Shell.''
 
+@item Binary
+Base-two notation, where the digits are @code{0}--@code{1}. Since
+electronic circuitry works ``naturally'' in base 2 (just think of Off/On),
+everything inside a computer is calculated using base 2. Each digit
+represents the presence (or absence) of a power of 2 and is called a
+@dfn{bit}. So, for example, the base-two number @code{10101} is
+the same as decimal 21, ((1 x 16) + (1 x 4) + (1 x 1)).
+
+Since base-two numbers quickly become
+very long to read and write, they are usually grouped by 3 (i.e., they are
+read as octal numbers), or by 4 (i.e., they are read as hexadecimal
+numbers). There is no direct way to insert base 2 numbers in a C program.
+If need arises, such numbers are usually inserted as octal or hexadecimal
+numbers. The number of base-two digits that fit into registers used for
+representing integer numbers in computers is a rough indication of the
+computing power of the computer itself.  Most computers nowadays use 64
+bits for representing integer numbers in their registers, but 32-bit,
+16-bit and 8-bit registers have been widely used in the past.
+@xref{Nondecimal-numbers}.
 @item Bit
 Short for ``Binary Digit.''
 All values in computer memory ultimately reduce to binary digits: values
@@ -38729,6 +39393,24 @@ originally written by Steven R.@: Bourne at Bell Laboratories.
 Many shells (Bash, @command{ksh}, @command{pdksh}, @command{zsh}) are
 generally upwardly compatible with the Bourne shell.
 
+@item Braces
+The characters @samp{@{} and @samp{@}}.  Braces are used in
+@command{awk} for delimiting actions, compound statements, and function
+bodies.
+
+@item Bracket Expression
+Inside a @dfn{regular expression}, an expression included in square
+brackets, meant to designate a single character as belonging to a
+specified character class. A bracket expression can contain a list of one
+or more characters, like @samp{[abc]}, a range of characters, like
+@samp{[A-Z]}, or a name, delimited by @samp{:}, that designates a known set
+of characters, like @samp{[:digit:]}. The form of bracket expression
+enclosed between @samp{:} is independent of the underlying representation
+of the character themselves, which could utilize the ASCII, ECBDIC, or
+Unicode codesets, depending on the architecture of the computer system, and on
+localization.
+See also ``Regular Expression.''
+
 @item Built-in Function
 The @command{awk} language provides built-in functions that perform various
 numerical, I/O-related, and string computations.  Examples are
@@ -38774,11 +39456,6 @@ are the variables that have special meaning to @command{gawk}.
 Changing some of them affects @command{awk}'s running environment.
 (@xref{Built-in Variables}.)
 
-@item Braces
-The characters @samp{@{} and @samp{@}}.  Braces are used in
-@command{awk} for delimiting actions, compound statements, and function
-bodies.
-
 @item C
 The system programming language that most GNU software is written in.  The
 @command{awk} programming language has C-like syntax, and this @value{DOCUMENT}
@@ -38787,9 +39464,25 @@ points out similarities between @command{awk} and C when appropriate.
 In general, @command{gawk} attempts to be as similar to the 1990 version
 of ISO C as makes sense.
 
+@item C Shell
+The C Shell (@command{csh} or its improved version, @command{tcsh}) is a Unix shell that was
+created by Bill Joy in the late 1970s. The C shell was differentiated from
+other shells by its interactive features and overall style, which
+looks more like C. The C Shell is not backward compatible with the Bourne
+Shell, so special attention is required when converting scripts
+written for other Unix shells to the C shell, especially with regard to the management of
+shell variables.
+See also ``Bourne Shell.''
+
 @item C++
 A popular object-oriented programming language derived from C.
 
+@item Character Class
+See ``Bracket Expression.''
+
+@item Character List
+See ``Bracket Expression.''
+
 @cindex ASCII
 @cindex ISO 8859-1
 @cindex ISO Latin-1
@@ -38813,7 +39506,59 @@ A preprocessor for @command{pic} that reads descriptions of molecules
 and produces @command{pic} input for drawing them.
 It was written in @command{awk}
 by Brian Kernighan and Jon Bentley, and is available from
-@uref{http://netlib.sandia.gov/netlib/typesetting/chem.gz}.
+@uref{http://netlib.org/typesetting/chem}.
+
+@item Comparison Expression
+A relation that is either true or false, such as @samp{a < b}.
+Comparison expressions are used in @code{if}, @code{while}, @code{do},
+and @code{for}
+statements, and in patterns to select which input records to process.
+(@xref{Typing and Comparison}.)
+
+@cindex compiled programs
+@item Compiler
+A program that translates human-readable source code into
+machine-executable object code.  The object code is then executed
+directly by the computer.
+See also ``Interpreter.''
+
+@item Complemented Bracket Expression
+The negation of a @dfn{bracket expression}.  All that is @emph{not}
+described by a given bracket expression. The symbol @samp{^} precedes
+the negated bracket expression.  E.g.: @samp{[[^:digit:]}
+designates whatever character is not a digit. @samp{[^bad]}
+designates whatever character is not one of the letters @samp{b}, @samp{a},
+or @samp{d}.
+See ``Bracket Expression.''
+
+@item Compound Statement
+A series of @command{awk} statements, enclosed in curly braces.  Compound
+statements may be nested.
+(@xref{Statements}.)
+
+@item Computed Regexps
+See ``Dynamic Regular Expressions.''
+
+@item Concatenation
+Concatenating two strings means sticking them together, one after another,
+producing a new string.  For example, the string @samp{foo} concatenated with
+the string @samp{bar} gives the string @samp{foobar}.
+(@xref{Concatenation}.)
+
+@item Conditional Expression
+An expression using the @samp{?:} ternary operator, such as
+@samp{@var{expr1} ? @var{expr2} : @var{expr3}}.  The expression
+@var{expr1} is evaluated; if the result is true, the value of the whole
+expression is the value of @var{expr2}; otherwise the value is
+@var{expr3}.  In either case, only one of @var{expr2} and @var{expr3}
+is evaluated. (@xref{Conditional Exp}.)
+
+@item Control Statement
+A control statement is an instruction to perform a given operation or a set
+of operations inside an @command{awk} program, if a given condition is
+true. Control statements are: @code{if}, @code{for}, @code{while}, and
+@code{do}
+(@pxref{Statements}).
 
 @cindex McIlroy, Doug
 @cindex cookie
@@ -38863,39 +39608,6 @@ Doug
 @item Coprocess
 A subordinate program with which two-way communications is possible.
 
-@cindex compiled programs
-@item Compiler
-A program that translates human-readable source code into
-machine-executable object code.  The object code is then executed
-directly by the computer.
-See also ``Interpreter.''
-
-@item Compound Statement
-A series of @command{awk} statements, enclosed in curly braces.  Compound
-statements may be nested.
-(@xref{Statements}.)
-
-@item Concatenation
-Concatenating two strings means sticking them together, one after another,
-producing a new string.  For example, the string @samp{foo} concatenated with
-the string @samp{bar} gives the string @samp{foobar}.
-(@xref{Concatenation}.)
-
-@item Conditional Expression
-An expression using the @samp{?:} ternary operator, such as
-@samp{@var{expr1} ? @var{expr2} : @var{expr3}}.  The expression
-@var{expr1} is evaluated; if the result is true, the value of the whole
-expression is the value of @var{expr2}; otherwise the value is
-@var{expr3}.  In either case, only one of @var{expr2} and @var{expr3}
-is evaluated. (@xref{Conditional Exp}.)
-
-@item Comparison Expression
-A relation that is either true or false, such as @samp{a < b}.
-Comparison expressions are used in @code{if}, @code{while}, @code{do},
-and @code{for}
-statements, and in patterns to select which input records to process.
-(@xref{Typing and Comparison}.)
-
 @item Curly Braces
 See ``Braces.''
 
@@ -38941,15 +39653,15 @@ ordinary expression.  It could be a string constant, such as
 @code{"foo"}, but it may also be an expression whose value can vary.
 (@xref{Computed Regexps}.)
 
+@item Empty String
+See ``Null String.''
+
 @item Environment
 A collection of strings, of the form @samp{@var{name}=@var{val}}, that each
 program has available to it. Users generally place values into the
 environment in order to provide information to various programs. Typical
 examples are the environment variables @env{HOME} and @env{PATH}.
 
-@item Empty String
-See ``Null String.''
-
 @cindex epoch, definition of
 @item Epoch
 The date used as the ``beginning of time'' for timestamps.
@@ -38976,11 +39688,11 @@ See ``Free Documentation License.''
 @item Field
 When @command{awk} reads an input record, it splits the record into pieces
 separated by whitespace (or by a separator regexp that you can
-change by setting the built-in variable @code{FS}).  Such pieces are
+change by setting the predefined variable @code{FS}).  Such pieces are
 called fields.  If the pieces are of fixed length, you can use the built-in
 variable @code{FIELDWIDTHS} to describe their lengths.
 If you wish to specify the contents of fields instead of the field
-separator, you can use the built-in variable @code{FPAT} to do so.
+separator, you can use the predefined variable @code{FPAT} to do so.
 (@xref{Field Separators},
 @ref{Constant Size},
 and
@@ -38999,22 +39711,18 @@ See also ``Double Precision'' and ``Single Precision.''
 Format strings control the appearance of output in the
 @code{strftime()} and @code{sprintf()} functions, and in the
 @code{printf} statement as well.  Also, data conversions from numbers to strings
-are controlled by the format strings contained in the built-in variables
+are controlled by the format strings contained in the predefined variables
 @code{CONVFMT} and @code{OFMT}. (@xref{Control Letters}.)
 
+@item Fortran
+Shorthand for FORmula TRANslator, one of the first programming languages
+available for scientific calculations. It was created by John Backus,
+and has been available since 1957. It is still in use today.
+
 @item Free Documentation License
 This document describes the terms under which this @value{DOCUMENT}
 is published and may be copied. (@xref{GNU Free Documentation License}.)
 
-@item Function
-A specialized group of statements used to encapsulate general
-or program-specific tasks.  @command{awk} has a number of built-in
-functions, and also allows you to define your own.
-(@xref{Functions}.)
-
-@item FSF
-See ``Free Software Foundation.''
-
 @cindex FSF (Free Software Foundation)
 @cindex Free Software Foundation (FSF)
 @cindex Stallman, Richard
@@ -39024,6 +39732,26 @@ to the production and distribution of freely distributable software.
 It was founded by Richard M.@: Stallman, the author of the original
 Emacs editor.  GNU Emacs is the most widely used version of Emacs today.
 
+@item FSF
+See ``Free Software Foundation.''
+
+@item Function
+A part of an @command{awk} program that can be invoked from every point of
+the program, to perform a task.  @command{awk} has several built-in
+functions.
+Users can define their own functions in every part of the program.
+Function can be recursive, i.e., they may invoke themselves.
+@xref{Functions}.
+In @command{gawk} it is also possible to have functions shared
+among different programs, and included where required using the
+@code{@@include} directive
+(@pxref{Include Files}).
+In @command{gawk} the name of the function that should be invoked
+can be generated at run time, i.e., dynamically.
+The @command{gawk} extension API provides constructor functions
+(@pxref{Constructor Functions}).
+
+
 @item @command{gawk}
 The GNU implementation of @command{awk}.
 
@@ -39146,6 +39874,12 @@ meaning.  Keywords are reserved and may not be used as variable names.
 and
 @code{while}.
 
+@item Korn Shell
+The Korn Shell (@command{ksh}) is a Unix shell which was developed by David Korn at Bell
+Laboratories in the early 1980s. The Korn Shell is backward-compatible with the Bourne
+shell and includes many features of the C shell.
+See also ``Bourne Shell.''
+
 @cindex LGPL (Lesser General Public License)
 @cindex Lesser General Public License (LGPL)
 @cindex GNU Lesser General Public License
@@ -39154,12 +39888,12 @@ This document describes the terms under which binary library archives
 or shared objects,
 and their source code may be distributed.
 
-@item Linux
-See ``GNU/Linux.''
-
 @item LGPL
 See ``Lesser General Public License.''
 
+@item Linux
+See ``GNU/Linux.''
+
 @item Localization
 The process of providing the data necessary for an
 internationalized program to work in a particular language.
@@ -39185,6 +39919,14 @@ Characters used within a regexp that do not stand for themselves.
 Instead, they denote regular expression operations, such as repetition,
 grouping, or alternation.
 
+@item Nesting
+Nesting is where information is organized in layers, or where objects
+contain other similar objects.
+In @command{gawk} the @code{@@include}
+directive can be nested. The ``natural'' nesting of arithmetic and
+logical operations can be changed using parentheses
+(@pxref{Precedence}).
+
 @item No-op
 An operation that does nothing.
 
@@ -39205,6 +39947,11 @@ Octal numbers are written in C using a leading @samp{0},
 to indicate their base.  Thus, @code{013} is 11 ((1 x 8) + 3).
 @xref{Nondecimal-numbers}.
 
+@item Output Record
+A single chunk of data that is written out by @command{awk}.  Usually, an
+@command{awk} output record consists of one or more lines of text.
+@xref{Records}.
+
 @item Pattern
 Patterns tell @command{awk} which input records are interesting to which
 rules.
@@ -39219,6 +39966,9 @@ An acronym describing what is possibly the most frequent
 source of computer usage problems. (Problem Exists Between
 Keyboard And Chair.)
 
+@item Plug-in
+See ``Extensions.''
+
 @item POSIX
 The name for a series of standards
 that specify a Portable Operating System interface.  The ``IX'' denotes
@@ -39243,6 +39993,9 @@ A sequence of consecutive lines from the input file(s).  A pattern
 can specify ranges of input lines for @command{awk} to process or it can
 specify single lines. (@xref{Pattern Overview}.)
 
+@item Record
+See ``Input record'' and ``Output record.''
+
 @item Recursion
 When a function calls itself, either directly or indirectly.
 If this is clear, stop, and proceed to the next entry.
@@ -39260,6 +40013,15 @@ operators.
 (@xref{Getline},
 and @ref{Redirection}.)
 
+@item Reference Counts
+An internal mechanism in @command{gawk} to minimize the amount of memory
+needed to store the value of string variables. If the value assumed by
+a variable is used in more than one place, only one copy of the value
+itself is kept, and the associated reference count is increased when the
+same value is used by an additional variable, and decresed when the related
+variable is no longer in use. When the reference count goes to zero,
+the memory space used to store the value of the variable is freed.
+
 @item Regexp
 See ``Regular Expression.''
 
@@ -39277,6 +40039,15 @@ slashes, such as @code{/foo/}.  This regular expression is chosen
 when you write the @command{awk} program and cannot be changed during
 its execution. (@xref{Regexp Usage}.)
 
+@item Regular Expression Operators
+See ``Metacharacters.''
+
+@item Rounding
+Rounding the result of an arithmetic operation can be tricky.
+More than one way of rounding exists, and in @command{gawk}
+it is possible to choose which method should be used in a program.
+@xref{Setting the rounding mode}.
+
 @item Rule
 A segment of an @command{awk} program that specifies how to process single
 input records.  A rule consists of a @dfn{pattern} and an @dfn{action}.
@@ -39297,12 +40068,12 @@ Regular variables are scalars; arrays and functions are not.
 In @command{gawk}, a list of directories to search for @command{awk} program source files.
 In the shell, a list of directories to search for executable programs.
 
-@item Seed
-The initial value, or starting point, for a sequence of random numbers.
-
 @item @command{sed}
 See ``Stream Editor.''
 
+@item Seed
+The initial value, or starting point, for a sequence of random numbers.
+
 @item Shell
 The command interpreter for Unix and POSIX-compliant systems.
 The shell works both interactively, and as a programming language
@@ -39336,6 +40107,12 @@ A @value{FN} interpreted internally by @command{gawk}, instead of being handed
 directly to the underlying operating system---for example, @file{/dev/stderr}.
 (@xref{Special Files}.)
 
+@item Statement
+An expression inside an @command{awk} program in the action part
+of a pattern--action rule, or inside an
+@command{awk} function. A statement can be a variable assignment,
+an array operation, a loop, etc.
+
 @item Stream Editor
 A program that reads records from an input stream and processes them one
 or more at a time.  This is in contrast with batch programs, which may
@@ -39386,9 +40163,14 @@ This is standard time in Greenwich, England, which is used as a
 reference time for day and date calculations.
 See also ``Epoch'' and ``GMT.''
 
+@item Variable
+A name for a value. In @command{awk}, variables may be either scalars
+or arrays.
+
 @item Whitespace
 A sequence of space, TAB, or newline characters occurring inside an input
 record or a string.
+
 @end table
 
 @end ifclear
@@ -39404,7 +40186,7 @@ record or a string.
 @end docbook
 
 @c This file is intended to be included within another document,
-@c hence no sectioning command or @node.  
+@c hence no sectioning command or @node.
 
 @display
 Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/}
@@ -39626,7 +40408,7 @@ terms of section 4, provided that you also meet all of these
 conditions:
 
 @enumerate a
-@item 
+@item
 The work must carry prominent notices stating that you modified it,
 and giving a relevant date.
 
@@ -40076,7 +40858,7 @@ state the exclusion of warranty; and each file should have at least
 the ``copyright'' line and a pointer to where the full notice is found.
 
 @smallexample
-@var{one line to give the program's name and a brief idea of what it does.}  
+@var{one line to give the program's name and a brief idea of what it does.}
 Copyright (C) @var{year} @var{name of author}
 
 This program is free software: you can redistribute it and/or modify
@@ -40099,7 +40881,7 @@ If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
 @smallexample
-@var{program} Copyright (C) @var{year} @var{name of author} 
+@var{program} Copyright (C) @var{year} @var{name of author}
 This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
 This is free software, and you are welcome to redistribute it
 under certain conditions; type @samp{show c} for details.
@@ -40678,6 +41460,7 @@ Consistency issues:
 	Use --foo, not -Wfoo when describing long options
 	Use "Bell Laboratories", but not "Bell Labs".
 	Use "behavior" instead of "behaviour".
+	Use "coprocess" instead of "co-process".
 	Use "zeros" instead of "zeroes".
 	Use "nonzero" not "non-zero".
 	Use "runtime" not "run time" or "run-time".
@@ -40782,4 +41565,4 @@ But to use it you have to say
 which sorta sucks.
 
 TODO:
------
+Check that all dark corners are indexed properly.
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 7506dffb..8236d7d2 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -3,11 +3,12 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2014-03-18.17}
+\def\texinfoversion{2015-02-05.16}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015
+% Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
@@ -96,7 +97,9 @@
 \let\ptexraggedright=\raggedright
 \let\ptexrbrace=\}
 \let\ptexslash=\/
+\let\ptexsp=\sp
 \let\ptexstar=\*
+\let\ptexsup=\sup
 \let\ptext=\t
 \let\ptextop=\top
 {\catcode`\'=\active \global\let\ptexquoteright'}% active in plain's math mode
@@ -1010,24 +1013,15 @@ where each line of input produces a line of output.}
 % paragraph.
 %
 \gdef\dosuppressfirstparagraphindent{%
-  \gdef\indent{%
-    \restorefirstparagraphindent
-    \indent
-  }%
-  \gdef\noindent{%
-    \restorefirstparagraphindent
-    \noindent
-  }%
-  \global\everypar = {%
-    \kern -\parindent
-    \restorefirstparagraphindent
-  }%
+  \gdef\indent  {\restorefirstparagraphindent \indent}%
+  \gdef\noindent{\restorefirstparagraphindent \noindent}%
+  \global\everypar = {\kern -\parindent \restorefirstparagraphindent}%
 }
-
+%
 \gdef\restorefirstparagraphindent{%
-  \global \let \indent = \ptexindent
-  \global \let \noindent = \ptexnoindent
-  \global \everypar = {}%
+  \global\let\indent = \ptexindent
+  \global\let\noindent = \ptexnoindent
+  \global\everypar = {}%
 }
 
 
@@ -2090,12 +2084,9 @@ end
  \endgroup
 }
 
-
 % In order for the font changes to affect most math symbols and letters,
-% we have to define the \textfont of the standard families.  Since
-% texinfo doesn't allow for producing subscripts and superscripts except
-% in the main text, we don't bother to reset \scriptfont and
-% \scriptscriptfont (which would also require loading a lot more fonts).
+% we have to define the \textfont of the standard families.  We don't
+% bother to reset \scriptfont and \scriptscriptfont; awaiting user need.
 %
 \def\resetmathfonts{%
   \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy
@@ -2109,8 +2100,8 @@ end
 % \tenSTYLE to set the current font.
 %
 % Each font-changing command also sets the names \lsize (one size lower)
-% and \lllsize (three sizes lower).  These relative commands are used in
-% the LaTeX logo and acronyms.
+% and \lllsize (three sizes lower).  These relative commands are used
+% in, e.g., the LaTeX logo and acronyms.
 %
 % This all needs generalizing, badly.
 %
@@ -2146,7 +2137,7 @@ end
   \let\tenttsl=\secttsl
   \def\curfontsize{sec}%
   \def\lsize{subsec}\def\lllsize{reduced}%
-  \resetmathfonts \setleading{16pt}}
+  \resetmathfonts \setleading{17pt}}
 \def\subsecfonts{%
   \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl
   \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
@@ -2851,6 +2842,8 @@ end
   \let\v=\check
   \let\~=\tilde
   \let\dotaccent=\dot
+  % have to provide another name for sup operator
+  \let\mathopsup=\sup
   $\finishmath
 }
 \def\finishmath#1{#1$\endgroup}  % Close the group opened by \tex.
@@ -2874,6 +2867,18 @@ end
   }
 }
 
+% for @sub and @sup, if in math mode, just do a normal sub/superscript.
+% If in text, use math to place as sub/superscript, but switch
+% into text mode, with smaller fonts.  This is a different font than the
+% one used for real math sub/superscripts (8pt vs. 7pt), but let's not
+% fix it (significant additions to font machinery) until someone notices.
+%
+\def\sub{\ifmmode \expandafter\sb \else \expandafter\finishsub\fi}
+\def\finishsub#1{$\sb{\hbox{\selectfonts\lllsize #1}}$}%
+%
+\def\sup{\ifmmode \expandafter\ptexsp \else \expandafter\finishsup\fi}
+\def\finishsup#1{$\ptexsp{\hbox{\selectfonts\lllsize #1}}$}%
+
 % ctrl is no longer a Texinfo command, but leave this definition for fun.
 \def\ctrl #1{{\tt \rawbackslash \hat}#1}
 
@@ -4484,7 +4489,6 @@ end
 % Called from \indexdummies and \atdummies.
 %
 \def\commondummies{%
-  %
   % \definedummyword defines \#1 as \string\#1\space, thus effectively
   % preventing its expansion.  This is used only for control words,
   % not control letters, because the \space would be incorrect for
@@ -4561,6 +4565,7 @@ end
   \definedummyword\guilsinglright
   \definedummyword\lbracechar
   \definedummyword\leq
+  \definedummyword\mathopsup
   \definedummyword\minus
   \definedummyword\ogonek
   \definedummyword\pounds
@@ -4574,6 +4579,8 @@ end
   \definedummyword\quotesinglbase
   \definedummyword\rbracechar
   \definedummyword\result
+  \definedummyword\sub
+  \definedummyword\sup
   \definedummyword\textdegree
   %
   % We want to disable all macros so that they are not expanded by \write.
@@ -4648,6 +4655,7 @@ end
   \definedummyword\samp
   \definedummyword\strong
   \definedummyword\tie
+  \definedummyword\U
   \definedummyword\uref
   \definedummyword\url
   \definedummyword\var
@@ -5739,13 +5747,16 @@ end
 %
 % #1 is the text, #2 is the section type (Ynumbered, Ynothing,
 % Yappendix, Yomitfromtoc), #3 the chapter number.
+% Not used for @heading series.
 %
 % To test against our argument.
 \def\Ynothingkeyword{Ynothing}
-\def\Yomitfromtockeyword{Yomitfromtoc}
 \def\Yappendixkeyword{Yappendix}
+\def\Yomitfromtockeyword{Yomitfromtoc}
 %
 \def\chapmacro#1#2#3{%
+  \checkenv{}% chapters, etc., should not start inside an environment.
+  %
   % Insert the first mark before the heading break (see notes for \domark).
   \let\prevchapterdefs=\lastchapterdefs
   \let\prevsectiondefs=\lastsectiondefs
@@ -5798,6 +5809,7 @@ end
   %
   {%
     \chapfonts \rmisbold
+    \let\footnote=\errfootnoteheading % give better error message
     %
     % Have to define \lastsection before calling \donoderef, because the
     % xref code eventually uses it.  On the other hand, it has to be called
@@ -5891,22 +5903,29 @@ end
 
 % Print any size, any type, section title.
 %
-% #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is
-% the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the
-% section number.
+% #1 is the text of the title,
+% #2 is the section level (sec/subsec/subsubsec),
+% #3 is the section type (Ynumbered, Ynothing, Yappendix, Yomitfromtoc),
+% #4 is the section number.
 %
 \def\seckeyword{sec}
 %
 \def\sectionheading#1#2#3#4{%
   {%
-    \checkenv{}% should not be in an environment.
+    \def\sectionlevel{#2}%
+    \def\temptype{#3}%
+    %
+    % It is ok for the @heading series commands to appear inside an
+    % environment (it's been historically allowed, though the logic is
+    % dubious), but not the others.
+    \ifx\temptype\Yomitfromtockeyword\else
+      \checkenv{}% non-@*heading should not be in an environment.
+    \fi
+    \let\footnote=\errfootnoteheading
     %
     % Switch to the right set of fonts.
     \csname #2fonts\endcsname \rmisbold
     %
-    \def\sectionlevel{#2}%
-    \def\temptype{#3}%
-    %
     % Insert first mark before the heading break (see notes for \domark).
     \let\prevsectiondefs=\lastsectiondefs
     \ifx\temptype\Ynothingkeyword
@@ -6333,6 +6352,7 @@ end
   % other math active characters (just in case), to plain's definitions.
   \mathactive
   %
+  % Inverse of the list at the beginning of the file.
   \let\b=\ptexb
   \let\bullet=\ptexbullet
   \let\c=\ptexc
@@ -6348,7 +6368,9 @@ end
   \let\+=\tabalign
   \let\}=\ptexrbrace
   \let\/=\ptexslash
+  \let\sp=\ptexsp
   \let\*=\ptexstar
+  %\let\sup=\ptexsup % do not redefine, we want @sup to work in math mode
   \let\t=\ptext
   \expandafter \let\csname top\endcsname=\ptextop  % we've made it outer
   \let\frenchspacing=\plainfrenchspacing
@@ -7414,7 +7436,6 @@ end
 %
 % \anythingelse will almost certainly be an error of some kind.
 
-
 % \mbodybackslash is the definition of \ in @macro bodies.
 % It maps \foo\ => \csname macarg.foo\endcsname => #N
 % where N is the macro parameter number.
@@ -7523,8 +7544,7 @@ end
 % the catcode regime underwhich the body was input).
 %
 % If you compile with TeX (not eTeX), and you have macros with 10 or more
-% arguments, you need that no macro has more than 256 arguments, otherwise an
-% error is produced.
+% arguments, no macro can have more than 256 arguments (else error).
 \def\parsemargdef#1;{%
   \paramno=0\def\paramlist{}%
   \let\hash\relax
@@ -8318,14 +8338,7 @@ end
   \catcode`\\=\other
   %
   % Make the characters 128-255 be printing characters.
-  {%
-    \count1=128
-    \def\loop{%
-      \catcode\count1=\other
-      \advance\count1 by 1
-      \ifnum \count1<256 \loop \fi
-    }%
-  }%
+  {\setnonasciicharscatcodenonglobal\other}%
   %
   % @ is our escape character in .aux files, and we need braces.
   \catcode`\{=1
@@ -8359,9 +8372,6 @@ end
 %
 % Auto-number footnotes.  Otherwise like plain.
 \gdef\footnote{%
-  \let\indent=\ptexindent
-  \let\noindent=\ptexnoindent
-  %
   \global\advance\footnoteno by \@ne
   \edef\thisfootno{$^{\the\footnoteno}$}%
   %
@@ -8388,7 +8398,7 @@ end
   %
   % Nested footnotes are not supported in TeX, that would take a lot
   % more work.  (\startsavinginserts does not suffice.)
-  \let\footnote=\errfootnote
+  \let\footnote=\errfootnotenest
   %
   % We want to typeset this text as a normal paragraph, even if the
   % footnote reference occurs in (for example) a display environment.
@@ -8427,12 +8437,17 @@ end
 }
 }%end \catcode `\@=11
 
-\def\errfootnote{%
+\def\errfootnotenest{%
   \errhelp=\EMsimple
   \errmessage{Nested footnotes not supported in texinfo.tex,
     even though they work in makeinfo; sorry}
 }
 
+\def\errfootnoteheading{%
+  \errhelp=\EMsimple
+  \errmessage{Footnotes in chapters, sections, etc., are not supported}
+}
+
 % In case a @footnote appears in a vbox, save the footnote text and create
 % the real \insert just after the vbox finished.  Otherwise, the insertion
 % would be lost.
@@ -8856,20 +8871,20 @@ end
 {
   \catcode`\_ = \active
   \globaldefs=1
-\parseargdef\documentlanguage{\begingroup
-  \let_=\normalunderscore  % normal _ character for filenames
+\parseargdef\documentlanguage{%
   \tex % read txi-??.tex file in plain TeX.
     % Read the file by the name they passed if it exists.
+    \let_ = \normalunderscore  % normal _ character for filename test
     \openin 1 txi-#1.tex
     \ifeof 1
-      \documentlanguagetrywithoutunderscore{#1_\finish}%
+      \documentlanguagetrywithoutunderscore #1_\finish
     \else
       \globaldefs = 1  % everything in the txi-LL files needs to persist
       \input txi-#1.tex
     \fi
     \closein 1
   \endgroup % end raw TeX
-\endgroup}
+}
 %
 % If they passed de_DE, and txi-de_DE.tex doesn't exist,
 % try txi-de.tex.
@@ -8934,6 +8949,7 @@ directory should work if nowhere else does.}
       \catcode\count255=#1\relax
       \advance\count255 by 1
    \repeat
+
 }
 
 % @documentencoding sets the definition of non-ASCII characters
@@ -8968,10 +8984,12 @@ directory should work if nowhere else does.}
   %
   \else \ifx \declaredencoding \utfeight
      \setnonasciicharscatcode\active
-     \utfeightchardefs
+     % since we already invoked \utfeightchardefs at the top level
+     % (below), do not re-invoke it, then our check for duplicated
+     % definitions triggers.  Making non-ascii chars active is enough.
   %
   \else
-    \message{Unknown document encoding #1, ignoring.}%
+    \message{Ignoring unknown document encoding: #1.}%
   %
   \fi % utfeight
   \fi % latnine
@@ -8980,10 +8998,11 @@ directory should work if nowhere else does.}
   \fi % ascii
 }
 
+% emacs-page
 % A message to be logged when using a character that isn't available
 % the default font encoding (OT1).
 %
-\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}}
+\def\missingcharmsg#1{\message{Character missing, sorry: #1.}}
 
 % Take account of \c (plain) vs. \, (Texinfo) difference.
 \def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi}
@@ -9019,12 +9038,10 @@ directory should work if nowhere else does.}
   \gdef^^b4{\'{}}
   \gdef^^b5{$\mu$}
   \gdef^^b6{\P}
-  %
-  \gdef^^b7{$^.$}
+  \gdef^^b7{\ifmmode\cdot\else $\cdot$\fi}
   \gdef^^b8{\cedilla\ }
   \gdef^^b9{$^1$}
   \gdef^^ba{\ordm}
-  %
   \gdef^^bb{\guillemetright}
   \gdef^^bc{$1\over4$}
   \gdef^^bd{$1\over2$}
@@ -9279,6 +9296,18 @@ directory should work if nowhere else does.}
   \UTFviiiLoop
 \endgroup
 
+\def\globallet{\global\let} % save some \expandafter's below
+
+% @U{xxxx} to produce U+xxxx, if we support it.
+\def\U#1{%
+  \expandafter\ifx\csname uni:#1\endcsname \relax
+    \errhelp = \EMsimple	
+    \errmessage{Unicode character U+#1 not supported, sorry}%
+  \else
+    \csname uni:#1\endcsname
+  \fi
+}
+
 \begingroup
   \catcode`\"=12
   \catcode`\<=12
@@ -9287,7 +9316,6 @@ directory should work if nowhere else does.}
   \catcode`\;=12
   \catcode`\!=12
   \catcode`\~=13
-
   \gdef\DeclareUnicodeCharacter#1#2{%
     \countUTFz = "#1\relax
     %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
@@ -9302,6 +9330,13 @@ directory should work if nowhere else does.}
       \expandafter\expandafter\expandafter\expandafter
        \expandafter\expandafter\expandafter
        \gdef\UTFviiiTmp{#2}%
+      % 
+      \expandafter\ifx\csname uni:#1\endcsname \relax \else
+       \errmessage{Internal error, already defined: #1}%
+      \fi
+      %
+      % define an additional control sequence for this code point.
+      \expandafter\globallet\csname uni:#1\endcsname \UTFviiiTmp
     \endgroup}
 
   \gdef\parseXMLCharref{%
@@ -9339,23 +9374,49 @@ directory should work if nowhere else does.}
     \uppercase{\gdef\UTFviiiTmp{#2#3#4}}}
 \endgroup
 
+% https://en.wikipedia.org/wiki/Plane_(Unicode)#Basic_M
+% U+0000..U+007F = https://en.wikipedia.org/wiki/Basic_Latin_(Unicode_block)
+% U+0080..U+00FF = https://en.wikipedia.org/wiki/Latin-1_Supplement_(Unicode_block)
+% U+0100..U+017F = https://en.wikipedia.org/wiki/Latin_Extended-A
+% U+0180..U+024F = https://en.wikipedia.org/wiki/Latin_Extended-B
+% 
+% Many of our renditions are less than wonderful, and all the missing
+% characters are available somewhere.  Loading the necessary fonts
+% awaits user request.  We can't truly support Unicode without
+% reimplementing everything that's been done in LaTeX for many years,
+% plus probably using luatex or xetex, and who knows what else.
+% We won't be doing that here in this simple file.  But we can try to at
+% least make most of the characters not bomb out.
+%
 \def\utfeightchardefs{%
   \DeclareUnicodeCharacter{00A0}{\tie}
   \DeclareUnicodeCharacter{00A1}{\exclamdown}
   \DeclareUnicodeCharacter{00A3}{\pounds}
+  \DeclareUnicodeCharacter{00A7}{\S}
   \DeclareUnicodeCharacter{00A8}{\"{ }}
   \DeclareUnicodeCharacter{00A9}{\copyright}
   \DeclareUnicodeCharacter{00AA}{\ordf}
   \DeclareUnicodeCharacter{00AB}{\guillemetleft}
+  \DeclareUnicodeCharacter{00AC}{\ifmmode\lnot\else $\lnot$\fi}
   \DeclareUnicodeCharacter{00AD}{\-}
   \DeclareUnicodeCharacter{00AE}{\registeredsymbol}
   \DeclareUnicodeCharacter{00AF}{\={ }}
 
   \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}
+  \DeclareUnicodeCharacter{00B1}{\ifmmode\pm\else $\pm$\fi}
+  \DeclareUnicodeCharacter{00B2}{$^2$}
+  \DeclareUnicodeCharacter{00B3}{$^3$}
   \DeclareUnicodeCharacter{00B4}{\'{ }}
+  \DeclareUnicodeCharacter{00B5}{$\mu$}
+  \DeclareUnicodeCharacter{00B6}{\P}
+  \DeclareUnicodeCharacter{00B7}{\ifmmode\cdot\else $\cdot$\fi}
   \DeclareUnicodeCharacter{00B8}{\cedilla{ }}
+  \DeclareUnicodeCharacter{00B9}{$^1$}
   \DeclareUnicodeCharacter{00BA}{\ordm}
   \DeclareUnicodeCharacter{00BB}{\guillemetright}
+  \DeclareUnicodeCharacter{00BC}{$1\over4$}
+  \DeclareUnicodeCharacter{00BD}{$1\over2$}
+  \DeclareUnicodeCharacter{00BE}{$3\over4$}
   \DeclareUnicodeCharacter{00BF}{\questiondown}
 
   \DeclareUnicodeCharacter{00C0}{\`A}
@@ -9382,6 +9443,7 @@ directory should work if nowhere else does.}
   \DeclareUnicodeCharacter{00D4}{\^O}
   \DeclareUnicodeCharacter{00D5}{\~O}
   \DeclareUnicodeCharacter{00D6}{\"O}
+  \DeclareUnicodeCharacter{00D7}{\ifmmode\times\else $\times$\fi}
   \DeclareUnicodeCharacter{00D8}{\O}
   \DeclareUnicodeCharacter{00D9}{\`U}
   \DeclareUnicodeCharacter{00DA}{\'U}
@@ -9415,6 +9477,7 @@ directory should work if nowhere else does.}
   \DeclareUnicodeCharacter{00F4}{\^o}
   \DeclareUnicodeCharacter{00F5}{\~o}
   \DeclareUnicodeCharacter{00F6}{\"o}
+  \DeclareUnicodeCharacter{00F7}{\ifmmode\div\else $\div$\fi}
   \DeclareUnicodeCharacter{00F8}{\o}
   \DeclareUnicodeCharacter{00F9}{\`u}
   \DeclareUnicodeCharacter{00FA}{\'u}
@@ -9434,20 +9497,23 @@ directory should work if nowhere else does.}
   \DeclareUnicodeCharacter{0107}{\'c}
   \DeclareUnicodeCharacter{0108}{\^C}
   \DeclareUnicodeCharacter{0109}{\^c}
-  \DeclareUnicodeCharacter{0118}{\ogonek{E}}
-  \DeclareUnicodeCharacter{0119}{\ogonek{e}}
   \DeclareUnicodeCharacter{010A}{\dotaccent{C}}
   \DeclareUnicodeCharacter{010B}{\dotaccent{c}}
   \DeclareUnicodeCharacter{010C}{\v{C}}
   \DeclareUnicodeCharacter{010D}{\v{c}}
   \DeclareUnicodeCharacter{010E}{\v{D}}
+  \DeclareUnicodeCharacter{010F}{d'}
 
+  \DeclareUnicodeCharacter{0110}{\DH}
+  \DeclareUnicodeCharacter{0111}{\dh}
   \DeclareUnicodeCharacter{0112}{\=E}
   \DeclareUnicodeCharacter{0113}{\=e}
   \DeclareUnicodeCharacter{0114}{\u{E}}
   \DeclareUnicodeCharacter{0115}{\u{e}}
   \DeclareUnicodeCharacter{0116}{\dotaccent{E}}
   \DeclareUnicodeCharacter{0117}{\dotaccent{e}}
+  \DeclareUnicodeCharacter{0118}{\ogonek{E}}
+  \DeclareUnicodeCharacter{0119}{\ogonek{e}}
   \DeclareUnicodeCharacter{011A}{\v{E}}
   \DeclareUnicodeCharacter{011B}{\v{e}}
   \DeclareUnicodeCharacter{011C}{\^G}
@@ -9457,14 +9523,20 @@ directory should work if nowhere else does.}
 
   \DeclareUnicodeCharacter{0120}{\dotaccent{G}}
   \DeclareUnicodeCharacter{0121}{\dotaccent{g}}
+  \DeclareUnicodeCharacter{0122}{\cedilla{G}}
+  \DeclareUnicodeCharacter{0123}{\cedilla{g}}
   \DeclareUnicodeCharacter{0124}{\^H}
   \DeclareUnicodeCharacter{0125}{\^h}
+  \DeclareUnicodeCharacter{0126}{\missingcharmsg{H WITH STROKE}}
+  \DeclareUnicodeCharacter{0127}{\missingcharmsg{h WITH STROKE}}
   \DeclareUnicodeCharacter{0128}{\~I}
   \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}
   \DeclareUnicodeCharacter{012A}{\=I}
   \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}
   \DeclareUnicodeCharacter{012C}{\u{I}}
   \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}
+  \DeclareUnicodeCharacter{012E}{\ogonek{I}}
+  \DeclareUnicodeCharacter{012F}{\ogonek{i}}
 
   \DeclareUnicodeCharacter{0130}{\dotaccent{I}}
   \DeclareUnicodeCharacter{0131}{\dotless{i}}
@@ -9472,15 +9544,29 @@ directory should work if nowhere else does.}
   \DeclareUnicodeCharacter{0133}{ij}
   \DeclareUnicodeCharacter{0134}{\^J}
   \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}
+  \DeclareUnicodeCharacter{0136}{\cedilla{K}}
+  \DeclareUnicodeCharacter{0137}{\cedilla{k}}
+  \DeclareUnicodeCharacter{0138}{\ifmmode\kappa\else $\kappa$\fi}  
   \DeclareUnicodeCharacter{0139}{\'L}
   \DeclareUnicodeCharacter{013A}{\'l}
+  \DeclareUnicodeCharacter{013B}{\cedilla{L}}
+  \DeclareUnicodeCharacter{013C}{\cedilla{l}}
+  \DeclareUnicodeCharacter{013D}{L'}% should kern
+  \DeclareUnicodeCharacter{013E}{l'}% should kern
+  \DeclareUnicodeCharacter{013F}{L\U{00B7}}
 
+  \DeclareUnicodeCharacter{0140}{l\U{00B7}}
   \DeclareUnicodeCharacter{0141}{\L}
   \DeclareUnicodeCharacter{0142}{\l}
   \DeclareUnicodeCharacter{0143}{\'N}
   \DeclareUnicodeCharacter{0144}{\'n}
+  \DeclareUnicodeCharacter{0145}{\cedilla{N}}
+  \DeclareUnicodeCharacter{0146}{\cedilla{n}}
   \DeclareUnicodeCharacter{0147}{\v{N}}
   \DeclareUnicodeCharacter{0148}{\v{n}}
+  \DeclareUnicodeCharacter{0149}{'n}
+  \DeclareUnicodeCharacter{014A}{\missingcharmsg{ENG}}
+  \DeclareUnicodeCharacter{014B}{\missingcharmsg{eng}}
   \DeclareUnicodeCharacter{014C}{\=O}
   \DeclareUnicodeCharacter{014D}{\=o}
   \DeclareUnicodeCharacter{014E}{\u{O}}
@@ -9492,6 +9578,8 @@ directory should work if nowhere else does.}
   \DeclareUnicodeCharacter{0153}{\oe}
   \DeclareUnicodeCharacter{0154}{\'R}
   \DeclareUnicodeCharacter{0155}{\'r}
+  \DeclareUnicodeCharacter{0156}{\cedilla{R}}
+  \DeclareUnicodeCharacter{0157}{\cedilla{r}}
   \DeclareUnicodeCharacter{0158}{\v{R}}
   \DeclareUnicodeCharacter{0159}{\v{r}}
   \DeclareUnicodeCharacter{015A}{\'S}
@@ -9503,10 +9591,12 @@ directory should work if nowhere else does.}
 
   \DeclareUnicodeCharacter{0160}{\v{S}}
   \DeclareUnicodeCharacter{0161}{\v{s}}
-  \DeclareUnicodeCharacter{0162}{\cedilla{t}}
-  \DeclareUnicodeCharacter{0163}{\cedilla{T}}
+  \DeclareUnicodeCharacter{0162}{\cedilla{T}}
+  \DeclareUnicodeCharacter{0163}{\cedilla{t}}
   \DeclareUnicodeCharacter{0164}{\v{T}}
-
+  \DeclareUnicodeCharacter{0165}{\v{t}}
+  \DeclareUnicodeCharacter{0166}{\missingcharmsg{H WITH STROKE}}
+  \DeclareUnicodeCharacter{0167}{\missingcharmsg{h WITH STROKE}}
   \DeclareUnicodeCharacter{0168}{\~U}
   \DeclareUnicodeCharacter{0169}{\~u}
   \DeclareUnicodeCharacter{016A}{\=U}
@@ -9518,6 +9608,8 @@ directory should work if nowhere else does.}
 
   \DeclareUnicodeCharacter{0170}{\H{U}}
   \DeclareUnicodeCharacter{0171}{\H{u}}
+  \DeclareUnicodeCharacter{0172}{\ogonek{U}}
+  \DeclareUnicodeCharacter{0173}{\ogonek{u}}
   \DeclareUnicodeCharacter{0174}{\^W}
   \DeclareUnicodeCharacter{0175}{\^w}
   \DeclareUnicodeCharacter{0176}{\^Y}
@@ -9529,6 +9621,7 @@ directory should work if nowhere else does.}
   \DeclareUnicodeCharacter{017C}{\dotaccent{z}}
   \DeclareUnicodeCharacter{017D}{\v{Z}}
   \DeclareUnicodeCharacter{017E}{\v{z}}
+  \DeclareUnicodeCharacter{017F}{\missingcharmsg{LONG S}}
 
   \DeclareUnicodeCharacter{01C4}{D\v{Z}}
   \DeclareUnicodeCharacter{01C5}{D\v{z}}
@@ -9734,12 +9827,51 @@ directory should work if nowhere else does.}
   \DeclareUnicodeCharacter{2261}{\equiv}
 }% end of \utfeightchardefs
 
-
 % US-ASCII character definitions.
 \def\asciichardefs{% nothing need be done
    \relax
 }
 
+% Latin1 (ISO-8859-1) character definitions.
+\def\nonasciistringdefs{%
+  \setnonasciicharscatcode\active
+  \def\defstringchar##1{\def##1{\string##1}}%
+  \defstringchar^^a0\defstringchar^^a1\defstringchar^^a2\defstringchar^^a3%
+  \defstringchar^^a4\defstringchar^^a5\defstringchar^^a6\defstringchar^^a7%
+  \defstringchar^^a8\defstringchar^^a9\defstringchar^^aa\defstringchar^^ab%
+  \defstringchar^^ac\defstringchar^^ad\defstringchar^^ae\defstringchar^^af%
+  %
+  \defstringchar^^b0\defstringchar^^b1\defstringchar^^b2\defstringchar^^b3%
+  \defstringchar^^b4\defstringchar^^b5\defstringchar^^b6\defstringchar^^b7%
+  \defstringchar^^b8\defstringchar^^b9\defstringchar^^ba\defstringchar^^bb%
+  \defstringchar^^bc\defstringchar^^bd\defstringchar^^be\defstringchar^^bf%
+  %
+  \defstringchar^^c0\defstringchar^^c1\defstringchar^^c2\defstringchar^^c3%
+  \defstringchar^^c4\defstringchar^^c5\defstringchar^^c6\defstringchar^^c7%
+  \defstringchar^^c8\defstringchar^^c9\defstringchar^^ca\defstringchar^^cb%
+  \defstringchar^^cc\defstringchar^^cd\defstringchar^^ce\defstringchar^^cf%
+  %
+  \defstringchar^^d0\defstringchar^^d1\defstringchar^^d2\defstringchar^^d3%
+  \defstringchar^^d4\defstringchar^^d5\defstringchar^^d6\defstringchar^^d7%
+  \defstringchar^^d8\defstringchar^^d9\defstringchar^^da\defstringchar^^db%
+  \defstringchar^^dc\defstringchar^^dd\defstringchar^^de\defstringchar^^df%
+  %
+  \defstringchar^^e0\defstringchar^^e1\defstringchar^^e2\defstringchar^^e3%
+  \defstringchar^^e4\defstringchar^^e5\defstringchar^^e6\defstringchar^^e7%
+  \defstringchar^^e8\defstringchar^^e9\defstringchar^^ea\defstringchar^^eb%
+  \defstringchar^^ec\defstringchar^^ed\defstringchar^^ee\defstringchar^^ef%
+  %
+  \defstringchar^^f0\defstringchar^^f1\defstringchar^^f2\defstringchar^^f3%
+  \defstringchar^^f4\defstringchar^^f5\defstringchar^^f6\defstringchar^^f7%
+  \defstringchar^^f8\defstringchar^^f9\defstringchar^^fa\defstringchar^^fb%
+  \defstringchar^^fc\defstringchar^^fd\defstringchar^^fe\defstringchar^^ff%
+}
+
+
+% define all the unicode characters we know about, for the sake of @U.
+\utfeightchardefs
+
+
 % Make non-ASCII characters printable again for compatibility with
 % existing Texinfo documents that may use them, even without declaring a
 % document encoding.
@@ -10093,6 +10225,7 @@ directory should work if nowhere else does.}
 %
 {@catcode`- = @active
  @gdef@normalturnoffactive{%
+   @nonasciistringdefs
    @let-=@normaldash
    @let"=@normaldoublequote
    @let$=@normaldollar %$ font-lock fix
@@ -10161,7 +10294,7 @@ directory should work if nowhere else does.}
 
 @c Local variables:
 @c eval: (add-hook 'write-file-hooks 'time-stamp)
-@c page-delimiter: "^\\\\message"
+@c page-delimiter: "^\\\\message\\|emacs-page"
 @c time-stamp-start: "def\\\\texinfoversion{"
 @c time-stamp-format: "%:y-%02m-%02d.%02H"
 @c time-stamp-end: "}"
diff --git a/double.c b/double.c
index cfb2fbf9..114ab4f1 100644
--- a/double.c
+++ b/double.c
@@ -141,7 +141,7 @@ awknum_init(bltin_t **numbr_bltins)
 		{ "atan2",	do_atan2 },
 		{ "compl",	do_compl },
 		{ "cos",	do_cos },
-		{ "div",	do_div },
+		{ "div",	do_intdiv },
 		{ "exp",	do_exp },
 		{ "int",	do_int },
 		{ "log",	do_log },
@@ -374,10 +374,8 @@ make_awknum(AWKNUM x)
 	r->valref = 1;
 	r->stptr = NULL;
 	r->stlen = 0;
-#if MBS_SUPPORT
 	r->wstptr = NULL;
 	r->wstlen = 0;
-#endif /* defined MBS_SUPPORT */
 	return r;
 }
 
@@ -1341,7 +1339,7 @@ do_strtonum(int nargs)
 	return make_awknum(d);
 }
 
-/* do_div --- do integer division, return quotient and remainder in dest array */
+/* do_intdiv --- do integer division, return quotient and remainder in dest array */
 
 /*
  * We define the semantics as:
@@ -1352,7 +1350,7 @@ do_strtonum(int nargs)
  */
 
 NODE *
-do_div(int nargs)
+do_intdiv(int nargs)
 {
 	NODE *numerator, *denominator, *result;
 	double num, denom, quotient, remainder;
@@ -1360,7 +1358,7 @@ do_div(int nargs)
 
 	result = POP_PARAM();
 	if (result->type != Node_var_array)
-		fatal(_("div: third argument is not an array"));
+		fatal(_("intdiv: third argument is not an array"));
 	assoc_clear(result);
 
 	denominator = POP_SCALAR();
@@ -1368,9 +1366,9 @@ do_div(int nargs)
 
 	if (do_lint) {
 		if ((numerator->flags & (NUMCUR|NUMBER)) == 0)
-			lintwarn(_("div: received non-numeric first argument"));
+			lintwarn(_("intdiv: received non-numeric first argument"));
 		if ((denominator->flags & (NUMCUR|NUMBER)) == 0)
-			lintwarn(_("div: received non-numeric second argument"));
+			lintwarn(_("intdiv: received non-numeric second argument"));
 	}
 
 	(void) force_number(numerator);
diff --git a/eval.c b/eval.c
index 7bca21a4..b8f828ac 100644
--- a/eval.c
+++ b/eval.c
@@ -25,7 +25,6 @@
 
 #include "awk.h"
 
-extern void after_beginfile(IOBUF **curfile);
 extern double pow(double x, double y);
 extern double modf(double x, double *yp);
 extern double fmod(double x, double y);
@@ -358,6 +357,7 @@ static struct optypetab {
 	{ "Op_after_beginfile", NULL },
 	{ "Op_after_endfile", NULL },
 	{ "Op_func", NULL },
+	{ "Op_comment", NULL },
 	{ "Op_exec_count", NULL },
 	{ "Op_breakpoint", NULL },
 	{ "Op_lint", NULL },
@@ -526,7 +526,7 @@ posix_compare(NODE *s1, NODE *s2)
 		 * In either case, ret will be the right thing to return.
 		 */
 	}
-#if MBS_SUPPORT
+#if ! defined(__DJGPP__)
 	else {
 		/* Similar logic, using wide characters */
 		(void) force_wstring(s1);
@@ -606,15 +606,14 @@ cmp_nodes(NODE *t1, NODE *t2)
 		const unsigned char *cp1 = (const unsigned char *) t1->stptr;
 		const unsigned char *cp2 = (const unsigned char *) t2->stptr;
 
-#if MBS_SUPPORT
 		if (gawk_mb_cur_max > 1) {
 			ret = strncasecmpmbs((const unsigned char *) cp1,
 					     (const unsigned char *) cp2, l);
-		} else
-#endif
-		/* Could use tolower() here; see discussion above. */
-		for (ret = 0; l-- > 0 && ret == 0; cp1++, cp2++)
-			ret = casetable[*cp1] - casetable[*cp2];
+		} else {
+			/* Could use tolower() here; see discussion above. */
+			for (ret = 0; l-- > 0 && ret == 0; cp1++, cp2++)
+				ret = casetable[*cp1] - casetable[*cp2];
+		}
 	} else
 		ret = memcmp(t1->stptr, t2->stptr, l);
 
@@ -704,6 +703,8 @@ set_IGNORECASE()
 	load_casetable();
 	if (do_traditional)
 		IGNORECASE = false;
+	else if ((n->flags & (NUMCUR|NUMBER)) != 0)
+		IGNORECASE = ! iszero(n);
 	else if ((n->flags & (STRING|STRCUR)) != 0) {
 		if ((n->flags & MAYBE_NUM) == 0) {
 			(void) force_string(n);
@@ -712,9 +713,7 @@ set_IGNORECASE()
 			(void) force_number(n);
 			IGNORECASE = ! iszero(n);
 		}
-	} else if ((n->flags & (NUMCUR|NUMBER)) != 0)
-		IGNORECASE = ! iszero(n);
-	else
+	} else
 		IGNORECASE = false;		/* shouldn't happen */
                  
 	set_RS();	/* set_RS() calls set_FS() if need be, for us */
@@ -1082,6 +1081,7 @@ update_ERRNO_int(int errcode)
 {
 	char *cp;
 
+	update_PROCINFO_num("errno", errcode);
 	if (errcode) {
 		cp = strerror(errcode);
 		cp = gettext(cp);
@@ -1096,6 +1096,7 @@ update_ERRNO_int(int errcode)
 void
 update_ERRNO_string(const char *string)
 {
+	update_PROCINFO_num("errno", 0);
 	unref(ERRNO_node->var_value);
 	ERRNO_node->var_value = make_string(string, strlen(string));
 }
@@ -1105,6 +1106,7 @@ update_ERRNO_string(const char *string)
 void
 unset_ERRNO(void)
 {
+	update_PROCINFO_num("errno", 0);
 	unref(ERRNO_node->var_value);
 	ERRNO_node->var_value = dupnode(Nnull_string);
 }
@@ -1221,7 +1223,7 @@ r_get_lhs(NODE *n, bool reference)
 
 /* r_get_field --- get the address of a field node */
  
-static inline NODE **
+NODE **
 r_get_field(NODE *n, Func_ptr *assign, bool reference)
 {
 	long field_num;
diff --git a/ext.c b/ext.c
index afb8d715..cf813674 100644
--- a/ext.c
+++ b/ext.c
@@ -397,6 +397,9 @@ close_extensions()
 {
 	SRCFILE *s;
 
+	if (srcfiles == NULL)
+		return;
+
 	for (s = srcfiles->next; s != srcfiles; s = s->next) 
 		if (s->stype == SRC_EXTLIB && s->fini_func)
                	        (*s->fini_func)();
diff --git a/extension/ChangeLog b/extension/ChangeLog
index f324bdeb..5d1651fd 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,137 @@
+2015-03-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* testext.c: Move test for deferred variables here.
+
+2015-03-18         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* configure: Updated to libtool 2.4.6.
+
+2015-03-18         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* inplace.3am (SYNOPSIS): Updated to not show the contents
+	of the extension.
+	(BUGS): Removed.
+
+2015-03-17         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* inplace.c (do_inplace_begin): Jump through more hoops to satisfy
+	a newer version of clang.
+	* inplace.3am (BUGS): Add new section and documentation.
+
+2015-02-26         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (EXTRA_DIST): Add rwarray0.c to the list.
+
+2015-02-11         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* filefuncs.c: Punctuation fix.
+
+2015-01-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Infrastructure updates.
+
+	Automake 1.15. Libtool 2.4.5.
+
+	* configure.ac: Remove gettext macros.
+
+2015-01-07         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* testext.c (var_test): Adjust for PROCINFO now being there.
+
+2015-01-06         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* testext.c (test_deferred): New function to help with testing
+	of deferred variable instantiation.
+	(do_get_file): Remove unused variable array.
+	(func_table): Add test_deferred.
+
+2015-01-05         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* testext.c (test_get_file): Fix error message.
+	(do_get_file): Implement new function providing low-level access
+	to the get_file API.
+	(func_table): Add "get_file" -> do_get_file.
+	(init_testext): If TESTEXT_QUIET has been set to a numeric value,
+	return quietly.
+
+2015-01-02         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* testext.c (test_get_file): The get_file hook no longer takes a
+	typelen argument.
+
+2015-01-02         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	Remove the select extension, since it will be part of gawkextlib.
+	* select.c, siglist.h: Deleted.
+	* Makefile.am (pkgextension_LTLIBRARIES): Remove select.la.
+	(select_la_SOURCES, select_la_LDFLAGS, select_la_LIBADD): Remove.
+	(EXTRA_DIST): Remove siglist.h.
+	* configure.ac (AC_CHECK_HEADERS): Remove signal.h.
+	(AC_CHECK_FUNCS): Remove fcntl, kill, sigaction, and sigprocmask.
+
+2014-12-14         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	Remove the errno extension, since it is now part of gawkextlib.
+	* errno.c, errlist.h: Deleted.
+	* Makefile.am (pkgextension_LTLIBRARIES): Remove errno.la.
+	(errno_la_SOURCES, errno_la_LDFLAGS, errno_la_LIBADD): Remove.
+	(EXTRA_DIST): Remove errlist.h.
+
+2014-11-23         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* inplace.c (do_inplace_begin): Jump through hoops to silence
+	GCC warnings about return value of chown.
+
+2014-11-09         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* select.c (do_input_fd): New function to return the input file
+	descriptor associated with a file/command.
+	(do_output_fd): New function to return the output file descriptor
+	associated with a file/command.
+	(func_table): Add new functions "input_fd" and "output_fd".
+	* testext.c (test_get_file): Do not use __func__, since it is a C99
+	feature, and gawk does not assume C99.
+
+2014-11-06         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* errno.c (do_errno2name, do_name2errno): Remove unused variable 'str'.
+	* select.c (do_signal): Remove unused variable 'override'.
+	(grabfd): New helper function to map a gawk file to the appropriate
+	fd for use in the arguments to selectd.
+	(do_select): get_file has 3 new arguments and returns info about both
+	the input and output buf.
+	(do_set_non_blocking): Support changes to get_file API.
+	* testext.c (test_get_file): New test function to check that extension
+	file creation via the get_file API is working.
+
+2014-11-05         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* select.c (set_retry): New function to set PROCINFO[<name>, "RETRY"].
+	(do_set_non_blocking): If called with a file name as opposed to a file
+	descriptor, call the set_retry function to configure PROCINFO to tell
+	io.c to retry I/O for temporary failures.
+
+2014-10-12         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (uninstall-so): Remove *.lib too, per suggestion
+	from Andreas Buening.
+
+2014-10-12         KO Myung-Hun          <komh78@gmail.com>
+
+	Fixes for OS/2:
+
+	* Makefile.am (uninstall-so): Remove *.dll and *.a, also.
+
+2014-10-08         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* inplace.c (do_inplace_begin): Use a cast to void in front
+	of the second call to chown to avoid compiler warnings from clang.
+
+2014-09-29         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* filefuncs.c: Minor edits to sync with documentation.
+	* testext.c: Add test to get PROCINFO, expected to fail.
+
 2014-08-12         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* Makefile.am (RM): Define for makes that don't have it,
@@ -148,6 +282,108 @@
 	* gawkdirfd.h (FAKE_FD_VALUE): Move definition up in the file to give
 	clean compile on MinGW.
 
+2013-07-07         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* configure.ac (AC_CHECK_FUNCS): Check for fcntl.
+	* select.c (set_non_blocking): Check that fcntl and O_NONBLOCK are
+	available.
+
+2013-07-07         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* select.c (signal_handler): On platforms lacking sigaction, reset
+	the signal handler each time a signal is trapped to protect in case
+	the system resets it to default.
+
+2013-07-05         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* select.c (signal_result): New function to set result string from
+	signal function and detect when we need to roll back.
+	(do_signal): Now takes an optional 3rd override argument.  Instead
+	of returning -1 or 0, we now return information about the previously
+	installed signal handler: default, ignore, trap, or unknown.  An
+	empty string is returned on error.  If it is an unknown handler,
+	and override is not non-zero, we roll back the handler and return "".
+
+2013-07-05         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* select.c (set_non_blocking): Do not attempt F_SETFL if F_GETFL fails.
+	(do_set_non_blocking): Add support for case when called with a single
+	"" argument.
+
+2013-07-05         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* select.c (do_signal): If sigaction is unavailable, fall back to
+	signal and hope that it does the right thing.
+
+2013-07-05         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* configure.ac (AC_CHECK_FUNCS): Add kill and sigprocmask.
+	* select.c (get_signal_number): Change error messages since now may
+	be called by "kill" as well as "select_signal".
+	(do_signal): Add a lint warning if there are more than 2 args.
+	(do_kill): Add new function to send a signal.
+	(do_select): Support platforms where sigprocmask is not available.
+	There will be a race condition on such platforms, but that is not
+	easily avoided.
+
+2013-07-02         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* select.c (do_select): Now that the API flatten_array call has been
+	patched to ensure that the index values are strings, we can remove
+	the code to check for the AWK_NUMBER case.
+
+2013-07-02         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* select.c (do_select): Do not treat a numeric command value as a
+	file descriptor unless the command type is empty.
+
+2013-07-02         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* Makefile.am (EXTRA_DIST): Add errlist.h and siglist.h.
+
+2013-07-02         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* select.c (set_non_blocking): New helper function to call fcntl.
+	(do_set_non_blocking): Add support for the case where there's a single
+	integer fd argument.
+
+2013-07-01         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* select.c (do_set_non_blocking): Implement new set_non_blocking
+	function.
+	(func_table): Add set_non_blocking.
+
+2013-07-01         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* errlist.h: New file containing a list of all the errno values I could
+	find.
+	* errno.c: Implement a new errno extension providing strerror,
+	errno2name, and name2errno.
+	* Makefile.am (pkgextension_LTLIBRARIES): Add errno.la.
+	(errno_la_SOURCES, errno_la_LDFLAGS, errno_la_LIBADD): Build new errno
+	extension.
+	* select.c (ext_version): Fix version string.
+	* siglist.h: Update to newest glibc version.
+
+2013-07-01         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* siglist.h: New file copied from glibc to provide a mapping between
+	signal number and name.
+	* select.c: Add a new "select_signal" function and provide support
+	for trapping signals.
+	(do_select): Add support for a 5th argument to contain an array
+	of returned signals.  Improve the argument processing, and add
+	better warning messages.
+
+2013-06-30         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* Makefile.am (pkgextension_LTLIBRARIES): Add select.la.
+	(select_la_SOURCES, select_la_LDFLAGS, select_la_LIBADD): Build new
+	select extension.
+	* configure.ac (AC_CHECK_HEADERS): Add signal.h.
+	(AC_CHECK_FUNCS): Add sigaction.
+	* select.c: Implement the new select extension.
+
 2013-06-10         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* configure.ac (AC_HEADER_MAJOR): New macro added.
diff --git a/extension/INSTALL b/extension/INSTALL
index 6e90e07d..20998407 100644
--- a/extension/INSTALL
+++ b/extension/INSTALL
@@ -1,7 +1,7 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
 Inc.
 
    Copying and distribution of this file, with or without modification,
@@ -12,8 +12,8 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented
diff --git a/extension/Makefile.am b/extension/Makefile.am
index e6678c54..3e64bc9b 100644
--- a/extension/Makefile.am
+++ b/extension/Makefile.am
@@ -109,6 +109,9 @@ install-data-hook:
 # Keep the uninstall check working:
 uninstall-so:
 	$(RM) $(DESTDIR)$(pkgextensiondir)/*.so
+	$(RM) $(DESTDIR)$(pkgextensiondir)/*.dll
+	$(RM) $(DESTDIR)$(pkgextensiondir)/*.a
+	$(RM) $(DESTDIR)$(pkgextensiondir)/*.lib
 
 uninstall-recursive: uninstall-so
 
@@ -116,7 +119,8 @@ EXTRA_DIST = build-aux/config.rpath  \
 	ChangeLog \
 	ChangeLog.0 \
 	fts.3 \
-	README.fts
+	README.fts \
+	rwarray0.c
 
 dist_man_MANS = \
 	filefuncs.3am fnmatch.3am fork.3am inplace.3am \
diff --git a/extension/Makefile.in b/extension/Makefile.in
index 46168e4e..cda5020b 100644
--- a/extension/Makefile.in
+++ b/extension/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -38,7 +38,17 @@
 #
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -102,33 +112,15 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
-	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/configh.in ABOUT-NLS $(top_srcdir)/build-aux/depcomp \
-	$(dist_man_MANS) COPYING build-aux/ChangeLog build-aux/ar-lib \
-	build-aux/config.guess build-aux/config.rpath \
-	build-aux/config.sub build-aux/depcomp build-aux/install-sh \
-	build-aux/missing build-aux/ltmain.sh \
-	$(top_srcdir)/build-aux/ar-lib \
-	$(top_srcdir)/build-aux/config.guess \
-	$(top_srcdir)/build-aux/config.rpath \
-	$(top_srcdir)/build-aux/config.sub \
-	$(top_srcdir)/build-aux/install-sh \
-	$(top_srcdir)/build-aux/ltmain.sh \
-	$(top_srcdir)/build-aux/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/dirfd.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -166,8 +158,7 @@ am__installdirs = "$(DESTDIR)$(pkgextensiondir)" \
 	"$(DESTDIR)$(man3dir)"
 LTLIBRARIES = $(pkgextension_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-filefuncs_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+filefuncs_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_filefuncs_la_OBJECTS = filefuncs.lo stack.lo gawkfts.lo
 filefuncs_la_OBJECTS = $(am_filefuncs_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -177,67 +168,67 @@ am__v_lt_1 =
 filefuncs_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(filefuncs_la_LDFLAGS) $(LDFLAGS) -o $@
-fnmatch_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+fnmatch_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_fnmatch_la_OBJECTS = fnmatch.lo
 fnmatch_la_OBJECTS = $(am_fnmatch_la_OBJECTS)
 fnmatch_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(fnmatch_la_LDFLAGS) $(LDFLAGS) -o $@
-fork_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+fork_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_fork_la_OBJECTS = fork.lo
 fork_la_OBJECTS = $(am_fork_la_OBJECTS)
 fork_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(fork_la_LDFLAGS) $(LDFLAGS) -o $@
-inplace_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+inplace_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_inplace_la_OBJECTS = inplace.lo
 inplace_la_OBJECTS = $(am_inplace_la_OBJECTS)
 inplace_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(inplace_la_LDFLAGS) $(LDFLAGS) -o $@
-ordchr_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+ordchr_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_ordchr_la_OBJECTS = ordchr.lo
 ordchr_la_OBJECTS = $(am_ordchr_la_OBJECTS)
 ordchr_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(ordchr_la_LDFLAGS) $(LDFLAGS) -o $@
-readdir_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+readdir_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_readdir_la_OBJECTS = readdir.lo
 readdir_la_OBJECTS = $(am_readdir_la_OBJECTS)
 readdir_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(readdir_la_LDFLAGS) $(LDFLAGS) -o $@
-readfile_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+readfile_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_readfile_la_OBJECTS = readfile.lo
 readfile_la_OBJECTS = $(am_readfile_la_OBJECTS)
 readfile_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(readfile_la_LDFLAGS) $(LDFLAGS) -o $@
-revoutput_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+revoutput_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_revoutput_la_OBJECTS = revoutput.lo
 revoutput_la_OBJECTS = $(am_revoutput_la_OBJECTS)
 revoutput_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(revoutput_la_LDFLAGS) $(LDFLAGS) -o $@
-revtwoway_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+revtwoway_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_revtwoway_la_OBJECTS = revtwoway.lo
 revtwoway_la_OBJECTS = $(am_revtwoway_la_OBJECTS)
 revtwoway_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(revtwoway_la_LDFLAGS) $(LDFLAGS) -o $@
-rwarray_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+rwarray_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_rwarray_la_OBJECTS = rwarray.lo
 rwarray_la_OBJECTS = $(am_rwarray_la_OBJECTS)
 rwarray_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(rwarray_la_LDFLAGS) $(LDFLAGS) -o $@
-testext_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+testext_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_testext_la_OBJECTS = testext.lo
 testext_la_OBJECTS = $(am_testext_la_OBJECTS)
 testext_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(testext_la_LDFLAGS) $(LDFLAGS) -o $@
-time_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+time_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_time_la_OBJECTS = time.lo
 time_la_OBJECTS = $(am_time_la_OBJECTS)
 time_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -333,6 +324,19 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
+	$(srcdir)/configh.in $(top_srcdir)/build-aux/ar-lib \
+	$(top_srcdir)/build-aux/compile \
+	$(top_srcdir)/build-aux/config.guess \
+	$(top_srcdir)/build-aux/config.sub \
+	$(top_srcdir)/build-aux/depcomp \
+	$(top_srcdir)/build-aux/install-sh \
+	$(top_srcdir)/build-aux/ltmain.sh \
+	$(top_srcdir)/build-aux/missing ABOUT-NLS AUTHORS COPYING \
+	ChangeLog INSTALL NEWS README build-aux/ChangeLog \
+	build-aux/ar-lib build-aux/compile build-aux/config.guess \
+	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
+	build-aux/install-sh build-aux/ltmain.sh build-aux/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -400,35 +404,24 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -443,17 +436,12 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -576,7 +564,8 @@ EXTRA_DIST = build-aux/config.rpath  \
 	ChangeLog \
 	ChangeLog.0 \
 	fts.3 \
-	README.fts
+	README.fts \
+	rwarray0.c
 
 dist_man_MANS = \
 	filefuncs.3am fnmatch.3am fork.3am inplace.3am \
@@ -606,7 +595,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -627,8 +615,8 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/configh.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -738,14 +726,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -993,10 +981,16 @@ dist-xz: distdir
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
@@ -1031,16 +1025,17 @@ distcheck: dist
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1231,6 +1226,8 @@ uninstall-man: uninstall-man3
 	tags tags-am uninstall uninstall-am uninstall-man \
 	uninstall-man3 uninstall-pkgextensionLTLIBRARIES
 
+.PRECIOUS: Makefile
+
 
 install-data-hook:
 	for i in $(pkgextension_LTLIBRARIES) ; do \
@@ -1240,6 +1237,9 @@ install-data-hook:
 # Keep the uninstall check working:
 uninstall-so:
 	$(RM) $(DESTDIR)$(pkgextensiondir)/*.so
+	$(RM) $(DESTDIR)$(pkgextensiondir)/*.dll
+	$(RM) $(DESTDIR)$(pkgextensiondir)/*.a
+	$(RM) $(DESTDIR)$(pkgextensiondir)/*.lib
 
 uninstall-recursive: uninstall-so
 
diff --git a/extension/aclocal.m4 b/extension/aclocal.m4
index 7e987650..d2e755e4 100644
--- a/extension/aclocal.m4
+++ b/extension/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.13'
+[am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.13.4], [],
+m4_if([$1], [1.15], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,12 +51,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.13.4])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -76,7 +76,8 @@ AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
 : ${AR=ar}
 
 AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
-  [am_cv_ar_interface=ar
+  [AC_LANG_PUSH([C])
+   am_cv_ar_interface=ar
    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
      [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
       AC_TRY_EVAL([am_ar_try])
@@ -93,7 +94,7 @@ AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
       fi
       rm -f conftest.lib libconftest.a
      ])
-   ])
+   AC_LANG_POP([C])])
 
 case $am_cv_ar_interface in
 ar)
@@ -117,7 +118,7 @@ AC_SUBST([AR])dnl
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -162,15 +163,14 @@ AC_SUBST([AR])dnl
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -201,7 +201,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -392,7 +392,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -468,7 +468,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -477,6 +477,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -552,8 +558,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -585,6 +591,51 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
 ])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
@@ -593,7 +644,6 @@ dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -615,7 +665,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -626,7 +676,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -636,7 +686,7 @@ if test x"${install_sh}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -657,7 +707,7 @@ AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -707,7 +757,7 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -746,7 +796,7 @@ fi
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -775,9 +825,73 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -858,7 +972,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -918,7 +1032,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -946,7 +1060,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -965,7 +1079,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1097,17 +1211,8 @@ AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([m4/dirfd.m4])
-m4_include([m4/gettext.m4])
-m4_include([m4/iconv.m4])
-m4_include([m4/intlmacosx.m4])
-m4_include([m4/lib-ld.m4])
-m4_include([m4/lib-link.m4])
-m4_include([m4/lib-prefix.m4])
 m4_include([m4/libtool.m4])
 m4_include([m4/ltoptions.m4])
 m4_include([m4/ltsugar.m4])
 m4_include([m4/ltversion.m4])
 m4_include([m4/lt~obsolete.m4])
-m4_include([m4/nls.m4])
-m4_include([m4/po.m4])
-m4_include([m4/progtest.m4])
diff --git a/extension/build-aux/ChangeLog b/extension/build-aux/ChangeLog
index 697db607..589d20cc 100644
--- a/extension/build-aux/ChangeLog
+++ b/extension/build-aux/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-18         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* config.guess, config.sub, ltmain.sh: Updated, from libtool 2.4.6.
+
 2014-04-08         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 4.1.1: Release tar ball made.
diff --git a/extension/build-aux/ar-lib b/extension/build-aux/ar-lib
index 67f5f36f..463b9ec0 100755
--- a/extension/build-aux/ar-lib
+++ b/extension/build-aux/ar-lib
@@ -4,7 +4,7 @@
 me=ar-lib
 scriptversion=2012-03-01.08; # UTC
 
-# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 # Written by Peter Rosin <peda@lysator.liu.se>.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/extension/build-aux/compile b/extension/build-aux/compile
new file mode 100755
index 00000000..a85b723c
--- /dev/null
+++ b/extension/build-aux/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/extension/build-aux/config.guess b/extension/build-aux/config.guess
index 4438cd70..dbfb9786 100755
--- a/extension/build-aux/config.guess
+++ b/extension/build-aux/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2014-01-01'
+timestamp='2015-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@ timestamp='2014-01-01'
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 #
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 
 
 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +149,7 @@ Linux|GNU|GNU/*)
 	LIBC=gnu
 	#endif
 	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
 	;;
 esac
 
@@ -579,8 +579,9 @@ EOF
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@@ -826,7 +827,7 @@ EOF
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
@@ -969,10 +970,10 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    or1k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
 	exit ;;
-    or32:Linux:*:*)
+    or32:Linux:*:* | or1k*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
@@ -1371,154 +1372,6 @@ EOF
 	exit ;;
 esac
 
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
 cat >&2 <<EOF
 $0: unable to guess system type
 
diff --git a/extension/build-aux/config.sub b/extension/build-aux/config.sub
index 092cff00..6d2e94c8 100755
--- a/extension/build-aux/config.sub
+++ b/extension/build-aux/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2014-01-01'
+timestamp='2015-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ timestamp='2014-01-01'
 # of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -260,7 +260,7 @@ case $basic_machine in
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
-	| fido | fr30 | frv \
+	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
@@ -283,8 +283,10 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipsr5900 | mipsr5900el \
@@ -296,11 +298,11 @@ case $basic_machine in
 	| nds32 | nds32le | nds32be \
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
-	| or1k | or32 \
+	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
+	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -311,6 +313,7 @@ case $basic_machine in
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -325,6 +328,9 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -402,8 +408,10 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipsr5900-* | mipsr5900el-* \
@@ -415,6 +423,7 @@ case $basic_machine in
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -432,6 +441,7 @@ case $basic_machine in
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
+	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -769,6 +779,9 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@@ -824,6 +837,10 @@ case $basic_machine in
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -1369,14 +1386,14 @@ case $os in
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1594,9 +1611,6 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
-	or1k-*)
-		os=-elf
-		;;
 	or32-*)
 		os=-coff
 		;;
diff --git a/extension/build-aux/depcomp b/extension/build-aux/depcomp
index 31788017..fc98710e 100755
--- a/extension/build-aux/depcomp
+++ b/extension/build-aux/depcomp
@@ -3,7 +3,7 @@
 
 scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -251,6 +251,41 @@ hp)
   exit 1
   ;;
 
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
 xlc)
   # This case exists only to let depend.m4 do its work.  It works by
   # looking at the text of this script.  This case will never be run,
diff --git a/extension/build-aux/install-sh b/extension/build-aux/install-sh
index 04367377..0b0fdcbb 100755
--- a/extension/build-aux/install-sh
+++ b/extension/build-aux/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2013-10-30.23; # UTC
+scriptversion=2013-12-25.23; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -82,7 +82,7 @@ dir_arg=
 dst_arg=
 
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -139,14 +139,16 @@ while test $# -ne 0; do
 
     -s) stripcmd=$stripprog;;
 
-    -t) dst_arg=$2
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
         # Protect names problematic for 'test' and other utilities.
         case $dst_arg in
           -* | [=\(\)!]) dst_arg=./$dst_arg;;
         esac
         shift;;
 
-    -T) no_target_directory=true;;
+    -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
@@ -161,6 +163,16 @@ while test $# -ne 0; do
   shift
 done
 
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -192,6 +204,15 @@ if test $# -eq 0; then
 fi
 
 if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
   do_exit='(exit $ret); exit $ret'
   trap "ret=129; $do_exit" 1
   trap "ret=130; $do_exit" 2
@@ -253,7 +274,7 @@ do
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
+      if test "$is_target_a_directory" = never; then
         echo "$0: $dst_arg: Is a directory" >&2
         exit 1
       fi
diff --git a/extension/build-aux/ltmain.sh b/extension/build-aux/ltmain.sh
index a50a21a6..0f0a2da3 100644
--- a/extension/build-aux/ltmain.sh
+++ b/extension/build-aux/ltmain.sh
@@ -1,10 +1,12 @@
 #! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+##               by inline-source v2014-01-03.01
 
-# libtool (GNU libtool) 2.4.2.418
+# libtool (GNU libtool) 2.4.6
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -29,8 +31,8 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4.2.418
-package_revision=2.4.2.418
+VERSION=2.4.6
+package_revision=2.4.6
 
 
 ## ------ ##
@@ -62,12 +64,12 @@ package_revision=2.4.2.418
 # libraries, which are installed to $pkgauxdir.
 
 # Set a version string for this script.
-scriptversion=2013-08-23.20; # UTC
+scriptversion=2015-01-20.17; # UTC
 
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -147,47 +149,157 @@ nl='
 '
 IFS="$sp	$nl"
 
-# There are still modern systems that have problems with 'echo' mis-
-# handling backslashes, among others, so make sure $bs_echo is set to a
-# command that correctly interprets backslashes.
-# (this code from Autoconf 2.68)
-
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-bs_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-bs_echo=$bs_echo$bs_echo$bs_echo$bs_echo$bs_echo
-bs_echo=$bs_echo$bs_echo$bs_echo$bs_echo$bs_echo$bs_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $bs_echo`" = "X$bs_echo") 2>/dev/null; then
-  bs_echo='print -r --'
-  bs_echo_n='print -rn --'
-elif (test "X`printf %s $bs_echo`" = "X$bs_echo") 2>/dev/null; then
-  bs_echo='printf %s\n'
-  bs_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $bs_echo) 2>/dev/null`" = "X-n $bs_echo"; then
-    bs_echo_body='eval /usr/ucb/echo -n "$1$nl"'
-    bs_echo_n='/usr/ucb/echo -n'
-  else
-    bs_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    bs_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$nl"*)
-	expr "X$arg" : "X\\(.*\\)$nl";
-	arg=`expr "X$arg" : ".*$nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$nl"
-    '
-    export bs_echo_n_body
-    bs_echo_n='sh -c $bs_echo_n_body bs_echo'
-  fi
-  export bs_echo_body
-  bs_echo='sh -c $bs_echo_body bs_echo'
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 
+
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+    test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+    _G_progs_list=$1
+    _G_check_func=$2
+    _G_PATH=${3-"$PATH"}
+
+    _G_path_prog_max=0
+    _G_path_prog_found=false
+    _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+    for _G_dir in $_G_PATH; do
+      IFS=$_G_save_IFS
+      test -z "$_G_dir" && _G_dir=.
+      for _G_prog_name in $_G_progs_list; do
+        for _exeext in '' .EXE; do
+          _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+          func_executable_p "$_G_path_prog" || continue
+          case `"$_G_path_prog" --version 2>&1` in
+            *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+            *)     $_G_check_func $_G_path_prog
+		   func_path_progs_result=$func_check_prog_result
+		   ;;
+          esac
+          $_G_path_prog_found && break 3
+        done
+      done
+    done
+    IFS=$_G_save_IFS
+    test -z "$func_path_progs_result" && {
+      echo "no acceptable sed could be found in \$PATH" >&2
+      exit 1
+    }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+  _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+  for _G_i in 1 2 3 4 5 6 7; do
+    _G_sed_script=$_G_sed_script$nl$_G_sed_script
+  done
+  echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+  _G_sed_script=
+
+  func_check_prog_sed ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo '' >> conftest.nl
+      "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+  rm -f conftest.sed
+  SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+  func_check_prog_grep ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    _G_path_prog_max=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo 'GREP' >> conftest.nl
+      "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+  GREP=$func_path_progs_result
+}
+
+
 ## ------------------------------- ##
 ## User overridable command paths. ##
 ## ------------------------------- ##
@@ -198,16 +310,14 @@ fi
 # in the command search PATH.
 
 : ${CP="cp -f"}
-: ${ECHO="$bs_echo"}
-: ${EGREP="grep -E"}
-: ${FGREP="grep -F"}
-: ${GREP="grep"}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
 : ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 
 
@@ -298,13 +408,13 @@ exit_status=$EXIT_SUCCESS
 progpath=$0
 
 # The name of this program.
-progname=`$bs_echo "$progpath" |$SED "$sed_basename"`
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
 
 # Make sure we have an absolute progpath for reexecution:
 case $progpath in
   [\\/]*|[A-Za-z]:\\*) ;;
   *[\\/]*)
-     progdir=`$bs_echo "$progpath" |$SED "$sed_dirname"`
+     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
      progdir=`cd "$progdir" && pwd`
      progpath=$progdir/$progname
      ;;
@@ -498,7 +608,7 @@ func_append_uniq ()
 {
     $debug_cmd
 
-    eval _G_current_value='`$bs_echo $'$1'`'
+    eval _G_current_value='`$ECHO $'$1'`'
     _G_delim=`expr "$2" : '\(.\)'`
 
     case $_G_delim$_G_current_value$_G_delim in
@@ -611,7 +721,7 @@ func_echo ()
     IFS=$nl
     for _G_line in $_G_message; do
       IFS=$func_echo_IFS
-      $bs_echo "$progname: $_G_line"
+      $ECHO "$progname: $_G_line"
     done
     IFS=$func_echo_IFS
 }
@@ -645,17 +755,17 @@ func_echo_infix_1 ()
     for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
     do
       test -n "$_G_tc" && {
-        _G_esc_tc=`$bs_echo "$_G_tc" | sed "$sed_make_literal_regex"`
-        _G_indent=`$bs_echo "$_G_indent" | sed "s|$_G_esc_tc||g"`
+        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
       }
     done
-    _G_indent="$progname: "`echo "$_G_indent" | sed 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
+    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
 
     func_echo_infix_1_IFS=$IFS
     IFS=$nl
     for _G_line in $_G_message; do
       IFS=$func_echo_infix_1_IFS
-      $bs_echo "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
       _G_prefix=$_G_indent
     done
     IFS=$func_echo_infix_1_IFS
@@ -1232,56 +1342,40 @@ func_sort_ver ()
 {
     $debug_cmd
 
-    ver1=$1
-    ver2=$2
+    printf '%s\n%s\n' "$1" "$2" \
+      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false.  Use it like this:
+#
+#  func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+    $debug_cmd
 
-    # Split on '.' and compare each component.
-    i=1
-    while :; do
-      p1=`echo "$ver1" |cut -d. -f$i`
-      p2=`echo "$ver2" |cut -d. -f$i`
-      if test ! "$p1"; then
-        echo "$1 $2"
-        break
-      elif test ! "$p2"; then
-        echo "$2 $1"
-        break
-      elif test ! "$p1" = "$p2"; then
-        if test "$p1" -gt "$p2" 2>/dev/null; then # numeric comparison
-          echo "$2 $1"
-        elif test "$p2" -gt "$p1" 2>/dev/null; then # numeric comparison
-          echo "$1 $2"
-        else # numeric, then lexicographic comparison
-          lp=`printf "$p1\n$p2\n" |sort -n |tail -n1`
-          if test "$lp" = "$p2"; then
-            echo "$1 $2"
-          else
-            echo "$2 $1"
-          fi
-        fi
-        break
-      fi
-      i=`expr $i + 1`
-    done
+    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
 }
 
 
 # Local variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
 # time-stamp-time-zone: "UTC"
 # End:
 #! /bin/sh
 
 # Set a version string for this script.
-scriptversion=2012-10-21.11; # UTC
+scriptversion=2014-01-07.03; # UTC
 
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -1421,7 +1515,7 @@ func_remove_hook ()
 {
     $debug_cmd
 
-    eval ${1}_hooks='`$bs_echo "\$'$1'_hooks" |$SED "s| '$2'||"`'
+    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
 }
 
 
@@ -1698,9 +1792,9 @@ func_validate_options ()
 
 
 
-## ------------------##
+## ----------------- ##
 ## Helper functions. ##
-## ------------------##
+## ----------------- ##
 
 # This section contains the helper functions used by the rest of the
 # hookable option parser framework in ascii-betical order.
@@ -1714,8 +1808,8 @@ func_fatal_help ()
 {
     $debug_cmd
 
-    eval \$bs_echo \""Usage: $usage"\"
-    eval \$bs_echo \""$fatal_help"\"
+    eval \$ECHO \""Usage: $usage"\"
+    eval \$ECHO \""$fatal_help"\"
     func_error ${1+"$@"}
     exit $EXIT_FAILURE
 }
@@ -1729,7 +1823,7 @@ func_help ()
     $debug_cmd
 
     func_usage_message
-    $bs_echo "$long_help_message"
+    $ECHO "$long_help_message"
     exit 0
 }
 
@@ -1816,7 +1910,7 @@ func_usage ()
     $debug_cmd
 
     func_usage_message
-    $bs_echo "Run '$progname --help |${PAGER-more}' for full usage"
+    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
     exit 0
 }
 
@@ -1828,7 +1922,7 @@ func_usage_message ()
 {
     $debug_cmd
 
-    eval \$bs_echo \""Usage: $usage"\"
+    eval \$ECHO \""Usage: $usage"\"
     echo
     $SED -n 's|^# ||
         /^Written by/{
@@ -1837,7 +1931,7 @@ func_usage_message ()
 	h
 	/^Written by/q' < "$progpath"
     echo
-    eval \$bs_echo \""$usage_message"\"
+    eval \$ECHO \""$usage_message"\"
 }
 
 
@@ -1849,7 +1943,7 @@ func_version ()
     $debug_cmd
 
     printf '%s\n' "$progname $scriptversion"
-    $SED -n '/^##/q
+    $SED -n '
         /(C)/!b go
         :more
         /\./!{
@@ -1877,13 +1971,13 @@ func_version ()
 # Local variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
 # time-stamp-time-zone: "UTC"
 # End:
 
 # Set a version string.
-scriptversion='(GNU libtool) 2.4.2.418'
+scriptversion='(GNU libtool) 2.4.6'
 
 
 # func_echo ARG...
@@ -1900,7 +1994,7 @@ func_echo ()
     IFS=$nl
     for _G_line in $_G_message; do
       IFS=$func_echo_IFS
-      $bs_echo "$progname${opt_mode+: $opt_mode}: $_G_line"
+      $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
     done
     IFS=$func_echo_IFS
 }
@@ -1945,7 +2039,12 @@ usage_message="Options:
 "
 
 # Additional text appended to 'usage_message' in response to '--help'.
-long_help_message=$long_help_message"
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message
 
 MODE must be one of the following:
 
@@ -1969,13 +2068,15 @@ include the following information:
        compiler:       $LTCC
        compiler flags: $LTCFLAGS
        linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname (GNU libtool) 2.4.2.418
+       version:        $progname (GNU libtool) 2.4.6
        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
 
 Report bugs to <bug-libtool@gnu.org>.
 GNU libtool home page: <http://www.gnu.org/software/libtool/>.
 General help using GNU software: <http://www.gnu.org/gethelp/>."
+    exit 0
+}
 
 
 # func_lo2o OBJECT-NAME
@@ -2315,7 +2416,9 @@ libtool_validate_options ()
     test : = "$debug_cmd" || func_append preserve_args " --debug"
 
     case $host in
-      *cygwin* | *mingw* | *pw32* | *cegcc*)
+      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
         # don't eliminate duplications in $postdeps and $predeps
         opt_duplicate_compiler_generated_deps=:
         ;;
@@ -2386,6 +2489,14 @@ $1
 _LTECHO_EOF'
 }
 
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+  $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
 # func_lalib_p file
 # True iff FILE is a libtool '.la' library or '.lo' object file.
 # This function is only a basic sanity check; it will hardly flush out
@@ -2393,8 +2504,7 @@ _LTECHO_EOF'
 func_lalib_p ()
 {
     test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null \
-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
 }
 
 # func_lalib_unsafe_p file
@@ -2426,7 +2536,8 @@ func_lalib_unsafe_p ()
 # determined imposters.
 func_ltwrapper_script_p ()
 {
-    func_lalib_p "$1"
+    test -f "$1" &&
+      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
 }
 
 # func_ltwrapper_executable_p file
@@ -3626,7 +3737,8 @@ The following components of LINK-COMMAND are treated specially:
   -no-install       link a not-installable executable
   -no-undefined     declare that a library does not refer to external symbols
   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -objectlist FILE  use a list of object files found in FILE to specify objects
+  -os2dllname NAME  force a short DLL name on OS/2 (no effect on other OSes)
   -precious-files-regex REGEX
                     don't remove output files matching REGEX
   -release RELEASE  specify package release information
@@ -3696,7 +3808,7 @@ if $opt_help; then
       for opt_mode in compile link execute install finish uninstall clean; do
 	func_mode_help
       done
-    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
+    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
     {
       func_help noexit
       for opt_mode in compile link execute install finish uninstall clean; do
@@ -3704,7 +3816,7 @@ if $opt_help; then
 	func_mode_help
       done
     } |
-    sed '1d
+    $SED '1d
       /^When reporting/,/^Report/{
 	H
 	d
@@ -3894,7 +4006,7 @@ func_mode_finish ()
       else
         tmpdir=`func_mktempdir`
         for lib in $libs; do
-	  sed -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	  $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
 	    > $tmpdir/tmp-la
 	  mv -f $tmpdir/tmp-la $lib
 	done
@@ -4208,6 +4320,13 @@ func_mode_install ()
 	      ;;
 	    esac
 	    ;;
+	  os2*)
+	    case $realname in
+	    *_dll.a)
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
 	  esac
 	  if test -n "$tstripme" && test -n "$striplib"; then
 	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
@@ -4449,7 +4568,7 @@ func_generate_dlsyms ()
     my_outputname=$1
     my_originator=$2
     my_pic_p=${3-false}
-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
     my_dlsyms=
 
     if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
@@ -5049,7 +5168,7 @@ func_extract_archives ()
 	      $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
 	    done # $darwin_arches
             ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
 	    darwin_file=
 	    darwin_files=
 	    for darwin_file in $darwin_filelist; do
@@ -5322,7 +5441,7 @@ func_exec_program ()
     if test -n \"\$relink_command\"; then
       if relink_command_output=\`eval \$relink_command 2>&1\`; then :
       else
-	$ECHO \"\$relink_command_output\" >&2
+	\$ECHO \"\$relink_command_output\" >&2
 	$RM \"\$progdir/\$file\"
 	exit 1
       fi
@@ -5554,7 +5673,12 @@ void lt_dump_script (FILE *f);
 EOF
 
 	    cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
 const char * LIB_PATH_VARNAME = "$shlibpath_var";
 EOF
 
@@ -6344,6 +6468,24 @@ func_win32_import_lib_p ()
     esac
 }
 
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+    $debug_cmd
+
+    case " $compile_command " in
+    *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+      suncc_use_cstd_abi=no
+      ;;
+    *)
+      suncc_use_cstd_abi=yes
+      ;;
+    esac
+}
+
 # func_mode_link arg...
 func_mode_link ()
 {
@@ -6402,6 +6544,7 @@ func_mode_link ()
     module=no
     no_install=no
     objs=
+    os2dllname=
     non_pic_objects=
     precious_files_regex=
     prefer_static_libs=no
@@ -6659,6 +6802,11 @@ func_mode_link ()
 	  prev=
 	  continue
 	  ;;
+	os2dllname)
+	  os2dllname=$arg
+	  prev=
+	  continue
+	  ;;
 	precious_regex)
 	  precious_files_regex=$arg
 	  prev=
@@ -6968,6 +7116,11 @@ func_mode_link ()
 	continue
 	;;
 
+      -os2dllname)
+	prev=os2dllname
+	continue
+	;;
+
       -o) prev=output ;;
 
       -precious-files-regex)
@@ -7114,6 +7267,7 @@ func_mode_link ()
       # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
       # -F/path              path to uninstalled frameworks, gcc on darwin
       # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # -fstack-protector*   stack protector flags for GCC
       # @file                GCC response files
       # -tp=*                Portland pgcc target processor selection
       # --sysroot=*          for sysroot support
@@ -7121,7 +7275,7 @@ func_mode_link ()
       # -stdlib=*            select c++ std lib with clang
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-stdlib=*)
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
         func_quote_for_eval "$arg"
 	arg=$func_quote_for_eval_result
         func_append compile_command " $arg"
@@ -7130,6 +7284,25 @@ func_mode_link ()
         continue
         ;;
 
+      -Z*)
+        if test os2 = "`expr $host : '.*\(os2\)'`"; then
+          # OS/2 uses -Zxxx to specify OS/2-specific options
+	  compiler_flags="$compiler_flags $arg"
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  case $arg in
+	  -Zlinker | -Zstack)
+	    prev=xcompiler
+	    ;;
+	  esac
+	  continue
+        else
+	  # Otherwise treat like 'Some other compiler flag' below
+	  func_quote_for_eval "$arg"
+	  arg=$func_quote_for_eval_result
+        fi
+	;;
+
       # Some other compiler flag.
       -* | +*)
         func_quote_for_eval "$arg"
@@ -7289,6 +7462,9 @@ func_mode_link ()
     eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
     eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
 
+    # Definition is injected by LT_CONFIG during libtool generation.
+    func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
     func_dirname "$output" "/" ""
     output_objdir=$func_dirname_result$objdir
     func_to_tool_file "$output_objdir/"
@@ -7956,7 +8132,7 @@ func_mode_link ()
 	if test -n "$library_names" &&
 	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
 	  case $host in
-	  *cygwin* | *mingw* | *cegcc*)
+	  *cygwin* | *mingw* | *cegcc* | *os2*)
 	      # No point in relinking DLLs because paths are not encoded
 	      func_append notinst_deplibs " $lib"
 	      need_relink=no
@@ -8026,7 +8202,7 @@ func_mode_link ()
 	    elif test -n "$soname_spec"; then
 	      # bleh windows
 	      case $host in
-	      *cygwin* | mingw* | *cegcc*)
+	      *cygwin* | mingw* | *cegcc* | *os2*)
 	        func_arith $current - $age
 		major=$func_arith_result
 		versuffix=-$major
@@ -8451,6 +8627,37 @@ func_mode_link ()
 	  eval $var=\"$tmp_libs\"
 	done # for var
       fi
+
+      # Add Sun CC postdeps if required:
+      test CXX = "$tagname" && {
+        case $host_os in
+        linux*)
+          case `$CC -V 2>&1 | sed 5q` in
+          *Sun\ C*) # Sun C++ 5.9
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+
+        solaris*)
+          func_cc_basename "$CC"
+          case $func_cc_basename_result in
+          CC* | sunCC*)
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+        esac
+      }
+
       # Last step: remove runtime libs from dependency_libs
       # (they stay in deplibs)
       tmp_libs=
@@ -8598,13 +8805,13 @@ func_mode_link ()
 	  #
 	  case $version_type in
 	  # correct linux to gnu/linux during the next big refactor
-	  darwin|linux|osf|windows|none)
+	  darwin|freebsd-elf|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
 	    age=$number_minor
 	    revision=$number_revision
 	    ;;
-	  freebsd-aout|freebsd-elf|qnx|sunos)
+	  freebsd-aout|qnx|sunos)
 	    current=$number_major
 	    revision=$number_minor
 	    age=0
@@ -8690,8 +8897,9 @@ func_mode_link ()
 	  ;;
 
 	freebsd-elf)
-	  major=.$current
-	  versuffix=.$current
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
 	  ;;
 
 	irix | nonstopux)
@@ -8754,6 +8962,11 @@ func_mode_link ()
 	  versuffix=.$current
 	  ;;
 
+	sco)
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
 	sunos)
 	  major=.$current
 	  versuffix=.$current.$revision
@@ -9906,15 +10119,17 @@ EOF
       # the extraction.
       reload_conv_objs=
       gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
+      # if reload_cmds runs $LD directly, get rid of -Wl from
+      # whole_archive_flag_spec and hope we can get by with turning comma
+      # into space.
+      case $reload_cmds in
+        *\$LD[\ \$]*) wl= ;;
+      esac
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
 	else
 	  gentop=$output_objdir/${obj}x
 	  func_append generated " $gentop"
diff --git a/extension/build-aux/missing b/extension/build-aux/missing
index cdea5149..f62bbae3 100755
--- a/extension/build-aux/missing
+++ b/extension/build-aux/missing
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -160,7 +160,7 @@ give_advice ()
       ;;
    autom4te*)
       echo "You might have modified some maintainer files that require"
-      echo "the 'automa4te' program to be rebuilt."
+      echo "the 'autom4te' program to be rebuilt."
       program_details 'autom4te'
       ;;
     bison*|yacc*)
diff --git a/extension/configh.in b/extension/configh.in
index 5842f2f4..d3f7361e 100644
--- a/extension/configh.in
+++ b/extension/configh.in
@@ -10,22 +10,6 @@
 #endif
 
 
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
-#undef ENABLE_NLS
-
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
-   CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
-
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
-   the CoreFoundation framework. */
-#undef HAVE_CFPREFERENCESCOPYAPPVALUE
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
-#undef HAVE_DCGETTEXT
-
 /* Define to 1 if you have the declaration of `dirfd', and to 0 if you don't.
    */
 #undef HAVE_DECL_DIRFD
@@ -55,15 +39,9 @@
 /* Define to 1 if you have the `GetSystemTimeAsFileTime' function. */
 #undef HAVE_GETSYSTEMTIMEASFILETIME
 
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
-
 /* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
-/* Define if you have the iconv() function and it works. */
-#undef HAVE_ICONV
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
diff --git a/extension/configure b/extension/configure
index 2105648d..199833f7 100755
--- a/extension/configure
+++ b/extension/configure
@@ -631,12 +631,12 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-gt_needs=
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
 pkgextensiondir
+LT_SYS_LIBRARY_PATH
 OTOOL64
 OTOOL
 LIPO
@@ -653,16 +653,6 @@ DUMPBIN
 LD
 FGREP
 SED
-LIBTOOL
-ac_ct_AR
-AR
-POSUB
-LTLIBINTL
-LIBINTL
-INTLLIBS
-LTLIBICONV
-LIBICONV
-INTL_MACOSX_LIBS
 host_os
 host_vendor
 host_cpu
@@ -671,16 +661,9 @@ build_os
 build_vendor
 build_cpu
 build
-XGETTEXT_EXTRA_OPTIONS
-MSGMERGE
-XGETTEXT_015
-XGETTEXT
-GMSGFMT_015
-MSGFMT_015
-GMSGFMT
-MSGFMT
-GETTEXT_MACRO_VERSION
-USE_NLS
+LIBTOOL
+ac_ct_AR
+AR
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
@@ -771,16 +754,13 @@ ac_user_opts='
 enable_option_checking
 enable_dependency_tracking
 enable_silent_rules
-enable_nls
-with_gnu_ld
-enable_rpath
-with_libiconv_prefix
-with_libintl_prefix
 enable_largefile
 enable_static
 enable_shared
 with_pic
 enable_fast_install
+with_aix_soname
+with_gnu_ld
 with_sysroot
 enable_libtool_lock
 '
@@ -792,7 +772,8 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP'
+CPP
+LT_SYS_LIBRARY_PATH'
 
 
 # Initialize some variables set by options.
@@ -1417,8 +1398,6 @@ Optional Features:
                           speeds up one-time build
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
-  --disable-nls           do not use Native Language Support
-  --disable-rpath         do not hardcode runtime library paths
   --disable-largefile     omit support for large files
   --enable-static[=PKGS]  build static libraries [default=no]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
@@ -1429,13 +1408,11 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gnu-ld           assume the C compiler uses GNU ld default=no
-  --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
-  --without-libiconv-prefix     don't search for libiconv in includedir and libdir
-  --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
-  --without-libintl-prefix     don't search for libintl in includedir and libdir
   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
+  --with-aix-soname=aix|svr4|both
+                          shared library versioning (aka "SONAME") variant to
+                          provide on AIX, [default=aix].
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
                           compiler's sysroot if not specified).
@@ -1449,6 +1426,8 @@ Some influential environment variables:
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
+  LT_SYS_LIBRARY_PATH
+              User-defined run-time library search path.
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1771,52 +1750,6 @@ $as_echo "$ac_res" >&6; }
 
 } # ac_fn_c_check_header_compile
 
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
 # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
 # ----------------------------------------------------
 # Tries to find if the field MEMBER exists in type AGGR, after including
@@ -1874,6 +1807,52 @@ $as_echo "$ac_res" >&6; }
 
 } # ac_fn_c_check_member
 
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
 # ac_fn_c_check_func LINENO FUNC VAR
 # ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -2270,7 +2249,6 @@ $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
-gt_needs="$gt_needs "
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2371,6 +2349,9 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3160,6 +3141,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3623,7 +3663,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
 INSTALL="$ac_aux_dir/install-sh -c"
 export INSTALL
 
-am__api_version='1.13'
+am__api_version='1.15'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -3795,9 +3835,6 @@ test "$program_suffix" != NONE &&
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
@@ -3815,7 +3852,7 @@ else
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -4206,8 +4243,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
@@ -4351,2097 +4388,47 @@ fi
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
 
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-$as_echo_n "checking whether NLS is requested... " >&6; }
-    # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then :
-  enableval=$enable_nls; USE_NLS=$enableval
-else
-  USE_NLS=yes
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
-
-
-
-
-      GETTEXT_MACRO_VERSION=0.18
-
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case "$MSGFMT" in
-  [\\/]* | ?:[\\/]*)
-    ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&5
-          if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-            ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
-    ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test "$MSGFMT" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GMSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-$as_echo "$GMSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-    case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
-    *) MSGFMT_015=$MSGFMT ;;
-  esac
-
-  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
-    *) GMSGFMT_015=$GMSGFMT ;;
-  esac
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XGETTEXT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case "$XGETTEXT" in
-  [\\/]* | ?:[\\/]*)
-    ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&5
-          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-            ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-    ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test "$XGETTEXT" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-    rm -f messages.po
-
-    case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
-    *) XGETTEXT_015=$XGETTEXT ;;
-  esac
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGMERGE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case "$MSGMERGE" in
-  [\\/]* | ?:[\\/]*)
-    ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&5
-          if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
-            ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
-    ;;
-esac
-fi
-MSGMERGE="$ac_cv_path_MSGMERGE"
-if test "$MSGMERGE" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-$as_echo "$MSGMERGE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
 
-        test -n "$localedir" || localedir='${datadir}/locale'
-
-
-    test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
-
-
-  ac_config_commands="$ac_config_commands po-directories"
-
-
-
-      if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
-$as_echo_n "checking for ld used by GCC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${acl_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
-      *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break ;;
-      *)
-        test "$with_gnu_ld" != yes && break ;;
-      esac
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${acl_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
-*)
-  acl_cv_prog_gnu_ld=no ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-$as_echo "$acl_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$acl_cv_prog_gnu_ld
-
-
-
-
-                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
-$as_echo_n "checking for shared library run path origin... " >&6; }
-if ${acl_cv_rpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
-$as_echo "$acl_cv_rpath" >&6; }
-  wl="$acl_cv_wl"
-  acl_libext="$acl_cv_libext"
-  acl_shlibext="$acl_cv_shlibext"
-  acl_libname_spec="$acl_cv_libname_spec"
-  acl_library_names_spec="$acl_cv_library_names_spec"
-  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  acl_hardcode_direct="$acl_cv_hardcode_direct"
-  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
-    # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then :
-  enableval=$enable_rpath; :
-else
-  enable_rpath=yes
-fi
-
-
-
-
-  acl_libdirstem=lib
-  acl_libdirstem2=
-  case "$host_os" in
-    solaris*)
-                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
-$as_echo_n "checking for 64-bit host... " >&6; }
-if ${gl_cv_solaris_64bit+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef _LP64
-sixtyfour bits
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
-  gl_cv_solaris_64bit=yes
-else
-  gl_cv_solaris_64bit=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
-$as_echo "$gl_cv_solaris_64bit" >&6; }
-      if test $gl_cv_solaris_64bit = yes; then
-        acl_libdirstem=lib/64
-        case "$host_cpu" in
-          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
-          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
-        esac
-      fi
-      ;;
-    *)
-      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-      if test -n "$searchpath"; then
-        acl_save_IFS="${IFS= 	}"; IFS=":"
-        for searchdir in $searchpath; do
-          if test -d "$searchdir"; then
-            case "$searchdir" in
-              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-              */../ | */.. )
-                # Better ignore directories of this form. They are misleading.
-                ;;
-              *) searchdir=`cd "$searchdir" && pwd`
-                 case "$searchdir" in
-                   */lib64 ) acl_libdirstem=lib64 ;;
-                 esac ;;
-            esac
-          fi
-        done
-        IFS="$acl_save_IFS"
-      fi
-      ;;
-  esac
-  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
-
-
-
-
-
-
-
-
-
-
-
-
-    use_additional=yes
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-
-# Check whether --with-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then :
-  withval=$with_libiconv_prefix;
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-        if test "$acl_libdirstem2" != "$acl_libdirstem" \
-           && ! test -d "$withval/$acl_libdirstem"; then
-          additional_libdir="$withval/$acl_libdirstem2"
-        fi
-      fi
-    fi
-
-fi
-
-      LIBICONV=
-  LTLIBICONV=
-  INCICONV=
-  LIBICONV_PREFIX=
-      HAVE_LIBICONV=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='iconv '
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
-          else
-                                    :
-          fi
-        else
-                              found_dir=
-          found_la=
-          found_so=
-          found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
-          if test $use_additional = yes; then
-            dir="$additional_libdir"
-                                    if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
-              else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
-              fi
-            fi
-                        if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
-              fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                                    if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
-                    else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
-                    fi
-                  fi
-                                    if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
-                    fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
-                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-              else
-                                                                                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                                if test "$acl_hardcode_direct" = yes; then
-                                                      LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-                else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                                                                                haveit=
-                    for x in $LDFLAGS $LIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
-                    fi
-                    if test "$acl_hardcode_minus_L" != no; then
-                                                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-                    else
-                                                                                                                                                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
-              else
-                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
-              fi
-            fi
-                        additional_includedir=
-            case "$found_dir" in
-              */$acl_libdirstem | */$acl_libdirstem/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                if test "$name" = 'iconv'; then
-                  LIBICONV_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem2 | */$acl_libdirstem2/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                if test "$name" = 'iconv'; then
-                  LIBICONV_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INCICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                                            INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-                        if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-                            for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                                                                  haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                                                                  haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
-                    LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-            LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
-                        alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
-      done
-            acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
-    else
-            for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-            for found_dir in $ltrpathdirs; do
-      LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
-    done
-  fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
-$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <CoreFoundation/CFPreferences.h>
-int
-main ()
-{
-CFPreferencesCopyAppValue(NULL, NULL)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_CFPreferencesCopyAppValue=yes
-else
-  gt_cv_func_CFPreferencesCopyAppValue=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-
-$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
-
-  fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
-$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <CoreFoundation/CFLocale.h>
-int
-main ()
-{
-CFLocaleCopyCurrent();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_CFLocaleCopyCurrent=yes
-else
-  gt_cv_func_CFLocaleCopyCurrent=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-
-$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
-
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-
-
-
-
-
-
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-    case " $gt_needs " in
-    *" need-formatstring-macros "*) gt_api_version=3 ;;
-    *" need-ngettext "*) gt_api_version=2 ;;
-    *) gt_api_version=1 ;;
-  esac
-  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
-  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
-    if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-
-
-        if test $gt_api_version -ge 3; then
-          gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-'
-        else
-          gt_revision_test_code=
-        fi
-        if test $gt_api_version -ge 2; then
-          gt_expression_test_code=' + * ngettext ("", "", 0)'
-        else
-          gt_expression_test_code=
-        fi
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
-$as_echo_n "checking for GNU gettext in libc... " >&6; }
-if eval \${$gt_func_gnugettext_libc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-int
-main ()
-{
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$gt_func_gnugettext_libc=yes"
-else
-  eval "$gt_func_gnugettext_libc=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$gt_func_gnugettext_libc
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-
-
-
-
-
-          am_save_CPPFLAGS="$CPPFLAGS"
-
-  for element in $INCICONV; do
-    haveit=
-    for x in $CPPFLAGS; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
-    fi
-  done
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
-$as_echo_n "checking for iconv... " >&6; }
-if ${am_cv_func_iconv+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <iconv.h>
-int
-main ()
-{
-iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  am_cv_func_iconv=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <iconv.h>
-int
-main ()
-{
-iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-      LIBS="$am_save_LIBS"
-    fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-$as_echo "$am_cv_func_iconv" >&6; }
-  if test "$am_cv_func_iconv" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
-$as_echo_n "checking for working iconv... " >&6; }
-if ${am_cv_func_iconv_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-            am_save_LIBS="$LIBS"
-      if test $am_cv_lib_iconv = yes; then
-        LIBS="$LIBS $LIBICONV"
-      fi
-      if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-           *)            am_cv_func_iconv_works="guessing yes" ;;
-         esac
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <iconv.h>
-#include <string.h>
-int main ()
-{
-  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
-     returns.  */
-  {
-    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
-    if (cd_utf8_to_88591 != (iconv_t)(-1))
-      {
-        static const char input[] = "\342\202\254"; /* EURO SIGN */
-        char buf[10];
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_utf8_to_88591,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          return 1;
-      }
-  }
-  /* Test against Solaris 10 bug: Failures are not distinguishable from
-     successful returns.  */
-  {
-    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
-    if (cd_ascii_to_88591 != (iconv_t)(-1))
-      {
-        static const char input[] = "\263";
-        char buf[10];
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_ascii_to_88591,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          return 1;
-      }
-  }
-#if 0 /* This bug could be worked around by the caller.  */
-  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
-        char buf[50];
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_88591_to_utf8,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if ((int)res > 0)
-          return 1;
-      }
-  }
-#endif
-  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-     provided.  */
-  if (/* Try standardized names.  */
-      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
-      /* Try IRIX, OSF/1 names.  */
-      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
-      /* Try AIX names.  */
-      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
-      /* Try HP-UX names.  */
-      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    return 1;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  am_cv_func_iconv_works=yes
-else
-  am_cv_func_iconv_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-      LIBS="$am_save_LIBS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-$as_echo "$am_cv_func_iconv_works" >&6; }
-    case "$am_cv_func_iconv_works" in
-      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
-      *)   am_func_iconv=yes ;;
-    esac
-  else
-    am_func_iconv=no am_cv_lib_iconv=no
-  fi
-  if test "$am_func_iconv" = yes; then
-
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
-
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
-$as_echo_n "checking how to link with libiconv... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-$as_echo "$LIBICONV" >&6; }
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
   else
-            CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-
-
-
-
-
-
-
-
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
 
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
 
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
 
-    use_additional=yes
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-
-# Check whether --with-libintl-prefix was given.
-if test "${with_libintl_prefix+set}" = set; then :
-  withval=$with_libintl_prefix;
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-        if test "$acl_libdirstem2" != "$acl_libdirstem" \
-           && ! test -d "$withval/$acl_libdirstem"; then
-          additional_libdir="$withval/$acl_libdirstem2"
-        fi
-      fi
-    fi
-
-fi
-
-      LIBINTL=
-  LTLIBINTL=
-  INCINTL=
-  LIBINTL_PREFIX=
-      HAVE_LIBINTL=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='intl '
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
-          else
-                                    :
-          fi
-        else
-                              found_dir=
-          found_la=
-          found_so=
-          found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
-          if test $use_additional = yes; then
-            dir="$additional_libdir"
-                                    if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
-              else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
-              fi
-            fi
-                        if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
-              fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                                    if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
-                    else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
-                    fi
-                  fi
-                                    if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
-                    fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
-                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-              else
-                                                                                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                                if test "$acl_hardcode_direct" = yes; then
-                                                      LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                                                                                haveit=
-                    for x in $LDFLAGS $LIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
-                    fi
-                    if test "$acl_hardcode_minus_L" != no; then
-                                                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                    else
-                                                                                                                                                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
-              else
-                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
-              fi
-            fi
-                        additional_includedir=
-            case "$found_dir" in
-              */$acl_libdirstem | */$acl_libdirstem/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                if test "$name" = 'intl'; then
-                  LIBINTL_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem2 | */$acl_libdirstem2/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                if test "$name" = 'intl'; then
-                  LIBINTL_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INCINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                                            INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-                        if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-                            for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                                                                  haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                                                                  haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
-                    LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-            LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
-                        alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
-      done
-            acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
-    else
-            for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-            for found_dir in $ltrpathdirs; do
-      LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
-    done
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
   fi
-
-
-
-
-
-
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
-$as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if eval \${$gt_func_gnugettext_libintl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-int
-main ()
-{
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$gt_func_gnugettext_libintl=yes"
-else
-  eval "$gt_func_gnugettext_libintl=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-                        if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-int
-main ()
-{
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                eval "$gt_func_gnugettext_libintl=yes"
-
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"
-fi
-eval ac_res=\$$gt_func_gnugettext_libintl
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-        fi
-
-                                        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
-           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-                    LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-
-
-    if test -n "$INTL_MACOSX_LIBS"; then
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-                LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-      fi
-    fi
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-
-$as_echo "#define ENABLE_NLS 1" >>confdefs.h
-
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
-$as_echo_n "checking whether to use NLS... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
-  if test "$USE_NLS" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
-$as_echo_n "checking where the gettext function comes from... " >&6; }
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
-$as_echo "$gt_source" >&6; }
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
-$as_echo_n "checking how to link with libintl... " >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
-$as_echo "$LIBINTL" >&6; }
-
-  for element in $INCINTL; do
-    haveit=
-    for x in $CPPFLAGS; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
-    fi
-  done
-
-      fi
-
-
-$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
-
-
-$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
-
-    fi
-
-        POSUB=po
-  fi
-
-
-
-    INTLLIBS="$LIBINTL"
-
-
-
-
-
-
 
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default"
@@ -6562,7 +4549,13 @@ $as_echo_n "checking the archiver ($AR) interface... " >&6; }
 if ${am_cv_ar_interface+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  am_cv_ar_interface=ar
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+   am_cv_ar_interface=ar
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int some_variable = 0;
@@ -6593,6 +4586,11 @@ if ac_fn_c_try_compile "$LINENO"; then :
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
@@ -6854,8 +4852,8 @@ esac
 
 
 
-macro_version='2.4.2.418'
-macro_revision='2.4.2.418'
+macro_version='2.4.6'
+macro_revision='2.4.6'
 
 
 
@@ -6871,6 +4869,77 @@ macro_revision='2.4.2.418'
 
 ltmain=$ac_aux_dir/ltmain.sh
 
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
 # Backslashify metacharacters that are still active within
 # double-quoted strings.
 sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
@@ -7244,8 +5313,13 @@ else
 	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
 	#   nm: unknown option "B" ignored
 	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
 	  break 2
 	  ;;
@@ -8021,6 +6095,9 @@ sysv4 | sysv4.3*)
 tpf*)
   lt_cv_deplibs_check_method=pass_all
   ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 esac
 
 fi
@@ -9003,6 +7080,86 @@ $as_echo "${lt_sysroot:-no}" >&6; }
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+  ac_path_lt_DD_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in dd; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+      $ac_path_lt_DD_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_lt_DD"; then
+    :
+  fi
+else
+  ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
 # Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then :
   enableval=$enable_libtool_lock;
@@ -9987,7 +8144,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
 	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.[012]*)
+	10.[012][,.]*)
 	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
 	10.*)
 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
@@ -10010,6 +8167,41 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
     ;;
   esac
 
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
 for ac_header in dlfcn.h
 do :
   ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
@@ -10129,6 +8321,58 @@ fi
 
 
 
+  shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+  withval=$with_aix_soname; case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname
+else
+  if ${lt_cv_with_aix_soname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_with_aix_soname=aix
+fi
+
+    with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+
+
+
+
+
+
 
 
 
@@ -10248,15 +8492,8 @@ test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$LD" && LD=ld
 test -z "$ac_objext" && ac_objext=o
 
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
 
 
 # Only perform the check for file, if the check method requires it
@@ -10567,6 +8804,11 @@ lt_prog_compiler_static=
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
       lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -10663,6 +8905,11 @@ lt_prog_compiler_static=
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -11303,6 +9550,34 @@ _LT_EOF
       link_all_deplibs=yes
       ;;
 
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
     interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
@@ -11376,6 +9651,9 @@ _LT_EOF
         fi
 
 	case $cc_basename in
+	tcc*)
+	  export_dynamic_flag_spec='-rdynamic'
+	  ;;
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
@@ -11505,19 +9783,35 @@ _LT_EOF
 	no_entry_flag=
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
 	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
 	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
@@ -11525,6 +9819,13 @@ _LT_EOF
 	    break
 	  fi
 	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
 	  ;;
 	esac
 
@@ -11544,6 +9845,14 @@ _LT_EOF
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
       file_list_spec='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	hardcode_direct=no
+	hardcode_direct_absolute=no
+	;;
+      esac
 
       if test yes = "$GCC"; then
 	case $host_os in aix4.[012]|aix4.[012].*)
@@ -11571,6 +9880,11 @@ _LT_EOF
 	if test yes = "$aix_use_runtimelinking"; then
 	  shared_flag="$shared_flag "'$wl-G'
 	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
       else
 	# not using gcc
 	if test ia64 = "$host_cpu"; then
@@ -11583,6 +9897,8 @@ _LT_EOF
 	  else
 	    shared_flag='$wl-bM:SRE'
 	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
 	fi
       fi
 
@@ -11590,7 +9906,7 @@ _LT_EOF
       # It seems that -bexpall does not export symbols beginning with
       # underscore (_), so it is better to generate a list of symbols to export.
       always_export_symbols=yes
-      if test yes = "$aix_use_runtimelinking"; then
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag='-berok'
@@ -11705,8 +10021,20 @@ fi
 	    whole_archive_flag_spec='$convenience'
 	  fi
 	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
 	fi
       fi
       ;;
@@ -12025,6 +10353,16 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
       link_all_deplibs=yes
       ;;
 
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	ld_shlibs=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
     netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -12070,8 +10408,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
       ;;
 
     osf3*)
@@ -12594,6 +10952,8 @@ hardcode_into_libs=no
 # flags to be left without arguments
 need_version=unknown
 
+
+
 case $host_os in
 aix3*)
   version_type=linux # correct to gnu/linux during the next big refactor
@@ -12630,20 +10990,70 @@ aix[4-9]*)
       fi
       ;;
     esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
     # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
     # soname into executable. Probably we can add versioning support to
     # collect2, so additional links can be useful in future.
-    if test yes = "$aix_use_runtimelinking"; then
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
       # instead of lib<name>.a to let people know that these are not
       # typical AIX shared libraries.
       library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    else
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
       # We preserve .a as extension for shared libraries through AIX4.2
       # and later when we are not doing run time linking.
       library_names_spec='$libname$release.a $libname.a'
       soname_spec='$libname$release$shared_ext$major'
-    fi
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
     shlibpath_var=LIBPATH
   fi
   ;;
@@ -12831,7 +11241,8 @@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
@@ -12891,10 +11302,11 @@ hpux9* | hpux10* | hpux11*)
     soname_spec='$libname$release$shared_ext$major'
     if test 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
     shrext_cmds='.sl'
@@ -13046,7 +11458,12 @@ fi
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Append ld.so.conf contents to the search path
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
@@ -13115,11 +11532,32 @@ openbsd* | bitrig*)
 
 os2*)
   libname_spec='$name'
+  version_type=windows
   shrext_cmds=.dll
+  need_version=no
   need_lib_prefix=no
-  library_names_spec='$libname$shared_ext $libname.a'
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
   ;;
 
 osf3* | osf4* | osf5*)
@@ -13195,7 +11633,7 @@ sysv4*MP*)
   ;;
 
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
+  version_type=sco
   need_lib_prefix=no
   need_version=no
   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
@@ -13250,10 +11688,25 @@ fi
 if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
   sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 fi
+
 if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
   sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
 
 
 
@@ -13724,7 +12177,7 @@ else
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
 #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 int fnord () __attribute__((visibility("default")));
@@ -13830,7 +12283,7 @@ else
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
 #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 int fnord () __attribute__((visibility("default")));
@@ -13979,8 +12432,12 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
     ;;
 
   aix[4-9]*)
-    if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then
-      test yes = "$enable_shared" && enable_static=no
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
     fi
     ;;
   esac
@@ -15205,13 +13662,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # INIT-COMMANDS
 #
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake < 1.5.
-    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-
 
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -15227,6 +13677,7 @@ macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
 enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
 pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
 PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
@@ -15282,6 +13733,7 @@ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_
 lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
 nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
 lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
@@ -15346,7 +13798,8 @@ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
 finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
 hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
 sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
 hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
 enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
 enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
@@ -15402,6 +13855,7 @@ lt_cv_sys_global_symbol_to_c_name_address \
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
 lt_cv_nm_interface \
 nm_file_list_spec \
+lt_cv_truncate_bin \
 lt_prog_compiler_no_builtin_flag \
 lt_prog_compiler_pic \
 lt_prog_compiler_wl \
@@ -15463,7 +13917,8 @@ postinstall_cmds \
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec; do
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path; do
     case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
       eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
@@ -15500,7 +13955,6 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:configh.in" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
@@ -16192,119 +14646,6 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "po-directories":C)
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        # Treat a directory as a PO directory if and only if it has a
-        # POTFILES.in file. This allows packages to have multiple PO
-        # directories under different names or in different locations.
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
-            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-          fi
-          # Compute POFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-          # Compute UPDATEPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-          # Compute DUMMYPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-          # Compute GMOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          GMOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done ;;
     "libtool":C)
 
     # See if we are running on zsh, and set the options that allow our
@@ -16319,44 +14660,42 @@ $as_echo X"$file" |
 
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
 # Generated automatically by $as_me ($PACKAGE) $VERSION
 # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
 #
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
 #
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # The names of the tagged configurations supported by this script.
 available_tags=''
 
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
 # ### BEGIN LIBTOOL CONFIG
 
 # Whether or not to build static libraries.
@@ -16375,6 +14714,9 @@ pic_mode=$pic_mode
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
 # Shell to use when invoking shell scripts.
 SHELL=$lt_SHELL
 
@@ -16510,6 +14852,9 @@ nm_file_list_spec=$lt_nm_file_list_spec
 # The root where to search for dependent libraries,and where our libraries should be installed.
 lt_sysroot=$lt_sysroot
 
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
 
@@ -16600,8 +14945,11 @@ hardcode_into_libs=$hardcode_into_libs
 # Compile-time system search path for libraries.
 sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
 
 # Whether dlopen is supported.
 dlopen_support=$enable_dlopen
@@ -16752,6 +15100,65 @@ hardcode_action=$hardcode_action
 
 _LT_EOF
 
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
   case $host_os in
   aix3*)
     cat <<\_LT_EOF >> "$cfgfile"
diff --git a/extension/configure.ac b/extension/configure.ac
index 1f876a0e..6a516cbc 100644
--- a/extension/configure.ac
+++ b/extension/configure.ac
@@ -33,10 +33,7 @@ AC_USE_SYSTEM_EXTENSIONS
 INSTALL="$ac_aux_dir/install-sh -c"
 export INSTALL
 
-AM_INIT_AUTOMAKE([-Wall -Werror])
-
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.18.1])
+AM_INIT_AUTOMAKE([1.15 -Wall -Werror])
 
 dnl checks for structure members
 AC_CHECK_MEMBERS([struct stat.st_blksize])
diff --git a/extension/filefuncs.c b/extension/filefuncs.c
index d5249a4e..ddb1ecda 100644
--- a/extension/filefuncs.c
+++ b/extension/filefuncs.c
@@ -145,7 +145,7 @@ static const char *ext_version = "filefuncs extension: version 1.0";
 
 int plugin_is_GPL_compatible;
 
-/*  do_chdir --- provide dynamically loaded chdir() builtin for gawk */
+/*  do_chdir --- provide dynamically loaded chdir() function for gawk */
 
 static awk_value_t *
 do_chdir(int nargs, awk_value_t *result)
@@ -448,7 +448,7 @@ fill_stat_array(const char *name, awk_array_t array, struct stat *sbuf)
 		}
 	}
 
-	array_set(array, "type", make_const_string(type, strlen(type), &tmp));
+	array_set(array, "type", make_const_string(type, strlen(type), & tmp));
 
 	return 0;
 }
@@ -490,7 +490,7 @@ do_stat(int nargs, awk_value_t *result)
 	/* always empty out the array */
 	clear_array(array);
 
-	/* stat the file, if error, set ERRNO and return */
+	/* stat the file; if error, set ERRNO and return */
 	ret = statfunc(name, & sbuf);
 	if (ret < 0) {
 		update_ERRNO_int(errno);
diff --git a/extension/inplace.3am b/extension/inplace.3am
index 5ca04be2..f8fc098f 100644
--- a/extension/inplace.3am
+++ b/extension/inplace.3am
@@ -1,21 +1,10 @@
-.TH INPLACE 3am "Jan 15 2013" "Free Software Foundation" "GNU Awk Extension Modules"
+.TH INPLACE 3am "Mar 18 2015" "Free Software Foundation" "GNU Awk Extension Modules"
 .SH NAME
 inplace \- emulate sed/perl/ruby in-place editing
 .SH SYNOPSIS
 .ft CW
 .nf
-@load "inplace"
-
-# Please set INPLACE_SUFFIX to make a backup copy.  For example, you may
-# want to set INPLACE_SUFFIX to .bak on the command line or in a BEGIN rule.
-
-BEGINFILE {
-    inplace_begin(FILENAME, INPLACE_SUFFIX)
-}
-
-ENDFILE {
-    inplace_end(FILENAME, INPLACE_SUFFIX)
-}
+gawk -i inplace ...
 .fi
 .ft R
 .SH DESCRIPTION
@@ -27,8 +16,7 @@ and
 .BR inplace_end() .
 These functions are meant to be invoked from the
 .I inplace.awk
-wrapper (whose contents are displayed above)
-which is installed when
+wrapper which is installed when
 .I gawk
 is.
 .PP
diff --git a/extension/inplace.c b/extension/inplace.c
index e2f8b73f..e3685e30 100644
--- a/extension/inplace.c
+++ b/extension/inplace.c
@@ -170,10 +170,13 @@ do_inplace_begin(int nargs, awk_value_t *result)
 			state.tname, strerror(errno));
 
 	/* N.B. chown/chmod should be more portable than fchown/fchmod */
-	if (chown(state.tname, sbuf.st_uid, sbuf.st_gid) < 0)
-		/* checking chown here shuts up the compiler. bleah */
-		if (chown(state.tname, -1, sbuf.st_gid) < 0)
-			;
+	if (chown(state.tname, sbuf.st_uid, sbuf.st_gid) < 0) {
+		/* jumping through hoops to silence gcc and clang. :-( */
+		int junk;
+		junk = chown(state.tname, -1, sbuf.st_gid);
+		++junk;
+	}
+
 	if (chmod(state.tname, sbuf.st_mode) < 0)
 		fatal(ext_id, _("inplace_begin: chmod failed (%s)"),
 			strerror(errno));
diff --git a/extension/m4/ChangeLog b/extension/m4/ChangeLog
index 349bbcc8..6895c6b6 100644
--- a/extension/m4/ChangeLog
+++ b/extension/m4/ChangeLog
@@ -1,3 +1,11 @@
+2015-03-18         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* libtoolm4, ltversion.m4: Updated to libtool 2.4.6.
+
+2015-01-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gettext.m4, iconv.m4, intlmacosx.m4, po.m4: Removed.
+
 2014-04-08         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 4.1.1: Release tar ball made.
diff --git a/extension/m4/gettext.m4 b/extension/m4/gettext.m4
deleted file mode 100644
index f84e6a5d..00000000
--- a/extension/m4/gettext.m4
+++ /dev/null
@@ -1,383 +0,0 @@
-# gettext.m4 serial 63 (gettext-0.18)
-dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
-
-dnl Macro to add for using GNU gettext.
-
-dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-dnl    default (if it is not specified or empty) is 'no-libtool'.
-dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
-dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
-dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-dnl    $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.  If NEEDSYMBOL is specified and is
-dnl    'need-formatstring-macros', then GNU gettext implementations that don't
-dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value `$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl    and used.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl    Catalog format: none
-dnl    Catalog extension: none
-dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_GNU_GETTEXT],
-[
-  dnl Argument checking.
-  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
-    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])])
-  ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
-    [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
-  define([gt_included_intl],
-    ifelse([$1], [external],
-      ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
-      [yes]))
-  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
-  gt_NEEDS_INIT
-  AM_GNU_GETTEXT_NEED([$2])
-
-  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-  ifelse(gt_included_intl, yes, [
-    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-  ])
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-  dnl Ideally we would do this search only after the
-  dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-  dnl the configure script would need to contain the same shell code
-  dnl again, outside any 'if'. There are two solutions:
-  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-  dnl documented, we avoid it.
-  ifelse(gt_included_intl, yes, , [
-    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-  ])
-
-  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
-  gt_INTL_MACOSX
-
-  dnl Set USE_NLS.
-  AC_REQUIRE([AM_NLS])
-
-  ifelse(gt_included_intl, yes, [
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-  ])
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-  dnl Add a version number to the cache macros.
-  case " $gt_needs " in
-    *" need-formatstring-macros "*) gt_api_version=3 ;;
-    *" need-ngettext "*) gt_api_version=2 ;;
-    *) gt_api_version=1 ;;
-  esac
-  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
-  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
-  dnl If we use NLS figure out what method
-  if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-    ifelse(gt_included_intl, yes, [
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH([included-gettext],
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-    ])
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
-
-        if test $gt_api_version -ge 3; then
-          gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-'
-        else
-          gt_revision_test_code=
-        fi
-        if test $gt_api_version -ge 2; then
-          gt_expression_test_code=' + * ngettext ("", "", 0)'
-        else
-          gt_expression_test_code=
-        fi
-
-        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
-         [AC_TRY_LINK([#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;],
-            [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
-            [eval "$gt_func_gnugettext_libc=yes"],
-            [eval "$gt_func_gnugettext_libc=no"])])
-
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          ifelse(gt_included_intl, yes, , [
-            AM_ICONV_LINK
-          ])
-          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-          dnl even if libiconv doesn't exist.
-          AC_LIB_LINKFLAGS_BODY([intl])
-          AC_CACHE_CHECK([for GNU gettext in libintl],
-            [$gt_func_gnugettext_libintl],
-           [gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-            dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_TRY_LINK([#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);],
-              [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
-              [eval "$gt_func_gnugettext_libintl=yes"],
-              [eval "$gt_func_gnugettext_libintl=no"])
-            dnl Now see whether libintl exists and depends on libiconv.
-            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              AC_TRY_LINK([#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);],
-                [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
-               [LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                eval "$gt_func_gnugettext_libintl=yes"
-               ])
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"])
-        fi
-
-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
-        dnl gettext is already preinstalled in libintl, we update this
-        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
-           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-          dnl Reset the values set by searching for libintl.
-          LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-    ifelse(gt_included_intl, yes, [
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-          dnl GNU gettext is not found in the C library.
-          dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      CATOBJEXT=
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions to use GNU gettext tools.
-        CATOBJEXT=.gmo
-      fi
-    ])
-
-    if test -n "$INTL_MACOSX_LIBS"; then
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Some extra flags are needed during linking.
-        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-      fi
-    fi
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE([ENABLE_NLS], [1],
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  AC_MSG_CHECKING([whether to use NLS])
-  AC_MSG_RESULT([$USE_NLS])
-  if test "$USE_NLS" = "yes"; then
-    AC_MSG_CHECKING([where the gettext function comes from])
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    AC_MSG_RESULT([$gt_source])
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        AC_MSG_CHECKING([how to link with libintl])
-        AC_MSG_RESULT([$LIBINTL])
-        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-      fi
-
-      dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE([HAVE_GETTEXT], [1],
-       [Define if the GNU gettext() function is already present or preinstalled.])
-      AC_DEFINE([HAVE_DCGETTEXT], [1],
-       [Define if the GNU dcgettext() function is already present or preinstalled.])
-    fi
-
-    dnl We need to process the po/ directory.
-    POSUB=po
-  fi
-
-  ifelse(gt_included_intl, yes, [
-    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-    dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST([BUILD_INCLUDED_LIBINTL])
-    AC_SUBST([USE_INCLUDED_LIBINTL])
-    AC_SUBST([CATOBJEXT])
-
-    dnl For backward compatibility. Some configure.ins may be using this.
-    nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    DATADIRNAME=share
-    AC_SUBST([DATADIRNAME])
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INSTOBJEXT=.mo
-    AC_SUBST([INSTOBJEXT])
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    GENCAT=gencat
-    AC_SUBST([GENCAT])
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INTLOBJS=
-    if test "$USE_INCLUDED_LIBINTL" = yes; then
-      INTLOBJS="\$(GETTOBJS)"
-    fi
-    AC_SUBST([INTLOBJS])
-
-    dnl Enable libtool support if the surrounding package wishes it.
-    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-    AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
-  ])
-
-  dnl For backward compatibility. Some Makefiles may be using this.
-  INTLLIBS="$LIBINTL"
-  AC_SUBST([INTLLIBS])
-
-  dnl Make all documented variables known to autoconf.
-  AC_SUBST([LIBINTL])
-  AC_SUBST([LTLIBINTL])
-  AC_SUBST([POSUB])
-])
-
-
-dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
-m4_define([gt_NEEDS_INIT],
-[
-  m4_divert_text([DEFAULTS], [gt_needs=])
-  m4_define([gt_NEEDS_INIT], [])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
-AC_DEFUN([AM_GNU_GETTEXT_NEED],
-[
-  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
diff --git a/extension/m4/iconv.m4 b/extension/m4/iconv.m4
deleted file mode 100644
index e2041b9b..00000000
--- a/extension/m4/iconv.m4
+++ /dev/null
@@ -1,214 +0,0 @@
-# iconv.m4 serial 11 (gettext-0.18.1)
-dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-[
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
-AC_DEFUN([AM_ICONV_LINK],
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-
-  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed libiconv and not disabled its use
-  dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
-  am_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
-  AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
-      [am_cv_func_iconv=yes])
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-        [am_cv_lib_iconv=yes]
-        [am_cv_func_iconv=yes])
-      LIBS="$am_save_LIBS"
-    fi
-  ])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
-      dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
-      am_save_LIBS="$LIBS"
-      if test $am_cv_lib_iconv = yes; then
-        LIBS="$LIBS $LIBICONV"
-      fi
-      AC_TRY_RUN([
-#include <iconv.h>
-#include <string.h>
-int main ()
-{
-  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
-     returns.  */
-  {
-    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
-    if (cd_utf8_to_88591 != (iconv_t)(-1))
-      {
-        static const char input[] = "\342\202\254"; /* EURO SIGN */
-        char buf[10];
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_utf8_to_88591,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          return 1;
-      }
-  }
-  /* Test against Solaris 10 bug: Failures are not distinguishable from
-     successful returns.  */
-  {
-    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
-    if (cd_ascii_to_88591 != (iconv_t)(-1))
-      {
-        static const char input[] = "\263";
-        char buf[10];
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_ascii_to_88591,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          return 1;
-      }
-  }
-#if 0 /* This bug could be worked around by the caller.  */
-  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
-        char buf[50];
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_88591_to_utf8,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if ((int)res > 0)
-          return 1;
-      }
-  }
-#endif
-  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-     provided.  */
-  if (/* Try standardized names.  */
-      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
-      /* Try IRIX, OSF/1 names.  */
-      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
-      /* Try AIX names.  */
-      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
-      /* Try HP-UX names.  */
-      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    return 1;
-  return 0;
-}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
-        [case "$host_os" in
-           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-           *)            am_cv_func_iconv_works="guessing yes" ;;
-         esac])
-      LIBS="$am_save_LIBS"
-    ])
-    case "$am_cv_func_iconv_works" in
-      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
-      *)   am_func_iconv=yes ;;
-    esac
-  else
-    am_func_iconv=no am_cv_lib_iconv=no
-  fi
-  if test "$am_func_iconv" = yes; then
-    AC_DEFINE([HAVE_ICONV], [1],
-      [Define if you have the iconv() function and it works.])
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    AC_MSG_CHECKING([how to link with libiconv])
-    AC_MSG_RESULT([$LIBICONV])
-  else
-    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-    dnl either.
-    CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-  AC_SUBST([LIBICONV])
-  AC_SUBST([LTLIBICONV])
-])
-
-dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
-dnl avoid warnings like
-dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
-dnl This is tricky because of the way 'aclocal' is implemented:
-dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
-dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
-dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
-dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
-dnl   warnings.
-m4_define([gl_iconv_AC_DEFUN],
-  m4_version_prereq([2.64],
-    [[AC_DEFUN_ONCE(
-        [$1], [$2])]],
-    [[AC_DEFUN(
-        [$1], [$2])]]))
-gl_iconv_AC_DEFUN([AM_ICONV],
-[
-  AM_ICONV_LINK
-  if test "$am_cv_func_iconv" = yes; then
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL([am_cv_proto_iconv], [
-      AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([
-         $am_cv_proto_iconv])
-    AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
-      [Define as const if the declaration of iconv() needs const.])
-  fi
-])
diff --git a/extension/m4/intlmacosx.m4 b/extension/m4/intlmacosx.m4
deleted file mode 100644
index dd910259..00000000
--- a/extension/m4/intlmacosx.m4
+++ /dev/null
@@ -1,51 +0,0 @@
-# intlmacosx.m4 serial 3 (gettext-0.18)
-dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Checks for special options needed on MacOS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN([gt_INTL_MACOSX],
-[
-  dnl Check for API introduced in MacOS X 10.2.
-  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
-    [gt_cv_func_CFPreferencesCopyAppValue],
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
-       [CFPreferencesCopyAppValue(NULL, NULL)],
-       [gt_cv_func_CFPreferencesCopyAppValue=yes],
-       [gt_cv_func_CFPreferencesCopyAppValue=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
-      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
-  fi
-  dnl Check for API introduced in MacOS X 10.3.
-  AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
-       [gt_cv_func_CFLocaleCopyCurrent=yes],
-       [gt_cv_func_CFLocaleCopyCurrent=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
-      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-  AC_SUBST([INTL_MACOSX_LIBS])
-])
diff --git a/extension/m4/libtool.m4 b/extension/m4/libtool.m4
index 4bc6b22c..a3bc337b 100644
--- a/extension/m4/libtool.m4
+++ b/extension/m4/libtool.m4
@@ -1,6 +1,6 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996-2001, 2003-2013 Free Software Foundation, Inc.
+#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -8,33 +8,27 @@
 # modifications, as long as this notice is preserved.
 
 m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
 #
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
 #
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ])
 
 # serial 58 LT_INIT
@@ -65,7 +59,7 @@ esac
 # LT_INIT([OPTIONS])
 # ------------------
 AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
 AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_BEFORE([$0], [LT_LANG])dnl
 AC_BEFORE([$0], [LT_OUTPUT])dnl
@@ -109,19 +103,36 @@ dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
 dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
 
 
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in @S|@*""; do
+      case $cc_temp in
+        compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+        distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
 # _LT_CC_BASENAME(CC)
 # -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
 m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
 ])
 
 
@@ -175,6 +186,7 @@ m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
 m4_require([_LT_WITH_SYSROOT])dnl
+m4_require([_LT_CMD_TRUNCATE])dnl
 
 _LT_CONFIG_LIBTOOL_INIT([
 # See if we are running on zsh, and set the options that allow our
@@ -715,15 +727,19 @@ _LT_CONFIG_SAVE_COMMANDS([
 
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
 # Generated automatically by $as_me ($PACKAGE) $VERSION
 # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
 _LT_COPYING
 _LT_LIBTOOL_TAGS
 
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
 # ### BEGIN LIBTOOL CONFIG
 _LT_LIBTOOL_CONFIG_VARS
 _LT_LIBTOOL_TAG_VARS
@@ -731,6 +747,17 @@ _LT_LIBTOOL_TAG_VARS
 
 _LT_EOF
 
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
   case $host_os in
   aix3*)
     cat <<\_LT_EOF >> "$cfgfile"
@@ -1047,7 +1074,7 @@ _LT_EOF
       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
 	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]]*)
+	10.[[012]][[,.]]*)
 	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
 	10.*)
 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
@@ -1844,7 +1871,7 @@ else
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
 #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 int fnord () __attribute__((visibility("default")));
@@ -2206,6 +2233,47 @@ _LT_DECL([], [striplib], [1])
 ])# _LT_CMD_STRIPLIB
 
 
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x@S|@2 in
+    x)
+        ;;
+    *:)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+        ;;
+    x:*)
+        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+        ;;
+    *)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
 # _LT_SYS_DYNAMIC_LINKER([TAG])
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
@@ -2216,6 +2284,7 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_OBJDUMP])dnl
 m4_require([_LT_DECL_SED])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
 AC_MSG_CHECKING([dynamic linker characteristics])
 m4_if([$1],
 	[], [
@@ -2310,6 +2379,9 @@ hardcode_into_libs=no
 # flags to be left without arguments
 need_version=unknown
 
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
 case $host_os in
 aix3*)
   version_type=linux # correct to gnu/linux during the next big refactor
@@ -2346,20 +2418,70 @@ aix[[4-9]]*)
       fi
       ;;
     esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
     # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
     # soname into executable. Probably we can add versioning support to
     # collect2, so additional links can be useful in future.
-    if test yes = "$aix_use_runtimelinking"; then
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
       # instead of lib<name>.a to let people know that these are not
       # typical AIX shared libraries.
       library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    else
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a[(]lib.so.V[)]'
       # We preserve .a as extension for shared libraries through AIX4.2
       # and later when we are not doing run time linking.
       library_names_spec='$libname$release.a $libname.a'
       soname_spec='$libname$release$shared_ext$major'
-    fi
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
     shlibpath_var=LIBPATH
   fi
   ;;
@@ -2547,7 +2669,8 @@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
@@ -2607,10 +2730,11 @@ hpux9* | hpux10* | hpux11*)
     soname_spec='$libname$release$shared_ext$major'
     if test 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
     shrext_cmds='.sl'
@@ -2743,7 +2867,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Append ld.so.conf contents to the search path
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
@@ -2812,11 +2941,32 @@ openbsd* | bitrig*)
 
 os2*)
   libname_spec='$name'
+  version_type=windows
   shrext_cmds=.dll
+  need_version=no
   need_lib_prefix=no
-  library_names_spec='$libname$shared_ext $libname.a'
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
   ;;
 
 osf3* | osf4* | osf5*)
@@ -2892,7 +3042,7 @@ sysv4*MP*)
   ;;
 
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
+  version_type=sco
   need_lib_prefix=no
   need_version=no
   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
@@ -2946,10 +3096,20 @@ fi
 if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
   sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 fi
+
 if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
   sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
 _LT_DECL([], [variables_saved_for_relink], [1],
     [Variables whose values should be saved in libtool wrapper scripts and
     restored at link time])
@@ -2982,8 +3142,10 @@ _LT_DECL([], [hardcode_into_libs], [0],
     [Whether we should hardcode library paths into libraries])
 _LT_DECL([], [sys_lib_search_path_spec], [2],
     [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+    [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+    [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
 ])# _LT_SYS_DYNAMIC_LINKER
 
 
@@ -3221,6 +3383,43 @@ _LT_TAGDECL([], [reload_cmds], [2])dnl
 ])# _LT_CMD_RELOAD
 
 
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+  [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
+
+
 # _LT_CHECK_MAGIC_METHOD
 # ----------------------
 # how to check for library dependencies
@@ -3419,6 +3618,9 @@ sysv4 | sysv4.3*)
 tpf*)
   lt_cv_deplibs_check_method=pass_all
   ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 esac
 ])
 
@@ -3476,8 +3678,13 @@ else
 	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
 	#   nm: unknown option "B" ignored
 	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
 	  break 2
 	  ;;
@@ -4022,6 +4229,11 @@ m4_if([$1], [CXX], [
       # (--disable-auto-import) libraries
       m4_if([$1], [GCJ], [],
 	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
       ;;
     darwin* | rhapsody*)
       # PIC is the default on this platform
@@ -4341,6 +4553,11 @@ m4_if([$1], [CXX], [
       # (--disable-auto-import) libraries
       m4_if([$1], [GCJ], [],
 	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -4438,6 +4655,11 @@ m4_if([$1], [CXX], [
       # built for inclusion in a dll (and should export symbols for example).
       m4_if([$1], [GCJ], [],
 	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -4687,13 +4909,17 @@ m4_if([$1], [CXX], [
   case $host_os in
   aix[[4-9]]*)
     # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    # Also, AIX nm treats weak defined symbols like other global defined
-    # symbols, whereas GNU nm marks them as "W".
+    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
     else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
@@ -4904,6 +5130,34 @@ _LT_EOF
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
     interix[[3-9]]*)
       _LT_TAGVAR(hardcode_direct, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4977,6 +5231,9 @@ _LT_EOF
         fi
 
 	case $cc_basename in
+	tcc*)
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+	  ;;
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
@@ -5106,19 +5363,35 @@ _LT_EOF
 	no_entry_flag=
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
 	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	  for ld_flag in $LDFLAGS; do
 	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
@@ -5126,6 +5399,13 @@ _LT_EOF
 	    break
 	  fi
 	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
 	  ;;
 	esac
 
@@ -5145,6 +5425,14 @@ _LT_EOF
       _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+	;;
+      esac
 
       if test yes = "$GCC"; then
 	case $host_os in aix4.[[012]]|aix4.[[012]].*)
@@ -5172,6 +5460,11 @@ _LT_EOF
 	if test yes = "$aix_use_runtimelinking"; then
 	  shared_flag="$shared_flag "'$wl-G'
 	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
       else
 	# not using gcc
 	if test ia64 = "$host_cpu"; then
@@ -5184,6 +5477,8 @@ _LT_EOF
 	  else
 	    shared_flag='$wl-bM:SRE'
 	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
 	fi
       fi
 
@@ -5191,7 +5486,7 @@ _LT_EOF
       # It seems that -bexpall does not export symbols beginning with
       # underscore (_), so it is better to generate a list of symbols to export.
       _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test yes = "$aix_use_runtimelinking"; then
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
@@ -5222,8 +5517,20 @@ _LT_EOF
 	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 	  fi
 	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
 	fi
       fi
       ;;
@@ -5477,6 +5784,16 @@ _LT_EOF
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
     netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -5522,8 +5839,28 @@ _LT_EOF
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
 
     osf3*)
@@ -5918,8 +6255,12 @@ if test -n "$compiler"; then
     ;;
 
   aix[[4-9]]*)
-    if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then
-      test yes = "$enable_shared" && enable_static=no
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
     fi
     ;;
   esac
@@ -6107,7 +6448,19 @@ if test yes != "$_lt_caught_CXX_error"; then
 
           # Test if we are trying to use run time linking or normal
           # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
           case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	    for ld_flag in $LDFLAGS; do
 	      case $ld_flag in
@@ -6117,6 +6470,13 @@ if test yes != "$_lt_caught_CXX_error"; then
 	        ;;
 	      esac
 	    done
+	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	      # so we don't have lib.a shared libs to link our executables.
+	      # We have to force runtime linking in this case.
+	      aix_use_runtimelinking=yes
+	      LDFLAGS="$LDFLAGS -Wl,-brtl"
+	    fi
 	    ;;
           esac
 
@@ -6136,6 +6496,14 @@ if test yes != "$_lt_caught_CXX_error"; then
         _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
         _LT_TAGVAR(link_all_deplibs, $1)=yes
         _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;	# no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          _LT_TAGVAR(hardcode_direct, $1)=no
+          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+          ;;
+        esac
 
         if test yes = "$GXX"; then
           case $host_os in aix4.[[012]]|aix4.[[012]].*)
@@ -6162,6 +6530,11 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  if test yes = "$aix_use_runtimelinking"; then
 	    shared_flag=$shared_flag' $wl-G'
 	  fi
+	  # Need to ensure runtime linking is disabled for the traditional
+	  # shared library, or the linker may eventually find shared libraries
+	  # /with/ Import File - we do not want to mix them.
+	  shared_flag_aix='-shared'
+	  shared_flag_svr4='-shared $wl-G'
         else
           # not using gcc
           if test ia64 = "$host_cpu"; then
@@ -6174,6 +6547,8 @@ if test yes != "$_lt_caught_CXX_error"; then
 	    else
 	      shared_flag='$wl-bM:SRE'
 	    fi
+	    shared_flag_aix='$wl-bM:SRE'
+	    shared_flag_svr4='$wl-G'
           fi
         fi
 
@@ -6182,10 +6557,11 @@ if test yes != "$_lt_caught_CXX_error"; then
         # underscore (_), so it is better to generate a list of symbols to
 	# export.
         _LT_TAGVAR(always_export_symbols, $1)=yes
-        if test yes = "$aix_use_runtimelinking"; then
+	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
           # Warning - without using the other runtime loading flags (-brtl),
           # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # The "-G" linker flag allows undefined symbols.
+          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
           _LT_SYS_MODULE_PATH_AIX([$1])
@@ -6214,9 +6590,21 @@ if test yes != "$_lt_caught_CXX_error"; then
 	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 	    fi
 	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	    # -brtl affects multiple linker settings, -berok does not and is overridden later
+	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	    if test svr4 != "$with_aix_soname"; then
+	      # This is similar to how AIX traditionally builds its shared
+	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	    fi
+	    if test aix != "$with_aix_soname"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	    else
+	      # used by -dlpreopen to get the symbols
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	    fi
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
           fi
         fi
         ;;
@@ -6316,6 +6704,34 @@ if test yes != "$_lt_caught_CXX_error"; then
         _LT_DARWIN_LINKER_FEATURES($1)
 	;;
 
+      os2*)
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	shrext_cmds=.dll
+	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  prefix_cmds="$SED"~
+	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	    prefix_cmds="$prefix_cmds -e 1d";
+	  fi~
+	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+
       dgux*)
         case $cc_basename in
           ec++*)
@@ -7029,6 +7445,7 @@ func_stripname_cnf ()
 } # func_stripname_cnf
 ])# _LT_FUNC_STRIPNAME_CNF
 
+
 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
 # ---------------------------------
 # Figure out "hidden" library dependencies from verbose
@@ -7207,51 +7624,6 @@ interix[[3-9]]*)
   _LT_TAGVAR(postdep_objects,$1)=
   _LT_TAGVAR(postdeps,$1)=
   ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test yes != "$solaris_use_stlport4"; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC* | sunCC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test yes != "$solaris_use_stlport4"; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
 esac
 ])
 
@@ -7369,8 +7741,12 @@ if test yes != "$_lt_disable_F77"; then
         fi
         ;;
       aix[[4-9]]*)
-	if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then
-	  test yes = "$enable_shared" && enable_static=no
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
 	fi
         ;;
     esac
@@ -7503,8 +7879,12 @@ if test yes != "$_lt_disable_FC"; then
         fi
         ;;
       aix[[4-9]]*)
-	if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then
-	  test yes = "$enable_shared" && enable_static=no
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
 	fi
         ;;
     esac
diff --git a/extension/m4/ltoptions.m4 b/extension/m4/ltoptions.m4
index 50c77236..94b08297 100644
--- a/extension/m4/ltoptions.m4
+++ b/extension/m4/ltoptions.m4
@@ -1,6 +1,6 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004-2005, 2007-2009, 2011-2013 Free Software
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
 #   Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
@@ -82,6 +82,8 @@ m4_if([$1],[LT_INIT],[
   _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
   _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
 		   [_LT_ENABLE_FAST_INSTALL])
+  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+		   [_LT_WITH_AIX_SONAME([aix])])
   ])
 ])# _LT_SET_OPTIONS
 
@@ -319,6 +321,59 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
 dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
 
 
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+  AC_MSG_CHECKING([which variant of shared library versioning to provide])
+  AC_ARG_WITH([aix-soname],
+    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+      [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+    [case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname],
+    [AC_CACHE_VAL([lt_cv_with_aix_soname],
+      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+    with_aix_soname=$lt_cv_with_aix_soname])
+  AC_MSG_RESULT([$with_aix_soname])
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
 # _LT_WITH_PIC([MODE])
 # --------------------
 # implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
diff --git a/extension/m4/ltsugar.m4 b/extension/m4/ltsugar.m4
index 9000a057..48bc9344 100644
--- a/extension/m4/ltsugar.m4
+++ b/extension/m4/ltsugar.m4
@@ -1,6 +1,7 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
@@ -33,7 +34,7 @@ m4_define([_lt_join],
 # ------------
 # Manipulate m4 lists.
 # These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
+# Autoconf-2.59, which quotes differently.
 m4_define([lt_car], [[$1]])
 m4_define([lt_cdr],
 [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@@ -44,7 +45,7 @@ m4_define([lt_unquote], $1)
 
 # lt_append(MACRO-NAME, STRING, [SEPARATOR])
 # ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
 # Note that neither SEPARATOR nor STRING are expanded; they are appended
 # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
 # No SEPARATOR is output if MACRO-NAME was previously undefined (different
diff --git a/extension/m4/ltversion.m4 b/extension/m4/ltversion.m4
index daeb0af7..fa04b52a 100644
--- a/extension/m4/ltversion.m4
+++ b/extension/m4/ltversion.m4
@@ -1,6 +1,6 @@
 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004
 #
 # This file is free software; the Free Software Foundation gives
@@ -9,15 +9,15 @@
 
 # @configure_input@
 
-# serial 4038 ltversion.m4
+# serial 4179 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4.2.418])
-m4_define([LT_PACKAGE_REVISION], [2.4.2.418])
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2.418'
-macro_revision='2.4.2.418'
+[macro_version='2.4.6'
+macro_revision='2.4.6'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff --git a/extension/m4/lt~obsolete.m4 b/extension/m4/lt~obsolete.m4
index c573da90..c6b26f88 100644
--- a/extension/m4/lt~obsolete.m4
+++ b/extension/m4/lt~obsolete.m4
@@ -1,6 +1,7 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+#   Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
@@ -11,7 +12,7 @@
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
 # which have later been changed to m4_define as they aren't part of the
 # exported API, or moved to Autoconf or Automake where they belong.
 #
@@ -25,7 +26,7 @@
 # included after everything else.  This provides aclocal with the
 # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
 # because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
 #
 # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
 # Yes, that means every name once taken will need to remain here until
diff --git a/extension/m4/po.m4 b/extension/m4/po.m4
deleted file mode 100644
index 3c9884ba..00000000
--- a/extension/m4/po.m4
+++ /dev/null
@@ -1,449 +0,0 @@
-# po.m4 serial 17 (gettext-0.18)
-dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.50])
-
-dnl Checks for all prerequisites of the po subdirectory.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
-  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
-  AC_REQUIRE([AM_NLS])dnl
-
-  dnl Release version of the gettext macros. This is used to ensure that
-  dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
-
-  dnl Perform the following tests also if --disable-nls has been given,
-  dnl because they are needed for "make dist" to work.
-
-  dnl Search for GNU msgfmt in the PATH.
-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-  dnl The second test excludes FreeBSD msgfmt.
-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
-
-  dnl Test whether it is GNU msgfmt >= 0.15.
-changequote(,)dnl
-  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
-    *) MSGFMT_015=$MSGFMT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([MSGFMT_015])
-changequote(,)dnl
-  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
-    *) GMSGFMT_015=$GMSGFMT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([GMSGFMT_015])
-
-  dnl Search for GNU xgettext 0.12 or newer in the PATH.
-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-  dnl The second test excludes FreeBSD xgettext.
-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  dnl Remove leftover from FreeBSD xgettext call.
-  rm -f messages.po
-
-  dnl Test whether it is GNU xgettext >= 0.15.
-changequote(,)dnl
-  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
-    *) XGETTEXT_015=$XGETTEXT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([XGETTEXT_015])
-
-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
-
-  dnl Installation directories.
-  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
-  dnl have to define it here, so that it can be used in po/Makefile.
-  test -n "$localedir" || localedir='${datadir}/locale'
-  AC_SUBST([localedir])
-
-  dnl Support for AM_XGETTEXT_OPTION.
-  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
-  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
-
-  AC_CONFIG_COMMANDS([po-directories], [[
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        # Treat a directory as a PO directory if and only if it has a
-        # POTFILES.in file. This allows packages to have multiple PO
-        # directories under different names or in different locations.
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
-            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-          fi
-          # Compute POFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-          # Compute UPDATEPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-          # Compute DUMMYPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-          # Compute GMOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          GMOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done]],
-   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake < 1.5.
-    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-   ])
-])
-
-dnl Postprocesses a Makefile in a directory containing PO files.
-AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
-[
-  # When this code is run, in config.status, two variables have already been
-  # set:
-  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
-  # - LINGUAS is the value of the environment variable LINGUAS at configure
-  #   time.
-
-changequote(,)dnl
-  # Adjust a relative srcdir.
-  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-  # In autoconf-2.13 it is called $ac_given_srcdir.
-  # In autoconf-2.50 it is called $srcdir.
-  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-  case "$ac_given_srcdir" in
-    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-    /*) top_srcdir="$ac_given_srcdir" ;;
-    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  # Find a way to echo strings without interpreting backslash.
-  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
-    gt_echo='echo'
-  else
-    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
-      gt_echo='printf %s\n'
-    else
-      echo_func () {
-        cat <<EOT
-$*
-EOT
-      }
-      gt_echo='echo_func'
-    fi
-  fi
-
-  # A sed script that extracts the value of VARIABLE from a Makefile.
-  sed_x_variable='
-# Test if the hold space is empty.
-x
-s/P/P/
-x
-ta
-# Yes it was empty. Look if we have the expected variable definition.
-/^[	 ]*VARIABLE[	 ]*=/{
-  # Seen the first line of the variable definition.
-  s/^[	 ]*VARIABLE[	 ]*=//
-  ba
-}
-bd
-:a
-# Here we are processing a line from the variable definition.
-# Remove comment, more precisely replace it with a space.
-s/#.*$/ /
-# See if the line ends in a backslash.
-tb
-:b
-s/\\$//
-# Print the line, without the trailing backslash.
-p
-tc
-# There was no trailing backslash. The end of the variable definition is
-# reached. Clear the hold space.
-s/^.*$//
-x
-bd
-:c
-# A trailing backslash means that the variable definition continues in the
-# next line. Put a nonempty string into the hold space to indicate this.
-s/^.*$/P/
-x
-:d
-'
-changequote([,])dnl
-
-  # Set POTFILES to the value of the Makefile variable POTFILES.
-  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
-  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
-  # Compute POTFILES_DEPS as
-  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-  POTFILES_DEPS=
-  for file in $POTFILES; do
-    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
-  done
-  POMAKEFILEDEPS=""
-
-  if test -n "$OBSOLETE_ALL_LINGUAS"; then
-    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-  fi
-  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-    # The LINGUAS file contains the set of available languages.
-    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-  else
-    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
-    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
-    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
-  fi
-  # Hide the ALL_LINGUAS assigment from automake < 1.5.
-  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-  # Compute POFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-  # Compute UPDATEPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-  # Compute DUMMYPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-  # Compute GMOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-  # Compute PROPERTIESFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
-  # Compute CLASSFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
-  # Compute QMFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
-  # Compute MSGFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
-  # Compute RESOURCESDLLFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
-  case "$ac_given_srcdir" in
-    .) srcdirpre= ;;
-    *) srcdirpre='$(srcdir)/' ;;
-  esac
-  POFILES=
-  UPDATEPOFILES=
-  DUMMYPOFILES=
-  GMOFILES=
-  PROPERTIESFILES=
-  CLASSFILES=
-  QMFILES=
-  MSGFILES=
-  RESOURCESDLLFILES=
-  for lang in $ALL_LINGUAS; do
-    POFILES="$POFILES $srcdirpre$lang.po"
-    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
-    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
-    QMFILES="$QMFILES $srcdirpre$lang.qm"
-    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
-    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
-  done
-  # CATALOGS depends on both $ac_dir and the user's LINGUAS
-  # environment variable.
-  INST_LINGUAS=
-  if test -n "$ALL_LINGUAS"; then
-    for presentlang in $ALL_LINGUAS; do
-      useit=no
-      if test "%UNSET%" != "$LINGUAS"; then
-        desiredlanguages="$LINGUAS"
-      else
-        desiredlanguages="$ALL_LINGUAS"
-      fi
-      for desiredlang in $desiredlanguages; do
-        # Use the presentlang catalog if desiredlang is
-        #   a. equal to presentlang, or
-        #   b. a variant of presentlang (because in this case,
-        #      presentlang can be used as a fallback for messages
-        #      which are not translated in the desiredlang catalog).
-        case "$desiredlang" in
-          "$presentlang"*) useit=yes;;
-        esac
-      done
-      if test $useit = yes; then
-        INST_LINGUAS="$INST_LINGUAS $presentlang"
-      fi
-    done
-  fi
-  CATALOGS=
-  JAVACATALOGS=
-  QTCATALOGS=
-  TCLCATALOGS=
-  CSHARPCATALOGS=
-  if test -n "$INST_LINGUAS"; then
-    for lang in $INST_LINGUAS; do
-      CATALOGS="$CATALOGS $lang.gmo"
-      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
-      QTCATALOGS="$QTCATALOGS $lang.qm"
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
-    done
-  fi
-
-  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
-  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang.msg: $lang.po
-	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if test -n "$POMAKEFILEDEPS"; then
-    cat >> "$ac_file.tmp" <<EOF
-Makefile: $POMAKEFILEDEPS
-EOF
-  fi
-  mv "$ac_file.tmp" "$ac_file"
-])
-
-dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
-AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
-[
-  XGETTEXT_EXTRA_OPTIONS=
-])
-
-dnl Registers an option to be passed to xgettext in the po subdirectory.
-AC_DEFUN([AM_XGETTEXT_OPTION],
-[
-  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
-  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
-])
diff --git a/extension/testext.c b/extension/testext.c
index 2dda339f..e2ddbe87 100644
--- a/extension/testext.c
+++ b/extension/testext.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012, 2013, 2014
+ * Copyright (C) 2012, 2013, 2014, 2015
  * the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
@@ -37,6 +37,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 
 #include "gawkapi.h"
 
@@ -302,6 +303,12 @@ var_test(int nargs, awk_value_t *result)
 		goto out;
 	}
 
+	/* look up PROCINFO - should succeed fail */
+	if (sym_lookup("PROCINFO", AWK_ARRAY, & value))
+		printf("var_test: sym_lookup of PROCINFO passed - got a value!\n");
+	else
+		printf("var_test: sym_lookup of PROCINFO failed - did not get a value\n");
+
 	/* look up a reserved variable - should pass */
 	if (sym_lookup("ARGC", AWK_NUMBER, & value))
 		printf("var_test: sym_lookup of ARGC passed - got a value!\n");
@@ -368,6 +375,84 @@ out:
 }
 
 /*
+ * 3/2015: This test is no longer strictly necessary,
+ * since PROCINFO is no longer a deferred variable.
+ * But we leave it in for safety, anyway.
+ */
+/*
+BEGIN {
+	print "test_deferred returns", test_deferred()
+	print ""
+}
+*/
+static awk_value_t *
+test_deferred(int nargs, awk_value_t *result)
+{
+	awk_value_t arr;
+	awk_value_t index, value;
+	const struct nval {
+		const char *name;
+		double val;
+	} seed[] = {
+		{ "fubar", 9.0, },
+		{ "rumpus", -5.0, },
+	};
+	struct nval sysval[] = {
+		{ "uid", getuid(), },
+		{ "api_major", GAWK_API_MAJOR_VERSION, },
+	};
+	size_t i;
+
+	assert(result != NULL);
+	make_number(0.0, result);
+
+	if (nargs != 0) {
+		printf("test_deferred: nargs not right (%d should be 0)\n", nargs);
+		goto out;
+	}
+
+	if (! sym_lookup("PROCINFO", AWK_ARRAY, & arr)) {
+		printf("test_deferred: %d: sym_lookup failed\n", __LINE__);
+		goto out;
+	}
+
+	for (i = 0; i < sizeof(seed)/sizeof(seed[0]); i++) {
+		make_const_string(seed[i].name, strlen(seed[i].name), & index);
+		make_number(seed[i].val, & value);
+		if (! set_array_element(arr.array_cookie, & index, & value)) {
+			printf("test_deferred: %d: set_array_element(%s) failed\n", __LINE__, seed[i].name);
+			goto out;
+		}
+	}
+
+	/* test that it still contains the values we loaded */
+	for (i = 0; i < sizeof(seed)/sizeof(seed[0]); i++) {
+		make_const_string(seed[i].name, strlen(seed[i].name), & index);
+		make_null_string(& value);
+		if (! get_array_element(arr.array_cookie, &index, AWK_NUMBER, & value)) {
+			printf("test_deferred: %d: get_array_element(%s) failed\n", __LINE__, seed[i].name);
+			goto out;
+		}
+		printf("%s = %g\n", seed[i].name, value.num_value);
+	}
+
+	/* check a few automatically-supplied values */
+	for (i = 0; i < sizeof(sysval)/sizeof(sysval[0]); i++) {
+		make_const_string(sysval[i].name, strlen(sysval[i].name), & index);
+		make_null_string(& value);
+		if (! get_array_element(arr.array_cookie, &index, AWK_NUMBER, & value)) {
+			printf("test_deferred: %d: get_array_element(%s) failed\n", __LINE__, sysval[i].name);
+			goto out;
+		}
+		printf("%s matches %d\n", sysval[i].name, (value.num_value == sysval[i].val));
+	}
+
+	make_number(1.0, result);
+out:
+	return result;
+}
+
+/*
 BEGIN {
 	for (i = 1; i <= 10; i++)
 		test_array[i] = i + 2
@@ -704,6 +789,7 @@ BEGIN {
 	ret = test_indirect_vars()	# should get correct value of NR
 	printf("test_indirect_var() return %d\n", ret)
 	delete ARGV[1]
+	print ""
 }
 */
 
@@ -736,6 +822,124 @@ out:
 	return result;
 }
 
+/*
+BEGIN {
+	outfile = "testexttmp.txt"
+	alias = ".test.alias"
+	print "line 1" > outfile
+	print "line 2" > outfile
+	print "line 3" > outfile
+	close(outfile)
+	ret = test_get_file(outfile, alias)
+	printf "test_get_file returned %d\n", ret
+	nr = 0
+	while ((getline < alias) > 0)
+		printf "File [%s] nr [%s]: %s\n", alias, ++nr, $0
+	close(alias)
+	system("rm " outfile)
+	print ""
+}
+*/
+
+/* test_get_file --- test that we can create a file */
+
+static awk_value_t *
+test_get_file(int nargs, awk_value_t *result)
+{
+	awk_value_t filename, alias;
+	int fd;
+	const awk_input_buf_t *ibuf;
+	const awk_output_buf_t *obuf;
+
+	if (nargs != 2) {
+		printf("%s: nargs not right (%d should be 2)\n", "test_get_file", nargs);
+		return make_number(-1.0, result);
+	}
+
+	if (! get_argument(0, AWK_STRING, & filename)) {
+		printf("%s: cannot get first arg\n", "test_get_file");
+		return make_number(-1.0, result);
+	}
+	if (! get_argument(1, AWK_STRING, & alias)) {
+		printf("%s: cannot get second arg\n", "test_get_file");
+		return make_number(-1.0, result);
+	}
+	if ((fd = open(filename.str_value.str, O_RDONLY)) < 0) {
+		printf("%s: open(%s) failed\n", "test_get_file", filename.str_value.str);
+		return make_number(-1.0, result);
+	}
+	if (! get_file(alias.str_value.str, strlen(alias.str_value.str), "<", fd, &ibuf, &obuf)) {
+		printf("%s: get_file(%s) failed\n", "test_get_file", alias.str_value.str);
+		return make_number(-1.0, result);
+	}
+	if (! ibuf || ibuf->fd != fd) {
+		printf("%s: get_file(%s) returned fd %d instead of %d\n", "test_get_file", alias.str_value.str, ibuf ? ibuf->fd : -1, fd);
+		return make_number(-1.0, result);
+	}
+	return make_number(0.0, result);
+}
+
+/* do_get_file --- provide access to get_file API */
+
+static awk_value_t *
+do_get_file(int nargs, awk_value_t *result)
+{
+	awk_value_t filename, filetype, fd, res;
+	const awk_input_buf_t *ibuf;
+	const awk_output_buf_t *obuf;
+
+	if (nargs != 4) {
+		printf("%s: nargs not right (%d should be 4)\n", "get_file", nargs);
+		return make_number(-1.0, result);
+	}
+
+	if (! get_argument(0, AWK_STRING, & filename)) {
+		printf("%s: cannot get first arg\n", "get_file");
+		return make_number(-1.0, result);
+	}
+	if (! get_argument(1, AWK_STRING, & filetype)) {
+		printf("%s: cannot get second arg\n", "get_file");
+		return make_number(-1.0, result);
+	}
+	if (! get_argument(2, AWK_NUMBER, & fd)) {
+		printf("%s: cannot get third arg\n", "get_file");
+		return make_number(-1.0, result);
+	}
+	if (! get_argument(3, AWK_ARRAY, & res)) {
+		printf("%s: cannot get fourth arg\n", "get_file");
+		return make_number(-1.0, result);
+	}
+	clear_array(res.array_cookie);
+
+	if (! get_file(filename.str_value.str, strlen(filename.str_value.str), filetype.str_value.str, fd.num_value, &ibuf, &obuf)) {
+		printf("%s: get_file(%s, %s, %d) failed\n", "get_file", filename.str_value.str, filetype.str_value.str, (int)(fd.num_value));
+		return make_number(0.0, result);
+	}
+
+	if (ibuf) {
+		awk_value_t idx, val;
+		set_array_element(res.array_cookie, 
+				  make_const_string("input", 5, & idx),
+				  make_number(ibuf->fd, & val));
+		if (ibuf->name)
+			set_array_element(res.array_cookie, 
+					  make_const_string("input_name", 10, & idx),
+					  make_const_string(ibuf->name, strlen(ibuf->name), & val));
+	}
+	if (obuf) {
+		awk_value_t idx, val;
+		set_array_element(res.array_cookie, 
+				  make_const_string("output", 6, & idx),
+				  make_number(obuf->fp ? fileno(obuf->fp) : -1,
+				  	      & val));
+		if (obuf->name)
+			set_array_element(res.array_cookie, 
+					  make_const_string("output_name", 11, & idx),
+					  make_const_string(obuf->name, strlen(obuf->name), & val));
+	}
+	return make_number(1.0, result);
+}
+
 /* fill_in_array --- fill in a new array */
 
 static void
@@ -823,6 +1027,7 @@ static awk_ext_func_t func_table[] = {
 	{ "dump_array_and_delete", dump_array_and_delete, 2 },
 	{ "try_modify_environ", try_modify_environ, 0 },
 	{ "var_test", var_test, 1 },
+	{ "test_deferred", test_deferred, 0 },
 	{ "test_errno", test_errno, 0 },
 	{ "test_array_size", test_array_size, 1 },
 	{ "test_array_elem", test_array_elem, 2 },
@@ -831,6 +1036,8 @@ static awk_ext_func_t func_table[] = {
 	{ "test_scalar", test_scalar, 1 },
 	{ "test_scalar_reserved", test_scalar_reserved, 0 },
 	{ "test_indirect_vars", test_indirect_vars, 0 },
+	{ "test_get_file", test_get_file, 2 },
+	{ "get_file", do_get_file, 4 },
 };
 
 /* init_testext --- additional initialization function */
@@ -841,6 +1048,10 @@ static awk_bool_t init_testext(void)
 	static const char message[] = "hello, world";	/* of course */
 	static const char message2[] = "i am a scalar";
 
+	/* This is used by the getfile test */
+	if (sym_lookup("TESTEXT_QUIET", AWK_NUMBER, & value))
+		return awk_true;
+
 	/* add at_exit functions */
 	awk_atexit(at_exit0, NULL);
 	awk_atexit(at_exit1, & data_for_1);
diff --git a/extras/ChangeLog b/extras/ChangeLog
new file mode 100644
index 00000000..5f7d33ad
--- /dev/null
+++ b/extras/ChangeLog
@@ -0,0 +1,3 @@
+2014-10-29         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* Makefile.am, gawk.sh, gawk.csh: New files.
diff --git a/extras/Makefile.am b/extras/Makefile.am
new file mode 100644
index 00000000..6a33ae04
--- /dev/null
+++ b/extras/Makefile.am
@@ -0,0 +1,29 @@
+#
+# extras/Makefile.am --- automake input file for gawk
+#
+# Copyright (C) 2014 the Free Software Foundation, Inc.
+#
+# This file is part of GAWK, the GNU implementation of the
+# AWK Programming Language.
+#
+# GAWK is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# GAWK is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+#
+
+## Process this file with automake to produce Makefile.in.
+
+profiledir = $(sysconfdir)/profile.d
+profile_DATA = gawk.sh gawk.csh
+
+EXTRA_DIST = $(profile_DATA)
diff --git a/extras/Makefile.in b/extras/Makefile.in
new file mode 100644
index 00000000..f6741221
--- /dev/null
+++ b/extras/Makefile.in
@@ -0,0 +1,528 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# extras/Makefile.am --- automake input file for gawk
+#
+# Copyright (C) 2014 the Free Software Foundation, Inc.
+#
+# This file is part of GAWK, the GNU implementation of the
+# AWK Programming Language.
+#
+# GAWK is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# GAWK is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = extras
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
+	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libsigsegv.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/mpfr.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/noreturn.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socket.m4 \
+	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(profiledir)"
+DATA = $(profile_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs \
+	ChangeLog
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GAWKLIBEXT = @GAWKLIBEXT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_LIBSIGSEGV = @HAVE_LIBSIGSEGV@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMPFR = @LIBMPFR@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBSIGSEGV = @LIBSIGSEGV@
+LIBSIGSEGV_PREFIX = @LIBSIGSEGV_PREFIX@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBSIGSEGV = @LTLIBSIGSEGV@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POSUB = @POSUB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+acl_shlibext = @acl_shlibext@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgextensiondir = @pkgextensiondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+profiledir = $(sysconfdir)/profile.d
+profile_DATA = gawk.sh gawk.csh
+EXTRA_DIST = $(profile_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extras/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu extras/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-profileDATA: $(profile_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(profile_DATA)'; test -n "$(profiledir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(profiledir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(profiledir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(profiledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(profiledir)" || exit $$?; \
+	done
+
+uninstall-profileDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(profile_DATA)'; test -n "$(profiledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(profiledir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(profiledir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-profileDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-profileDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-profileDATA install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am \
+	uninstall-profileDATA
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/extras/gawk.csh b/extras/gawk.csh
new file mode 100644
index 00000000..583d5bcd
--- /dev/null
+++ b/extras/gawk.csh
@@ -0,0 +1,11 @@
+alias gawkpath_default 'unsetenv AWKPATH; setenv AWKPATH `gawk -v x=AWKPATH "BEGIN {print ENVIRON[x]}"`'
+
+alias gawkpath_prepend 'if (! $?AWKPATH) setenv AWKPATH ""; if ($AWKPATH == "") then; unsetenv AWKPATH; setenv AWKPATH `gawk -v x=AWKPATH "BEGIN {print ENVIRON[x]}"`; endif; setenv AWKPATH "\!*"":$AWKPATH"'
+
+alias gawkpath_append 'if (! $?AWKPATH) setenv AWKPATH ""; if ($AWKPATH == "") then; unsetenv AWKPATH; setenv AWKPATH `gawk -v x=AWKPATH "BEGIN {print ENVIRON[x]}"`; endif; setenv AWKPATH "$AWKPATH"":\!*"'
+
+alias gawklibpath_default 'unsetenv AWKLIBPATH; setenv AWKLIBPATH `gawk -v x=AWKLIBPATH "BEGIN {print ENVIRON[x]}"`'
+
+alias gawklibpath_prepend 'if (! $?AWKLIBPATH) setenv AWKLIBPATH ""; if ($AWKLIBPATH == "") then; unsetenv AWKLIBPATH; setenv AWKLIBPATH `gawk -v x=AWKLIBPATH "BEGIN {print ENVIRON[x]}"`; endif; setenv AWKLIBPATH "\!*"":$AWKLIBPATH"'
+
+alias gawklibpath_append 'if (! $?AWKLIBPATH) setenv AWKLIBPATH ""; if ($AWKLIBPATH == "") then; unsetenv AWKLIBPATH; setenv AWKLIBPATH `gawk -v x=AWKLIBPATH "BEGIN {print ENVIRON[x]}"`; endif; setenv AWKLIBPATH "$AWKLIBPATH"":\!*"'
diff --git a/extras/gawk.sh b/extras/gawk.sh
new file mode 100644
index 00000000..c35471fa
--- /dev/null
+++ b/extras/gawk.sh
@@ -0,0 +1,31 @@
+gawkpath_default () {
+	unset AWKPATH
+	export AWKPATH=`gawk 'BEGIN {print ENVIRON["AWKPATH"]}'`
+}
+
+gawkpath_prepend () {
+	[ -z "$AWKPATH" ] && AWKPATH=`gawk 'BEGIN {print ENVIRON["AWKPATH"]}'`
+	export AWKPATH="$*:$AWKPATH"
+}
+
+gawkpath_append () {
+	[ -z "$AWKPATH" ] && AWKPATH=`gawk 'BEGIN {print ENVIRON["AWKPATH"]}'`
+	export AWKPATH="$AWKPATH:$*"
+}
+
+gawklibpath_default () {
+	unset AWKLIBPATH
+	export AWKLIBPATH=`gawk 'BEGIN {print ENVIRON["AWKLIBPATH"]}'`
+}
+
+gawklibpath_prepend () {
+	[ -z "$AWKLIBPATH" ] && \
+		AWKLIBPATH=`gawk 'BEGIN {print ENVIRON["AWKLIBPATH"]}'`
+	export AWKLIBPATH="$*:$AWKLIBPATH"
+}
+
+gawklibpath_append () {
+	[ -z "$AWKLIBPATH" ] && \
+		AWKLIBPATH=`gawk 'BEGIN {print ENVIRON["AWKLIBPATH"]}'`
+	export AWKLIBPATH="$AWKLIBPATH:$*"
+}
diff --git a/field.c b/field.c
index ffbfc6de..97b8f3a1 100644
--- a/field.c
+++ b/field.c
@@ -273,6 +273,12 @@ set_record(const char *buf, int cnt)
 	/* copy the data */
 	memcpy(databuf, buf, cnt);
 
+	/*
+	 * Add terminating '\0' so that C library routines 
+	 * will know when to stop.
+	 */
+	databuf[cnt] = '\0';
+
 	/* manage field 0: */
 	unref(fields_arr[0]);
 	getnode(n);
@@ -382,12 +388,10 @@ re_parse_field(long up_to,	/* parse only up to this field number */
 	char *end = scan + len;
 	int regex_flags = RE_NEED_START;
 	char *sep;
-#if MBS_SUPPORT
 	size_t mbclen = 0;
 	mbstate_t mbs;
-	if (gawk_mb_cur_max > 1)
-		memset(&mbs, 0, sizeof(mbstate_t));
-#endif
+
+	memset(&mbs, 0, sizeof(mbstate_t));
 
 	if (in_middle)
 		regex_flags |= RE_NO_BOL;
@@ -414,7 +418,6 @@ re_parse_field(long up_to,	/* parse only up to this field number */
 	       && nf < up_to) {
 		regex_flags |= RE_NO_BOL;
 		if (REEND(rp, scan) == RESTART(rp, scan)) {   /* null match */
-#if MBS_SUPPORT
 			if (gawk_mb_cur_max > 1)	{
 				mbclen = mbrlen(scan, end-scan, &mbs);
 				if ((mbclen == 1) || (mbclen == (size_t) -1)
@@ -424,8 +427,7 @@ re_parse_field(long up_to,	/* parse only up to this field number */
 				}
 				scan += mbclen;
 			} else
-#endif
-			scan++;
+				scan++;
 			if (scan == end) {
 				(*set)(++nf, field, (long)(scan - field), n);
 				up_to = nf;
@@ -626,7 +628,6 @@ null_parse_field(long up_to,	/* parse only up to this field number */
 	if (len == 0)
 		return nf;
 
-#if MBS_SUPPORT
 	if (gawk_mb_cur_max > 1) {
 		mbstate_t mbs;
 		memset(&mbs, 0, sizeof(mbstate_t));
@@ -642,12 +643,12 @@ null_parse_field(long up_to,	/* parse only up to this field number */
 			(*set)(++nf, scan, mbclen, n);
 			scan += mbclen;
 		}
-	} else
-#endif
-	for (; nf < up_to && scan < end; scan++) {
-		if (sep_arr != NULL && nf > 0)
-			set_element(nf, scan, 0L, sep_arr);
-		(*set)(++nf, scan, 1L, n);
+	} else {
+		for (; nf < up_to && scan < end; scan++) {
+			if (sep_arr != NULL && nf > 0)
+				set_element(nf, scan, 0L, sep_arr);
+			(*set)(++nf, scan, 1L, n);
+		}
 	}
 
 	*buf = scan;
@@ -678,12 +679,10 @@ sc_parse_field(long up_to,	/* parse only up to this field number */
 	char *field;
 	char *end = scan + len;
 	char sav;
-#if MBS_SUPPORT
 	size_t mbclen = 0;
 	mbstate_t mbs;
-	if (gawk_mb_cur_max > 1)
-		memset(&mbs, 0, sizeof(mbstate_t));
-#endif
+
+	memset(&mbs, 0, sizeof(mbstate_t));
 
 	if (up_to == UNLIMITED)
 		nf = 0;
@@ -702,7 +701,6 @@ sc_parse_field(long up_to,	/* parse only up to this field number */
 
 	for (; nf < up_to;) {
 		field = scan;
-#if MBS_SUPPORT
 		if (gawk_mb_cur_max > 1) {
 			while (*scan != fschar) {
 				mbclen = mbrlen(scan, end-scan, &mbs);
@@ -713,10 +711,10 @@ sc_parse_field(long up_to,	/* parse only up to this field number */
 				}
 				scan += mbclen;
 			}
-		} else
-#endif
-		while (*scan != fschar)
-			scan++;
+		} else {
+			while (*scan != fschar)
+				scan++;
+		}
 		(*set)(++nf, field, (long)(scan - field), n);
 		if (scan == end)
 			break;
@@ -756,7 +754,6 @@ fw_parse_field(long up_to,	/* parse only up to this field number */
 	char *scan = *buf;
 	long nf = parse_high_water;
 	char *end = scan + len;
-#if MBS_SUPPORT
 	int nmbc;
 	size_t mbclen;
 	size_t mbslen;
@@ -765,14 +762,12 @@ fw_parse_field(long up_to,	/* parse only up to this field number */
 	mbstate_t mbs;
 
 	memset(&mbs, 0, sizeof(mbstate_t));
-#endif
 
 	if (up_to == UNLIMITED)
 		nf = 0;
 	if (len == 0)
 		return nf;
 	for (; nf < up_to && (len = FIELDWIDTHS[nf+1]) != -1; ) {
-#if MBS_SUPPORT
 		if (gawk_mb_cur_max > 1) {
 			nmbc = 0;
 			mbslen = 0;
@@ -795,10 +790,7 @@ fw_parse_field(long up_to,	/* parse only up to this field number */
 	    		}
 			(*set)(++nf, scan, (long) mbslen, n);
 			scan += mbslen;
-		}
-		else
-#endif
-		{
+		} else {
 			if (len > end - scan)
 				len = end - scan;
 			(*set)(++nf, scan, (long) len, n);
@@ -1441,13 +1433,8 @@ set_fpat_function:
  * 			Implementation varies if doing MBS or not.
  */
 
-#if MBS_SUPPORT
 #define increment_scan(scanp, len) incr_scan(scanp, len, & mbs)
-#else
-#define increment_scan(scanp, len) ((*scanp)++)
-#endif
 
-#if MBS_SUPPORT
 /* incr_scan --- MBS version of increment_scan() */
 
 static void
@@ -1468,7 +1455,6 @@ incr_scan(char **scanp, size_t len, mbstate_t *mbs)
 	} else
 		(*scanp)++;
 }
-#endif
 
 /*
  * fpat_parse_field --- parse fields using a regexp.
@@ -1593,12 +1579,9 @@ fpat_parse_field(long up_to,	/* parse only up to this field number */
 	bool need_to_set_sep;
 	bool non_empty;
 	bool eosflag;
-#if MBS_SUPPORT
 	mbstate_t mbs;
 
-	if (gawk_mb_cur_max > 1)
-		memset(&mbs, 0, sizeof(mbstate_t));
-#endif
+	memset(&mbs, 0, sizeof(mbstate_t));
 
 	if (up_to == UNLIMITED)
 		nf = 0;
diff --git a/format.c b/format.c
index 2322d563..1cc29a85 100644
--- a/format.c
+++ b/format.c
@@ -37,7 +37,6 @@ char zero_string[] = "0";
 static size_t
 mbc_byte_count(const char *ptr, size_t numchars)
 {
-#if MBS_SUPPORT
 	mbstate_t cur_state;
 	size_t sum = 0;
 	int mb_len;
@@ -58,9 +57,6 @@ mbc_byte_count(const char *ptr, size_t numchars)
 	}
 
 	return sum;
-#else
-	return numchars;
-#endif
 }
 
 /* mbc_char_count --- return number of m.b. chars in string, up to numbytes bytes */
@@ -68,7 +64,6 @@ mbc_byte_count(const char *ptr, size_t numchars)
 static size_t
 mbc_char_count(const char *ptr, size_t numbytes)
 {
-#if MBS_SUPPORT
 	mbstate_t cur_state;
 	size_t sum = 0;
 	int mb_len;
@@ -91,9 +86,6 @@ mbc_char_count(const char *ptr, size_t numbytes)
 	}
 
 	return sum;
-#else
-	return numbytes;
-#endif
 }
 
 
@@ -593,7 +585,6 @@ check_pos:
 				(void) force_number(arg);
 			if ((arg->flags & NUMBER) != 0) {
 				uval = get_number_uj(arg);
-#if MBS_SUPPORT
 				if (gawk_mb_cur_max > 1) {
 					char buf[100];
 					wchar_t wc;
@@ -634,7 +625,6 @@ out0:
 				;
 				/* else,
 					fall through */
-#endif
 				CPBUF[0] = uval;
 				spec.prec = 1;
 				cp = CPBUF;
@@ -648,7 +638,6 @@ out0:
 			 */
 			cp = arg->stptr;
 			spec.prec = 1;
-#if MBS_SUPPORT
 			/*
 			 * First character can be multiple bytes if
 			 * it's a multibyte character. Grr.
@@ -666,7 +655,6 @@ out0:
 						spec.fw += count - 1;
 				}
 			}
-#endif
 			goto pr_tail;
 		case 's':
 			need_format = false;
diff --git a/gawkapi.c b/gawkapi.c
index 87e12448..c2f402f1 100644
--- a/gawkapi.c
+++ b/gawkapi.c
@@ -3,7 +3,7 @@
  */
 
 /* 
- * Copyright (C) 2012-2014 the Free Software Foundation, Inc.
+ * Copyright (C) 2012-2015 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
@@ -25,6 +25,11 @@
 
 #include "awk.h"
 
+/* Declare some globals used by api_get_file: */
+extern IOBUF *curfile;
+extern INSTRUCTION *main_beginfile;
+extern int currule;
+
 static awk_bool_t node_to_awk_value(NODE *node, awk_value_t *result, awk_valtype_t wanted);
 
 /*
@@ -441,7 +446,10 @@ node_to_awk_value(NODE *node, awk_value_t *val, awk_valtype_t wanted)
 
 		case AWK_UNDEFINED:
 			/* return true and actual type for request of undefined */
-			if ((node->flags & NUMBER) != 0) {
+			if (node == Nnull_string) {
+				val->val_type = AWK_UNDEFINED;
+				ret = awk_true;
+			} else if ((node->flags & NUMBER) != 0) {
 				val->val_type = AWK_NUMBER;
 				val->num_value = get_number_d(node);
 				ret = awk_true;
@@ -781,15 +789,16 @@ api_set_array_element(awk_ext_id_t id, awk_array_t a_cookie,
 
 	tmp = awk_value_to_node(index);
 	aptr = assoc_lookup(array, tmp);
-	unref(tmp);
 	unref(*aptr);
 	elem = *aptr = awk_value_to_node(value);
 	if (elem->type == Node_var_array) {
 		elem->parent_array = array;
 		elem->vname = estrdup(index->str_value.str,
 					index->str_value.len);
-		make_aname(elem);
 	}
+	if (array->astore != NULL)
+		(*array->astore)(array, tmp);
+	unref(tmp);
 
 	return awk_true;
 }
@@ -1033,6 +1042,99 @@ api_release_value(awk_ext_id_t id, awk_value_cookie_t value)
 	return awk_true;
 }
 
+/* api_get_file --- return a handle to an existing or newly opened file */
+
+static awk_bool_t
+api_get_file(awk_ext_id_t id, const char *name, size_t namelen, const char *filetype,
+		int fd, const awk_input_buf_t **ibufp, const awk_output_buf_t **obufp)
+{
+	const struct redirect *f;
+	int flag;	/* not used, sigh */
+	enum redirval redirtype;
+
+	if (name == NULL || namelen == 0) {
+		if (curfile == NULL) {
+			INSTRUCTION *pc;
+			int save_rule;
+			char *save_source;
+
+			if (nextfile(& curfile, false) <= 0)
+				return awk_false;
+
+			pc = main_beginfile;
+			/* save execution state */
+			save_rule = currule;
+			save_source = source;
+
+			for (;;) {
+				if (pc == NULL)
+					fatal(_("cannot find end of BEGINFILE rule"));
+				if (pc->opcode == Op_after_beginfile)
+					break;
+				pc = pc->nexti;
+			}
+			pc->opcode = Op_stop;
+		        (void) (*interpret)(main_beginfile);
+			pc->opcode = Op_after_beginfile;
+			after_beginfile(& curfile);
+			/* restore execution state */
+			currule = save_rule;
+			source = save_source;
+		}
+		*ibufp = &curfile->public;
+		*obufp = NULL;
+
+		return awk_true;
+	}
+
+	redirtype = redirect_none;
+	switch (filetype[0]) {
+	case '<':
+		if (filetype[1] == '\0')
+			redirtype = redirect_input;
+		break;
+	case '>':
+		switch (filetype[1]) {
+		case '\0':
+			redirtype = redirect_output;
+			break;
+		case '>':
+			if (filetype[2] == '\0')
+				redirtype = redirect_append;
+			break;
+		}
+		break;
+	case '|':
+		if (filetype[2] == '\0') {
+			switch (filetype[1]) {
+			case '>':
+				redirtype = redirect_pipe;
+				break;
+			case '<':
+				redirtype = redirect_pipein;
+				break;
+			case '&':
+				redirtype = redirect_twoway;
+				break;
+			}
+		}
+		break;
+	}
+
+	if (redirtype == redirect_none) {
+		warning(_("cannot open unrecognized file type `%s' for `%s'"),
+			filetype, name);
+		return awk_false;
+	}
+
+	if ((f = redirect_string(name, namelen, 0, redirtype, &flag, fd, false)) == NULL)
+		return awk_false;
+
+	*ibufp = f->iop ? & f->iop->public : NULL;
+	*obufp = f->output.fp ? & f->output : NULL;
+	return awk_true;
+}
+
 /*
  * Register a version string for this extension with gawk.
  */
@@ -1118,6 +1220,9 @@ gawk_api_t api_impl = {
 	calloc,
 	realloc,
 	free,
+
+	/* Find/open a file */
+	api_get_file,
 };
 
 /* init_ext_api --- init the extension API */
diff --git a/gawkapi.h b/gawkapi.h
index 090cf797..3604e906 100644
--- a/gawkapi.h
+++ b/gawkapi.h
@@ -263,7 +263,7 @@ typedef struct awk_two_way_processor {
 /* Current version of the API. */
 enum {
 	GAWK_API_MAJOR_VERSION = 1,
-	GAWK_API_MINOR_VERSION = 1
+	GAWK_API_MINOR_VERSION = 2
 };
 
 /* A number of typedefs related to different types of values. */
@@ -504,7 +504,7 @@ typedef struct gawk_api {
 					  awk_value_t *result);
 
 	/*
-	 * Convert a paramter that was undefined into an array
+	 * Convert a parameter that was undefined into an array
 	 * (provide call-by-reference for arrays).  Returns false
 	 * if count is too big, or if the argument's type is
 	 * not undefined.
@@ -674,6 +674,39 @@ typedef struct gawk_api {
 	void *(*api_calloc)(size_t nmemb, size_t size);
 	void *(*api_realloc)(void *ptr, size_t size);
 	void (*api_free)(void *ptr);
+
+        /*
+	 * Look up a file.  If the name is NULL or name_len is 0, it returns
+	 * data for the currently open input file corresponding to FILENAME
+	 * (and it will not access the filetype argument, so that may be
+	 * undefined).  
+	 * If the file is not already open, it tries to open it.
+	 * The "filetype" argument should be one of:
+	 *    ">", ">>", "<", "|>", "|<", and "|&"
+	 * If the file is not already open, and the fd argument is non-negative,
+	 * gawk will use that file descriptor instead of opening the file
+	 * in the usual way.  If the fd is non-negative, but the file exists
+	 * already, gawk ignores the fd and returns the existing file.  It is
+	 * the caller's responsibility to notice that the fd in the returned
+	 * awk_input_buf_t does not match the requested value.  Note that
+	 * supplying a file descriptor is currently NOT supported for pipes.
+	 * It should work for input, output, append, and two-way (coprocess)
+	 * sockets.  If the filetype is two-way, we assume that it is a socket!
+	 * Note that in the two-way case, the input and output file descriptors
+	 * may differ.  To check for success, one must check that either of
+	 * them matches.
+	 */
+	awk_bool_t (*api_get_file)(awk_ext_id_t id,
+			const char *name,
+			size_t name_len,
+			const char *filetype,
+			int fd,
+			/*
+			 * Return values (on success, one or both should
+			 * be non-NULL):
+			 */
+			const awk_input_buf_t **ibufp,
+			const awk_output_buf_t **obufp);
 } gawk_api_t;
 
 #ifndef GAWK	/* these are not for the gawk code itself! */
@@ -756,6 +789,9 @@ typedef struct gawk_api {
 #define release_value(value) \
 	(api->api_release_value(ext_id, value))
 
+#define get_file(name, namelen, filetype, fd, ibuf, obuf) \
+	(api->api_get_file(ext_id, name, namelen, filetype, fd, ibuf, obuf))
+
 #define register_ext_version(version) \
 	(api->api_register_ext_version(ext_id, version))
 
@@ -846,7 +882,7 @@ make_number(double num, awk_value_t *result)
 extern int dl_load(const gawk_api_t *const api_p, awk_ext_id_t id);
 
 #if 0
-/* Boiler plate code: */
+/* Boilerplate code: */
 int plugin_is_GPL_compatible;
 
 static gawk_api_t *const api;
@@ -865,17 +901,17 @@ static awk_bool_t (*init_func)(void) = NULL;
 /* OR: */
 
 static awk_bool_t
-init_my_module(void)
+init_my_extension(void)
 {
 	...
 }
 
-static awk_bool_t (*init_func)(void) = init_my_module;
+static awk_bool_t (*init_func)(void) = init_my_extension;
 
 dl_load_func(func_table, some_name, "name_space_in_quotes")
 #endif
 
-#define dl_load_func(func_table, module, name_space) \
+#define dl_load_func(func_table, extension, name_space) \
 int dl_load(const gawk_api_t *const api_p, awk_ext_id_t id)  \
 { \
 	size_t i, j; \
@@ -886,7 +922,7 @@ int dl_load(const gawk_api_t *const api_p, awk_ext_id_t id)  \
 \
 	if (api->major_version != GAWK_API_MAJOR_VERSION \
 	    || api->minor_version < GAWK_API_MINOR_VERSION) { \
-		fprintf(stderr, #module ": version mismatch with gawk!\n"); \
+		fprintf(stderr, #extension ": version mismatch with gawk!\n"); \
 		fprintf(stderr, "\tmy version (%d, %d), gawk version (%d, %d)\n", \
 			GAWK_API_MAJOR_VERSION, GAWK_API_MINOR_VERSION, \
 			api->major_version, api->minor_version); \
@@ -898,7 +934,7 @@ int dl_load(const gawk_api_t *const api_p, awk_ext_id_t id)  \
 		if (func_table[i].name == NULL) \
 			break; \
 		if (! add_ext_func(name_space, & func_table[i])) { \
-			warning(ext_id, #module ": could not add %s\n", \
+			warning(ext_id, #extension ": could not add %s\n", \
 					func_table[i].name); \
 			errors++; \
 		} \
@@ -906,7 +942,7 @@ int dl_load(const gawk_api_t *const api_p, awk_ext_id_t id)  \
 \
 	if (init_func != NULL) { \
 		if (! init_func()) { \
-			warning(ext_id, #module ": initialization function failed\n"); \
+			warning(ext_id, #extension ": initialization function failed\n"); \
 			errors++; \
 		} \
 	} \
diff --git a/gawkmisc.c b/gawkmisc.c
index a729d88d..0172a810 100644
--- a/gawkmisc.c
+++ b/gawkmisc.c
@@ -52,6 +52,8 @@ pointer
 xmalloc(size_t bytes)
 {
 	pointer p;
+	if (bytes == 0)
+		bytes = 1;	/* avoid dfa.c mishegos */
 	emalloc(p, pointer, bytes, "xmalloc");
 	return p;
 }
diff --git a/getopt.c b/getopt.c
index 7bd42bb6..4de0b9a0 100644
--- a/getopt.c
+++ b/getopt.c
@@ -2,7 +2,7 @@
    NOTE: getopt is part of the C library, so if you don't know what
    "Keep this file name-space clean" means, talk to drepper@gnu.org
    before changing it!
-   Copyright (C) 1987-2014 Free Software Foundation, Inc.
+   Copyright (C) 1987-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -613,7 +613,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 
 		  fputc_unlocked ('\n', fp);
 
-		  if (__builtin_expect (fclose (fp) != EOF, 1))
+		  if (__glibc_likely (fclose (fp) != EOF))
 		    {
 		      _IO_flockfile (stderr);
 
diff --git a/getopt.h b/getopt.h
index da1a01ff..75cd5e8d 100644
--- a/getopt.h
+++ b/getopt.h
@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-2014 Free Software Foundation, Inc.
+   Copyright (C) 1989-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -48,6 +48,21 @@
 extern "C" {
 #endif
 
+#ifdef __KLIBC__
+/* OS/2 kLIBC has already getopt(). So to avoid name clash, rename
+   them here. */
+
+# define optarg		gawk_optarg
+# define optind		gawk_optind
+# define opterr		gawk_opterr
+# define optopt		gawk_optopt
+
+# define getopt				gawk_getopt
+# define getopt_long		gawk_getopt_long
+# define getopt_long_only	gawk_getopt_long_only
+#endif
+
+
 /* For communication from `getopt' to the caller.
    When `getopt' finds an option that takes an argument,
    the argument value is returned here.
diff --git a/getopt1.c b/getopt1.c
index 32f2f6a6..b61041db 100644
--- a/getopt1.c
+++ b/getopt1.c
@@ -1,5 +1,5 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987-2014 Free Software Foundation, Inc.
+   Copyright (C) 1987-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/getopt_int.h b/getopt_int.h
index d255c8ee..03d62277 100644
--- a/getopt_int.h
+++ b/getopt_int.h
@@ -1,5 +1,5 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-2014 Free Software Foundation, Inc.
+   Copyright (C) 1989-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/install-sh b/install-sh
index 04367377..0b0fdcbb 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2013-10-30.23; # UTC
+scriptversion=2013-12-25.23; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -82,7 +82,7 @@ dir_arg=
 dst_arg=
 
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -139,14 +139,16 @@ while test $# -ne 0; do
 
     -s) stripcmd=$stripprog;;
 
-    -t) dst_arg=$2
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
         # Protect names problematic for 'test' and other utilities.
         case $dst_arg in
           -* | [=\(\)!]) dst_arg=./$dst_arg;;
         esac
         shift;;
 
-    -T) no_target_directory=true;;
+    -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
@@ -161,6 +163,16 @@ while test $# -ne 0; do
   shift
 done
 
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -192,6 +204,15 @@ if test $# -eq 0; then
 fi
 
 if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
   do_exit='(exit $ret); exit $ret'
   trap "ret=129; $do_exit" 1
   trap "ret=130; $do_exit" 2
@@ -253,7 +274,7 @@ do
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
+      if test "$is_target_a_directory" = never; then
         echo "$0: $dst_arg: Is a directory" >&2
         exit 1
       fi
diff --git a/interpret.h b/interpret.h
index e84c7b36..c2abe84d 100644
--- a/interpret.h
+++ b/interpret.h
@@ -23,7 +23,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-
+#define UNFIELD(l, r) \
+{ \
+	/* if was a field, turn it into a var */ \
+	if ((r->flags & FIELD) == 0) { \
+		l = r; \
+	} else if (r->valref == 1) { \
+		r->flags &= ~FIELD; \
+		l = r; \
+	} else { \
+		l = dupnode(r); \
+		DEREF(r); \
+	} \
+}
 int
 r_interpret(INSTRUCTION *code)
 {
@@ -340,7 +352,12 @@ uninitialized_scalar:
 			lhs = r_get_field(t1, (Func_ptr *) 0, true);
 			decr_sp();
 			DEREF(t1);
-			r = dupnode(*lhs);     /* can't use UPREF here */
+			/* only for $0, up ref count */
+			if (*lhs == fields_arr[0]) {
+				r = *lhs;
+				UPREF(r);
+			} else
+				r = dupnode(*lhs);
 			PUSH(r);
 			break;
 
@@ -565,7 +582,8 @@ DEREF(t2); REPLACE(r)
 			}
 
 			unref(*lhs);
-			*lhs = POP_SCALAR();
+			r = POP_SCALAR();
+			UNFIELD(*lhs, r);
 
 			/* execute post-assignment routine if any */
 			if (t1->astore != NULL)
@@ -583,11 +601,12 @@ DEREF(t2); REPLACE(r)
 			lhs = get_lhs(pc->memory, false);
 			unref(*lhs);
 			r = pc->initval;	/* constant initializer */
-			if (r == NULL)
-				*lhs = POP_SCALAR();
-			else {
+			if (r != NULL) {
 				UPREF(r);
 				*lhs = r;
+			} else {
+				r = POP_SCALAR();
+				UNFIELD(*lhs, r);
 			}
 			break;
 
@@ -603,7 +622,8 @@ DEREF(t2); REPLACE(r)
 			decr_sp();
 			DEREF(t1);
 			unref(*lhs);
-			*lhs = POP_SCALAR();
+			r = POP_SCALAR();
+			UNFIELD(*lhs, r);
 			assert(assign != NULL);
 			assign();
 		}
@@ -629,7 +649,6 @@ DEREF(t2); REPLACE(r)
 				t1->stptr[nlen] = '\0';
 				t1->flags &= ~(NUMCUR|NUMBER|NUMINT);
 
-#if MBS_SUPPORT
 				if ((t1->flags & WSTRCUR) != 0 && (t2->flags & WSTRCUR) != 0) {
 					size_t wlen = t1->wstlen + t2->wstlen;
 
@@ -641,7 +660,6 @@ DEREF(t2); REPLACE(r)
 					t1->flags |= WSTRCUR;
 				} else
 					free_wstr(*lhs);
-#endif
 			} else {
 				size_t nlen = t1->stlen + t2->stlen;  
 				char *p;
@@ -659,8 +677,8 @@ DEREF(t2); REPLACE(r)
 			lhs = POP_ADDRESS();
 			r = TOP_SCALAR();
 			unref(*lhs);
-			*lhs = r;
 			UPREF(r);
+			UNFIELD(*lhs, r);
 			REPLACE(r);
 			break;
 
@@ -982,7 +1000,15 @@ match_re:
 				assert(the_func != NULL);
 
 				/* call it */
-				r = the_func(arg_count);
+				if (the_func == (builtin_func_t) do_sub)
+					r = call_sub(t1->stptr, arg_count);
+				else if (the_func == do_match)
+					r = call_match(arg_count);
+				else if (the_func == do_split || the_func == do_patsplit)
+					r = call_split_func(t1->stptr, arg_count);
+				else
+					r = the_func(arg_count);
+
 				PUSH(r);
 				break;
 			} else if (f->type != Node_func) {
@@ -1229,17 +1255,18 @@ match_re:
 				fatal(_("`exit' cannot be called in the current context"));
 
 			exiting = true;
-			t1 = POP_NUMBER();
-			exit_val = (int) get_number_si(t1);
-			DEREF(t1);
+			if ((t1 = POP_NUMBER()) != Nnull_string) {
+				exit_val = (int) get_number_si(t1);
 #ifdef VMS
-			if (exit_val == 0)
-				exit_val = EXIT_SUCCESS;
-			else if (exit_val == 1)
-				exit_val = EXIT_FAILURE;
-			/* else
-				just pass anything else on through */
+				if (exit_val == 0)
+					exit_val = EXIT_SUCCESS;
+				else if (exit_val == 1)
+					exit_val = EXIT_FAILURE;
+				/* else
+					just pass anything else on through */
 #endif
+			}
+			DEREF(t1);
 
 			if (currule == BEGINFILE || currule == ENDFILE) {
 
@@ -1324,6 +1351,7 @@ match_re:
 		case Op_K_if:
 		case Op_K_else:
 		case Op_cond_exp:
+		case Op_comment:
 			break;
 
 		default:
diff --git a/io.c b/io.c
index feef47eb..b9fe2324 100644
--- a/io.c
+++ b/io.c
@@ -110,6 +110,14 @@
 
 #ifdef __EMX__
 #include <process.h>
+
+#if !defined(_S_IFDIR) && defined(S_IFDIR)
+#define _S_IFDIR	S_IFDIR
+#endif
+
+#if !defined(_S_IRWXU) && defined(S_IRWXU)
+#define _S_IRWXU	S_IRWXU
+#endif
 #endif
 
 #ifndef ENFILE
@@ -245,7 +253,6 @@ struct recmatch {
 
 
 static int iop_close(IOBUF *iop);
-struct redirect *redirect(NODE *redir_exp, int redirtype, int *errflg);
 static void close_one(void);
 static int close_redir(struct redirect *rp, bool exitwarn, two_way_close_type how);
 #ifndef PIPES_SIMULATED
@@ -256,7 +263,7 @@ static IOBUF *iop_alloc(int fd, const char *name, int errno_val);
 static IOBUF *iop_finish(IOBUF *iop);
 static int gawk_pclose(struct redirect *rp);
 static int str2mode(const char *mode);
-static int two_way_open(const char *str, struct redirect *rp);
+static int two_way_open(const char *str, struct redirect *rp, int extfd);
 static int pty_vs_pipe(const char *command);
 static void find_input_parser(IOBUF *iop);
 static bool find_output_wrapper(awk_output_buf_t *outbuf);
@@ -569,7 +576,8 @@ inrec(IOBUF *iop, int *errcode)
 	else 
 		cnt = get_a_record(& begin, iop, errcode);
 
-	if (cnt == EOF) {
+	/* Note that get_a_record may return -2 when I/O would block */
+	if (cnt < 0) {
 		retval = false;
 	} else {
 #if 0
@@ -706,13 +714,13 @@ redflags2str(int flags)
 	return genflags2str(flags, redtab);
 }
 
-/* redirect --- Redirection for printf and print commands */
+/* redirect_string --- Redirection for printf and print commands, use string info */
 
 struct redirect *
-redirect(NODE *redir_exp, int redirtype, int *errflg)
+redirect_string(const char *str, size_t explen, bool not_string,
+		int redirtype, int *errflg, int extfd, bool failure_fatal)
 {
 	struct redirect *rp;
-	char *str;
 	int tflag = 0;
 	int outflag = 0;
 	const char *direction = "to";
@@ -761,18 +769,16 @@ redirect(NODE *redir_exp, int redirtype, int *errflg)
 	default:
 		cant_happen();
 	}
-	if (do_lint && (redir_exp->flags & STRCUR) == 0)
+	if (do_lint && not_string)
 		lintwarn(_("expression in `%s' redirection only has numeric value"),
 			what);
-	redir_exp = force_string(redir_exp);
-	str = redir_exp->stptr;
 
 	if (str == NULL || *str == '\0')
 		fatal(_("expression for `%s' redirection has null string value"),
 			what);
 
-	if (do_lint && (strncmp(str, "0", redir_exp->stlen) == 0
-			|| strncmp(str, "1", redir_exp->stlen) == 0))
+	if (do_lint && (strncmp(str, "0", explen) == 0
+			|| strncmp(str, "1", explen) == 0))
 		lintwarn(_("filename `%s' for `%s' redirection may be result of logical expression"),
 				str, what);
 
@@ -810,8 +816,8 @@ redirect(NODE *redir_exp, int redirtype, int *errflg)
 #endif /* PIPES_SIMULATED */
 
 		/* now check for a match */
-		if (strlen(rp->value) == redir_exp->stlen
-		    && memcmp(rp->value, str, redir_exp->stlen) == 0
+		if (strlen(rp->value) == explen
+		    && memcmp(rp->value, str, explen) == 0
 		    && ((rp->flag & ~(RED_NOBUF|RED_EOF|RED_PTY)) == tflag
 			|| (outflag != 0
 			    && (rp->flag & (RED_FILE|RED_WRITE)) == outflag))) {
@@ -822,23 +828,25 @@ redirect(NODE *redir_exp, int redirtype, int *errflg)
 			if (do_lint && rpflag != newflag)
 				lintwarn(
 		_("unnecessary mixing of `>' and `>>' for file `%.*s'"),
-					(int) redir_exp->stlen, rp->value);
+					(int) explen, rp->value);
 
 			break;
 		}
 	}
 
 	if (rp == NULL) {
+		char *newstr;
 		new_rp = true;
 		if (save_rp != NULL) {
 			rp = save_rp;
 			efree(rp->value);
 		} else
 			emalloc(rp, struct redirect *, sizeof(struct redirect), "redirect");
-		emalloc(str, char *, redir_exp->stlen + 1, "redirect");
-		memcpy(str, redir_exp->stptr, redir_exp->stlen);
-		str[redir_exp->stlen] = '\0';
-		rp->value = str;
+		emalloc(newstr, char *, explen + 1, "redirect");
+		memcpy(newstr, str, explen);
+		newstr[explen] = '\0';
+		str = newstr;
+		rp->value = newstr;
 		rp->flag = tflag;
 		init_output_wrapper(& rp->output);
 		rp->output.name = str;
@@ -870,10 +878,20 @@ redirect(NODE *redir_exp, int redirtype, int *errflg)
 			mode = binmode("a");
 			break;
 		case redirect_pipe:
+			if (extfd >= 0) {
+				warning(_("get_file cannot create pipe `%s' with fd %d"), str, extfd);
+				return NULL;
+			}
 			/* synchronize output before new pipe */
 			(void) flush_io();
 
 			os_restore_mode(fileno(stdin));
+			/*
+			 * Don't check failure_fatal; see input pipe below.
+			 * Note that the failure happens upon failure to fork,
+			 * using a non-existant program will still succeed the
+			 * popen().
+			 */
 			if ((rp->output.fp = popen(str, binmode("w"))) == NULL)
 				fatal(_("can't open pipe `%s' for output (%s)"),
 						str, strerror(errno));
@@ -883,6 +901,10 @@ redirect(NODE *redir_exp, int redirtype, int *errflg)
 			rp->flag |= RED_NOBUF;
 			break;
 		case redirect_pipein:
+			if (extfd >= 0) {
+				warning(_("get_file cannot create pipe `%s' with fd %d"), str, extfd);
+				return NULL;
+			}
 			direction = "from";
 			if (gawk_popen(str, rp) == NULL)
 				fatal(_("can't open pipe `%s' for input (%s)"),
@@ -890,7 +912,7 @@ redirect(NODE *redir_exp, int redirtype, int *errflg)
 			break;
 		case redirect_input:
 			direction = "from";
-			fd = devopen(str, binmode("r"));
+			fd = (extfd >= 0) ? extfd : devopen(str, binmode("r"));
 			if (fd == INVALID_HANDLE && errno == EISDIR) {
 				*errflg = EISDIR;
 				/* do not free rp, saving it for reuse (save_rp = rp) */
@@ -907,15 +929,19 @@ redirect(NODE *redir_exp, int redirtype, int *errflg)
 			}
 			break;
 		case redirect_twoway:
+#ifndef HAVE_SOCKETS
+			if (extfd >= 0) {
+				warning(_("get_file socket creation not supported on this platform for `%s' with fd %d"), str, extfd);
+				return NULL;
+			}
+#endif
 			direction = "to/from";
-			if (! two_way_open(str, rp)) {
-#ifdef HAVE_SOCKETS
-				if (inetfile(str, NULL)) {
+			if (! two_way_open(str, rp, extfd)) {
+				if (! failure_fatal || is_non_fatal_redirect(str)) {
 					*errflg = errno;
 					/* do not free rp, saving it for reuse (save_rp = rp) */
 					return NULL;
 				} else
-#endif
 					fatal(_("can't open two way pipe `%s' for input/output (%s)"),
 							str, strerror(errno));
 			}
@@ -927,7 +953,7 @@ redirect(NODE *redir_exp, int redirtype, int *errflg)
 		if (mode != NULL) {
 			errno = 0;
 			rp->output.mode = mode;
-			fd = devopen(str, mode);
+			fd = (extfd >= 0) ? extfd : devopen(str, mode);
 
 			if (fd > INVALID_HANDLE) {
 				if (fd == fileno(stdin))
@@ -991,11 +1017,14 @@ redirect(NODE *redir_exp, int redirtype, int *errflg)
 				 * can return -1.  For output to file,
 				 * complain. The shell will complain on
 				 * a bad command to a pipe.
+				 *
+				 * 12/2014: Take nonfatal settings in PROCINFO into account.
 				 */
 				if (errflg != NULL)
 					*errflg = errno;
-				if (   redirtype == redirect_output
-				    || redirtype == redirect_append) {
+				if (failure_fatal && ! is_non_fatal_redirect(str) &&
+				    (redirtype == redirect_output
+				     || redirtype == redirect_append)) {
 					/* multiple messages make life easier for translators */
 					if (*direction == 'f')
 						fatal(_("can't redirect from `%s' (%s)"),
@@ -1026,6 +1055,18 @@ redirect(NODE *redir_exp, int redirtype, int *errflg)
 	return rp;
 }
 
+/* redirect --- Redirection for printf and print commands */
+
+struct redirect *
+redirect(NODE *redir_exp, int redirtype, int *errflg, bool failure_fatal)
+{
+	bool not_string = ((redir_exp->flags & STRCUR) == 0);
+
+	redir_exp = force_string(redir_exp);
+	return redirect_string(redir_exp->stptr, redir_exp->stlen, not_string,
+				redirtype, errflg, -1, failure_fatal);
+}
+
 /* getredirect --- find the struct redirect for this file or pipe */
 
 struct redirect *
@@ -1040,6 +1081,36 @@ getredirect(const char *str, int len)
 	return NULL;
 }
 
+/* is_non_fatal_std --- return true if fp is stdout/stderr and nonfatal */
+
+bool
+is_non_fatal_std(FILE *fp)
+{
+	static const char nonfatal[] = "NONFATAL";
+
+	if (in_PROCINFO(nonfatal, NULL, NULL))
+		return true;
+
+	/* yucky logic. sigh. */
+	if (fp == stdout) {
+		return (   in_PROCINFO("-", nonfatal, NULL) != NULL
+		        || in_PROCINFO("/dev/stdout", nonfatal, NULL) != NULL);
+	} else if (fp == stderr) {
+		return (in_PROCINFO("/dev/stderr", nonfatal, NULL) != NULL);
+	}
+
+	return false;
+}
+
+/* is_non_fatal_redirect --- return true if redirected I/O should be nonfatal */
+
+bool
+is_non_fatal_redirect(const char *str)
+{
+	return in_PROCINFO("NONFATAL", NULL, NULL) != NULL
+	       || in_PROCINFO(str, "NONFATAL", NULL) != NULL;
+}
+
 /* close_one --- temporarily close an open file to re-use the fd */
 
 static void
@@ -1412,7 +1483,7 @@ str2mode(const char *mode)
 
 static int
 socketopen(int family, int type, const char *localpname,
-	const char *remotepname, const char *remotehostname)
+	const char *remotepname, const char *remotehostname, bool *hard_error)
 {
 	struct addrinfo *lres, *lres0;
 	struct addrinfo lhints;
@@ -1431,8 +1502,11 @@ socketopen(int family, int type, const char *localpname,
 
 	lerror = getaddrinfo(NULL, localpname, & lhints, & lres);
 	if (lerror) {
-		if (strcmp(localpname, "0") != 0)
-			fatal(_("local port %s invalid in `/inet'"), localpname);
+		if (strcmp(localpname, "0") != 0) {
+			warning(_("local port %s invalid in `/inet'"), localpname);
+			*hard_error = true;
+			return INVALID_HANDLE;
+		}
 		lres0 = NULL;
 		lres = & lhints;
 	} else
@@ -1450,7 +1524,9 @@ socketopen(int family, int type, const char *localpname,
 		if (rerror) {
 			if (lres0 != NULL)
 				freeaddrinfo(lres0);
-			fatal(_("remote host and port information (%s, %s) invalid"), remotehostname, remotepname);
+			warning(_("remote host and port information (%s, %s) invalid"), remotehostname, remotepname);
+			*hard_error = true;
+			return INVALID_HANDLE;
 		}
 		rres0 = rres;
 		socket_fd = INVALID_HANDLE;
@@ -1540,6 +1616,17 @@ nextrres:
  * change the string.
  */
 
+/*
+ * 9/2014: Flow here is a little messy.
+ *
+ * For do_posix, we don't allow any of the special filenames.
+ *
+ * For do_traditional, we allow /dev/{stdin,stdout,stderr} since BWK awk
+ * (and mawk) support them.  But we don't allow /dev/fd/N or /inet.
+ *
+ * Note that for POSIX systems os_devopen() is a no-op.
+ */
+
 int
 devopen(const char *name, const char *mode)
 {
@@ -1548,6 +1635,7 @@ devopen(const char *name, const char *mode)
 	char *ptr;
 	int flag = 0;
 	struct inet_socket_info isi;
+	int save_errno = 0;
 
 	if (strcmp(name, "-") == 0)
 		return fileno(stdin);
@@ -1555,7 +1643,7 @@ devopen(const char *name, const char *mode)
 	flag = str2mode(mode);
 	openfd = INVALID_HANDLE;
 
-	if (do_traditional)
+	if (do_posix)
 		goto strictopen;
 
 	if ((openfd = os_devopen(name, flag)) != INVALID_HANDLE) {
@@ -1572,6 +1660,8 @@ devopen(const char *name, const char *mode)
 			openfd = fileno(stdout);
 		else if (strcmp(cp, "stderr") == 0 && (flag & O_ACCMODE) == O_WRONLY)
 			openfd = fileno(stderr);
+		else if (do_traditional)
+			goto strictopen;
 		else if (strncmp(cp, "fd/", 3) == 0) {
 			struct stat sbuf;
 
@@ -1584,8 +1674,18 @@ devopen(const char *name, const char *mode)
 		/* do not set close-on-exec for inherited fd's */
 		if (openfd != INVALID_HANDLE)
 			return openfd;
+	} else if (do_traditional) {
+		goto strictopen;
 	} else if (inetfile(name, & isi)) {
 #ifdef HAVE_SOCKETS
+#define DEFAULT_RETRIES 20
+		static unsigned long def_retries = DEFAULT_RETRIES;
+		static bool first_time = true;
+		unsigned long retries = 0;
+		static long msleep = 1000;
+		bool hard_error = false;
+		bool non_fatal = is_non_fatal_redirect(name);
+
 		cp = (char *) name;
 
 		/* socketopen requires NUL-terminated strings */
@@ -1593,13 +1693,6 @@ devopen(const char *name, const char *mode)
 		cp[isi.remotehost.offset+isi.remotehost.len] = '\0';
 		/* remoteport comes last, so already NUL-terminated */
 
-		{
-#define DEFAULT_RETRIES 20
-		static unsigned long def_retries = DEFAULT_RETRIES;
-		static bool first_time = true;
-		unsigned long retries = 0;
-		static long msleep = 1000;
-
 		if (first_time) {
 			char *cp, *end;
 			unsigned long count = 0;
@@ -1625,25 +1718,41 @@ devopen(const char *name, const char *mode)
 					msleep *= 1000;
 			}
 		}
-		retries = def_retries;
+		/*
+		 * PROCINFO["NONFATAL"] or PROCINFO[name, "NONFATAL"] overrrides
+		 * GAWK_SOCK_RETRIES.  The explicit code in the program carries
+		 * a bigger stick than the environment variable does.
+		 */
+		retries = non_fatal ? 1 : def_retries;
 
+		errno = 0;
 		do {
-			openfd = socketopen(isi.family, isi.protocol, name+isi.localport.offset, name+isi.remoteport.offset, name+isi.remotehost.offset);
+			openfd = socketopen(isi.family, isi.protocol, name+isi.localport.offset,
+					name+isi.remoteport.offset, name+isi.remotehost.offset,
+					& hard_error);
 			retries--;
-		} while (openfd == INVALID_HANDLE && retries > 0 && usleep(msleep) == 0);
-	}
+		} while (openfd == INVALID_HANDLE && ! hard_error && retries > 0 && usleep(msleep) == 0);
+		save_errno = errno;
 
-	/* restore original name string */
-	cp[isi.localport.offset+isi.localport.len] = '/';
-	cp[isi.remotehost.offset+isi.remotehost.len] = '/';
+		/* restore original name string */
+		cp[isi.localport.offset+isi.localport.len] = '/';
+		cp[isi.remotehost.offset+isi.remotehost.len] = '/';
 #else /* ! HAVE_SOCKETS */
-	fatal(_("TCP/IP communications are not supported"));
+		fatal(_("TCP/IP communications are not supported"));
 #endif /* HAVE_SOCKETS */
 	}
 
 strictopen:
-	if (openfd == INVALID_HANDLE)
+	if (openfd == INVALID_HANDLE) {
 		openfd = open(name, flag, 0666);
+		/*
+		 * ENOENT means there is no such name in the filesystem.
+		 * Therefore it's ok to propagate up the error from
+		 * getaddrinfo() that's in save_errno.
+		 */
+		if (openfd == INVALID_HANDLE && errno == ENOENT && save_errno)
+			errno = save_errno;
+	}
 #if defined(__EMX__) || defined(__MINGW32__)
 	if (openfd == INVALID_HANDLE && errno == EACCES) {
 		/* On OS/2 and Windows directory access via open() is
@@ -1666,16 +1775,16 @@ strictopen:
 /* two_way_open --- open a two way communications channel */
 
 static int
-two_way_open(const char *str, struct redirect *rp)
+two_way_open(const char *str, struct redirect *rp, int extfd)
 {
 	static bool no_ptys = false;
 
 #ifdef HAVE_SOCKETS
 	/* case 1: socket */
-	if (inetfile(str, NULL)) {
+	if (extfd >= 0 || inetfile(str, NULL)) {
 		int fd, newfd;
 
-		fd = devopen(str, "rw");
+		fd = (extfd >= 0) ? extfd : devopen(str, "rw");
 		if (fd == INVALID_HANDLE)
 			return false;
 		if ((BINMODE & BINMODE_OUTPUT) != 0)
@@ -2135,17 +2244,43 @@ use_pipes:
 
 #ifndef PIPES_SIMULATED		/* real pipes */
 
-/* wait_any --- wait for a child process, close associated pipe */
+/*
+ * wait_any --- if the argument pid is 0, wait for all child processes that
+ * have exited.  We loop to make sure to reap all children that have exited to
+ * minimize the risk of running out of process slots.  Since we don't process
+ * SIGCHLD, we do not immediately reap exited children.  So when we get here,
+ * we want to reap any that have piled up.
+ *
+ * Note: on platforms that do not support waitpid with WNOHANG, when called with
+ * a zero argument, this function will hang until all children have exited.
+ *
+ * AJS, 2013-07-07: I do not see why we need to ignore signals during this
+ * function.  This function just waits and updates the pid and status fields.
+ * I don't see why that should interfere with any signal handlers.  But I am
+ * reluctant to remove this protection.  So I changed to use sigprocmask to
+ * block signals instead to avoid interfering with installed signal handlers.
+ */
 
 static int
 wait_any(int interesting)	/* pid of interest, if any */
 {
-	RETSIGTYPE (*hstat)(int), (*istat)(int), (*qstat)(int);
 	int pid;
 	int status = 0;
 	struct redirect *redp;
+#ifdef HAVE_SIGPROCMASK
+	sigset_t set, oldset;
+
+	/* I have no idea why we are blocking signals during this function... */
+	sigemptyset(& set);
+	sigaddset(& set, SIGINT);
+	sigaddset(& set, SIGHUP);
+	sigaddset(& set, SIGQUIT);
+	sigprocmask(SIG_BLOCK, & set, & oldset);
+#else
+	RETSIGTYPE (*hstat)(int), (*istat)(int), (*qstat)(int);
 
 	istat = signal(SIGINT, SIG_IGN);
+#endif
 #ifdef __MINGW32__
 	if (interesting < 0) {
 		status = -1;
@@ -2161,11 +2296,22 @@ wait_any(int interesting)	/* pid of interest, if any */
 				break;
 			}
 	}
-#else
+#else /* ! __MINGW32__ */
+#ifndef HAVE_SIGPROCMASK
 	hstat = signal(SIGHUP, SIG_IGN);
 	qstat = signal(SIGQUIT, SIG_IGN);
+#endif
 	for (;;) {
-# ifdef HAVE_SYS_WAIT_H	/* POSIX compatible sys/wait.h */
+# if defined(HAVE_WAITPID) && defined(WNOHANG)
+		/*
+		 * N.B. If the caller wants status for a specific child process
+		 * (i.e. interesting is non-zero), then we must hang until we
+		 * get exit status for that child.
+		 */
+		if ((pid = waitpid(-1, & status, (interesting ? 0 : WNOHANG))) == 0)
+			/* No children have exited */
+			break;
+# elif defined(HAVE_SYS_WAIT_H)	/* POSIX compatible sys/wait.h */
 		pid = wait(& status);
 # else
 		pid = wait((union wait *) & status);
@@ -2183,10 +2329,16 @@ wait_any(int interesting)	/* pid of interest, if any */
 		if (pid == -1 && errno == ECHILD)
 			break;
 	}
+#ifndef HAVE_SIGPROCMASK
 	signal(SIGHUP, hstat);
 	signal(SIGQUIT, qstat);
 #endif
+#endif /* ! __MINGW32__ */
+#ifndef HAVE_SIGPROCMASK
 	signal(SIGINT, istat);
+#else
+	sigprocmask(SIG_SETMASK, & oldset, NULL);
+#endif
 	return status;
 }
 
@@ -2388,7 +2540,7 @@ do_getline_redir(int into_variable, enum redirval redirtype)
 
 	assert(redirtype != redirect_none);
 	redir_exp = TOP();
-	rp = redirect(redir_exp, redirtype, & redir_error);
+	rp = redirect(redir_exp, redirtype, & redir_error, false);
 	DEREF(redir_exp);
 	decr_sp();
 	if (rp == NULL) {
@@ -2407,7 +2559,7 @@ do_getline_redir(int into_variable, enum redirval redirtype)
 	if (errcode != 0) {
 		if (! do_traditional && (errcode != -1))
 			update_ERRNO_int(errcode);
-		return make_number((AWKNUM) -1.0);
+		return make_number((AWKNUM) cnt);
 	}
 
 	if (cnt == EOF) {
@@ -2457,7 +2609,7 @@ do_getline(int into_variable, IOBUF *iop)
 			update_ERRNO_int(errcode);
 		if (into_variable)
 			(void) POP_ADDRESS();
-		return make_number((AWKNUM) -1.0); 
+		return make_number((AWKNUM) cnt); 
 	}
 
 	if (cnt == EOF)
@@ -2489,7 +2641,6 @@ do_getline(int into_variable, IOBUF *iop)
 typedef struct {
 	const char *envname;
 	char **dfltp;		/* pointer to address of default path */
-	char try_cwd;		/* always search current directory? */
 	char **awkpath;		/* array containing library search paths */ 
 	int max_pathlen;	/* length of the longest item in awkpath */ 
 } path_info;
@@ -2497,13 +2648,11 @@ typedef struct {
 static path_info pi_awkpath = {
 	/* envname */	"AWKPATH",
 	/* dfltp */	& defpath,
-	/* try_cwd */	true,
 };
 
 static path_info pi_awklibpath = {
 	/* envname */	"AWKLIBPATH",
 	/* dfltp */	& deflibpath,
-	/* try_cwd */	false,
 };
 
 /* init_awkpath --- split path(=$AWKPATH) into components */
@@ -2561,30 +2710,6 @@ init_awkpath(path_info *pi)
 #undef INC_PATH
 }
 
-/* get_cwd -- get current working directory */
-
-static char *
-get_cwd ()
-{
-#define BSIZE	100
-	char *buf;
-	size_t bsize = BSIZE;
-
-	emalloc(buf, char *, bsize * sizeof(char), "get_cwd");
-	while (true) {
-		if (getcwd(buf, bsize) == buf)
-			return buf;
-		if (errno != ERANGE) {
-			efree(buf);
-			return NULL;
-		}
-		bsize *= 2;
-		erealloc(buf, char *, bsize * sizeof(char), "get_cwd");
-	}
-#undef BSIZE
-}
-
-
 /* do_find_source --- search $AWKPATH for file, return NULL if not found */ 
 
 static char *
@@ -2606,24 +2731,6 @@ do_find_source(const char *src, struct stat *stb, int *errcode, path_info *pi)
 		return NULL;
 	}
 
-	/* try current directory before $AWKPATH search */
-	if (pi->try_cwd && stat(src, stb) == 0) {
-		path = get_cwd();
-		if (path == NULL) {
-			*errcode = errno;
-			return NULL;
-		}
-		erealloc(path, char *, strlen(path) + strlen(src) + 2, "do_find_source");
-#ifdef VMS
-		if (strcspn(path,">]:") == strlen(path))
-			strcat(path, "/");
-#else
-		strcat(path, "/");
-#endif
-		strcat(path, src);
-		return path;
-	}
-
 	if (pi->awkpath == NULL)
 		init_awkpath(pi);
 
@@ -3094,10 +3201,8 @@ rs1scan(IOBUF *iop, struct recmatch *recm, SCANSTATE *state)
 {
 	char *bp;
 	char rs;
-#if MBS_SUPPORT
 	size_t mbclen = 0;
 	mbstate_t mbs;
-#endif
 
 	memset(recm, '\0', sizeof(struct recmatch));
 	rs = RS->stptr[0];
@@ -3108,7 +3213,6 @@ rs1scan(IOBUF *iop, struct recmatch *recm, SCANSTATE *state)
 	if (*state == INDATA)   /* skip over data we've already seen */
 		bp += iop->scanoff;
 
-#if MBS_SUPPORT
 	/*
 	 * From: Bruno Haible <bruno@clisp.org>
 	 * To: Aharon Robbins <arnold@skeeve.com>, gnits@gnits.org
@@ -3205,7 +3309,7 @@ rs1scan(IOBUF *iop, struct recmatch *recm, SCANSTATE *state)
 			return NOTERM;
 		}
 	}
-#endif
+
 	while (*bp != rs)
 		bp++;
 
@@ -3407,10 +3511,45 @@ find_longest_terminator:
 	return REC_OK;
 }
 
+/* retryable --- return true if PROCINFO[<filename>, "RETRY"] exists */
+
+static inline int
+retryable(IOBUF *iop)
+{
+	return PROCINFO_node && in_PROCINFO(iop->public.name, "RETRY", NULL);
+}
+
+/* errno_io_retry --- Does the I/O error indicate that the operation should be retried later? */
+
+static inline int
+errno_io_retry(void)
+{
+	switch (errno) {
+#ifdef EAGAIN
+	case EAGAIN:
+#endif
+#ifdef EWOULDBLOCK
+#if !defined(EAGAIN) || (EWOULDBLOCK != EAGAIN)
+	case EWOULDBLOCK:
+#endif
+#endif
+#ifdef EINTR
+	case EINTR:
+#endif
+#ifdef ETIMEDOUT
+	case ETIMEDOUT:
+#endif
+		return 1;
+	default:
+		return 0;
+	}
+}
+
 /*
  * get_a_record --- read a record from IOP into out,
  * return length of EOF, set RT.
  * Note that errcode is never NULL, and the caller initializes *errcode to 0.
+ * If I/O would block, return -2.
  */
 
 static int
@@ -3454,8 +3593,10 @@ get_a_record(char **out,        /* pointer to pointer to data */
 			iop->flag |= IOP_AT_EOF;
 			return EOF;
 		} else if (iop->count == -1) {
-			iop->flag |= IOP_AT_EOF; 
 			*errcode = errno;
+			if (errno_io_retry() && retryable(iop))
+				return -2;
+			iop->flag |= IOP_AT_EOF; 
 			return EOF;
 		} else {
 			iop->dataend = iop->buf + iop->count;
@@ -3529,6 +3670,8 @@ get_a_record(char **out,        /* pointer to pointer to data */
 		iop->count = iop->public.read_func(iop->public.fd, iop->dataend, amt_to_read);
 		if (iop->count == -1) {
 			*errcode = errno;
+			if (errno_io_retry() && retryable(iop))
+				return -2;
 			iop->flag |= IOP_AT_EOF;
 			break;
 		} else if (iop->count == 0) {
@@ -3680,8 +3823,10 @@ pty_vs_pipe(const char *command)
 #ifdef HAVE_TERMIOS_H
 	NODE *val;
 
-	if (PROCINFO_node == NULL)
-		return false;
+	/*
+	 * N.B. No need to check for NULL PROCINFO_node, since the
+	 * in_PROCINFO function now checks that for us.
+	 */
 	val = in_PROCINFO(command, "pty", NULL);
 	if (val) {
 		if ((val->flags & MAYBE_NUM) != 0)
@@ -3823,12 +3968,21 @@ in_PROCINFO(const char *pidx1, const char *pidx2, NODE **full_idx)
 	NODE *r, *sub = NULL; 
 	NODE *subsep = SUBSEP_node->var_value;
 
+	if (PROCINFO_node == NULL || (pidx1 == NULL && pidx2 == NULL))
+		return NULL;
+
 	/* full_idx is in+out parameter */
 
 	if (full_idx)
 		sub = *full_idx;
 
-	str_len = strlen(pidx1) + subsep->stlen	+ strlen(pidx2);
+	if (pidx1 != NULL && pidx2 == NULL)
+		str_len = strlen(pidx1);
+	else if (pidx1 == NULL && pidx2 != NULL)
+		str_len = strlen(pidx2);
+	else
+		str_len = strlen(pidx1) + subsep->stlen	+ strlen(pidx2);
+
 	if (sub == NULL) {
 		emalloc(str, char *, str_len + 1, "in_PROCINFO");
 		sub = make_str_node(str, str_len, ALREADY_MALLOCED);
@@ -3842,8 +3996,14 @@ in_PROCINFO(const char *pidx1, const char *pidx2, NODE **full_idx)
 		sub->stlen = str_len;
 	}
 
-	sprintf(sub->stptr, "%s%.*s%s", pidx1, (int)subsep->stlen,
-			subsep->stptr, pidx2);
+	if (pidx1 != NULL && pidx2 == NULL)
+		strcpy(sub->stptr, pidx1);
+	else if (pidx1 == NULL && pidx2 != NULL)
+		strcpy(sub->stptr, pidx2);
+	else
+		sprintf(sub->stptr, "%s%.*s%s", pidx1, (int)subsep->stlen,
+				subsep->stptr, pidx2);
+
 	r = in_array(PROCINFO_node, sub);
 	if (! full_idx)
 		unref(sub);
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 81fdcec0..41febbdd 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,25 @@
+2015-01-24  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* iconv.m4: Upgrade to gettext-0.19.4.
+	* po.m4: Upgrade to gettext-0.19.4.
+
+2014-11-19  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* gettext.m4: Upgrade to gettext-0.19.3.
+	* iconv.m4: Upgrade to gettext-0.19.3.
+	* lib-ld.m4: Upgrade to gettext-0.19.3.
+	* lib-link.m4: Upgrade to gettext-0.19.3.
+	* lib-prefix.m4: Upgrade to gettext-0.19.3.
+	* nls.m4: Upgrade to gettext-0.19.3.
+	* po.m4: Upgrade to gettext-0.19.3.
+	* progtest.m4: Upgrade to gettext-0.19.3.
+
+2014-10-30         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* readline.m4: Enable cross compiling. Thanks to
+	Christer Solskogen <christer.solskogen@gmail.com> for
+	motivating and testing.
+
 2014-04-08         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 4.1.1: Release tar ball made.
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index f84e6a5d..be247bf7 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,5 +1,5 @@
-# gettext.m4 serial 63 (gettext-0.18)
-dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+# gettext.m4 serial 66 (gettext-0.18.2)
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -35,7 +35,7 @@ dnl    will be ignored.  If NEEDSYMBOL is specified and is
 dnl    'need-formatstring-macros', then GNU gettext implementations that don't
 dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
 dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value `$(top_builddir)/intl/' is used.
+dnl    the value '$(top_builddir)/intl/' is used.
 dnl
 dnl The result of the configuration is one of three cases:
 dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
@@ -97,7 +97,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
     AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
   ])
 
-  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
   gt_INTL_MACOSX
 
   dnl Set USE_NLS.
@@ -157,12 +157,18 @@ changequote([,])dnl
         fi
 
         AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
-         [AC_TRY_LINK([#include <libintl.h>
+         [AC_LINK_IFELSE(
+            [AC_LANG_PROGRAM(
+               [[
+#include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;],
-            [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
+extern int *_nl_domain_bindings;
+               ]],
+               [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+               ]])],
             [eval "$gt_func_gnugettext_libc=yes"],
             [eval "$gt_func_gnugettext_libc=no"])])
 
@@ -183,35 +189,47 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
             dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_TRY_LINK([#include <libintl.h>
+            AC_LINK_IFELSE(
+              [AC_LANG_PROGRAM(
+                 [[
+#include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias (const char *);],
-              [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+const char *_nl_expand_alias (const char *);
+                 ]],
+                 [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+                 ]])],
               [eval "$gt_func_gnugettext_libintl=yes"],
               [eval "$gt_func_gnugettext_libintl=no"])
             dnl Now see whether libintl exists and depends on libiconv.
             if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
-              AC_TRY_LINK([#include <libintl.h>
+              AC_LINK_IFELSE(
+                [AC_LANG_PROGRAM(
+                   [[
+#include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias (const char *);],
-                [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
-               [LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                eval "$gt_func_gnugettext_libintl=yes"
-               ])
+const char *_nl_expand_alias (const char *);
+                   ]],
+                   [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+                   ]])],
+                [LIBINTL="$LIBINTL $LIBICONV"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                 eval "$gt_func_gnugettext_libintl=yes"
+                ])
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS"])
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index e2041b9b..4e373631 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,5 +1,5 @@
-# iconv.m4 serial 11 (gettext-0.18.1)
-dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
+# iconv.m4 serial 19 (gettext-0.18.2)
+dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -30,27 +30,35 @@ AC_DEFUN([AM_ICONV_LINK],
   dnl Add $INCICONV to CPPFLAGS before performing the following checks,
   dnl because if the user has installed libiconv and not disabled its use
   dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+  dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
   am_save_CPPFLAGS="$CPPFLAGS"
   AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
 
   AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
-    AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(
+         [[
+#include <stdlib.h>
+#include <iconv.h>
+         ]],
+         [[iconv_t cd = iconv_open("","");
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);]])],
       [am_cv_func_iconv=yes])
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
-      AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[
+#include <stdlib.h>
+#include <iconv.h>
+           ]],
+           [[iconv_t cd = iconv_open("","");
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);]])],
         [am_cv_lib_iconv=yes]
         [am_cv_func_iconv=yes])
       LIBS="$am_save_LIBS"
@@ -58,33 +66,43 @@ AC_DEFUN([AM_ICONV_LINK],
   ])
   if test "$am_cv_func_iconv" = yes; then
     AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
-      dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
+      dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
+      dnl Solaris 10.
       am_save_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
-      AC_TRY_RUN([
+      am_cv_func_iconv_works=no
+      for ac_iconv_const in '' 'const'; do
+        AC_RUN_IFELSE(
+          [AC_LANG_PROGRAM(
+             [[
 #include <iconv.h>
 #include <string.h>
-int main ()
-{
+
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+             ]],
+             [[int result = 0;
   /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
      returns.  */
   {
     iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
     if (cd_utf8_to_88591 != (iconv_t)(-1))
       {
-        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
         char buf[10];
-        const char *inptr = input;
+        ICONV_CONST char *inptr = input;
         size_t inbytesleft = strlen (input);
         char *outptr = buf;
         size_t outbytesleft = sizeof (buf);
         size_t res = iconv (cd_utf8_to_88591,
-                            (char **) &inptr, &inbytesleft,
+                            &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
       }
   }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
@@ -93,17 +111,37 @@ int main ()
     iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
     if (cd_ascii_to_88591 != (iconv_t)(-1))
       {
-        static const char input[] = "\263";
+        static ICONV_CONST char input[] = "\263";
         char buf[10];
-        const char *inptr = input;
+        ICONV_CONST char *inptr = input;
         size_t inbytesleft = strlen (input);
         char *outptr = buf;
         size_t outbytesleft = sizeof (buf);
         size_t res = iconv (cd_ascii_to_88591,
-                            (char **) &inptr, &inbytesleft,
+                            &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\304";
+        static char buf[2] = { (char)0xDE, (char)0xAD };
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
       }
   }
 #if 0 /* This bug could be worked around by the caller.  */
@@ -112,17 +150,18 @@ int main ()
     iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
     if (cd_88591_to_utf8 != (iconv_t)(-1))
       {
-        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
         char buf[50];
-        const char *inptr = input;
+        ICONV_CONST char *inptr = input;
         size_t inbytesleft = strlen (input);
         char *outptr = buf;
         size_t outbytesleft = sizeof (buf);
         size_t res = iconv (cd_88591_to_utf8,
-                            (char **) &inptr, &inbytesleft,
+                            &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          return 1;
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
       }
   }
 #endif
@@ -136,13 +175,16 @@ int main ()
       && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
       /* Try HP-UX names.  */
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    return 1;
-  return 0;
-}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
-        [case "$host_os" in
-           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-           *)            am_cv_func_iconv_works="guessing yes" ;;
-         esac])
+    result |= 16;
+  return result;
+]])],
+          [am_cv_func_iconv_works=yes], ,
+          [case "$host_os" in
+             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+             *)            am_cv_func_iconv_works="guessing yes" ;;
+           esac])
+        test "$am_cv_func_iconv_works" = no || break
+      done
       LIBS="$am_save_LIBS"
     ])
     case "$am_cv_func_iconv_works" in
@@ -183,32 +225,47 @@ m4_define([gl_iconv_AC_DEFUN],
   m4_version_prereq([2.64],
     [[AC_DEFUN_ONCE(
         [$1], [$2])]],
-    [[AC_DEFUN(
-        [$1], [$2])]]))
+    [m4_ifdef([gl_00GNULIB],
+       [[AC_DEFUN_ONCE(
+           [$1], [$2])]],
+       [[AC_DEFUN(
+           [$1], [$2])]])]))
 gl_iconv_AC_DEFUN([AM_ICONV],
 [
   AM_ICONV_LINK
   if test "$am_cv_func_iconv" = yes; then
     AC_MSG_CHECKING([for iconv declaration])
     AC_CACHE_VAL([am_cv_proto_iconv], [
-      AC_TRY_COMPILE([
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[
 #include <stdlib.h>
 #include <iconv.h>
 extern
 #ifdef __cplusplus
 "C"
 #endif
-#if defined(__STDC__) || defined(__cplusplus)
+#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
 size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
 #else
 size_t iconv();
 #endif
-], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
+           ]],
+           [[]])],
+        [am_cv_proto_iconv_arg1=""],
+        [am_cv_proto_iconv_arg1="const"])
       am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
     am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
     AC_MSG_RESULT([
          $am_cv_proto_iconv])
     AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
       [Define as const if the declaration of iconv() needs const.])
+    dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
+    m4_ifdef([gl_ICONV_H_DEFAULTS],
+      [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
+       if test -n "$am_cv_proto_iconv_arg1"; then
+         ICONV_CONST="const"
+       fi
+      ])
   fi
 ])
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
index ebb30528..ddc569f7 100644
--- a/m4/lib-ld.m4
+++ b/m4/lib-ld.m4
@@ -1,50 +1,56 @@
-# lib-ld.m4 serial 4 (gettext-0.18)
-dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
+# lib-ld.m4 serial 6
+dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
+dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
+dnl collision with libtool.m4.
 
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
 AC_DEFUN([AC_LIB_PROG_LD_GNU],
 [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
+  acl_cv_prog_gnu_ld=yes
+  ;;
 *)
-  acl_cv_prog_gnu_ld=no ;;
+  acl_cv_prog_gnu_ld=no
+  ;;
 esac])
 with_gnu_ld=$acl_cv_prog_gnu_ld
 ])
 
-dnl From libtool-1.4. Sets the variable LD.
+dnl From libtool-2.4. Sets the variable LD.
 AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
+[AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+        [assume the C compiler uses GNU ld [default=no]])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
+  AC_MSG_CHECKING([for ld used by $CC])
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -54,11 +60,11 @@ if test "$GCC" = yes; then
   esac
   case $ac_prog in
     # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      [re_direlt='/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
         ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
@@ -79,23 +85,26 @@ else
 fi
 AC_CACHE_VAL([acl_cv_path_LD],
 [if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
+    IFS="$acl_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       acl_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break ;;
+        test "$with_gnu_ld" != no && break
+        ;;
       *)
-        test "$with_gnu_ld" != yes && break ;;
+        test "$with_gnu_ld" != yes && break
+        ;;
       esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$acl_save_ifs"
 else
   acl_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index c73bd8e3..3522d994 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,5 +1,5 @@
-# lib-link.m4 serial 21 (gettext-0.18)
-dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
+# lib-link.m4 serial 26 (gettext-0.18.2)
+dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -18,9 +18,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
 [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[translit([$1],[./-], [___])])
-  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([Name],[m4_translit([$1],[./+-], [____])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
   AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
     AC_LIB_LINKFLAGS_BODY([$1], [$2])
     ac_cv_lib[]Name[]_libs="$LIB[]NAME"
@@ -58,9 +58,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
 [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[translit([$1],[./-], [___])])
-  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([Name],[m4_translit([$1],[./+-], [____])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
 
   dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
   dnl accordingly.
@@ -85,7 +85,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
       *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
       *)       LIBS="$LIB[]NAME $LIBS" ;;
     esac
-    AC_TRY_LINK([$3], [$4],
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[$3]], [[$4]])],
       [ac_cv_lib[]Name=yes],
       [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
     LIBS="$ac_save_LIBS"
@@ -115,6 +116,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
 dnl Determine the platform dependent parameters needed to use rpath:
 dnl   acl_libext,
 dnl   acl_shlibext,
+dnl   acl_libname_spec,
+dnl   acl_library_names_spec,
 dnl   acl_hardcode_libdir_flag_spec,
 dnl   acl_hardcode_libdir_separator,
 dnl   acl_hardcode_direct,
@@ -157,15 +160,15 @@ dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
 dnl macro call that searches for libname.
 AC_DEFUN([AC_LIB_FROMPACKAGE],
 [
-  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
   define([acl_frompackage_]NAME, [$2])
   popdef([NAME])
   pushdef([PACK],[$2])
-  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
-                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
+                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
   define([acl_libsinpackage_]PACKUP,
-    m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
+    m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
   popdef([PACKUP])
   popdef([PACK])
 ])
@@ -178,14 +181,14 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
 [
   AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
   pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
-  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
-                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
+                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
   pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
   dnl Autoconf >= 2.61 supports dots in --with options.
-  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
+  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
   dnl By default, look in $includedir and $libdir.
   use_additional=yes
   AC_LIB_WITH_FINAL_PREFIX([
@@ -242,7 +245,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
         names_already_handled="$names_already_handled $name"
         dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
         dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 1601ceae..31f49e40 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,5 +1,5 @@
 # lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/nls.m4 b/m4/nls.m4
index 003704c4..53cdc8be 100644
--- a/m4/nls.m4
+++ b/m4/nls.m4
@@ -1,5 +1,5 @@
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/po.m4 b/m4/po.m4
index 2c9532f0..43012dca 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -1,5 +1,5 @@
-# po.m4 serial 17 (gettext-0.18)
-dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+# po.m4 serial 24 (gettext-0.19)
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@ dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
 dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
 
-AC_PREREQ([2.50])
+AC_PREREQ([2.60])
 
 dnl Checks for all prerequisites of the po subdirectory.
 AC_DEFUN([AM_PO_SUBDIRS],
@@ -25,11 +25,12 @@ AC_DEFUN([AM_PO_SUBDIRS],
   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   AC_REQUIRE([AC_PROG_INSTALL])dnl
   AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+  AC_REQUIRE([AC_PROG_SED])dnl
   AC_REQUIRE([AM_NLS])dnl
 
   dnl Release version of the gettext macros. This is used to ensure that
   dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
 
   dnl Perform the following tests also if --disable-nls has been given,
   dnl because they are needed for "make dist" to work.
@@ -102,7 +103,7 @@ changequote([,])dnl
       case "$ac_file" in */Makefile.in)
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.
@@ -118,7 +119,8 @@ changequote([,])dnl
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
           # on $ac_dir but don't depend on user-specified configuration
@@ -129,12 +131,12 @@ changequote([,])dnl
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -226,7 +228,7 @@ AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
 changequote(,)dnl
   # Adjust a relative srcdir.
   ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
   ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
   # In autoconf-2.13 it is called $ac_given_srcdir.
   # In autoconf-2.50 it is called $srcdir.
@@ -254,6 +256,7 @@ EOT
   fi
 
   # A sed script that extracts the value of VARIABLE from a Makefile.
+  tab=`printf '\t'`
   sed_x_variable='
 # Test if the hold space is empty.
 x
@@ -261,9 +264,9 @@ s/P/P/
 x
 ta
 # Yes it was empty. Look if we have the expected variable definition.
-/^[	 ]*VARIABLE[	 ]*=/{
+/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
   # Seen the first line of the variable definition.
-  s/^[	 ]*VARIABLE[	 ]*=//
+  s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
   ba
 }
 bd
@@ -315,7 +318,7 @@ changequote([,])dnl
     sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
     ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
   fi
-  # Hide the ALL_LINGUAS assigment from automake < 1.5.
+  # Hide the ALL_LINGUAS assignment from automake < 1.5.
   eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
   # Compute POFILES
   # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
@@ -405,14 +408,15 @@ changequote([,])dnl
   fi
 
   sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+  tab=`printf '\t'`
   if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
     # Add dependencies that cannot be formulated as a simple suffix rule.
     for lang in $ALL_LINGUAS; do
       frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
       cat >> "$ac_file.tmp" <<EOF
 $frobbedlang.msg: $lang.po
-	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF
     done
   fi
@@ -422,8 +426,8 @@ EOF
       frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
       cat >> "$ac_file.tmp" <<EOF
 $frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF
     done
   fi
diff --git a/m4/progtest.m4 b/m4/progtest.m4
index 2d804ac9..b499f79c 100644
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -1,5 +1,5 @@
-# progtest.m4 serial 6 (gettext-0.18)
-dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
+# progtest.m4 serial 7 (gettext-0.18.2)
+dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -27,15 +27,14 @@ AC_DEFUN([AM_PATH_PROG_WITH_TEST],
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
diff --git a/m4/readline.m4 b/m4/readline.m4
index 77ed8b25..740b9c7b 100644
--- a/m4/readline.m4
+++ b/m4/readline.m4
@@ -62,7 +62,28 @@ dnl action if true:
 dnl action if false:
             [_found_readline=no],
 dnl action if cross compiling:
-            [_found_readline=no]
+		AC_TRY_LINK([#include <stdio.h>
+#include <readline/readline.h>
+#include <readline/history.h>],		dnl includes
+			dnl function body
+			[
+	int fd;
+	char *line;
+
+	close(0);
+	close(1);
+	fd = open("/dev/null", 2);	/* should get fd 0 */
+	dup(fd);
+	line = readline("giveittome> ");
+
+	/* some printfs don't handle NULL for %s */
+	printf("got <%s>\n", line ? line : "(NULL)");
+],
+dnl action if found:
+			[_found_readline=yes],
+dnl action if not found:
+			[_found_readline=no]
+		)
 	)
 
         AC_MSG_RESULT([$_found_readline])
diff --git a/main.c b/main.c
index 4a31459e..f7909b87 100644
--- a/main.c
+++ b/main.c
@@ -3,7 +3,7 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2014 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2015 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
@@ -24,7 +24,7 @@
  */
 
 /* FIX THIS BEFORE EVERY RELEASE: */
-#define UPDATE_YEAR	2014
+#define UPDATE_YEAR	2015
 
 #include "awk.h"
 #include "getopt.h"
@@ -145,17 +145,20 @@ static bool disallow_var_assigns = false;	/* true for --exec */
 
 static void add_preassign(enum assign_type type, char *val);
 
+static void parse_args(int argc, char **argv);
+static void set_locale_stuff(void);
+static bool stopped_early = false;
+
 int do_flags = false;
 bool do_optimize = false;		/* apply default optimizations */
 static int do_nostalgia = false;	/* provide a blast from the past */
 static int do_binary = false;		/* hands off my data! */
 static int do_version = false;		/* print version info */
+static const char *locale = "";		/* default value to setlocale */
 
 int use_lc_numeric = false;	/* obey locale for decimal point */
 
-#if MBS_SUPPORT
 int gawk_mb_cur_max;		/* MB_CUR_MAX value, see comment in main() */
-#endif
 
 FILE *output_fp;		/* default gawk output, can be redirected in the debugger */
 bool output_is_tty = false;	/* control flushing of output */
@@ -189,6 +192,9 @@ static const struct option optab[] = {
 	{ "lint",		optional_argument,	NULL,	'L' },
 	{ "lint-old",		no_argument,		NULL,	't' },
 	{ "load",		required_argument,	NULL,	'l' },
+#if defined(LOCALEDEBUG)
+	{ "locale",		required_argument,	NULL,	'Z' },
+#endif
 	{ "non-decimal-data",	no_argument,		NULL,	'n' },
 	{ "nostalgia",		no_argument,		& do_nostalgia,	1 },
 	{ "optimize",		no_argument,		NULL,	'O' },
@@ -212,15 +218,7 @@ static const struct option optab[] = {
 int
 main(int argc, char **argv)
 {
-	/*
-	 * The + on the front tells GNU getopt not to rearrange argv.
-	 */
-	const char *optlist = "+F:f:v:W;bcCd::D::e:E:gh:i:l:L:nNo::Op::MPrStVY";
-	bool stopped_early = false;
-	int old_optind;
 	int i;
-	int c;
-	char *scan, *src;
 	char *extra_stack;
 	int have_srcfile = 0;
 	SRCFILE *s;
@@ -240,49 +238,11 @@ main(int argc, char **argv)
 #endif /* HAVE_MTRACE */
 #endif /* HAVE_MCHECK_H */
 
-#if defined(LC_CTYPE)
-	setlocale(LC_CTYPE, "");
-#endif
-#if defined(LC_COLLATE)
-	setlocale(LC_COLLATE, "");
-#endif
-#if defined(LC_MESSAGES)
-	setlocale(LC_MESSAGES, "");
-#endif
-#if defined(LC_NUMERIC) && defined(HAVE_LOCALE_H)
-	/*
-	 * Force the issue here.  According to POSIX 2001, decimal
-	 * point is used for parsing source code and for command-line
-	 * assignments and the locale value for processing input,
-	 * number to string conversion, and printing output.
-	 *
-	 * 10/2005 --- see below also; we now only use the locale's
-	 * decimal point if do_posix in effect.
-	 *
-	 * 9/2007:
-	 * This is a mess. We need to get the locale's numeric info for
-	 * the thousands separator for the %'d flag.
-	 */
-	setlocale(LC_NUMERIC, "");
-	init_locale(& loc);
-	setlocale(LC_NUMERIC, "C");
-#endif
-#if defined(LC_TIME)
-	setlocale(LC_TIME, "");
-#endif
-
-#if MBS_SUPPORT
-	/*
-	 * In glibc, MB_CUR_MAX is actually a function.  This value is
-	 * tested *a lot* in many speed-critical places in gawk. Caching
-	 * this value once makes a speed difference.
-	 */
-	gawk_mb_cur_max = MB_CUR_MAX;
-	/* Without MBS_SUPPORT, gawk_mb_cur_max is 1. */
+	myname = gawk_name(argv[0]);
+	os_arg_fixup(&argc, &argv); /* emulate redirection, expand wildcards */
 
-	/* init the cache for checking bytes if they're characters */
-	init_btowc_cache();
-#endif
+	if (argc < 2)
+		usage(EXIT_FAILURE, stderr);
 
 	(void) bindtextdomain(PACKAGE, LOCALEDIR);
 	(void) textdomain(PACKAGE);
@@ -326,232 +286,30 @@ main(int argc, char **argv)
 	/* Robustness: check that file descriptors 0, 1, 2 are open */
 	init_fds();
 
-	output_fp = stdout;
+	/* init array handling. */
+	array_init();
 
-	/* we do error messages ourselves on invalid options */
-	opterr = false;
+	/* init the symbol tables */
+	init_symbol_table();
 
-	/* copy argv before getopt gets to it; used to restart the debugger */  
-	save_argv(argc, argv);
+	output_fp = stdout;
 
 	/* initialize global (main) execution context */
 	push_context(new_context());
 
-	/* option processing. ready, set, go! */
-	for (optopt = 0, old_optind = 1;
-	     (c = getopt_long(argc, argv, optlist, optab, NULL)) != EOF;
-	     optopt = 0, old_optind = optind) {
-		if (do_posix)
-			opterr = true;
-
-		switch (c) {
-		case 'F':
-			add_preassign(PRE_ASSIGN_FS, optarg);
-			break;
-
-		case 'E':
-			disallow_var_assigns = true;
-			/* fall through */
-		case 'f':
-			/*
-			 * Allow multiple -f options.
-			 * This makes function libraries real easy.
-			 * Most of the magic is in the scanner.
-			 *
-			 * The following is to allow for whitespace at the end
-			 * of a #! /bin/gawk line in an executable file
-			 */
-			scan = optarg;
-			if (argv[optind-1] != optarg)
-				while (isspace((unsigned char) *scan))
-					scan++;
-			src = (*scan == '\0' ? argv[optind++] : optarg);
-			(void) add_srcfile((src && src[0] == '-' && src[1] == '\0') ?
-					SRC_STDIN : SRC_FILE,
-					src, srcfiles, NULL, NULL);
-
-			break;
-
-		case 'v':
-			add_preassign(PRE_ASSIGN, optarg);
-			break;
-
-		case 'b':
-			do_binary = true;
-			break;
-
-		case 'c':
-			do_flags |= DO_TRADITIONAL;
-			break;
-
-		case 'C':
-			copyleft();
-			break;
-
-		case 'd':
-			do_flags |= DO_DUMP_VARS;
-			if (optarg != NULL && optarg[0] != '\0')
-				varfile = optarg;
-			break;
-
-		case 'D':
-			do_flags |= DO_DEBUG;
-			if (optarg != NULL && optarg[0] != '\0')
-				command_file = optarg;
-			break;
-
-		case 'e':
-			if (optarg[0] == '\0')
-				warning(_("empty argument to `-e/--source' ignored"));
-			else
-				(void) add_srcfile(SRC_CMDLINE, optarg, srcfiles, NULL, NULL);
-			break;
-
-		case 'g':
-			do_flags |= DO_INTL;
-			break;
-
-		case 'h':
-			/* write usage to stdout, per GNU coding stds */
-			usage(EXIT_SUCCESS, stdout);
-			break;
-
-		case 'i':
-			(void) add_srcfile(SRC_INC, optarg, srcfiles, NULL, NULL);
-			break;
-
-		case 'l':
-			(void) add_srcfile(SRC_EXTLIB, optarg, srcfiles, NULL, NULL);
-			break;
-
-#ifndef NO_LINT
-		case 'L':
-			do_flags |= DO_LINT_ALL;
-			if (optarg != NULL) {
-				if (strcmp(optarg, "fatal") == 0)
-					lintfunc = r_fatal;
-				else if (strcmp(optarg, "invalid") == 0) {
-					do_flags &= ~DO_LINT_ALL;
-					do_flags |= DO_LINT_INVALID;
-				}
-			}
-			break;
-
-		case 't':
-			do_flags |= DO_LINT_OLD;
-			break;
-#else
-		case 'L':
-		case 't':
-			break;
-#endif
-
-		case 'n':
-			do_flags |= DO_NON_DEC_DATA;
-			break;
-
-		case 'N':
-			use_lc_numeric = true;
-			break;
-
-		case 'O':
-			do_optimize = true;
-			break;
-
-		case 'p':
-			do_flags |= DO_PROFILE;
-			/* fall through */
-		case 'o':
-			do_flags |= DO_PRETTY_PRINT;
-			if (optarg != NULL)
-				set_prof_file(optarg);
-			else
-				set_prof_file(DEFAULT_PROFILE);
-			break;
-
-		case 'M':
-#ifdef HAVE_MPFR
-			numbr_hndlr = & mpfp_hndlr;
-#else
-			warning(_("-M ignored: MPFR/GMP support not compiled in"));
-#endif
-			break;
-
-		case 'P':
-			do_flags |= DO_POSIX;
-			break;
-
-		case 'r':
-			do_flags |= DO_INTERVALS;
- 			break;
- 
-		case 'S':
-			do_flags |= DO_SANDBOX;
-  			break;
-
-		case 'V':
-			do_version = true;
-			break;
+	parse_args(argc, argv);
 
-		case 'W':       /* gawk specific options - now in getopt_long */
-			fprintf(stderr, _("%s: option `-W %s' unrecognized, ignored\n"),
-				argv[0], optarg);
-			break;
+	set_locale_stuff();
 
-		case 0:
-			/*
-			 * getopt_long found an option that sets a variable
-			 * instead of returning a letter. Do nothing, just
-			 * cycle around for the next one.
-			 */
-			break;
+	/*
+	 * In glibc, MB_CUR_MAX is actually a function.  This value is
+	 * tested *a lot* in many speed-critical places in gawk. Caching
+	 * this value once makes a speed difference.
+	 */
+	gawk_mb_cur_max = MB_CUR_MAX;
 
-		case 'Y':
-#if defined(YYDEBUG) || defined(GAWKDEBUG)
-			if (c == 'Y') {
-				yydebug = 2;
-				break;
-			}
-#endif
-			/* if not debugging, fall through */
-		case '?':
-		default:
-			/*
-			 * If not posix, an unrecognized option stops argument
-			 * processing so that it can go into ARGV for the awk
-			 * program to see. This makes use of ``#! /bin/gawk -f''
-			 * easier.
-			 *
-			 * However, it's never simple. If optopt is set,
-			 * an option that requires an argument didn't get the
-			 * argument. We care because if opterr is 0, then
-			 * getopt_long won't print the error message for us.
-			 */
-			if (! do_posix
-			    && (optopt == '\0' || strchr(optlist, optopt) == NULL)) {
-				/*
-				 * can't just do optind--. In case of an
-				 * option with >= 2 letters, getopt_long
-				 * won't have incremented optind.
-				 */
-				optind = old_optind;
-				stopped_early = true;
-				goto out;
-			} else if (optopt != '\0') {
-				/* Use POSIX required message format */
-				fprintf(stderr,
-					_("%s: option requires an argument -- %c\n"),
-					myname, optopt);
-				usage(EXIT_FAILURE, stderr);
-			}
-			/* else
-				let getopt print error message for us */
-			break;
-		}
-		if (c == 'E')	/* --exec ends option processing */
-			break;
-	}
-out:
+	/* init the cache for checking bytes if they're characters */
+	init_btowc_cache();
 
 	if (do_nostalgia)
 		nostalgia();
@@ -584,7 +342,6 @@ out:
 	if (do_lint && os_is_setuid())
 		warning(_("running %s setuid root may be a security problem"), myname);
 
-#if MBS_SUPPORT
 	if (do_binary) {
 		if (do_posix)
 			warning(_("`--posix' overrides `--characters-as-bytes'"));
@@ -594,7 +351,6 @@ out:
 		setlocale(LC_ALL, "C");
 #endif
 	}
-#endif
 
 	/* Set up number handler */
 	init_numbr_handler(& numbr_bltins);
@@ -602,12 +358,6 @@ out:
 	if (do_debug)	/* Need to register the debugger pre-exec hook before any other */
 		init_debug();
 
-	/* init array handling. */
-	array_init();
-
-	/* init the symbol tables */
-	init_symbol_table();
-
 	/* load group set */
 	init_groupset();
 
@@ -731,9 +481,9 @@ out:
 	 * data using the local decimal point.
 	 */
 	if (use_lc_numeric)
-		setlocale(LC_NUMERIC, "");
+		setlocale(LC_NUMERIC, locale);
 #endif
-	
+
 	init_io();
 	output_fp = stdout;
 
@@ -1044,10 +794,10 @@ init_vars()
 
 	numbr_hndlr->init_numvars();	/* set default values for variables e.g. PREC */ 
 
-	/* Set up deferred variables (loaded only when accessed). */
+	/* Load PROCINFO and ENVIRON */
 	if (! do_traditional)
-		register_deferred_variable("PROCINFO", load_procinfo);
-	register_deferred_variable("ENVIRON", load_environ);
+		load_procinfo();
+	load_environ();
 }
 
 /* path_environ --- put path variable into environment if not already there */
@@ -1060,18 +810,23 @@ path_environ(const char *pname, const char *dflt)
 	NODE *tmp;
 
 	tmp = make_string(pname, strlen(pname));
-	if (! in_array(ENVIRON_node, tmp)) {
-		/*
-		 * On VMS, environ[] only holds a subset of what getenv() can
-		 * find, so look AWKPATH up before resorting to default path.
-		 */
-		val = getenv(pname);
-		if (val == NULL)
-			val = dflt;
-		aptr = assoc_lookup(ENVIRON_node, tmp);
+	/*
+	 * On VMS, environ[] only holds a subset of what getenv() can
+	 * find, so look AWKPATH up before resorting to default path.
+	 */
+	val = getenv(pname);
+	if (val == NULL || *val == '\0')
+		val = dflt;
+	aptr = assoc_lookup(ENVIRON_node, tmp);
+	/*
+	 * If original value was the empty string, set it to
+	 * the default value.
+	 */
+	if ((*aptr)->stlen == 0) {
 		unref(*aptr);
 		*aptr = make_string(val, strlen(val));
 	}
+
 	unref(tmp);
 }
 
@@ -1118,6 +873,11 @@ load_environ()
 	/*
 	 * Put AWKPATH and AWKLIBPATH into ENVIRON if not already there.
 	 * This allows querying it from within awk programs.
+	 *
+	 * October 2014:
+	 * If their values are "", override with the default values;
+	 * since 2.10 AWKPATH used default value if environment's
+	 * value was "".
 	 */
 	path_environ("AWKPATH", defpath);
 	path_environ("AWKLIBPATH", deflibpath);
@@ -1357,7 +1117,7 @@ arg_assign(char *arg, bool initing)
 			setlocale(LC_NUMERIC, "C");
 		(void) force_number(it);
 		if (do_posix)
-			setlocale(LC_NUMERIC, "");
+			setlocale(LC_NUMERIC, locale);
 #endif /* LC_NUMERIC */
 
 		/*
@@ -1657,3 +1417,285 @@ getenv_long(const char *name)
 	}
 	return -1;
 }
+
+/* parse_args --- do the getopt_long thing */
+
+static void
+parse_args(int argc, char **argv)
+{
+	/*
+	 * The + on the front tells GNU getopt not to rearrange argv.
+	 */
+	const char *optlist = "+F:f:v:W;bcCd::D::e:E:ghi:l:L:nNo::Op::MPrStVYZ:";
+	int old_optind;
+	int c;
+	char *scan;
+	char *src;
+
+	/* we do error messages ourselves on invalid options */
+	opterr = false;
+
+	/* copy argv before getopt gets to it; used to restart the debugger */  
+	save_argv(argc, argv);
+
+	/* option processing. ready, set, go! */
+	for (optopt = 0, old_optind = 1;
+	     (c = getopt_long(argc, argv, optlist, optab, NULL)) != EOF;
+	     optopt = 0, old_optind = optind) {
+		if (do_posix)
+			opterr = true;
+
+		switch (c) {
+		case 'F':
+			add_preassign(PRE_ASSIGN_FS, optarg);
+			break;
+
+		case 'E':
+			disallow_var_assigns = true;
+			/* fall through */
+		case 'f':
+			/*
+			 * Allow multiple -f options.
+			 * This makes function libraries real easy.
+			 * Most of the magic is in the scanner.
+			 *
+			 * The following is to allow for whitespace at the end
+			 * of a #! /bin/gawk line in an executable file
+			 */
+			scan = optarg;
+			if (argv[optind-1] != optarg)
+				while (isspace((unsigned char) *scan))
+					scan++;
+			src = (*scan == '\0' ? argv[optind++] : optarg);
+			(void) add_srcfile((src && src[0] == '-' && src[1] == '\0') ?
+					SRC_STDIN : SRC_FILE,
+					src, srcfiles, NULL, NULL);
+
+			break;
+
+		case 'v':
+			add_preassign(PRE_ASSIGN, optarg);
+			break;
+
+		case 'b':
+			do_binary = true;
+			break;
+
+		case 'c':
+			do_flags |= DO_TRADITIONAL;
+			break;
+
+		case 'C':
+			copyleft();
+			break;
+
+		case 'd':
+			do_flags |= DO_DUMP_VARS;
+			if (optarg != NULL && optarg[0] != '\0')
+				varfile = optarg;
+			break;
+
+		case 'D':
+			do_flags |= DO_DEBUG;
+			if (optarg != NULL && optarg[0] != '\0')
+				command_file = optarg;
+			break;
+
+		case 'e':
+			if (optarg[0] == '\0')
+				warning(_("empty argument to `-e/--source' ignored"));
+			else
+				(void) add_srcfile(SRC_CMDLINE, optarg, srcfiles, NULL, NULL);
+			break;
+
+		case 'g':
+			do_flags |= DO_INTL;
+			break;
+
+		case 'h':
+			/* write usage to stdout, per GNU coding stds */
+			usage(EXIT_SUCCESS, stdout);
+			break;
+
+		case 'i':
+			(void) add_srcfile(SRC_INC, optarg, srcfiles, NULL, NULL);
+			break;
+
+		case 'l':
+			(void) add_srcfile(SRC_EXTLIB, optarg, srcfiles, NULL, NULL);
+			break;
+
+#ifndef NO_LINT
+		case 'L':
+			do_flags |= DO_LINT_ALL;
+			if (optarg != NULL) {
+				if (strcmp(optarg, "fatal") == 0)
+					lintfunc = r_fatal;
+				else if (strcmp(optarg, "invalid") == 0) {
+					do_flags &= ~DO_LINT_ALL;
+					do_flags |= DO_LINT_INVALID;
+				}
+			}
+			break;
+
+		case 't':
+			do_flags |= DO_LINT_OLD;
+			break;
+#else
+		case 'L':
+		case 't':
+			break;
+#endif
+
+		case 'n':
+			do_flags |= DO_NON_DEC_DATA;
+			break;
+
+		case 'N':
+			use_lc_numeric = true;
+			break;
+
+		case 'O':
+			do_optimize = true;
+			break;
+
+		case 'p':
+			do_flags |= DO_PROFILE;
+			/* fall through */
+		case 'o':
+			do_flags |= DO_PRETTY_PRINT;
+			if (optarg != NULL)
+				set_prof_file(optarg);
+			else
+				set_prof_file(DEFAULT_PROFILE);
+			break;
+
+		case 'M':
+#ifdef HAVE_MPFR
+			numbr_hndlr = & mpfp_hndlr;
+#else
+			warning(_("-M ignored: MPFR/GMP support not compiled in"));
+#endif
+			break;
+
+		case 'P':
+			do_flags |= DO_POSIX;
+			break;
+
+		case 'r':
+			do_flags |= DO_INTERVALS;
+ 			break;
+ 
+		case 'S':
+			do_flags |= DO_SANDBOX;
+  			break;
+
+		case 'V':
+			do_version = true;
+			break;
+
+		case 'W':       /* gawk specific options - now in getopt_long */
+			fprintf(stderr, _("%s: option `-W %s' unrecognized, ignored\n"),
+				argv[0], optarg);
+			break;
+
+		case 0:
+			/*
+			 * getopt_long found an option that sets a variable
+			 * instead of returning a letter. Do nothing, just
+			 * cycle around for the next one.
+			 */
+			break;
+
+		case 'Y':
+		case 'Z':
+#if defined(YYDEBUG) || defined(GAWKDEBUG)
+			if (c == 'Y') {
+				yydebug = 2;
+				break;
+			}
+#endif
+#if defined(LOCALEDEBUG)
+			if (c == 'Z') {
+				locale = optarg;
+				break;
+			}
+#endif
+			/* if not debugging, fall through */
+		case '?':
+		default:
+			/*
+			 * If not posix, an unrecognized option stops argument
+			 * processing so that it can go into ARGV for the awk
+			 * program to see. This makes use of ``#! /bin/gawk -f''
+			 * easier.
+			 *
+			 * However, it's never simple. If optopt is set,
+			 * an option that requires an argument didn't get the
+			 * argument. We care because if opterr is 0, then
+			 * getopt_long won't print the error message for us.
+			 */
+			if (! do_posix
+			    && (optopt == '\0' || strchr(optlist, optopt) == NULL)) {
+				/*
+				 * can't just do optind--. In case of an
+				 * option with >= 2 letters, getopt_long
+				 * won't have incremented optind.
+				 */
+				optind = old_optind;
+				stopped_early = true;
+				goto out;
+			} else if (optopt != '\0') {
+				/* Use POSIX required message format */
+				fprintf(stderr,
+					_("%s: option requires an argument -- %c\n"),
+					myname, optopt);
+				usage(EXIT_FAILURE, stderr);
+			}
+			/* else
+				let getopt print error message for us */
+			break;
+		}
+		if (c == 'E')	/* --exec ends option processing */
+			break;
+	}
+out:
+	return;
+}
+
+/* set_locale_stuff --- setup the locale stuff */
+
+static void
+set_locale_stuff(void)
+{
+#if defined(LC_CTYPE)
+	setlocale(LC_CTYPE, locale);
+#endif
+#if defined(LC_COLLATE)
+	setlocale(LC_COLLATE, locale);
+#endif
+#if defined(LC_MESSAGES)
+	setlocale(LC_MESSAGES, locale);
+#endif
+#if defined(LC_NUMERIC) && defined(HAVE_LOCALE_H)
+	/*
+	 * Force the issue here.  According to POSIX 2001, decimal
+	 * point is used for parsing source code and for command-line
+	 * assignments and the locale value for processing input,
+	 * number to string conversion, and printing output.
+	 *
+	 * 10/2005 --- see below also; we now only use the locale's
+	 * decimal point if do_posix in effect.
+	 *
+	 * 9/2007:
+	 * This is a mess. We need to get the locale's numeric info for
+	 * the thousands separator for the %'d flag.
+	 */
+	setlocale(LC_NUMERIC, locale);
+	init_locale(& loc);
+	setlocale(LC_NUMERIC, "C");
+#endif
+#if defined(LC_TIME)
+	setlocale(LC_TIME, locale);
+#endif
+}
diff --git a/mbsupport.h b/mbsupport.h
index 9a62486f..f4e1a821 100644
--- a/mbsupport.h
+++ b/mbsupport.h
@@ -23,81 +23,25 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-/*
- * This file is needed because we test for i18n support in 3 different
- * places, and we want a consistent definition in all of them.  Following
- * the ``Don't Repeat Yourself'' principle from "The Pragmatic Programmer",
- * we centralize the tests here.
- *
- * This test is the union of all the current tests.
- */
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifndef NO_MBSUPPORT
-
-#if    defined(HAVE_ISWCTYPE) \
-    && defined(HAVE_LOCALE_H) \
-    && (defined(HAVE_BTOWC) || defined(ZOS_USS)) \
-    && defined(HAVE_MBRLEN) \
-    && defined(HAVE_MBRTOWC) \
-    && defined(HAVE_WCHAR_H) \
-    && defined(HAVE_WCRTOMB) \
-    && defined(HAVE_WCSCOLL) \
-    && defined(HAVE_WCTYPE) \
-    && defined(HAVE_WCTYPE_H) \
-    && defined(HAVE_WCTYPE_T) \
-    && defined(HAVE_WINT_T) \
-    && defined(HAVE_ISWLOWER) \
-    && defined(HAVE_ISWUPPER) \
-    && defined(HAVE_TOWLOWER) \
-    && defined(HAVE_TOWUPPER) \
-    && (defined(HAVE_STDLIB_H) && defined(MB_CUR_MAX)) \
-/* We can handle multibyte strings.  */
-# define MBS_SUPPORT 1
-#else
-# define MBS_SUPPORT 0
-#endif
 
-#else /* NO_MBSUPPORT is defined */
-# define MBS_SUPPORT 0
-#endif
-
-#if ! MBS_SUPPORT
+#ifdef __DJGPP__
 # undef MB_CUR_MAX
 # define MB_CUR_MAX 1
 
-/* All this glop is for dfa.c. Bleah. */
-
-#ifndef __DJGPP__
-#define wchar_t         char
-#endif
+/* All this glop is for DGJPP */
 
-#define wctype_t	int
-#define wint_t		int
-#define mbstate_t	int
-#define WEOF		EOF
 #define towupper	toupper
 #define towlower	tolower
-#ifndef __DJGPP__
-#define btowc(x)	((int)x)
-#endif
 #define iswalnum	isalnum
 #define iswalpha	isalpha
 #define iswupper	isupper
-#if defined(ZOS_USS)
-#undef towupper
-#undef towlower
-#undef btowc
-#undef iswalnum
-#undef iswalpha
-#undef iswupper
-#undef wctype
-#undef iswctype
-#undef wcscoll
-#endif
+#define iswlower	islower
+
+#define mbrtowc(wcp, s, e, mbs)	(-1)
+#define mbrlen(s, e, mbs)	strlen(s)
+#define wcrtomb(wc, b, mbs)	(-1)
+#define wcslen		strlen
+#define wctob(wc)	(EOF)
 
 extern wctype_t wctype(const char *name);
 extern int iswctype(wint_t wc, wctype_t desc);
diff --git a/missing b/missing
index cdea5149..f62bbae3 100755
--- a/missing
+++ b/missing
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -160,7 +160,7 @@ give_advice ()
       ;;
    autom4te*)
       echo "You might have modified some maintainer files that require"
-      echo "the 'automa4te' program to be rebuilt."
+      echo "the 'autom4te' program to be rebuilt."
       program_details 'autom4te'
       ;;
     bison*|yacc*)
diff --git a/missing_d/ChangeLog b/missing_d/ChangeLog
index 70fbde64..89dbdb4d 100644
--- a/missing_d/ChangeLog
+++ b/missing_d/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* getaddrinfo.h (gai_strerror): Add declaration.
+	* getaddrinfo.c (gai_strerror): New function.
+	(getaddrinfo): Return errno values instead of just -1.
+
 2014-04-08         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 4.1.1: Release tar ball made.
diff --git a/missing_d/getaddrinfo.c b/missing_d/getaddrinfo.c
index 677f27d0..f24ac598 100644
--- a/missing_d/getaddrinfo.c
+++ b/missing_d/getaddrinfo.c
@@ -12,6 +12,8 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
+#include <errno.h>
+#include <string.h>	/* strerror */
 
 #include "getaddrinfo.h"
 
@@ -29,12 +31,12 @@ getaddrinfo(const char *hostname, const char *portname,
 {
 	struct addrinfo *out;
 	if (res == NULL)
-		return -1;
+		return EINVAL;
 
 	out = (struct addrinfo *) malloc(sizeof(*out));
 	if (out == NULL) {
 		*res = NULL;
-		return -1;
+		return ENOMEM;
 	}
 	memset(out, '\0', sizeof(*out));
 
@@ -42,7 +44,7 @@ getaddrinfo(const char *hostname, const char *portname,
 	if (out->ai_addr == NULL) {
 		free(out);
 		*res = NULL;
-		return -1;
+		return ENOMEM;
 	}
 
 	out->ai_socktype = SOCK_STREAM;
@@ -78,7 +80,7 @@ getaddrinfo(const char *hostname, const char *portname,
 				= ((struct in_addr *)he->h_addr_list[0])->s_addr;
 		} else {
 			freeaddrinfo(out);
-			return -1;
+			return EADDRNOTAVAIL;
 		}
 	} else {
 		if (!(out->ai_flags & AI_PASSIVE))
@@ -109,4 +111,10 @@ getaddrinfo(const char *hostname, const char *portname,
 
 	return 0;
 }
+
+const char *
+gai_strerror(int errcode)
+{
+	return strerror(errcode);
+}
 #endif
diff --git a/missing_d/getaddrinfo.h b/missing_d/getaddrinfo.h
index 3d816c93..873d67df 100644
--- a/missing_d/getaddrinfo.h
+++ b/missing_d/getaddrinfo.h
@@ -29,3 +29,5 @@ void freeaddrinfo(struct xaddrinfo * res);
 
 int getaddrinfo(const char * hostname, const char * portname,
 	struct xaddrinfo * hints, struct xaddrinfo ** res);
+
+const char *gai_strerror(int errcode);
diff --git a/mpfr.c b/mpfr.c
index d7d22b07..2a04ad4b 100644
--- a/mpfr.c
+++ b/mpfr.c
@@ -84,9 +84,9 @@ static NODE *do_mpfp_and(int);
 static NODE *do_mpfp_atan2(int);
 static NODE *do_mpfp_compl(int);
 static NODE *do_mpfp_cos(int);
-static NODE *do_mpfp_div(int);
 static NODE *do_mpfp_exp(int);
 static NODE *do_mpfp_int(int);
+static NODE *do_mpfp_intdiv(int);
 static NODE *do_mpfp_log(int);
 static NODE *do_mpfp_lshift(int);
 static NODE *do_mpfp_or(int);
@@ -196,9 +196,9 @@ mpfp_init(bltin_t **numbr_bltins)
 		{ "atan2",	do_mpfp_atan2 },
 		{ "compl",	do_mpfp_compl },
 		{ "cos",	do_mpfp_cos },
-		{ "div",	do_mpfp_div },
 		{ "exp",	do_mpfp_exp },
 		{ "int",	do_mpfp_int },
+		{ "intdiv",	do_mpfp_intdiv },
 		{ "log",	do_mpfp_log },
 		{ "lshift",	do_mpfp_lshift },
 		{ "or",		do_mpfp_or },
@@ -353,10 +353,8 @@ mpfp_make_node(unsigned int type)
 	r->flags |= (MALLOC|NUMBER|NUMCUR);
 	r->stptr = NULL;
 	r->stlen = 0;
-#if MBS_SUPPORT
 	r->wstptr = NULL;
 	r->wstlen = 0;
-#endif /* defined MBS_SUPPORT */
 	return r;
 }
 
@@ -1523,7 +1521,7 @@ do_mpfp_srand(int nargs)
 	return res;
 }
 
-/* do_mpfp_div --- do integer division, return quotient and remainder in dest array */
+/* do_mpfp_intdiv --- do integer division, return quotient and remainder in dest array */
 
 /*
  * We define the semantics as:
@@ -1534,7 +1532,7 @@ do_mpfp_srand(int nargs)
  */
 
 static NODE *
-do_mpfp_div(int nargs)
+do_mpfp_intdiv(int nargs)
 {
 	NODE *numerator, *denominator, *result;
 	NODE *num, *denom;
@@ -1543,7 +1541,7 @@ do_mpfp_div(int nargs)
 
 	result = POP_PARAM();
 	if (result->type != Node_var_array)
-		fatal(_("div: third argument is not an array"));
+		fatal(_("intdiv: third argument is not an array"));
 	assoc_clear(result);
 
 	denominator = POP_SCALAR();
@@ -1551,9 +1549,9 @@ do_mpfp_div(int nargs)
 
 	if (do_lint) {
 		if ((numerator->flags & (NUMCUR|NUMBER)) == 0)
-			lintwarn(_("div: received non-numeric first argument"));
+			lintwarn(_("intdiv: received non-numeric first argument"));
 		if ((denominator->flags & (NUMCUR|NUMBER)) == 0)
-			lintwarn(_("div: received non-numeric second argument"));
+			lintwarn(_("intdiv: received non-numeric second argument"));
 	}
 
 	(void) force_number(numerator);
@@ -1587,7 +1585,7 @@ do_mpfp_div(int nargs)
 	}
 
 	if (mpz_sgn(MPZ_T(denom->qnumbr)) == 0)
-		fatal(_("div: division by zero attempted"));
+		fatal(_("intdiv: division by zero attempted"));
 
 	quotient = mpfp_integer();
 	remainder = mpfp_integer();
diff --git a/node.c b/node.c
index 81a1e55d..fcbac336 100644
--- a/node.c
+++ b/node.c
@@ -60,7 +60,6 @@ r_dupnode(NODE *n)
 	r->flags &= ~FIELD;
 	r->flags |= MALLOC;
 	r->valref = 1;
-#if MBS_SUPPORT
 	/*
 	 * DON'T call free_wstr(r) here!
 	 * r->wstptr still points at n->wstptr's value, and we
@@ -68,13 +67,11 @@ r_dupnode(NODE *n)
 	 */
 	r->wstptr = NULL;
 	r->wstlen = 0;
-#endif /* MBS_SUPPORT */
 
 	if ((n->flags & STRCUR) != 0) {
 		emalloc(r->stptr, char *, n->stlen + 2, "r_dupnode");
 		memcpy(r->stptr, n->stptr, n->stlen);
 		r->stptr[n->stlen] = '\0';
-#if MBS_SUPPORT
 		if ((n->flags & WSTRCUR) != 0) {
 			r->wstlen = n->wstlen;
 			emalloc(r->wstptr, wchar_t *, sizeof(wchar_t) * (n->wstlen + 2), "r_dupnode");
@@ -82,7 +79,6 @@ r_dupnode(NODE *n)
 			r->wstptr[n->wstlen] = L'\0';
 			r->flags |= WSTRCUR;
 		}
-#endif /* MBS_SUPPORT */
 	}
 	
 	return r;
@@ -100,11 +96,8 @@ make_str_node(const char *s, size_t len, int flags)
 	r->flags = (MALLOC|STRING|STRCUR);
 	r->valref = 1;
 	r->stfmt = -1;
-
-#if MBS_SUPPORT
 	r->wstptr = NULL;
 	r->wstlen = 0;
-#endif /* MBS_SUPPORT */
 
 	if ((flags & ALREADY_MALLOCED) != 0)
 		r->stptr = (char *) s;
@@ -119,15 +112,12 @@ make_str_node(const char *s, size_t len, int flags)
 		char *ptm;
 		int c;
 		const char *end;
-#if MBS_SUPPORT
 		mbstate_t cur_state;
 
 		memset(& cur_state, 0, sizeof(cur_state));
-#endif
 
 		end = &(r->stptr[len]);
 		for (pf = ptm = r->stptr; pf < end;) {
-#if MBS_SUPPORT
 			/*
 			 * Keep multibyte characters together. This avoids
 			 * problems if a subsequent byte of a multibyte
@@ -144,7 +134,7 @@ make_str_node(const char *s, size_t len, int flags)
 					continue;
 				}
 			}
-#endif
+
 			c = *pf++;
 			if (c == '\\') {
 				c = parse_escape(&pf);
@@ -374,7 +364,6 @@ get_numbase(const char *s, bool use_locale)
 	return 8;
 }
 
-#if MBS_SUPPORT
 /* str2wstr --- convert a multibyte string to a wide string */
 
 NODE *
@@ -623,10 +612,7 @@ out:	;
 
 	return NULL;
 }
-#endif /* MBS_SUPPORT */
-
 
-#if MBS_SUPPORT
 wint_t btowc_cache[256];
 
 /* init_btowc_cache --- initialize the cache */
@@ -639,7 +625,6 @@ void init_btowc_cache()
 		btowc_cache[i] = btowc(i);
 	}
 }
-#endif
 
 #define BLOCKCHUNK 100
 
diff --git a/pc/ChangeLog b/pc/ChangeLog
index a66edae9..218621eb 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,21 @@
+2014-11-21         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.tst (id): Add an 'expect to fail for DJGPP' message.
+
+2014-11-13         Scott Deifik  <scottd.mail@sbcglobal.net>
+
+	* Makefile.tst: Sync with mainline.
+
+2014-10-12         KO Myung-Hun          <komh78@gmail.com>
+
+	Fixes for OS/2:
+
+	* gawkmisc.pc (init_sockets): Add additional checks for __EMX__.
+
+2014-09-23         Scott Deifik  <scottd.mail@sbcglobal.net>
+
+	* Makefile.tst: Sync with mainline.
+
 2014-04-17         Scott Deifik  <scottd.mail@sbcglobal.net>
 
 	* Makefile.tst: Add readfile2 test.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 610704e4..79d01ad9 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -180,19 +180,19 @@ UNIX_TESTS = \
 GAWK_EXT_TESTS = \
 	aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
 	backw badargs beginfile1 beginfile2 binmode1 charasbytes \
-	colonwarn clos1way delsub devfd devfd1 devfd2 dumpvars exit \
+	colonwarn clos1way dbugeval delsub devfd devfd1 devfd2 dumpvars exit \
 	fieldwdth fpat1 fpat2 fpat3  fpatnull fsfwfs funlen \
 	functab1 functab2 functab3 fwtest fwtest2 fwtest3 \
-	gensub gensub2 getlndir gnuops2 gnuops3 gnureops \
+	genpot gensub gensub2 getlndir gnuops2 gnuops3 gnureops \
 	icasefs icasers id igncdym igncfs ignrcas2 ignrcase \
 	incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \
-	include include2 indirectcall \
+	include include2 indirectcall indirectcall2 \
 	lint lintold lintwarn \
 	manyfiles match1 match2 match3 mbstr1 \
 	nastyparm next nondec nondec2 \
-	patsplit posix printfbad1 printfbad2 printfbad3 procinfs \
-	profile1 profile2 profile3 profile4 profile5 pty1 \
-	rebuf regx8bit reginttrad reint reint2 rsstart1 \
+	patsplit posix printfbad1 printfbad2 printfbad3 printhuge procinfs \
+	profile1 profile2 profile3 profile4 profile5 profile6 profile7 pty1 \
+	rebuf regnul1 regnul2 regx8bit reginttrad reint reint2 rsgetline rsglstdin rsstart1 \
 	rsstart2 rsstart3 rstest6 shadow sortfor sortu split_after_fpat \
 	splitarg4 strftime \
 	strtonum switch2 symtab1 symtab2 symtab3 symtab4 symtab5 symtab6 \
@@ -201,8 +201,9 @@ GAWK_EXT_TESTS = \
 EXTRA_TESTS = inftest regtest
 INET_TESTS = inetdayu inetdayt inetechu inetecht
 MACHINE_TESTS = double1 double2 fmtspcl intformat
-MPFR_TESTS = mpfrnr mpfrnegzero mpfrrnd mpfrieee mpfrexprange \
-	mpfrsort mpfrbigint
+MPFR_TESTS = mpfrnr mpfrnegzero mpfrrem mpfrrnd mpfrieee mpfrexprange \
+	mpfrsort mpfrsqrt mpfrbigint
+
 LOCALE_CHARSET_TESTS = \
 	asort asorti backbigs1 backsmalls1 backsmalls2 \
 	fmttest fnarydel fnparydl jarebug lc_num1 mbfw1 \
@@ -318,6 +319,12 @@ machine-msg-end:
 
 charset-msg-start:
 	@echo "======== Starting tests that can vary based on character set or locale support ========"
+	@echo "************************************************"
+	@echo "** Some or all of these tests may fail if you **"
+	@echo "** have inadequate or missing locale support  **"
+	@echo "** At least en_US.UTF-8, ru_RU.UTF-8 and      **"
+	@echo "** ja_JP.UTF-8 are needed.                    **"
+	@echo "************************************************"
 
 charset-msg-end:
 	@echo "======== Done with tests that can vary based on character set or locale support ========"
@@ -352,7 +359,7 @@ poundbang::
 	@if ./_pbd.awk "$(srcdir)"/poundbang.awk > _`basename $@` ; \
 	then : ; \
 	else \
-		sed "s;/tmp/gawk;../$(AWKPROG);" < "$(srcdir)"/poundbang.awk > ./_pbd.awk ; \
+		sed "s;/tmp/gawk;$(AWKPROG);" < "$(srcdir)"/poundbang.awk > ./_pbd.awk ; \
 		chmod +x ./_pbd.awk ; \
 		LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} ./_pbd.awk "$(srcdir)"/poundbang.awk > _`basename $@`;  \
 	fi
@@ -503,6 +510,16 @@ fmtspcl: fmtspcl.ok
 	$(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
 	fi
 
+rebuf::
+	@echo $@
+	@AWKBUFSIZE=4096 AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+rsglstdin:: 
+	@echo $@
+	@cat  "$(srcdir)"/rsgetline.in | AWKPATH="$(srcdir)" $(AWK) -f rsgetline.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 reint::
 	@echo $@
 	@$(AWK) --re-interval -f "$(srcdir)"/reint.awk "$(srcdir)"/reint.in >_$@
@@ -846,7 +863,7 @@ dumpvars::
 profile1:
 	@echo $@
 	@$(AWK) --pretty-print=ap-$@.out -f "$(srcdir)"/xref.awk "$(srcdir)"/dtdgport.awk > _$@.out1
-	@$(AWK) -f ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out
+	@$(AWK) -f ./ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out
 	@$(CMP) _$@.out1 _$@.out2 && rm _$@.out[12] || { echo EXIT CODE: $$? >>_$@ ; \
 	cp "$(srcdir)"/dtdgport.awk > $@.ok ; }
 
@@ -875,6 +892,18 @@ profile5:
 	@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+profile6:
+	@echo $@
+	@$(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null
+	@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+profile7:
+	@echo $@
+	@$(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null
+	@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 posix2008sub:
 	@echo $@
 	@$(AWK) --posix -f "$(srcdir)"/$@.awk > _$@ 2>&1
@@ -932,6 +961,16 @@ mpfrbigint:
 	@$(AWK) -M -f "$(srcdir)"/$@.awk > _$@ 2>&1
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+mpfrsqrt:
+	@echo $@
+	@$(AWK) -M -f "$(srcdir)"/$@.awk > _$@ 2>&1
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+mpfrrem:
+	@echo $@
+	@$(AWK) -M -f "$(srcdir)"/$@.awk > _$@ 2>&1
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 jarebug::
 	@echo $@
 	@echo Expect jarebug to fail with DJGPP and MinGW.
@@ -1030,7 +1069,7 @@ testext::
 	@echo $@
 #	@$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk
 	@$(AWK) ' /^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk
-	@$(AWK) -f testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk
 
 readdir:
@@ -1135,6 +1174,27 @@ backsmalls2:
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+dbugeval::
+	@echo $@
+	@$(AWK) --debug -f /dev/null < "$(srcdir)"/$@.in > _$@  2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+printhuge::
+	@echo $@
+	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+	AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+filefuncs:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk -v builddir="$(abs_top_builddir)"  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+genpot:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk --gen-pot >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
 addcomma:
@@ -2199,6 +2259,7 @@ icasers:
 
 id:
 	@echo $@
+	@echo Expect id to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -2227,6 +2288,11 @@ indirectcall:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+indirectcall2:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 lint:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2299,9 +2365,14 @@ pty1:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-rebuf:
+regnul1:
 	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+regnul2:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 regx8bit:
@@ -2309,6 +2380,11 @@ regx8bit:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+rsgetline:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 rstest6:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2445,11 +2521,6 @@ fnmatch:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-filefuncs:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
 fork:
 	@echo $@
 	@echo Expect $@ to fail with MinGW because fork.dll is not available
diff --git a/pc/config.h b/pc/config.h
index c5d78a96..a6b2d4c4 100644
--- a/pc/config.h
+++ b/pc/config.h
@@ -242,6 +242,9 @@
 #define HAVE_STDLIB_H 1
 #endif
 
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
 /* Define to 1 if you have the `strchr' function. */
 #define HAVE_STRCHR 1
 
@@ -407,6 +410,9 @@
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL
 
+/* enable severe portability problems */
+#undef I_DONT_KNOW_WHAT_IM_DOING
+
 /* libc is broken for regex handling */
 #undef LIBC_IS_BORKED
 
diff --git a/pc/gawkmisc.pc b/pc/gawkmisc.pc
index 239f3f8f..fdd32e7e 100644
--- a/pc/gawkmisc.pc
+++ b/pc/gawkmisc.pc
@@ -850,12 +850,12 @@ w32_shutdown (int fd, int how)
 
 #endif	/* __MINGW32__ */
 
-#if defined(__DJGPP__) || defined(__MINGW32__)
+#if defined(__DJGPP__) || defined(__MINGW32__) || defined(__EMX__)
 
 void
 init_sockets(void)
 {
-#ifdef HAVE_SOCKETS
+#if defined(HAVE_SOCKETS) && !defined(__EMX__)
   WSADATA  winsockData;
   int errcode;
 
diff --git a/po/ChangeLog b/po/ChangeLog
index a9cca765..3ef4175b 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* POTFILES.in: Brought up to date.
+
+2014-11-19  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.19.3.
+	* Rules-quot: Upgrade to gettext-0.19.3.
+
 2014-04-08         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 4.1.1: Release tar ball made.
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 83d8838a..65184f65 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -8,13 +8,14 @@
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.18
-GETTEXT_MACRO_VERSION = 0.18
+# Origin: gettext-0.19
+GETTEXT_MACRO_VERSION = 0.19
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
+SED = @SED@
 SHELL = /bin/sh
 @SET_MAKE@
 
@@ -76,6 +77,16 @@ POTFILES = \
 
 CATALOGS = @CATALOGS@
 
+POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
+POFILESDEPS_yes = $(POFILESDEPS_)
+POFILESDEPS_no =
+POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
+
+DISTFILESDEPS_ = update-po
+DISTFILESDEPS_yes = $(DISTFILESDEPS_)
+DISTFILESDEPS_no =
+DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
+
 # Makevars gets inserted here. (Don't remove this line!)
 
 .SUFFIXES:
@@ -96,14 +107,14 @@ CATALOGS = @CATALOGS@
 	mv t-$@ $@
 
 
-all: check-macro-version all-@USE_NLS@
+all: all-@USE_NLS@
 
 all-yes: stamp-po
 all-no:
 
 # Ensure that the gettext macros and this Makefile.in.in are in sync.
-check-macro-version:
-	@test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+CHECK_MACRO_VERSION = \
+	test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
 	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
 	       exit 1; \
 	     }
@@ -123,6 +134,7 @@ check-macro-version:
 # $(POFILES) has been designed to not touch files that don't need to be
 # changed.
 stamp-po: $(srcdir)/$(DOMAIN).pot
+	@$(CHECK_MACRO_VERSION)
 	test ! -f $(srcdir)/$(DOMAIN).pot || \
 	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
 	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
@@ -137,11 +149,29 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+# The determination of whether the package xyz is a GNU one is based on the
+# heuristic whether some file in the top level directory mentions "GNU xyz".
+# If GNU 'find' is available, we avoid grepping through monster files.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-	if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
-	  package_gnu='GNU '; \
+	package_gnu="$(PACKAGE_GNU)"; \
+	test -n "$$package_gnu" || { \
+	  if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
+		 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
+			       -size -10000000c -exec grep 'GNU @PACKAGE@' \
+			       /dev/null '{}' ';' 2>/dev/null; \
+	       else \
+		 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+	       fi; \
+	     } | grep -v 'libtool:' >/dev/null; then \
+	     package_gnu=yes; \
+	   else \
+	     package_gnu=no; \
+	   fi; \
+	}; \
+	if test "$$package_gnu" = "yes"; then \
+	  package_prefix='GNU '; \
 	else \
-	  package_gnu=''; \
+	  package_prefix=''; \
 	fi; \
 	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
 	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
@@ -161,7 +191,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
 	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
 	      --files-from=$(srcdir)/POTFILES.in \
 	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
-	      --package-name="$${package_gnu}@PACKAGE@" \
+	      --package-name="$${package_prefix}@PACKAGE@" \
 	      --package-version='@VERSION@' \
 	      --msgid-bugs-address="$$msgid_bugs_address" \
 	    ;; \
@@ -189,9 +219,10 @@ $(srcdir)/$(DOMAIN).pot:
 
 # This target rebuilds a PO file if $(DOMAIN).pot has changed.
 # Note that a PO file is not touched if it doesn't need to be changed.
-$(POFILES): $(srcdir)/$(DOMAIN).pot
+$(POFILES): $(POFILESDEPS)
 	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
 	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
 	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
 	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
 	  cd $(srcdir) \
@@ -352,7 +383,7 @@ maintainer-clean: distclean
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
-	$(MAKE) update-po
+	test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
 	@$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
 dist2: stamp-po $(DISTFILES)
diff --git a/po/Makevars b/po/Makevars
index c5a271db..4293de4e 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -20,6 +20,13 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
 # their copyright.
 COPYRIGHT_HOLDER = Free Software Foundation, Inc.
 
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -34,8 +41,38 @@ COPYRIGHT_HOLDER = Free Software Foundation, Inc.
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS = arnold@skeeve.com
+MSGID_BUGS_ADDRESS = bug-gawk@gnu.org
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes
diff --git a/po/Makevars.template b/po/Makevars.template
index 32692ab4..0648ec75 100644
--- a/po/Makevars.template
+++ b/po/Makevars.template
@@ -20,6 +20,13 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
 # their copyright.
 COPYRIGHT_HOLDER = Free Software Foundation, Inc.
 
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -39,3 +46,33 @@ MSGID_BUGS_ADDRESS =
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 63461e76..0781efc1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,11 +13,17 @@ ext.c
 extension/filefuncs.c
 extension/fnmatch.c
 extension/fork.c
+extension/gawkfts.c
 extension/inplace.c
 extension/ordchr.c
 extension/readdir.c
 extension/readfile.c
+extension/revoutput.c
+extension/revtwoway.c
 extension/rwarray.c
+extension/rwarray0.c
+extension/stack.c
+extension/testext.c
 extension/time.c
 field.c
 floatcomp.c
diff --git a/po/Rules-quot b/po/Rules-quot
index af524879..9dc96307 100644
--- a/po/Rules-quot
+++ b/po/Rules-quot
@@ -1,3 +1,4 @@
+# This file, Rules-quot, can be copied and used freely without restrictions.
 # Special Makefile rules for English message catalogs with quotation marks.
 
 DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
@@ -14,13 +15,23 @@ en@boldquot.po-update: en@boldquot.po-update-en
 
 .insert-header.po-update-en:
 	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
-	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
 	tmpdir=`pwd`; \
 	echo "$$lang:"; \
 	ll=`echo $$lang | sed -e 's/@.*//'`; \
 	LC_ALL=C; export LC_ALL; \
 	cd $(srcdir); \
-	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+	if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \
+	   | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \
+	   { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	     '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \
+	       $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \
+	       ;; \
+	     *) \
+	       $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \
+	       ;; \
+	     esac } 2>/dev/null > $$tmpdir/$$lang.new.po \
+	     ; then \
 	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
 	    rm -f $$tmpdir/$$lang.new.po; \
 	  else \
diff --git a/po/ca.gmo b/po/ca.gmo
index 465f05a5..290d2016 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
diff --git a/po/ca.po b/po/ca.po
index 444f09c4..31742b9c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gawk 4.1.0b\n"
-"Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2014-04-08 19:23+0300\n"
+"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
+"POT-Creation-Date: 2015-02-26 20:05+0200\n"
 "PO-Revision-Date: 2014-02-26 20:18+0100\n"
 "Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -36,9 +36,9 @@ msgstr "s'ha intentat usar un paràmetre escalar `%s' com a una matriu"
 msgid "attempt to use scalar `%s' as an array"
 msgstr "s'ha intentat usar la dada escalar `%s' com a una matriu"
 
-#: array.c:409 array.c:576 builtin.c:85 builtin.c:1615 builtin.c:1661
-#: builtin.c:1674 builtin.c:2102 builtin.c:2116 eval.c:1122 eval.c:1126
-#: eval.c:1531
+#: array.c:409 array.c:576 builtin.c:85 builtin.c:1606 builtin.c:1652
+#: builtin.c:1665 builtin.c:2092 builtin.c:2106 eval.c:1149 eval.c:1153
+#: eval.c:1558
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "s'ha intentat usar la matriu `%s' en un context escalar"
@@ -97,415 +97,420 @@ msgstr ""
 "asorti: no es pot usar una submatriu com a segon argument per al primer "
 "argument"
 
-#: array.c:1314
+#: array.c:1313
 #, c-format
 msgid "`%s' is invalid as a function name"
 msgstr "`%s' no és vàlid com a nom de funció"
 
-#: array.c:1318
+#: array.c:1317
 #, c-format
 msgid "sort comparison function `%s' is not defined"
 msgstr "la funció de comparació d'ordenació `%s' no està definida"
 
-#: awkgram.y:233
+#: awkgram.y:226
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "%s blocs han de tenir una part d'acció"
 
-#: awkgram.y:236
+#: awkgram.y:229
 msgid "each rule must have a pattern or an action part"
 msgstr "cada regla ha de tenir un patró o una part d'acció"
 
-#: awkgram.y:325 awkgram.y:336
+#: awkgram.y:320 awkgram.y:331
 msgid "old awk does not support multiple `BEGIN' or `END' rules"
 msgstr "l'antic awk no suporta múltiples regles `BEGIN' i `END'"
 
-#: awkgram.y:373
+#: awkgram.y:368
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "`%s' és una funció interna, no pot ser redefinida"
 
-#: awkgram.y:419
+#: awkgram.y:417
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr ""
 "la constant d'expressió regular `//' sembla un comentari en C++, però no ho "
 "és"
 
-#: awkgram.y:423
+#: awkgram.y:421
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr ""
 "la constant d'expressió regular `/%s/' sembla un comentari en C, però no ho "
 "és"
 
-#: awkgram.y:515
+#: awkgram.y:513
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "valors duplicats de casos al cos de l'expressió switch: %s"
 
-#: awkgram.y:536
+#: awkgram.y:534
 msgid "duplicate `default' detected in switch body"
 msgstr ""
 "s'ha detectat el cas predeterminat `default' duplicat a l'expressió switch "
 
-#: awkgram.y:796 awkgram.y:3723
+#: awkgram.y:794 awkgram.y:3751
 msgid "`break' is not allowed outside a loop or switch"
 msgstr "no es permet `break' a fora d'un bucle o bifurcació"
 
-#: awkgram.y:805 awkgram.y:3715
+#: awkgram.y:803 awkgram.y:3743
 msgid "`continue' is not allowed outside a loop"
 msgstr "no es permet `continue' a fora d'un bucle"
 
-#: awkgram.y:815
+#: awkgram.y:813
 #, c-format
 msgid "`next' used in %s action"
 msgstr "`next' usat a l'acció %s"
 
-#: awkgram.y:824
+#: awkgram.y:822
 #, c-format
 msgid "`nextfile' used in %s action"
 msgstr "`nextfile' usat a l'acció %s"
 
-#: awkgram.y:848
+#: awkgram.y:846
 msgid "`return' used outside function context"
 msgstr "`return' és usat fora del context d'una funció"
 
-#: awkgram.y:922
+#: awkgram.y:920
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "el `print'» simple en la regla BEGIN o END probablement ha de ser `print "
 "\"\"'"
 
-#: awkgram.y:988 awkgram.y:1037
+#: awkgram.y:986 awkgram.y:1035
 msgid "`delete' is not allowed with SYMTAB"
 msgstr "no es permet `delete' amb SYMTAB"
 
-#: awkgram.y:990 awkgram.y:1039
+#: awkgram.y:988 awkgram.y:1037
 msgid "`delete' is not allowed with FUNCTAB"
 msgstr "no es permet `delete' a FUNCTAB"
 
-#: awkgram.y:1024 awkgram.y:1028
+#: awkgram.y:1022 awkgram.y:1026
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "`delete(array)' és una extensió tawk no portable"
 
-#: awkgram.y:1149
+#: awkgram.y:1147
 msgid "multistage two-way pipelines don't work"
 msgstr "les canonades bidireccionals multi-etapes no funcionen"
 
-#: awkgram.y:1264
+#: awkgram.y:1262
 msgid "regular expression on right of assignment"
 msgstr "expressió regular a la dreta d'una assignació"
 
-#: awkgram.y:1275
+#: awkgram.y:1273
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "expressió regular a l'esquerra de l'operador `~' o `!~'"
 
-#: awkgram.y:1291 awkgram.y:1442
+#: awkgram.y:1289 awkgram.y:1431
 msgid "old awk does not support the keyword `in' except after `for'"
 msgstr ""
 "l'antic awk no dóna suport a la paraula clau `in' excepte després de `for'"
 
-#: awkgram.y:1301
+#: awkgram.y:1299
 msgid "regular expression on right of comparison"
 msgstr "expressió regular a la dreta de la comparació"
 
-#: awkgram.y:1417
-#, c-format
-msgid "`getline var' invalid inside `%s' rule"
-msgstr "`getline var' no és vàlid a dins de la regla `%s'"
-
-#: awkgram.y:1420
-#, c-format
-msgid "`getline' invalid inside `%s' rule"
+#: awkgram.y:1411
+#, fuzzy, c-format
+msgid "non-redirected `getline' invalid inside `%s' rule"
 msgstr "`getline' no és vàlid a dins de la regla `%s'"
 
-#: awkgram.y:1425
+#: awkgram.y:1414
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "`getline' no redirigit sense definir dintre de l'acció FINAL"
 
-#: awkgram.y:1444
+#: awkgram.y:1433
 msgid "old awk does not support multidimensional arrays"
 msgstr "l'antic awk no suporta matrius multidimensionals"
 
-#: awkgram.y:1541
+#: awkgram.y:1530
 msgid "call of `length' without parentheses is not portable"
 msgstr "la crida de `length' sense parèntesis no és portable"
 
-#: awkgram.y:1607
+#: awkgram.y:1596
 msgid "indirect function calls are a gawk extension"
 msgstr "les crides a funcions indirectes són una extensió gawk"
 
-#: awkgram.y:1620
+#: awkgram.y:1609
 #, c-format
 msgid "can not use special variable `%s' for indirect function call"
 msgstr ""
 "no es pot usar la variable especial `%s' per a una crida indirecta de funció"
 
-#: awkgram.y:1698
+#: awkgram.y:1635
+#, fuzzy, c-format
+msgid "attempt to use non-function `%s' in function call"
+msgstr "s'ha intentat usar la funció «%s» com a una matriu"
+
+#: awkgram.y:1699
 msgid "invalid subscript expression"
 msgstr "expressió de subíndex no vàlida"
 
-#: awkgram.y:2048 awkgram.y:2068 gawkapi.c:206 gawkapi.c:224 msg.c:126
+#: awkgram.y:2045 awkgram.y:2065 gawkapi.c:206 gawkapi.c:224 msg.c:126
 msgid "warning: "
 msgstr "advertiment: "
 
-#: awkgram.y:2066 gawkapi.c:192 gawkapi.c:221 msg.c:158
+#: awkgram.y:2063 gawkapi.c:192 gawkapi.c:221 msg.c:158
 msgid "fatal: "
 msgstr "fatal: "
 
-#: awkgram.y:2116
+#: awkgram.y:2113
 msgid "unexpected newline or end of string"
 msgstr "nova línia inesperada o final d'una cadena de caràcters"
 
-#: awkgram.y:2383 awkgram.y:2459 awkgram.y:2682 debug.c:523 debug.c:539
+#: awkgram.y:2392 awkgram.y:2468 awkgram.y:2691 debug.c:523 debug.c:539
 #: debug.c:2812 debug.c:5055
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "no es pot obrir el fitxer font `%s' per a lectura (%s)"
 
-#: awkgram.y:2384 awkgram.y:2509
+#: awkgram.y:2393 awkgram.y:2518
 #, c-format
 msgid "can't open shared library `%s' for reading (%s)"
 msgstr "no es pot obrir la llibreria compartida `%s' per a lectura (%s)"
 
-#: awkgram.y:2386 awkgram.y:2460 awkgram.y:2510 builtin.c:135 debug.c:5206
+#: awkgram.y:2395 awkgram.y:2469 awkgram.y:2519 builtin.c:135 debug.c:5206
 msgid "reason unknown"
 msgstr "motiu desconegut"
 
-#: awkgram.y:2395 awkgram.y:2419
+#: awkgram.y:2404 awkgram.y:2428
 #, c-format
 msgid "can't include `%s' and use it as a program file"
 msgstr "no es pot incloure `%s' i usar-lo com un fitxer de programa"
 
-#: awkgram.y:2408
+#: awkgram.y:2417
 #, c-format
 msgid "already included source file `%s'"
 msgstr "ja s'ha inclòs el fitxer font `%s'"
 
-#: awkgram.y:2409
+#: awkgram.y:2418
 #, c-format
 msgid "already loaded shared library `%s'"
 msgstr "ja s'ha carregat la biblioteca compartida `%s'"
 
-#: awkgram.y:2444
+#: awkgram.y:2453
 msgid "@include is a gawk extension"
 msgstr "@include és una extensió de gawk"
 
-#: awkgram.y:2450
+#: awkgram.y:2459
 msgid "empty filename after @include"
 msgstr "nom de fitxer buit després de @include"
 
-#: awkgram.y:2494
+#: awkgram.y:2503
 msgid "@load is a gawk extension"
 msgstr "@load és una extensió de gawk"
 
-#: awkgram.y:2500
+#: awkgram.y:2509
 msgid "empty filename after @load"
 msgstr "fitxer buit després de @load"
 
-#: awkgram.y:2634
+#: awkgram.y:2643
 msgid "empty program text on command line"
 msgstr "el text del programa en la línia de comandaments està buit"
 
-#: awkgram.y:2749
+#: awkgram.y:2758
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "no es pot llegir el fitxer font `%s' (%s)"
 
-#: awkgram.y:2760
+#: awkgram.y:2769
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "el fitxer font `%s' està buit"
 
-#: awkgram.y:2937
+#: awkgram.y:2828
+#, c-format
+msgid "PEBKAC error: invalid character '\\%03o' in source code"
+msgstr ""
+
+#: awkgram.y:2959
 msgid "source file does not end in newline"
 msgstr "el fitxer font no finalitza amb un retorn de carro"
 
-#: awkgram.y:3042
+#: awkgram.y:3062
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "expressió regular sense finalitzar acaba amb `\\' al final del fitxer"
 
-#: awkgram.y:3066
+#: awkgram.y:3089
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr "%s: %d: el modificador regex tawk `/.../%c' no funciona a gawk"
 
-#: awkgram.y:3070
+#: awkgram.y:3093
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr "el modificador regex tawk `/.../%c' no funciona a gawk"
 
-#: awkgram.y:3077
+#: awkgram.y:3100
 msgid "unterminated regexp"
 msgstr "expressió regular sense finalitzar"
 
-#: awkgram.y:3081
+#: awkgram.y:3104
 msgid "unterminated regexp at end of file"
 msgstr "expressió regular sense finalitzar al final del fitxer"
 
-#: awkgram.y:3140
+#: awkgram.y:3162
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "l'ús de `\\ #...' com a continuació de línia no és portable"
 
-#: awkgram.y:3156
+#: awkgram.y:3178
 msgid "backslash not last character on line"
 msgstr "la barra invertida no és l'últim caràcter en la línia"
 
-#: awkgram.y:3217
+#: awkgram.y:3239
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX no permet l'operador `**='"
 
-#: awkgram.y:3219
+#: awkgram.y:3241
 msgid "old awk does not support operator `**='"
 msgstr "l'antic awk no suporta l'operador `**='"
 
-#: awkgram.y:3228
+#: awkgram.y:3250
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX no permet l'operador `**'"
 
-#: awkgram.y:3230
+#: awkgram.y:3252
 msgid "old awk does not support operator `**'"
 msgstr "l'antic awk no suporta l'operador `**='"
 
-#: awkgram.y:3265
+#: awkgram.y:3287
 msgid "operator `^=' is not supported in old awk"
 msgstr "l'operador `^=' no està suportat en l'antic awk"
 
-#: awkgram.y:3273
+#: awkgram.y:3295
 msgid "operator `^' is not supported in old awk"
 msgstr "l'operador `^' no està suportat en l'antic awk"
 
-#: awkgram.y:3366 awkgram.y:3382 command.y:1178
+#: awkgram.y:3392 awkgram.y:3410 command.y:1180
 msgid "unterminated string"
 msgstr "cadena sense finalitzar"
 
-#: awkgram.y:3603
+#: awkgram.y:3631
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "caràcter `%c' no vàlid en l'expressió"
 
-#: awkgram.y:3650
+#: awkgram.y:3678
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "`%s' és una extensió de gawk"
 
-#: awkgram.y:3655
+#: awkgram.y:3683
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX no permet «%s»"
 
-#: awkgram.y:3663
+#: awkgram.y:3691
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "`%s' no està suportat en l'antic awk"
 
-#: awkgram.y:3753
+#: awkgram.y:3781
 msgid "`goto' considered harmful!\n"
 msgstr "`goto' es considera perjudicial!\n"
 
-#: awkgram.y:3787
+#: awkgram.y:3815
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d no és vàlid com a nombre d'arguments per a %s"
 
-#: awkgram.y:3822
+#: awkgram.y:3850
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr "%s: la cadena literal com a últim argument de substitució no té efecte"
 
-#: awkgram.y:3827
+#: awkgram.y:3855
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "%s el tercer paràmetre no és un objecte intercanviable"
 
-#: awkgram.y:3910 awkgram.y:3913
+#: awkgram.y:3938 awkgram.y:3941
 msgid "match: third argument is a gawk extension"
 msgstr "match: el tercer argument és una extensió de gawk"
 
-#: awkgram.y:3967 awkgram.y:3970
+#: awkgram.y:3995 awkgram.y:3998
 msgid "close: second argument is a gawk extension"
 msgstr "close: el segon argument és una extensió de gawk"
 
-#: awkgram.y:3982
+#: awkgram.y:4010
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "l'ús de dcgettext(_\"...\") no és correcte: elimineu el guió baix inicial"
 
-#: awkgram.y:3997
+#: awkgram.y:4025
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "l'ús de dcgettext(_\"...\") no és correcte: elimineu el guió baix inicial"
 
-#: awkgram.y:4016
+#: awkgram.y:4044
 msgid "index: regexp constant as second argument is not allowed"
 msgstr "índex: no es permet una constant regexp com a segon argument"
 
-#: awkgram.y:4069
+#: awkgram.y:4097
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "funció `%s': paràmetre `%s' ofusca la variable global"
 
-#: awkgram.y:4126 debug.c:4041 debug.c:4084 debug.c:5204
+#: awkgram.y:4154 debug.c:4041 debug.c:4084 debug.c:5204
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "no es pot obrir `%s' per a escriptura (%s)"
 
-#: awkgram.y:4127
+#: awkgram.y:4155
 msgid "sending variable list to standard error"
 msgstr "s'està enviant la llista de variables a l'eixida d'error estàndard"
 
-#: awkgram.y:4135
+#: awkgram.y:4163
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: tancament erroni (%s)"
 
-#: awkgram.y:4160
+#: awkgram.y:4188
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() s'ha cridat dues vegades!"
 
-#: awkgram.y:4168
+#: awkgram.y:4196
 msgid "there were shadowed variables."
 msgstr "hi ha hagut variables a l'ombra"
 
-#: awkgram.y:4239
+#: awkgram.y:4267
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "nom de la funció `%s' definida prèviament"
 
-#: awkgram.y:4285
+#: awkgram.y:4313
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "funció `%s»: no pot usar el nom de la funció com a paràmetre"
 
-#: awkgram.y:4288
+#: awkgram.y:4316
 #, c-format
 msgid "function `%s': can't use special variable `%s' as a function parameter"
 msgstr ""
 "funció `%s': no es pot usar la variable especial `%s' com a un paràmetre de "
 "funció"
 
-#: awkgram.y:4296
+#: awkgram.y:4324
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "funció `%s': paràmetre #%d, `%s', duplica al paràmetre #%d"
 
-#: awkgram.y:4383 awkgram.y:4389
+#: awkgram.y:4411 awkgram.y:4417
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "es crida a la funció `%s' però no s'ha definit"
 
-#: awkgram.y:4393
+#: awkgram.y:4421
 #, c-format
 msgid "function `%s' defined but never called directly"
 msgstr "la funció `%s' està definida però no s'ha cridat mai directament"
 
-#: awkgram.y:4425
+#: awkgram.y:4453
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr ""
 "l'expressió regular constant per al paràmetre #%d condueix a un valor booleà"
 
-#: awkgram.y:4484
+#: awkgram.y:4468
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -514,23 +519,23 @@ msgstr ""
 "s'ha cridat a la funció `%s' amb espai entre el nom i el '(',\n"
 "o s'ha usat com a variable o matriu"
 
-#: awkgram.y:4720
+#: awkgram.y:4674
 msgid "division by zero attempted"
 msgstr "s'ha intentat una divisió per zero"
 
-#: awkgram.y:4729
+#: awkgram.y:4683
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "s'ha intentat una divisió per zero en `%%'"
 
-#: awkgram.y:5049
+#: awkgram.y:5003
 msgid ""
 "cannot assign a value to the result of a field post-increment expression"
 msgstr ""
 "no es pot assignar un valor al resultat d'una expressió post-increment de "
 "camp"
 
-#: awkgram.y:5052
+#: awkgram.y:5006
 #, c-format
 msgid "invalid target of assignment (opcode %s)"
 msgstr "destí no vàlid d'assignació (opcode %s)"
@@ -572,193 +577,203 @@ msgstr ""
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: `%s' no és un fitxer obert, canonada o co-procés"
 
-#: builtin.c:362
+#: builtin.c:351
 msgid "index: received non-string first argument"
 msgstr "índex: el primer argument rebut no és una cadena"
 
-#: builtin.c:364
+#: builtin.c:353
 msgid "index: received non-string second argument"
 msgstr "índex: el segon argument rebut no és una cadena"
 
-#: builtin.c:488 mpfr.c:757
+#: builtin.c:466 mpfr.c:777
 msgid "int: received non-numeric argument"
 msgstr "int: s'ha rebut un argument no numèric"
 
-#: builtin.c:525
+#: builtin.c:503
 msgid "length: received array argument"
 msgstr "length: s'ha rebut un argument de matriu"
 
-#: builtin.c:528
+#: builtin.c:506
 msgid "`length(array)' is a gawk extension"
 msgstr "`length(array)' és una extensió de gawk"
 
-#: builtin.c:544
+#: builtin.c:525
 msgid "length: received non-string argument"
 msgstr "length: s'ha rebut un argument que no és una cadena"
 
-#: builtin.c:575
+#: builtin.c:554
 msgid "log: received non-numeric argument"
 msgstr "log: s'ha rebut un argument no numèric"
 
-#: builtin.c:578
+#: builtin.c:557
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: s'ha rebut l'argument negatiu %g"
 
-#: builtin.c:776 builtin.c:781
+#: builtin.c:755 builtin.c:760 builtin.c:911
 msgid "fatal: must use `count$' on all formats or none"
 msgstr "fatal: s'ha d'usar `count$' a tots els format o a cap"
 
-#: builtin.c:851
+#: builtin.c:830
 #, c-format
 msgid "field width is ignored for `%%' specifier"
 msgstr "l'amplada de camp s'ignorarà per a l'especificador `%%'"
 
-#: builtin.c:853
+#: builtin.c:832
 #, c-format
 msgid "precision is ignored for `%%' specifier"
 msgstr "la precisió s'ignorarà per a l'especificador `%%'"
 
-#: builtin.c:855
+#: builtin.c:834
 #, c-format
 msgid "field width and precision are ignored for `%%' specifier"
 msgstr "l'amplada de camp i la precisió s'ignoraran per a l'especificador `%%'"
 
-#: builtin.c:906
+#: builtin.c:885
 msgid "fatal: `$' is not permitted in awk formats"
 msgstr "fatal: no es permeten `$' en els formats awk"
 
-#: builtin.c:915
+#: builtin.c:894
 msgid "fatal: arg count with `$' must be > 0"
 msgstr "fatal: el recompte d'arguments amb `$' ha de ser > 0"
 
-#: builtin.c:919
+#: builtin.c:898
 #, c-format
 msgid "fatal: arg count %ld greater than total number of supplied arguments"
 msgstr ""
 "fatal: el recompte d'arguments %ld és major que el nombre total d'arguments "
 "proporcionats"
 
-#: builtin.c:923
+#: builtin.c:902
 msgid "fatal: `$' not permitted after period in format"
 msgstr "fatal: no es permet `$' després d'un punt en el format"
 
-#: builtin.c:939
+#: builtin.c:921
 msgid "fatal: no `$' supplied for positional field width or precision"
 msgstr ""
 "fatal: no es proporciona `$' per a l'ample o precisió del camp de posició"
 
-#: builtin.c:1009
+#: builtin.c:991
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "`l' manca de significat en els formats awk; serà ignorat"
 
-#: builtin.c:1013
+#: builtin.c:995
 msgid "fatal: `l' is not permitted in POSIX awk formats"
 msgstr "fatal: `l' no està permès en els formats POSIX de awk"
 
-#: builtin.c:1026
+#: builtin.c:1008
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "`L' manca de significat en els formats awk; serà ignorat"
 
-#: builtin.c:1030
+#: builtin.c:1012
 msgid "fatal: `L' is not permitted in POSIX awk formats"
 msgstr "fatal: `L' no està permès en els formats POSIX de awk"
 
-#: builtin.c:1043
+#: builtin.c:1025
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "`h' manca de significat en els formats awk; serà ignorat"
 
-#: builtin.c:1047
+#: builtin.c:1029
 msgid "fatal: `h' is not permitted in POSIX awk formats"
 msgstr "fatal: `h' no està permès en els formats POSIX de awk"
 
-#: builtin.c:1463
+#: builtin.c:1055
+#, fuzzy, c-format
+msgid "[s]printf: value %g is too big for %%c format"
+msgstr "[s]printf: el valor %g està fora de rang per al format `%%%c'"
+
+#: builtin.c:1068
+#, fuzzy, c-format
+msgid "[s]printf: value %g is not a valid wide character"
+msgstr "[s]printf: el valor %g està fora de rang per al format `%%%c'"
+
+#: builtin.c:1454
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf: el valor %g està fora de rang per al format `%%%c'"
 
-#: builtin.c:1561
+#: builtin.c:1552
 #, c-format
 msgid "ignoring unknown format specifier character `%c': no argument converted"
 msgstr ""
 "s'ignorarà el caràcter especificador de format `%c': no s'ha convertit cap "
 "argument"
 
-#: builtin.c:1566
+#: builtin.c:1557
 msgid "fatal: not enough arguments to satisfy format string"
 msgstr "fatal: no hi ha prou arguments per a satisfer el format d'una cadena"
 
-#: builtin.c:1568
+#: builtin.c:1559
 msgid "^ ran out for this one"
 msgstr "^ desbordament per a aquest"
 
-#: builtin.c:1575
+#: builtin.c:1566
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: l'especificador de format no conté lletra de control"
 
-#: builtin.c:1578
+#: builtin.c:1569
 msgid "too many arguments supplied for format string"
 msgstr "s'han proporcionat masses arguments per a la cadena de format"
 
-#: builtin.c:1634
+#: builtin.c:1625
 msgid "sprintf: no arguments"
 msgstr "sprintf: sense arguments"
 
-#: builtin.c:1657 builtin.c:1668
+#: builtin.c:1648 builtin.c:1659
 msgid "printf: no arguments"
 msgstr "printf: sense arguments"
 
-#: builtin.c:1711
+#: builtin.c:1702
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: s'ha rebut un argument no numèric"
 
-#: builtin.c:1715
+#: builtin.c:1706
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: cridat amb l'argument negatiu %g"
 
-#: builtin.c:1746
+#: builtin.c:1737
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: la longitud %g no és >= 1"
 
-#: builtin.c:1748
+#: builtin.c:1739
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: la longitud %g no és >= 0"
 
-#: builtin.c:1755
+#: builtin.c:1753
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: la longitud sobre un nombre no enter %g serà truncada"
 
-#: builtin.c:1760
+#: builtin.c:1758
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
 "substr: la llargada %g és massa gran per a la indexació de cadenes de "
 "caràcters, es truncarà a %g"
 
-#: builtin.c:1772
+#: builtin.c:1770
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: l'índex d'inici %g no és vàlid, usant 1"
 
-#: builtin.c:1777
+#: builtin.c:1775
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: l'índex d'inici no enter %g serà truncat"
 
-#: builtin.c:1802
+#: builtin.c:1798
 msgid "substr: source string is zero length"
 msgstr "substr: la cadena font és de longitud zero"
 
-#: builtin.c:1818
+#: builtin.c:1812
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: l'índex d'inici %g sobrepassa l'acabament de la cadena"
 
-#: builtin.c:1826
+#: builtin.c:1820
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -766,189 +781,195 @@ msgstr ""
 "substr: la longitud %g a l'índex d'inici %g excedeix la longitud del primer "
 "argument (%lu)"
 
-#: builtin.c:1900
+#: builtin.c:1890
 msgid "strftime: format value in PROCINFO[\"strftime\"] has numeric type"
 msgstr "strftime: el valor de format a PROCINFO[\"strftime\"] té tipus numèric"
 
-#: builtin.c:1923
+#: builtin.c:1913
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: s'ha rebut un segon argument no numèric"
 
-#: builtin.c:1927
+#: builtin.c:1917
 msgid "strftime: second argument less than 0 or too big for time_t"
 msgstr ""
 "strftime: el segon argument és més petit que 0 o massa gran per a time_t"
 
-#: builtin.c:1934
+#: builtin.c:1924
 msgid "strftime: received non-string first argument"
 msgstr "strftime: el primer argument rebut no és una cadena"
 
-#: builtin.c:1941
+#: builtin.c:1931
 msgid "strftime: received empty format string"
 msgstr "strftime: s'ha rebut una cadena de format buida"
 
-#: builtin.c:2007
+#: builtin.c:1997
 msgid "mktime: received non-string argument"
 msgstr "mktime: s'ha rebut un argument que no és una cadena"
 
-#: builtin.c:2024
+#: builtin.c:2014
 msgid "mktime: at least one of the values is out of the default range"
 msgstr "mktime: almenys un dels valors està forra del rang predeterminat"
 
-#: builtin.c:2059
+#: builtin.c:2049
 msgid "'system' function not allowed in sandbox mode"
 msgstr "la funció 'system' no es permet fora del mode entorn de proves"
 
-#: builtin.c:2064
+#: builtin.c:2054
 msgid "system: received non-string argument"
 msgstr "system: s'ha rebut un argument que no és una cadena"
 
-#: builtin.c:2184
+#: builtin.c:2174
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "referència a una variable sense inicialitzar `$%d'"
 
-#: builtin.c:2271
+#: builtin.c:2259
 msgid "tolower: received non-string argument"
 msgstr "tolower: s'ha rebut un argument que no és una cadena"
 
-#: builtin.c:2305
+#: builtin.c:2290
 msgid "toupper: received non-string argument"
 msgstr "toupper: s'ha rebut un argument que no és una cadena"
 
-#: builtin.c:2341 mpfr.c:672
+#: builtin.c:2323 mpfr.c:679
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: el primer argument rebut no és numèric"
 
-#: builtin.c:2343 mpfr.c:674
+#: builtin.c:2325 mpfr.c:681
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: el segon argument rebut no és numèric"
 
-#: builtin.c:2362
+#: builtin.c:2344
 msgid "sin: received non-numeric argument"
 msgstr "sin: s'ha rebut un argument que no és numèric"
 
-#: builtin.c:2378
+#: builtin.c:2360
 msgid "cos: received non-numeric argument"
 msgstr "cos: s'ha rebut un argument que no és numèric"
 
-#: builtin.c:2431 mpfr.c:1156
+#: builtin.c:2413 mpfr.c:1176
 msgid "srand: received non-numeric argument"
 msgstr "srand: s'ha rebut un argument que no és numèric"
 
-#: builtin.c:2462
+#: builtin.c:2444
 msgid "match: third argument is not an array"
 msgstr "match: el tercer argument no és una matriu"
 
-#: builtin.c:2734
-msgid "gensub: third argument of 0 treated as 1"
+#: builtin.c:2705
+#, fuzzy, c-format
+msgid "gensub: third argument `%.*s' treated as 1"
 msgstr "gensub: el tercer argument de 0 és tractat com a 1"
 
-#: builtin.c:3030
+#: builtin.c:2720
+#, fuzzy, c-format
+msgid "gensub: third argument %g treated as 1"
+msgstr "gensub: el tercer argument de 0 és tractat com a 1"
+
+#: builtin.c:3020
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: el primer argument rebut no és numèric"
 
-#: builtin.c:3032
+#: builtin.c:3022
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift: el segon argument rebut no és numèric"
 
-#: builtin.c:3038
+#: builtin.c:3028
 #, c-format
 msgid "lshift(%f, %f): negative values will give strange results"
 msgstr "lshift(%f, %f): els valors negatius donaran resultats estranys"
 
-#: builtin.c:3040
+#: builtin.c:3030
 #, c-format
 msgid "lshift(%f, %f): fractional values will be truncated"
 msgstr "lshift(%f, %f): els valors fraccionaris sernn truncats"
 
-#: builtin.c:3042
+#: builtin.c:3032
 #, c-format
 msgid "lshift(%f, %f): too large shift value will give strange results"
 msgstr ""
 "lshift(%f, %f): un valor de desplaçament massa gran donarà resultats estranys"
 
-#: builtin.c:3067
+#: builtin.c:3057
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: el primer argument rebut no és numèric"
 
-#: builtin.c:3069
+#: builtin.c:3059
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift: el segon argument rebut no és numèric"
 
-#: builtin.c:3075
+#: builtin.c:3065
 #, c-format
 msgid "rshift(%f, %f): negative values will give strange results"
 msgstr "rshift(%f, %f): els valors negatius donaran resultats estranys"
 
-#: builtin.c:3077
+#: builtin.c:3067
 #, c-format
 msgid "rshift(%f, %f): fractional values will be truncated"
 msgstr "rshift(%f, %f): els valors fraccionaris seran truncats"
 
-#: builtin.c:3079
+#: builtin.c:3069
 #, c-format
 msgid "rshift(%f, %f): too large shift value will give strange results"
 msgstr ""
 "rshift(%f, %f): un valor de desplaçament massa gran donarà resultats estranys"
 
-#: builtin.c:3104 mpfr.c:968
+#: builtin.c:3094 mpfr.c:988
 msgid "and: called with less than two arguments"
 msgstr "and: cridat amb menys de dos arguments"
 
-#: builtin.c:3109
+#: builtin.c:3099
 #, c-format
 msgid "and: argument %d is non-numeric"
 msgstr "exp: l'argument %d no és numèric"
 
-#: builtin.c:3113
+#: builtin.c:3103
 #, c-format
 msgid "and: argument %d negative value %g will give strange results"
 msgstr "and: l'argument %d amb valor negatiu %g donarà resultats estranys"
 
-#: builtin.c:3136 mpfr.c:1000
+#: builtin.c:3126 mpfr.c:1020
 msgid "or: called with less than two arguments"
 msgstr "or: cridat amb menys de dos arguments"
 
-#: builtin.c:3141
+#: builtin.c:3131
 #, c-format
 msgid "or: argument %d is non-numeric"
 msgstr "or: l'argument %d no és numèric"
 
-#: builtin.c:3145
+#: builtin.c:3135
 #, c-format
 msgid "or: argument %d negative value %g will give strange results"
 msgstr "or: l'argument %d amb valor negatiu %g donarà resultats estranys"
 
-#: builtin.c:3167 mpfr.c:1031
+#: builtin.c:3157 mpfr.c:1051
 msgid "xor: called with less than two arguments"
 msgstr "xort: cridat amb menys de dos arguments"
 
-#: builtin.c:3173
+#: builtin.c:3163
 #, c-format
 msgid "xor: argument %d is non-numeric"
 msgstr "xor: l'argument %d no és numèric"
 
-#: builtin.c:3177
+#: builtin.c:3167
 #, c-format
 msgid "xor: argument %d negative value %g will give strange results"
 msgstr "xor: l'argument %d del valor negatiu %g donarà resultats estranys"
 
-#: builtin.c:3202 mpfr.c:787
+#: builtin.c:3192 mpfr.c:807
 msgid "compl: received non-numeric argument"
 msgstr "compl: s'ha rebut un argument que no és numèric"
 
-#: builtin.c:3208
+#: builtin.c:3198
 #, c-format
 msgid "compl(%f): negative value will give strange results"
 msgstr "compl(%f): el valor negatiu donarà resultats estranys"
 
-#: builtin.c:3210
+#: builtin.c:3200
 #, c-format
 msgid "compl(%f): fractional value will be truncated"
 msgstr "compl(%f): el valor fraccionari serà truncat"
 
-#: builtin.c:3379
+#: builtin.c:3369
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: `%s' no és una categoria local vàlida"
@@ -1272,40 +1293,49 @@ msgstr "up [N] - mou-te N marcs cap a dalt de la pila."
 msgid "watch var - set a watchpoint for a variable."
 msgstr "watch var - estableix un punt d'inspecció per a una variable."
 
-#: command.y:1011 debug.c:401 msg.c:135
+#: command.y:901
+#, fuzzy
+msgid ""
+"where [N] - (same as backtrace) print trace of all or N innermost (outermost "
+"if N < 0) frames."
+msgstr ""
+"backtrace [N] - imprimeix la traça de tot els N marcs interiors (exteriors "
+"si N < 0)."
+
+#: command.y:1013 debug.c:401 msg.c:135
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: command.y:1051
+#: command.y:1053
 #, c-format
 msgid "can't read command (%s)\n"
 msgstr "no es pot llegir l'ordre (%s)\n"
 
-#: command.y:1065
+#: command.y:1067
 #, c-format
 msgid "can't read command (%s)"
 msgstr "no es pot llegir l'ordre (%s)"
 
-#: command.y:1116
+#: command.y:1118
 msgid "invalid character in command"
 msgstr "caràcter no vàlida en la instucció"
 
-#: command.y:1152
+#: command.y:1154
 #, c-format
 msgid "unknown command - \"%.*s\", try help"
 msgstr "ordre desconeguda - \"%.*s\", prova l'ajuda"
 
-#: command.y:1222
+#: command.y:1224
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.y:1284
+#: command.y:1286
 msgid "invalid character"
 msgstr "caràcter no vàlid"
 
-#: command.y:1455
+#: command.y:1457
 #, c-format
 msgid "undefined command: %s\n"
 msgstr "ordre no definida: %s\n"
@@ -1846,68 +1876,70 @@ msgstr "`%s' no està permès al context actual; s'ignorarà la declaració"
 msgid "`return' not allowed in current context; statement ignored"
 msgstr "`return' no està permès al context actual; s'ignorarà la declaració"
 
-#: debug.c:5590
+#: debug.c:5604
 #, c-format
 msgid "No symbol `%s' in current context"
 msgstr "No hi ha un símbol `%s' al context actual"
 
-#: dfa.c:1118 dfa.c:1121 dfa.c:1142 dfa.c:1150 dfa.c:1162 dfa.c:1197
-#: dfa.c:1206 dfa.c:1209 dfa.c:1214 dfa.c:1228 dfa.c:1275
+#: dfa.c:1063 dfa.c:1066 dfa.c:1085 dfa.c:1095 dfa.c:1107 dfa.c:1143
+#: dfa.c:1152 dfa.c:1155 dfa.c:1160 dfa.c:1174 dfa.c:1222
 msgid "unbalanced ["
 msgstr "[ sense aparellar"
 
-#: dfa.c:1174
+#: dfa.c:1119
 msgid "invalid character class"
 msgstr "classe no vàlida de caràcters"
 
-#: dfa.c:1316
+#: dfa.c:1265
 msgid "character class syntax is [[:space:]], not [:space:]"
 msgstr "la sintaxi de la classe de caràcters és [[:espai:]], no [:espai:]"
 
-#: dfa.c:1366
+#: dfa.c:1327
 msgid "unfinished \\ escape"
 msgstr "seqüència d'escapada \\ sense finalitzar"
 
-#: dfa.c:1513 regcomp.c:161
-msgid "Invalid content of \\{\\}"
+#: dfa.c:1474
+#, fuzzy
+msgid "invalid content of \\{\\}"
 msgstr "Contingut no vàlid de \\{\\}"
 
-#: dfa.c:1516 regcomp.c:176
-msgid "Regular expression too big"
+#: dfa.c:1477
+#, fuzzy
+msgid "regular expression too big"
 msgstr "L'expressió regular és massa gran"
 
-#: dfa.c:1936
+#: dfa.c:1912
 msgid "unbalanced ("
 msgstr "( sense aparellar"
 
-#: dfa.c:2062
+#: dfa.c:2038
 msgid "no syntax specified"
 msgstr "no s'ha especificat una sintaxi"
 
-#: dfa.c:2070
+#: dfa.c:2046
 msgid "unbalanced )"
 msgstr ") sense aparellar"
 
-#: eval.c:394
+#: eval.c:396
 #, c-format
 msgid "unknown nodetype %d"
 msgstr "tipus de node %d desconegut"
 
-#: eval.c:405 eval.c:419
+#: eval.c:407 eval.c:421
 #, c-format
 msgid "unknown opcode %d"
 msgstr "opcode %d desconegut"
 
-#: eval.c:416
+#: eval.c:418
 #, c-format
 msgid "opcode %s not an operator or keyword"
 msgstr "l'opcode %s no és un operador o una paraula clau"
 
-#: eval.c:472
+#: eval.c:474
 msgid "buffer overflow in genflags2str"
 msgstr "desbordament del cau temporal en genflags2str"
 
-#: eval.c:675
+#: eval.c:676
 #, c-format
 msgid ""
 "\n"
@@ -1918,217 +1950,217 @@ msgstr ""
 "\t# Pila de crida a les funcions:\n"
 "\n"
 
-#: eval.c:704
+#: eval.c:705
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "`IGNORECASE' és una extensió de gawk"
 
-#: eval.c:736
+#: eval.c:737
 msgid "`BINMODE' is a gawk extension"
 msgstr "`BINMODE' és una extensió de gawk"
 
-#: eval.c:794
+#: eval.c:795
 #, c-format
 msgid "BINMODE value `%s' is invalid, treated as 3"
 msgstr "El valor BINMODE `%s' no és vàlid, es tractarà com 3"
 
-#: eval.c:885
+#: eval.c:912
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "`%sFMT' especificació errònia `%s'"
 
-#: eval.c:969
+#: eval.c:996
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "desactivant `--lint' degut a una assignació a `LINT'"
 
-#: eval.c:1147
+#: eval.c:1174
 #, c-format
 msgid "reference to uninitialized argument `%s'"
 msgstr "referència a un argument sense inicialitzar `%s'"
 
-#: eval.c:1148
+#: eval.c:1175
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "referència a una variable sense inicialitzar `%s'"
 
-#: eval.c:1166
+#: eval.c:1193
 msgid "attempt to field reference from non-numeric value"
 msgstr "s'ha intentat una referència de camp a partir d'un valor no numèric"
 
-#: eval.c:1168
+#: eval.c:1195
 msgid "attempt to field reference from null string"
 msgstr "s'ha intentat entrar una referència a partir d'una cadena nul·la"
 
-#: eval.c:1176
+#: eval.c:1203
 #, c-format
 msgid "attempt to access field %ld"
 msgstr "s'ha intentat accedir al camp %ld"
 
-#: eval.c:1185
+#: eval.c:1212
 #, c-format
 msgid "reference to uninitialized field `$%ld'"
 msgstr "referència a una variable sense inicialitzar `$%ld'"
 
-#: eval.c:1272
+#: eval.c:1299
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "s'ha cridat a la funció `%s' amb més arguments dels declarats"
 
-#: eval.c:1473
+#: eval.c:1500
 #, c-format
 msgid "unwind_stack: unexpected type `%s'"
 msgstr "unwind_stack: tipus no esperat `%s'"
 
-#: eval.c:1569
+#: eval.c:1596
 msgid "division by zero attempted in `/='"
 msgstr "s'ha intentat una divisió per zero en `/='"
 
-#: eval.c:1576
+#: eval.c:1603
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "s'ha intentat una divisió per zero en `%%='"
 
-#: ext.c:89 ext.c:171
+#: ext.c:65 ext.c:147
 msgid "extensions are not allowed in sandbox mode"
 msgstr "les extensions no estan permeses en mode de proves"
 
-#: ext.c:92
+#: ext.c:68
 msgid "-l / @load are gawk extensions"
 msgstr "-l / @load són extensions gawk"
 
-#: ext.c:95
+#: ext.c:71
 msgid "load_ext: received NULL lib_name"
 msgstr "load_ext: s'ha rebut lib_name nul"
 
-#: ext.c:98
+#: ext.c:74
 #, c-format
 msgid "load_ext: cannot open library `%s' (%s)\n"
 msgstr "load_ext: no es pot obrir la llibreria `%s' (%s)\n"
 
-#: ext.c:104
+#: ext.c:80
 #, c-format
 msgid ""
 "load_ext: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
 msgstr ""
 "load_ext: biblioteca `%s': no defineix `plugin_is_GPL_compatible' (%s)\n"
 
-#: ext.c:110
+#: ext.c:86
 #, c-format
 msgid "load_ext: library `%s': cannot call function `%s' (%s)\n"
 msgstr "load_ext: biblioteca `%s': no es pot cridar a la funció `%s' (%s)\n"
 
-#: ext.c:114
+#: ext.c:90
 #, c-format
 msgid "load_ext: library `%s' initialization routine `%s' failed\n"
 msgstr ""
 "load_ext: la biblioteca `%s' amb rutina d'inicialització `%s' ha fallat\n"
 
-#: ext.c:174
+#: ext.c:150
 msgid "`extension' is a gawk extension"
 msgstr "`extension' és una extensió gawk"
 
-#: ext.c:177
+#: ext.c:153
 msgid "extension: received NULL lib_name"
 msgstr "extension: s'ha rebut lib_name nul"
 
-#: ext.c:180
+#: ext.c:156
 #, c-format
 msgid "extension: cannot open library `%s' (%s)"
 msgstr "extension: no es pot obrir la biblioteca `%s' (%s)"
 
-#: ext.c:186
+#: ext.c:162
 #, c-format
 msgid ""
 "extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)"
 msgstr ""
 "extension: biblioteca `%s': no defineix `plugin_is_GPL_compatible' (%s)"
 
-#: ext.c:190
+#: ext.c:166
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)"
 msgstr "extension: biblioteca `%s': no es pot cridar a la funció `%s' (%s)"
 
-#: ext.c:221
+#: ext.c:197
 msgid "make_builtin: missing function name"
 msgstr "make_builtin: nom absent de funció"
 
-#: ext.c:236
+#: ext.c:212
 #, c-format
 msgid "make_builtin: can't redefine function `%s'"
 msgstr "make_builtin: no es pot redefinir la funció `%s'"
 
-#: ext.c:240
+#: ext.c:216
 #, c-format
 msgid "make_builtin: function `%s' already defined"
 msgstr "make_builtin: la funció `%s' ja està definida"
 
-#: ext.c:244
+#: ext.c:220
 #, c-format
 msgid "make_builtin: function name `%s' previously defined"
 msgstr "make_builtin: nom de la funció `%s' definida prèviament"
 
-#: ext.c:246
+#: ext.c:222
 #, c-format
 msgid "make_builtin: can't use gawk built-in `%s' as function name"
 msgstr "make_builtin: no es pot usar el nom intern `%s' com a nom de funció"
 
-#: ext.c:249 ext.c:304
+#: ext.c:225 ext.c:280
 #, c-format
 msgid "make_builtin: negative argument count for function `%s'"
 msgstr "make_builtin: recompte negatiu d'arguments per a la funció `%s'"
 
-#: ext.c:276
+#: ext.c:252
 msgid "extension: missing function name"
 msgstr "extension: nom absent de funció"
 
-#: ext.c:279 ext.c:283
+#: ext.c:255 ext.c:259
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: caràcter `%c' il·legal al nom de funció `%s'"
 
-#: ext.c:291
+#: ext.c:267
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: no es pot redefinir la funció `%s'"
 
-#: ext.c:295
+#: ext.c:271
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr "extension: la funció `%s' ja està definida"
 
-#: ext.c:299
+#: ext.c:275
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "extension: nom de la funció `%s' definida prèviament"
 
-#: ext.c:301
+#: ext.c:277
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr "extension: no es pot usar el nom intern `%s' com a nom de funció"
 
-#: ext.c:375
+#: ext.c:351
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "la funció `%s' està definida per agafar no més de %d argument(s)"
 
-#: ext.c:378
+#: ext.c:354
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "funció `%s': falta l'argument  #%d"
 
-#: ext.c:395
+#: ext.c:371
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr ""
 "funció `%s': argument #%d: s'ha intentat usar una dada escalar com a una "
 "matriu"
 
-#: ext.c:399
+#: ext.c:375
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 "funció `%s': argument #%d: s'ha intentat usar una matriu com a un escalar"
 
-#: ext.c:413
+#: ext.c:389
 msgid "dynamic loading of library not supported"
 msgstr "no està suportada la càrrega dinàmica de la biblioteca"
 
@@ -2272,7 +2304,7 @@ msgstr "wait: s'ha cridat amb massa arguments"
 msgid "inplace_begin: in-place editing already active"
 msgstr "inplace_begin: l'edició in situ ja està activa"
 
-#: extension/inplace.c:133 extension/inplace.c:207
+#: extension/inplace.c:133 extension/inplace.c:210
 #, c-format
 msgid "inplace_begin: expects 2 arguments but called with %d"
 msgstr "inplace_begin: s'esperaven 2 arguments però s'ha cridat amb %d"
@@ -2305,57 +2337,57 @@ msgstr "inplace_begin: `%s' no és un fitxer regular"
 msgid "inplace_begin: mkstemp(`%s') failed (%s)"
 msgstr "inplace_begin: mkstemp(`%s') ha fallat (%s)"
 
-#: extension/inplace.c:178
+#: extension/inplace.c:181
 #, c-format
 msgid "inplace_begin: chmod failed (%s)"
 msgstr "inplace_begin: ha fallat chmod (%s)"
 
-#: extension/inplace.c:185
+#: extension/inplace.c:188
 #, c-format
 msgid "inplace_begin: dup(stdout) failed (%s)"
 msgstr "inplace_begin: dup(stdout) ha fallat(%s)"
 
-#: extension/inplace.c:188
+#: extension/inplace.c:191
 #, c-format
 msgid "inplace_begin: dup2(%d, stdout) failed (%s)"
 msgstr "inplace_begin: dup2(%d, stdout) ha fallat (%s)"
 
-#: extension/inplace.c:191
+#: extension/inplace.c:194
 #, c-format
 msgid "inplace_begin: close(%d) failed (%s)"
 msgstr "inplace begin: close(%d) ha fallat (%s)"
 
-#: extension/inplace.c:210
+#: extension/inplace.c:213
 msgid "inplace_end: cannot retrieve 1st argument as a string filename"
 msgstr ""
 "inplace_end: no es pot obtenir el primer argument com un nom de fitxer "
 "cadena de caràcters"
 
-#: extension/inplace.c:217
+#: extension/inplace.c:220
 msgid "inplace_end: in-place editing not active"
 msgstr "inplace_end: no està activa l'edició in situ"
 
-#: extension/inplace.c:223
+#: extension/inplace.c:226
 #, c-format
 msgid "inplace_end: dup2(%d, stdout) failed (%s)"
 msgstr "inplace_end: dup2(%d, stdout) ha fallat (%s)"
 
-#: extension/inplace.c:226
+#: extension/inplace.c:229
 #, c-format
 msgid "inplace_end: close(%d) failed (%s)"
 msgstr "inplace_end: close(%d) ha fallat (%s)"
 
-#: extension/inplace.c:230
+#: extension/inplace.c:233
 #, c-format
 msgid "inplace_end: fsetpos(stdout) failed (%s)"
 msgstr "inplace_end: fsetpos(stdout) ha fallat (%s)"
 
-#: extension/inplace.c:243
+#: extension/inplace.c:246
 #, c-format
 msgid "inplace_end: link(`%s', `%s') failed (%s)"
 msgstr "inplace_end: link(`%s', `%s') ha fallat (%s)"
 
-#: extension/inplace.c:253
+#: extension/inplace.c:256
 #, c-format
 msgid "inplace_end: rename(`%s', `%s') failed (%s)"
 msgstr "inplace_end: rename(`%s', `%s') ha fallat (%s)"
@@ -2397,50 +2429,54 @@ msgstr "readfile: s'ha cridat amb massa arguments"
 msgid "readfile: called with no arguments"
 msgstr "readfile: s'ha cridat amb cap argument"
 
-#: extension/rwarray.c:124
+#: extension/revoutput.c:125
+msgid "revoutput: could not initialize REVOUT variable"
+msgstr ""
+
+#: extension/rwarray.c:124 extension/rwarray0.c:109
 msgid "writea: called with too many arguments"
 msgstr "writea: s'ha cridat amb massa arguments"
 
-#: extension/rwarray.c:131
+#: extension/rwarray.c:131 extension/rwarray0.c:116
 #, c-format
 msgid "do_writea: argument 0 is not a string\n"
 msgstr "do_writea: l'argument 0 no és una cadena de caràcters\n"
 
-#: extension/rwarray.c:137
+#: extension/rwarray.c:137 extension/rwarray0.c:122
 #, c-format
 msgid "do_writea: argument 1 is not an array\n"
 msgstr "do_writea: l'argument 1 no és una matriu\n"
 
-#: extension/rwarray.c:184
+#: extension/rwarray.c:184 extension/rwarray0.c:169
 #, c-format
 msgid "write_array: could not flatten array\n"
 msgstr "write_array: no s'ha pogut aplanar la matriu\n"
 
-#: extension/rwarray.c:198
+#: extension/rwarray.c:198 extension/rwarray0.c:183
 #, c-format
 msgid "write_array: could not release flattened array\n"
 msgstr "write_array: no s'ha pogut alliberar la matriu aplanada\n"
 
-#: extension/rwarray.c:280
+#: extension/rwarray.c:280 extension/rwarray0.c:265
 msgid "reada: called with too many arguments"
 msgstr "reada: s'ha cridat amb massa arguments"
 
-#: extension/rwarray.c:287
+#: extension/rwarray.c:287 extension/rwarray0.c:272
 #, c-format
 msgid "do_reada: argument 0 is not a string\n"
 msgstr "do_reada: l'argument 0 no és una cadena de caràcters\n"
 
-#: extension/rwarray.c:293
+#: extension/rwarray.c:293 extension/rwarray0.c:278
 #, c-format
 msgid "do_reada: argument 1 is not an array\n"
 msgstr "do_reada: l'argument 1 no és una matriu\n"
 
-#: extension/rwarray.c:337
+#: extension/rwarray.c:337 extension/rwarray0.c:322
 #, c-format
 msgid "do_reada: clear_array failed\n"
 msgstr "do_reada: clear_array ha fallat\n"
 
-#: extension/rwarray.c:374
+#: extension/rwarray.c:374 extension/rwarray0.c:358
 #, c-format
 msgid "read_array: set_array_element failed\n"
 msgstr "read_array: set_array_element ha fallat\n"
@@ -2469,86 +2505,86 @@ msgstr "sleep: l'argument és negatiu"
 msgid "sleep: not supported on this platform"
 msgstr "sleep: no està suportat en aquesta plataforma"
 
-#: field.c:345
+#: field.c:346
 msgid "NF set to negative value"
 msgstr "NF s'inicialitza sobre un valor negatiu"
 
-#: field.c:971 field.c:978 field.c:982
+#: field.c:958 field.c:965 field.c:969
 msgid "split: fourth argument is a gawk extension"
 msgstr "split: el quart argument és una extensió gawk"
 
-#: field.c:975
+#: field.c:962
 msgid "split: fourth argument is not an array"
 msgstr "split: el quart argument no és una matriu"
 
-#: field.c:989
+#: field.c:976
 msgid "split: second argument is not an array"
 msgstr "split: el segon argument no és una matriu"
 
-#: field.c:993
+#: field.c:980
 msgid "split: cannot use the same array for second and fourth args"
 msgstr ""
 "split: no es pot usar una submatriu de segon argument per a quart argument"
 
-#: field.c:998
+#: field.c:985
 msgid "split: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "split: no es pot usar una submatriu de segon argument per a quart argument"
 
-#: field.c:1001
+#: field.c:988
 msgid "split: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "split: no est pot usar una submatriu de quart argument per a segon argument"
 
-#: field.c:1032
+#: field.c:1019
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: la cadena nul·la per al tercer argument és una extensió de gawk"
 
-#: field.c:1072
+#: field.c:1059
 msgid "patsplit: fourth argument is not an array"
 msgstr "patsplit: el quart argument no és una matriu"
 
-#: field.c:1077
+#: field.c:1064
 msgid "patsplit: second argument is not an array"
 msgstr "patsplit: el tercer argument no és una matriu"
 
-#: field.c:1083
+#: field.c:1070
 msgid "patsplit: third argument must be non-null"
 msgstr "patsplit: el segon argument no és una matriu"
 
-#: field.c:1087
+#: field.c:1074
 msgid "patsplit: cannot use the same array for second and fourth args"
 msgstr ""
 "patsplit: no es pot usar la mateixa matriu per a segon i quart argument"
 
-#: field.c:1092
+#: field.c:1079
 msgid "patsplit: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "patsplit: no es pot usar una submatriu de segon argument per a quart argument"
 
-#: field.c:1095
+#: field.c:1082
 msgid "patsplit: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "patsplit: no es pot usar una submatriu de quart argument per a segon argument"
 
-#: field.c:1133
+#: field.c:1120
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "`FIELDWIDTHS' és una extensió de gawk"
 
-#: field.c:1197
+#: field.c:1184
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "valor FIELDWIDTHS no vàlid, a prop de `%s'"
 
-#: field.c:1270
+#: field.c:1257
 msgid "null string for `FS' is a gawk extension"
 msgstr "la cadena nul·la per a `FS' és una extensió de gawk"
 
-#: field.c:1274
+#: field.c:1261
 msgid "old awk does not support regexps as value of `FS'"
 msgstr "l'antic awk no suporta expressions regulars com a valor de `FS'"
 
-#: field.c:1393
+#: field.c:1380
 msgid "`FPAT' is a gawk extension"
 msgstr "`FPAT' és una extensió gawk"
 
@@ -2564,20 +2600,20 @@ msgstr "node_to_awk_value: s'ha rebut un node nul"
 msgid "node_to_awk_value: received null val"
 msgstr "node_to_awk_value: s'ha rebut un valor nul"
 
-#: gawkapi.c:807
+#: gawkapi.c:809
 msgid "remove_element: received null array"
 msgstr "remove_element: s'ha rebut una matriu nul·la"
 
-#: gawkapi.c:810
+#: gawkapi.c:812
 msgid "remove_element: received null subscript"
 msgstr "remove_element: s'ha rebut un subíndex nul"
 
-#: gawkapi.c:947
+#: gawkapi.c:949
 #, c-format
 msgid "api_flatten_array: could not convert index %d\n"
 msgstr "api_flatten_array: no s'ha pogut convertir l'índex %d\n"
 
-#: gawkapi.c:952
+#: gawkapi.c:954
 #, c-format
 msgid "api_flatten_array: could not convert value %d\n"
 msgstr "api_flatten_array: no s'ha pogut convertir el valor %d\n"
@@ -2637,299 +2673,281 @@ msgstr "%s: l'opció `-W %s' no admet cap argument\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: l'opció `-W %s' requereix un argument\n"
 
-#: io.c:392
+#: io.c:423
 #, c-format
 msgid "command line argument `%s' is a directory: skipped"
 msgstr "l'argument `%s' de línia d'ordres és un directori: s'ignorarà"
 
-#: io.c:395 io.c:513
+#: io.c:426 io.c:544
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "no es pot obrir el fitxer `%s' per a lectura (%s)"
 
-#: io.c:640
+#: io.c:671
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "la finalització del descriptor fd %d (`%s') ha fallat  (%s)"
 
-#: io.c:716
+#: io.c:749
 msgid "redirection not allowed in sandbox mode"
 msgstr "no est permeten redireccions en mode de proves"
 
-#: io.c:750
+#: io.c:783
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "l'expressió en la redirecció `%s' solt té un valor numèric"
 
-#: io.c:756
+#: io.c:789
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "l'expressió per a la redirecció `%s' té un valor de cadena nul·la"
 
-#: io.c:761
+#: io.c:794
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "el fitxer `%s' per a la redirecció `%s' pot ser resultat d'una expressió "
 "lògica"
 
-#: io.c:809
+#: io.c:842
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "mescla innecessària de `>' i `>>' per al fitxer `%.*s'"
 
-#: io.c:863
+#: io.c:896
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "no es pot obrir la canonada `%s' per a l'eixida (%s)"
 
-#: io.c:873
+#: io.c:906
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "no es pot obrir la canonada `%s' per a l'entrada (%s)"
 
-#: io.c:904
+#: io.c:937
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr ""
 "no es pot obrir una canonada bidireccional `%s' per a les entrades/eixides "
 "(%s)"
 
-#: io.c:986
+#: io.c:1019
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "no es pot redirigir des de `%s' (%s)"
 
-#: io.c:989
+#: io.c:1022
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "no es pot redirigir cap a `%s' (%s)"
 
-#: io.c:1040
+#: io.c:1073
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "s'ha arribat al límit del sistema per a fitxers oberts: es començarà a "
 "multiplexar els descriptors de fitxer"
 
-#: io.c:1056
+#: io.c:1089
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "la finalització de `%s' ha fallat  (%s)"
 
-#: io.c:1064
+#: io.c:1097
 msgid "too many pipes or input files open"
 msgstr "masses canonades o fitxers d'entrada oberts"
 
-#: io.c:1086
+#: io.c:1119
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: el segon argument hauria de ser `to' o `from'"
 
-#: io.c:1103
+#: io.c:1136
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: `%.*s' no és un fitxer obert, canonada o co-procés"
 
-#: io.c:1108
+#: io.c:1141
 msgid "close of redirection that was never opened"
 msgstr "finalització d'una redirecció que no s'ha obert"
 
-#: io.c:1205
+#: io.c:1238
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: la redirecció `%s' no s'obre amb `|&', s'ignora el segon argument"
 
-#: io.c:1222
+#: io.c:1255
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "estat de fallada (%d) en la finalització de la canonada `%s' (%s)"
 
-#: io.c:1225
+#: io.c:1258
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "estat de falla (%d) en la finalització del fitxer `%s' (%s)"
 
-#: io.c:1245
+#: io.c:1278
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "no s'aporta la finalització explícita del socket `%s'"
 
-#: io.c:1248
+#: io.c:1281
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "no s'aporta la finalització explícita del co-procés `%s'"
 
-#: io.c:1251
+#: io.c:1284
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "no s'aporta la finalització explícita de la canonada `%s'"
 
-#: io.c:1254
+#: io.c:1287
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "no s'aporta la finalització explícita del fitxer `%s'"
 
-#: io.c:1284 io.c:1342 main.c:864 main.c:906
+#: io.c:1317 io.c:1375 main.c:628 main.c:670
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "error en escriure a la sortida estàndard (%s)"
 
-#: io.c:1289 io.c:1348 main.c:866
+#: io.c:1322 io.c:1381 main.c:630
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "error en escriure a la sortida d'error estàndard (%s)"
 
-#: io.c:1297
+#: io.c:1330
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "la neteja de la canonada de `%sx' ha fallat (%s)."
 
-#: io.c:1300
+#: io.c:1333
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "la neteja de la canonada per al co-procés de `%sx' ha fallat (%s)."
 
-#: io.c:1303
+#: io.c:1336
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "la neteja del fitxer `%s' ha fallat (%s)."
 
-#: io.c:1420
+#: io.c:1453
 #, c-format
 msgid "local port %s invalid in `/inet'"
 msgstr "port local %s no vàlid a `/inet'"
 
-#: io.c:1438
+#: io.c:1471
 #, c-format
 msgid "remote host and port information (%s, %s) invalid"
 msgstr "amfitrió remot i informació de port (%s, %s) no vàlids"
 
-#: io.c:1590
-#, c-format
-msgid "no (known) protocol supplied in special filename `%s'"
-msgstr "no s'aporta cap protocol (conegut) en el nom del fitxer especial `%s'"
-
-#: io.c:1604
-#, c-format
-msgid "special file name `%s' is incomplete"
-msgstr "el nom del fitxer especial `%s' està incomplet"
-
-#: io.c:1621
-msgid "must supply a remote hostname to `/inet'"
-msgstr "s'ha de subministrar un nom de sistema remot a `/inet'"
-
-#: io.c:1639
-msgid "must supply a remote port to `/inet'"
-msgstr "s'ha de subministrar un port remot a `/inet'"
-
-#: io.c:1685
+#: io.c:1673
 msgid "TCP/IP communications are not supported"
 msgstr "les comunicacions TCP/IP no estan suportades"
 
-#: io.c:1867
+#: io.c:1854
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "no es pot obrir `%s', mode `%s'"
 
-#: io.c:1917
+#: io.c:1904
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "ha fallat el tancament del pty mestre (%s)"
 
-#: io.c:1919 io.c:2105 io.c:2305
+#: io.c:1906 io.c:2092 io.c:2293
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr ""
 "ha fallat la finalització de la sortida estàndard en els processos fills (%s)"
 
-#: io.c:1922
+#: io.c:1909
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 "ha fallat el trasllat del pty esclau cap a l'eixida estàndard dels processos "
 "fills (dup: %s)"
 
-#: io.c:1924 io.c:2110
+#: io.c:1911 io.c:2097
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr ""
 "ha fallat la finalització de l'entrada estàndard en els processos fills (%s)"
 
-#: io.c:1927
+#: io.c:1914
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 "ha fallat el trasllat del pty esclau cap a l'entrada estàndard dels "
 "processos fills (dup: %s)"
 
-#: io.c:1929 io.c:1951
+#: io.c:1916 io.c:1938
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "ha fallat el tancament del pty esclau (%s)"
 
-#: io.c:2040 io.c:2108 io.c:2276 io.c:2308
+#: io.c:2027 io.c:2095 io.c:2264 io.c:2296
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr ""
 "ha fallat la redirecció cap a l'eixida estàndard dels processos fills (dup: "
 "%s)"
 
-#: io.c:2047 io.c:2113
+#: io.c:2034 io.c:2100
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr ""
 "ha fallat la redirecció cap a l'entrada estàndard dels processos fills (dup: "
 "%s)"
 
-#: io.c:2073 io.c:2298
+#: io.c:2060 io.c:2286
 msgid "restoring stdout in parent process failed\n"
 msgstr "ha fallat la restauració de l'eixida estàndard en el procés pare\n"
 
-#: io.c:2081
+#: io.c:2068
 msgid "restoring stdin in parent process failed\n"
 msgstr "ha fallat la restauració de l'entrada estàndard en el procés pare\n"
 
-#: io.c:2116 io.c:2310 io.c:2324
+#: io.c:2103 io.c:2298 io.c:2313
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "ha fallat la finalització de la canonada (%s)"
 
-#: io.c:2174
+#: io.c:2162
 msgid "`|&' not supported"
 msgstr "`|&' no està suportat"
 
-#: io.c:2261
+#: io.c:2249
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "no es pot obrir la canonada `%s' (%s)"
 
-#: io.c:2318
+#: io.c:2307
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "no es pot crear el procés fill per a `%s' (fork: %s)"
 
-#: io.c:2790
+#: io.c:2734
 msgid "register_input_parser: received NULL pointer"
 msgstr "register_input_parser: s'ha rebut un punter nul"
 
-#: io.c:2818
+#: io.c:2762
 #, c-format
 msgid "input parser `%s' conflicts with previously installed input parser `%s'"
 msgstr ""
 "l'analitzador d'entrades `%s' està en conflicte amb analitzador d'entrades `"
 "%s' instal·lat prèviament"
 
-#: io.c:2825
+#: io.c:2769
 #, c-format
 msgid "input parser `%s' failed to open `%s'"
 msgstr "l'analitzador d'entrada `%s' no ha pogut obrir `%s'"
 
-#: io.c:2845
+#: io.c:2789
 msgid "register_output_wrapper: received NULL pointer"
 msgstr "register_output_wrapper: s'ha rebut un punter nul"
 
-#: io.c:2873
+#: io.c:2817
 #, c-format
 msgid ""
 "output wrapper `%s' conflicts with previously installed output wrapper `%s'"
@@ -2937,16 +2955,16 @@ msgstr ""
 "l'embolcall de sortida `%s' està en conflicte amb l'embolcall de sortida `"
 "%s' instal·lat prèviament"
 
-#: io.c:2880
+#: io.c:2824
 #, c-format
 msgid "output wrapper `%s' failed to open `%s'"
 msgstr "l'embolcall de sortida `%s' no ha pogut obrir `%s'"
 
-#: io.c:2901
+#: io.c:2845
 msgid "register_output_processor: received NULL pointer"
 msgstr "register_output_processor: s'ha rebut un punter nul"
 
-#: io.c:2930
+#: io.c:2874
 #, c-format
 msgid ""
 "two-way processor `%s' conflicts with previously installed two-way processor "
@@ -2955,210 +2973,197 @@ msgstr ""
 "el processsador de dues vies `%s' està en conflicte amb el processador de "
 "dues vies `%s' instal·lat prèviament"
 
-#: io.c:2939
+#: io.c:2883
 #, c-format
 msgid "two way processor `%s' failed to open `%s'"
 msgstr "el processador de dues vies `%s' no ha pogut obrir `%s'"
 
-#: io.c:3064
+#: io.c:3008
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "el fitxer de dades `%s' està buit"
 
-#: io.c:3106 io.c:3114
+#: io.c:3050 io.c:3058
 msgid "could not allocate more input memory"
 msgstr "no s'ha pogut assignar més memòria d'entrada"
 
-#: io.c:3682
+#: io.c:3636
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "el valor multicaràcter de `RS' és una extensió de gawk"
 
-#: io.c:3771
+#: io.c:3783
 msgid "IPv6 communication is not supported"
 msgstr "la comunicació IPv6 no està suportada"
 
-#: main.c:405
-msgid "empty argument to `-e/--source' ignored"
-msgstr "s'ignonarà l'argument buit de `-e/--source'"
-
-#: main.c:495
-#, c-format
-msgid "%s: option `-W %s' unrecognized, ignored\n"
-msgstr "%s: no es reconeix l'opció `-W %s', serà ignorada\n"
-
-#: main.c:541
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: l'opció requereix un argument -- %c\n"
-
-#: main.c:562
+#: main.c:321
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
 "la variable d'entorn `POSIXLY_CORRECT' està establerta: usant `--posix'"
 
-#: main.c:568
+#: main.c:327
 msgid "`--posix' overrides `--traditional'"
 msgstr "`--posix' solapa a `--traditional'"
 
-#: main.c:579
+#: main.c:338
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "`--posix' i `--traditional' solapen a `--non-decimal-data'"
 
-#: main.c:583
+#: main.c:342
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "executar %s com a setuid root pot ser un problema de seguretat"
 
-#: main.c:588
+#: main.c:346
 msgid "`--posix' overrides `--characters-as-bytes'"
 msgstr "`--posix' anul·la a `--characters-as-bytes'"
 
-#: main.c:647
+#: main.c:404
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "no es pot establir el mode binari en l'entrada estàndard (%s)"
 
-#: main.c:650
+#: main.c:407
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "no es pot establir el mode en l'eixida estàndard (%s)"
 
-#: main.c:652
+#: main.c:409
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "no es pot establir el mode en l'eixida d'error estàndard (%s)"
 
-#: main.c:710
+#: main.c:469
 msgid "no program text at all!"
 msgstr "no hi ha cap text per al programa!"
 
-#: main.c:799
+#: main.c:563
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr "Ús: %s [opcions d'estil POSIX o GNU] -f fitx_prog [--] fitxer ...\n"
 
-#: main.c:801
+#: main.c:565
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr "Ús: %s [opcions d'estil POSIX o GNU] [--] %cprograma%c fitxer ...\n"
 
-#: main.c:806
+#: main.c:570
 msgid "POSIX options:\t\tGNU long options: (standard)\n"
 msgstr "Opcions POSIX:\t\tOpcions llargues GNU: (estàndard)\n"
 
-#: main.c:807
+#: main.c:571
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f fitx_prog\t\t--file=fitx_prog\n"
 
-#: main.c:808
+#: main.c:572
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F fs\t\t\t--field-separator=fs (fs=sep_camp)\n"
 
-#: main.c:809
+#: main.c:573
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=valor\t\t--assign=var=valor\n"
 
-#: main.c:810
+#: main.c:574
 msgid "Short options:\t\tGNU long options: (extensions)\n"
 msgstr "Opcions curtes:\t\tOpcions llargues GNU: (extensions)\n"
 
-#: main.c:811
+#: main.c:575
 msgid "\t-b\t\t\t--characters-as-bytes\n"
 msgstr "\t-b\t\t\t--characters-as-bytes\n"
 
-#: main.c:812
+#: main.c:576
 msgid "\t-c\t\t\t--traditional\n"
 msgstr "\t-c\t\t\t--traditional\n"
 
-#: main.c:813
+#: main.c:577
 msgid "\t-C\t\t\t--copyright\n"
 msgstr "\t-C\t\t\t--copyright\n"
 
-#: main.c:814
+#: main.c:578
 msgid "\t-d[file]\t\t--dump-variables[=file]\n"
 msgstr "\t-d[file]\t\t--dump-variables[=file]\n"
 
-#: main.c:815
+#: main.c:579
 msgid "\t-D[file]\t\t--debug[=file]\n"
 msgstr "\t-D[file]\t\t--debug[=file]\n"
 
-#: main.c:816
+#: main.c:580
 msgid "\t-e 'program-text'\t--source='program-text'\n"
 msgstr "\t-e 'program-text'\t--source='program-text'\n"
 
-#: main.c:817
+#: main.c:581
 msgid "\t-E file\t\t\t--exec=file\n"
 msgstr "\t-E file\t\t\t--exec=file\n"
 
-#: main.c:818
+#: main.c:582
 msgid "\t-g\t\t\t--gen-pot\n"
 msgstr "\t-g\t\t\t--gen-pot\n"
 
-#: main.c:819
+#: main.c:583
 msgid "\t-h\t\t\t--help\n"
 msgstr "\t-h\t\t\t--help\n"
 
-#: main.c:820
+#: main.c:584
 msgid "\t-i includefile\t\t--include=includefile\n"
 msgstr "\t-i includefile\t\t--include=fitxer a incloure\n"
 
-#: main.c:821
+#: main.c:585
 msgid "\t-l library\t\t--load=library\n"
 msgstr "\t-l library\t\t--load=biblioteca\n"
 
-#: main.c:822
-msgid "\t-L [fatal]\t\t--lint[=fatal]\n"
+#: main.c:586
+#, fuzzy
+msgid "\t-L[fatal|invalid]\t--lint[=fatal|invalid]\n"
 msgstr "\t-L [fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:823
-msgid "\t-n\t\t\t--non-decimal-data\n"
-msgstr "\t-n\t\t\t--non-decimal-data\n"
-
-#: main.c:824
+#: main.c:587
 msgid "\t-M\t\t\t--bignum\n"
 msgstr "\t-M\t\t\t--bignum\n"
 
-#: main.c:825
+#: main.c:588
 msgid "\t-N\t\t\t--use-lc-numeric\n"
 msgstr "\t-N\t\t\t--use-lc-numeric\n"
 
-#: main.c:826
+#: main.c:589
+msgid "\t-n\t\t\t--non-decimal-data\n"
+msgstr "\t-n\t\t\t--non-decimal-data\n"
+
+#: main.c:590
 msgid "\t-o[file]\t\t--pretty-print[=file]\n"
 msgstr "\t-o[file]\t\t--pretty-print[=file]\n"
 
-#: main.c:827
+#: main.c:591
 msgid "\t-O\t\t\t--optimize\n"
 msgstr "\t-O\t\t\t--optimize\n"
 
-#: main.c:828
+#: main.c:592
 msgid "\t-p[file]\t\t--profile[=file]\n"
 msgstr "\t-p[file]\t\t--profile[=file]\n"
 
-#: main.c:829
+#: main.c:593
 msgid "\t-P\t\t\t--posix\n"
 msgstr "\t-P\t\t\t--posix\n"
 
-#: main.c:830
+#: main.c:594
 msgid "\t-r\t\t\t--re-interval\n"
 msgstr "\t-r\t\t\t--re-interval\n"
 
-#: main.c:831
+#: main.c:595
 msgid "\t-S\t\t\t--sandbox\n"
 msgstr "\t-S\t\t\t--sandbox\n"
 
-#: main.c:832
+#: main.c:596
 msgid "\t-t\t\t\t--lint-old\n"
 msgstr "\t-t\t\t\t--lint-old\n"
 
-#: main.c:833
+#: main.c:597
 msgid "\t-V\t\t\t--version\n"
 msgstr "\t-V\t\t\t--version\n"
 
-#: main.c:835
+#: main.c:599
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:838
+#: main.c:602
 msgid "\t-Y\t\t--parsedebug\n"
 msgstr "\t-Y\t\t--parsedebug\n"
 
@@ -3167,7 +3172,7 @@ msgstr "\t-Y\t\t--parsedebug\n"
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: main.c:847
+#: main.c:611
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -3179,7 +3184,7 @@ msgstr ""
 "és la secció `Informant sobre problemes i errors' a la versió impresa.\n"
 "Informeu dels errors de traducció a <ca@li.org>\n"
 
-#: main.c:851
+#: main.c:615
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -3189,7 +3194,7 @@ msgstr ""
 "De forma predeterminada llegeix l'entrada estàndard i escriu a la sortida "
 "estàndar.\n"
 
-#: main.c:855
+#: main.c:619
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -3199,7 +3204,7 @@ msgstr ""
 "\tgawk '{ sum += $1 }; END { print sum }' fitxer\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:880
+#: main.c:644
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
@@ -3218,7 +3223,7 @@ msgstr ""
 "Llicència, o (a la vostra elecció) qualsevol versió posterior.\n"
 "\n"
 
-#: main.c:888
+#: main.c:652
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3232,7 +3237,7 @@ msgstr ""
 "Per a més detalls consulteu la Llicència Pública General de GNU.\n"
 "\n"
 
-#: main.c:894
+#: main.c:658
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program. If not, see http://www.gnu.org/licenses/.\n"
@@ -3240,16 +3245,16 @@ msgstr ""
 "Junt amb aquest programa hauríeu d'haver rebut una còpia de la Llicència\n"
 "Pública General de GNU; si no és així, vegeu http://www.gnu.org/licenses/.\n"
 
-#: main.c:931
+#: main.c:695
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft no permet inicialitzar FS a un tabulador en la versió POSIX de awk"
 
-#: main.c:1208
+#: main.c:982
 #, c-format
 msgid "unknown value for field spec: %d\n"
 msgstr "valor desconegut per a l'especificació de camp: %d\n"
 
-#: main.c:1306
+#: main.c:1080
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -3258,99 +3263,117 @@ msgstr ""
 "%s: `%s' l'argument per a `-v' no està en forma `var=valor'\n"
 "\n"
 
-#: main.c:1332
+#: main.c:1106
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "`%s' no és nom legal de variable"
 
-#: main.c:1335
+#: main.c:1109
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "`%s' no és un valor de variable, s'esperava fitxer `%s=%s'"
 
-#: main.c:1339
+#: main.c:1113
 #, c-format
 msgid "cannot use gawk builtin `%s' as variable name"
 msgstr ""
 "no es pot usar el nom de la funció integrada `%s' com a nom de variable"
 
-#: main.c:1344
+#: main.c:1118
 #, c-format
 msgid "cannot use function `%s' as variable name"
 msgstr "no es pot usar el nom de la funció interna `%s' com nom de variable"
 
-#: main.c:1397
+#: main.c:1171
 msgid "floating point exception"
 msgstr "excepció de coma flotant"
 
-#: main.c:1404
+#: main.c:1178
 msgid "fatal error: internal error"
 msgstr "error fatal: error intern"
 
-#: main.c:1419
+#: main.c:1193
 msgid "fatal error: internal error: segfault"
 msgstr "error fatal: error intern: segfault"
 
-#: main.c:1431
+#: main.c:1205
 msgid "fatal error: internal error: stack overflow"
 msgstr "error fatal: error intern: sobreeiximent de pila"
 
-#: main.c:1490
+#: main.c:1264
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "no s'ha pre-obert el descriptor fd per a %d"
 
-#: main.c:1497
+#: main.c:1271
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "no es pot pre-obrir /dev/null per al descriptor fd %d"
 
-#: mpfr.c:550
+#: main.c:1485
+msgid "empty argument to `-e/--source' ignored"
+msgstr "s'ignonarà l'argument buit de `-e/--source'"
+
+#: main.c:1556
+msgid "-M ignored: MPFR/GMP support not compiled in"
+msgstr ""
+
+#: main.c:1577
+#, c-format
+msgid "%s: option `-W %s' unrecognized, ignored\n"
+msgstr "%s: no es reconeix l'opció `-W %s', serà ignorada\n"
+
+#: main.c:1630
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: l'opció requereix un argument -- %c\n"
+
+#: mpfr.c:557
 #, c-format
 msgid "PREC value `%.*s' is invalid"
 msgstr "Valor PREC `%.*s' no és vàlid"
 
-#: mpfr.c:608
+#: mpfr.c:615
 #, c-format
 msgid "RNDMODE value `%.*s' is invalid"
 msgstr "Valor RNDMODE `%.*s' no és vàlid"
 
-#: mpfr.c:698
+#: mpfr.c:711
 #, c-format
 msgid "%s: received non-numeric argument"
 msgstr "%s: s'ha rebut un argument que no és numèric"
 
-#: mpfr.c:800
+#: mpfr.c:820
 msgid "compl(%Rg): negative value will give strange results"
 msgstr "compl(%Rg): el valor negatiu donarà resultats estranys"
 
-#: mpfr.c:804
+#: mpfr.c:824
 msgid "comp(%Rg): fractional value will be truncated"
 msgstr "compl(%Rg): el valor fraccionari serà truncat"
 
-#: mpfr.c:816
+#: mpfr.c:836
 #, c-format
 msgid "cmpl(%Zd): negative values will give strange results"
 msgstr "cmpl(%Zd): els valors negatius donaran resultats estranys"
 
-#: mpfr.c:835
+#: mpfr.c:855
 #, c-format
 msgid "%s: received non-numeric argument #%d"
 msgstr "%s: s'ha rebut un argument no numèric #%d"
 
-#: mpfr.c:845
+#: mpfr.c:865
 msgid "%s: argument #%d has invalid value %Rg, using 0"
 msgstr "%s: l'argument #%d té valor no vàlid %Rg, s'usarà 0"
 
-#: mpfr.c:857
+#: mpfr.c:877
 msgid "%s: argument #%d negative value %Rg will give strange results"
 msgstr "%s: l'argument #%d amb valor negatiu %Rg donarà resultats estranys"
 
-#: mpfr.c:863
+#: mpfr.c:883
 msgid "%s: argument #%d fractional value %Rg will be truncated"
 msgstr "%s: l'argument #%d amb valor fraccional %Rg serà truncat"
 
-#: mpfr.c:878
+#: mpfr.c:898
 #, c-format
 msgid "%s: argument #%d negative value %Zd will give strange results"
 msgstr "%s: l'argument #%d amb valor negatiu %Zd donarà resultats estranys"
@@ -3360,24 +3383,24 @@ msgstr "%s: l'argument #%d amb valor negatiu %Zd donarà resultats estranys"
 msgid "cmd. line:"
 msgstr "línia cmd.:"
 
-#: node.c:421
+#: node.c:409
 msgid "backslash at end of string"
 msgstr "barra invertida al final de la cadena"
 
-#: node.c:500
+#: node.c:488
 #, c-format
 msgid "old awk does not support the `\\%c' escape sequence"
 msgstr "l'antic awk no dóna suport a la seqüencia d'escapada `\\%c'"
 
-#: node.c:551
+#: node.c:539
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX no permet seqüències d'escapada `\\x'"
 
-#: node.c:557
+#: node.c:545
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "no hi ha dígits hexadecimals en la seqüència d'escapada `\\x'"
 
-#: node.c:579
+#: node.c:567
 #, c-format
 msgid ""
 "hex escape \\x%.*s of %d characters probably not interpreted the way you "
@@ -3386,12 +3409,12 @@ msgstr ""
 "probablement no s'han interpretat els caràcters hex escape \\x%.*s of %d de "
 "la manera que esperàveu"
 
-#: node.c:594
+#: node.c:582
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "la seqüència d'escapada `\\%c' és tractada com a una simple `%c'"
 
-#: node.c:739
+#: node.c:726
 msgid ""
 "Invalid multibyte data detected. There may be a mismatch between your data "
 "and your locale."
@@ -3420,12 +3443,12 @@ msgid "sending profile to standard error"
 msgstr "enviant el perfil a l'eixida d'error estàndard"
 
 #: profile.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t# %s block(s)\n"
+"\t# %s rule(s)\n"
 "\n"
 msgstr ""
-"\t# %s bloc(s)\n"
+"\t# Regla(es)\n"
 "\n"
 
 #: profile.c:198
@@ -3442,11 +3465,11 @@ msgstr ""
 msgid "internal error: %s with null vname"
 msgstr "error intern: %s amb vname nul"
 
-#: profile.c:537
+#: profile.c:538
 msgid "internal error: builtin with null fname"
 msgstr "error intern: funció integrada amb fname nul"
 
-#: profile.c:949
+#: profile.c:958
 #, c-format
 msgid ""
 "\t# Loaded extensions (-l and/or @load)\n"
@@ -3455,12 +3478,12 @@ msgstr ""
 "\t# Extensions carregades (-l i/o @load)\n"
 "\n"
 
-#: profile.c:972
+#: profile.c:981
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# perfil gawk, creat %s\n"
 
-#: profile.c:1475
+#: profile.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -3469,7 +3492,7 @@ msgstr ""
 "\n"
 "\t# Funcions, llistades alfabèticament\n"
 
-#: profile.c:1513
+#: profile.c:1559
 #, c-format
 msgid "redir2str: unknown redirection type %d"
 msgstr "redir2str: tipus desconegut de redireccionament %d"
@@ -3479,74 +3502,111 @@ msgstr "redir2str: tipus desconegut de redireccionament %d"
 msgid "regexp component `%.*s' should probably be `[%.*s]'"
 msgstr "el component regexp `%.*s' probablement hauria de ser `[%.*s]'"
 
-#: regcomp.c:131
+#: regcomp.c:139
 msgid "Success"
 msgstr "Èxit"
 
-#: regcomp.c:134
+#: regcomp.c:142
 msgid "No match"
 msgstr "No hi ha concordança"
 
-#: regcomp.c:137
+#: regcomp.c:145
 msgid "Invalid regular expression"
 msgstr "Expressió regular no vàlida"
 
-#: regcomp.c:140
+#: regcomp.c:148
 msgid "Invalid collation character"
 msgstr "Caràcter de comparació no vàlid"
 
-#: regcomp.c:143
+#: regcomp.c:151
 msgid "Invalid character class name"
 msgstr "Nom de classe de caràcters no vàlid"
 
-#: regcomp.c:146
+#: regcomp.c:154
 msgid "Trailing backslash"
 msgstr "Barra invertida extra al final"
 
-#: regcomp.c:149
+#: regcomp.c:157
 msgid "Invalid back reference"
 msgstr "Referència cap endarrere no vàlida"
 
-#: regcomp.c:152
-msgid "Unmatched [ or [^"
+#: regcomp.c:160
+#, fuzzy
+msgid "Unmatched [, [^, [:, [., or [="
 msgstr "[ o [^ desemparellats"
 
-#: regcomp.c:155
+#: regcomp.c:163
 msgid "Unmatched ( or \\("
 msgstr "( o \\( desemparellats"
 
-#: regcomp.c:158
+#: regcomp.c:166
 msgid "Unmatched \\{"
 msgstr "\\{ desemparellat"
 
-#: regcomp.c:164
+#: regcomp.c:169
+msgid "Invalid content of \\{\\}"
+msgstr "Contingut no vàlid de \\{\\}"
+
+#: regcomp.c:172
 msgid "Invalid range end"
 msgstr "Final de rang no vàlid"
 
-#: regcomp.c:167
+#: regcomp.c:175
 msgid "Memory exhausted"
 msgstr "Memòria exhaurida"
 
-#: regcomp.c:170
+#: regcomp.c:178
 msgid "Invalid preceding regular expression"
 msgstr "Expressió regular precedent no vàlida"
 
-#: regcomp.c:173
+#: regcomp.c:181
 msgid "Premature end of regular expression"
 msgstr "Fí prematura de l'expressió regular"
 
-#: regcomp.c:179
+#: regcomp.c:184
+msgid "Regular expression too big"
+msgstr "L'expressió regular és massa gran"
+
+#: regcomp.c:187
 msgid "Unmatched ) or \\)"
 msgstr ") o \\) desemparellats"
 
-#: regcomp.c:704
+#: regcomp.c:712
 msgid "No previous regular expression"
 msgstr "No hi ha una expressió regular prèvia"
 
-#: symbol.c:741
+#: symbol.c:677
+#, fuzzy, c-format
+msgid "function `%s': can't use function `%s' as a parameter name"
+msgstr "funció `%s»: no pot usar el nom de la funció com a paràmetre"
+
+#: symbol.c:809
 msgid "can not pop main context"
 msgstr "no es pot mostrar el context principal"
 
+#~ msgid "`getline var' invalid inside `%s' rule"
+#~ msgstr "`getline var' no és vàlid a dins de la regla `%s'"
+
+#~ msgid "no (known) protocol supplied in special filename `%s'"
+#~ msgstr ""
+#~ "no s'aporta cap protocol (conegut) en el nom del fitxer especial `%s'"
+
+#~ msgid "special file name `%s' is incomplete"
+#~ msgstr "el nom del fitxer especial `%s' està incomplet"
+
+#~ msgid "must supply a remote hostname to `/inet'"
+#~ msgstr "s'ha de subministrar un nom de sistema remot a `/inet'"
+
+#~ msgid "must supply a remote port to `/inet'"
+#~ msgstr "s'ha de subministrar un port remot a `/inet'"
+
+#~ msgid ""
+#~ "\t# %s block(s)\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\t# %s bloc(s)\n"
+#~ "\n"
+
 #~ msgid "reference to uninitialized element `%s[\"%s\"]'"
 #~ msgstr "referència a un element sense valor inicial `%s[\"%s\"]'"
 
@@ -3633,9 +3693,6 @@ msgstr "no es pot mostrar el context principal"
 #~ msgid "illegal type (%s) in tree_eval"
 #~ msgstr "tipus il·legal (%s) en tree_eval"
 
-#~ msgid "attempt to use function `%s' as array"
-#~ msgstr "s'ha intentat usar la funció «%s» com a una matriu"
-
 #~ msgid "`%s' is a function, assignment is not allowed"
 #~ msgstr "«%s» és una funció, l'assignació no és permesa"
 
diff --git a/po/da.gmo b/po/da.gmo
index 0ba7ffc0..83958f48 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index f3840840..8dfedbea 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gawk 4.0.0h\n"
-"Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2014-04-08 19:23+0300\n"
+"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
+"POT-Creation-Date: 2015-02-26 20:05+0200\n"
 "PO-Revision-Date: 2012-02-06 10:37+0100\n"
 "Last-Translator: Keld Simonsen <keld@keldix.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -40,9 +40,9 @@ msgstr "forsøg på at bruge skalarparameteren '%s' som et array"
 msgid "attempt to use scalar `%s' as an array"
 msgstr "forsøg på at bruge skalar '%s' som et array"
 
-#: array.c:409 array.c:576 builtin.c:85 builtin.c:1615 builtin.c:1661
-#: builtin.c:1674 builtin.c:2102 builtin.c:2116 eval.c:1122 eval.c:1126
-#: eval.c:1531
+#: array.c:409 array.c:576 builtin.c:85 builtin.c:1606 builtin.c:1652
+#: builtin.c:1665 builtin.c:2092 builtin.c:2106 eval.c:1149 eval.c:1153
+#: eval.c:1558
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "forsøg på at bruge array '%s' i skalarsammenhæng"
@@ -98,415 +98,420 @@ msgid "asorti: cannot use a subarray of second arg for first arg"
 msgstr ""
 "asorti: kan ikke bruge et underarray af andet argument for første argument"
 
-#: array.c:1314
+#: array.c:1313
 #, c-format
 msgid "`%s' is invalid as a function name"
 msgstr "'%s' er ugyldigt som funktionsnavn"
 
-#: array.c:1318
+#: array.c:1317
 #, c-format
 msgid "sort comparison function `%s' is not defined"
 msgstr "funktionen for sorteringssammenligning '%s' er ikke defineret"
 
-#: awkgram.y:233
+#: awkgram.y:226
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "%s-blokke skal have en handlingsdel"
 
-#: awkgram.y:236
+#: awkgram.y:229
 msgid "each rule must have a pattern or an action part"
 msgstr "hver regel skal have et mønster eller en handlingsdel"
 
-#: awkgram.y:325 awkgram.y:336
+#: awkgram.y:320 awkgram.y:331
 msgid "old awk does not support multiple `BEGIN' or `END' rules"
 msgstr ""
 "gamle versioner af awk understøtter ikke flere 'BEGIN'- eller 'END'-regler"
 
-#: awkgram.y:373
+#: awkgram.y:368
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "'%s' er en indbygget funktion, den kan ikke omdefineres"
 
-#: awkgram.y:419
+#: awkgram.y:417
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr "regexp-konstanten '//' ser ud som en C++-kommentar, men er det ikke"
 
-#: awkgram.y:423
+#: awkgram.y:421
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr "regexp-konstanten '/%s/' ser ud som en C-kommentar, men er det ikke"
 
-#: awkgram.y:515
+#: awkgram.y:513
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "dublet case-værdier i switch-krop %s"
 
-#: awkgram.y:536
+#: awkgram.y:534
 msgid "duplicate `default' detected in switch body"
 msgstr "dublet 'default' opdaget i switch-krop"
 
-#: awkgram.y:796 awkgram.y:3723
+#: awkgram.y:794 awkgram.y:3751
 msgid "`break' is not allowed outside a loop or switch"
 msgstr "'break' uden for en løkke eller switch er ikke tilladt"
 
-#: awkgram.y:805 awkgram.y:3715
+#: awkgram.y:803 awkgram.y:3743
 msgid "`continue' is not allowed outside a loop"
 msgstr "'continue' uden for en løkke er ikke tilladt"
 
-#: awkgram.y:815
+#: awkgram.y:813
 #, c-format
 msgid "`next' used in %s action"
 msgstr "'next' brugt i %s-handling"
 
-#: awkgram.y:824
+#: awkgram.y:822
 #, c-format
 msgid "`nextfile' used in %s action"
 msgstr "'nextfile' brugt i %s-handling"
 
-#: awkgram.y:848
+#: awkgram.y:846
 msgid "`return' used outside function context"
 msgstr "'return' brugt uden for funktion"
 
-#: awkgram.y:922
+#: awkgram.y:920
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "alenestående 'print' i BEGIN eller END-regel skulle muligvis være 'print "
 "\"\"'"
 
-#: awkgram.y:988 awkgram.y:1037
+#: awkgram.y:986 awkgram.y:1035
 msgid "`delete' is not allowed with SYMTAB"
 msgstr ""
 
-#: awkgram.y:990 awkgram.y:1039
+#: awkgram.y:988 awkgram.y:1037
 msgid "`delete' is not allowed with FUNCTAB"
 msgstr ""
 
-#: awkgram.y:1024 awkgram.y:1028
+#: awkgram.y:1022 awkgram.y:1026
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "'delete array' er en ikke-portabel udvidelse fra tawk"
 
-#: awkgram.y:1149
+#: awkgram.y:1147
 msgid "multistage two-way pipelines don't work"
 msgstr "flertrins dobbeltrettede datakanaler fungerer ikke"
 
-#: awkgram.y:1264
+#: awkgram.y:1262
 msgid "regular expression on right of assignment"
 msgstr "regulært udtryk i højreleddet af en tildeling"
 
-#: awkgram.y:1275
+#: awkgram.y:1273
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "regulært udtryk på venstre side af en '~'- eller '!~'-operator"
 
-#: awkgram.y:1291 awkgram.y:1442
+#: awkgram.y:1289 awkgram.y:1431
 msgid "old awk does not support the keyword `in' except after `for'"
 msgstr ""
 "gamle versioner af awk understøtter ikke nøgleordet 'in' undtagen efter 'for'"
 
-#: awkgram.y:1301
+#: awkgram.y:1299
 msgid "regular expression on right of comparison"
 msgstr "regulært udtryk i højreleddet af en sammenligning"
 
-#: awkgram.y:1417
-#, c-format
-msgid "`getline var' invalid inside `%s' rule"
-msgstr "'getline var' ugyldig inden i '%s' regel"
-
-#: awkgram.y:1420
+#: awkgram.y:1411
 #, c-format
-msgid "`getline' invalid inside `%s' rule"
-msgstr "'getline' ugyldig inden i '%s' regel"
+msgid "non-redirected `getline' invalid inside `%s' rule"
+msgstr "ikke-omdirigeret 'getline' ugyldig inden i '%s'-regel"
 
-#: awkgram.y:1425
+#: awkgram.y:1414
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "ikke-omdirigeret 'getline' udefineret inden i END-handling"
 
-#: awkgram.y:1444
+#: awkgram.y:1433
 msgid "old awk does not support multidimensional arrays"
 msgstr "gamle versioner af awk understøtter ikke flerdimensionale array"
 
-#: awkgram.y:1541
+#: awkgram.y:1530
 msgid "call of `length' without parentheses is not portable"
 msgstr "kald af 'length' uden parenteser er ikke portabelt"
 
-#: awkgram.y:1607
+#: awkgram.y:1596
 msgid "indirect function calls are a gawk extension"
 msgstr "indirekte funktionskald er en gawk-udvidelse"
 
-#: awkgram.y:1620
+#: awkgram.y:1609
 #, c-format
 msgid "can not use special variable `%s' for indirect function call"
 msgstr "kan ikke bruge specialvariabel '%s' til indirekte funktionskald"
 
-#: awkgram.y:1698
+#: awkgram.y:1635
+#, fuzzy, c-format
+msgid "attempt to use non-function `%s' in function call"
+msgstr "forsøg på at bruge funktionen '%s' som et array"
+
+#: awkgram.y:1699
 msgid "invalid subscript expression"
 msgstr "ugyldigt indeksudtryk"
 
-#: awkgram.y:2048 awkgram.y:2068 gawkapi.c:206 gawkapi.c:224 msg.c:126
+#: awkgram.y:2045 awkgram.y:2065 gawkapi.c:206 gawkapi.c:224 msg.c:126
 msgid "warning: "
 msgstr "advarsel: "
 
-#: awkgram.y:2066 gawkapi.c:192 gawkapi.c:221 msg.c:158
+#: awkgram.y:2063 gawkapi.c:192 gawkapi.c:221 msg.c:158
 msgid "fatal: "
 msgstr "fatal: "
 
-#: awkgram.y:2116
+#: awkgram.y:2113
 msgid "unexpected newline or end of string"
 msgstr "uventet nylinjetegn eller strengafslutning"
 
-#: awkgram.y:2383 awkgram.y:2459 awkgram.y:2682 debug.c:523 debug.c:539
+#: awkgram.y:2392 awkgram.y:2468 awkgram.y:2691 debug.c:523 debug.c:539
 #: debug.c:2812 debug.c:5055
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "kan ikke åbne kildefilen '%s' for læsning (%s)"
 
-#: awkgram.y:2384 awkgram.y:2509
+#: awkgram.y:2393 awkgram.y:2518
 #, fuzzy, c-format
 msgid "can't open shared library `%s' for reading (%s)"
 msgstr "kan ikke åbne kildefilen '%s' for læsning (%s)"
 
-#: awkgram.y:2386 awkgram.y:2460 awkgram.y:2510 builtin.c:135 debug.c:5206
+#: awkgram.y:2395 awkgram.y:2469 awkgram.y:2519 builtin.c:135 debug.c:5206
 msgid "reason unknown"
 msgstr "ukendt årsag"
 
-#: awkgram.y:2395 awkgram.y:2419
+#: awkgram.y:2404 awkgram.y:2428
 #, c-format
 msgid "can't include `%s' and use it as a program file"
 msgstr ""
 
-#: awkgram.y:2408
+#: awkgram.y:2417
 #, c-format
 msgid "already included source file `%s'"
 msgstr "allerede inkluderet kildefil '%s'"
 
-#: awkgram.y:2409
+#: awkgram.y:2418
 #, fuzzy, c-format
 msgid "already loaded shared library `%s'"
 msgstr "allerede inkluderet kildefil '%s'"
 
-#: awkgram.y:2444
+#: awkgram.y:2453
 msgid "@include is a gawk extension"
 msgstr "@include er en gawk-udvidelse"
 
-#: awkgram.y:2450
+#: awkgram.y:2459
 msgid "empty filename after @include"
 msgstr "tomt filnavn efter @include"
 
-#: awkgram.y:2494
+#: awkgram.y:2503
 #, fuzzy
 msgid "@load is a gawk extension"
 msgstr "@include er en gawk-udvidelse"
 
-#: awkgram.y:2500
+#: awkgram.y:2509
 #, fuzzy
 msgid "empty filename after @load"
 msgstr "tomt filnavn efter @include"
 
-#: awkgram.y:2634
+#: awkgram.y:2643
 msgid "empty program text on command line"
 msgstr "tom programtekst på kommandolinjen"
 
-#: awkgram.y:2749
+#: awkgram.y:2758
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "kan ikke læse kildefilen '%s' (%s)"
 
-#: awkgram.y:2760
+#: awkgram.y:2769
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "kildefilen '%s' er tom"
 
-#: awkgram.y:2937
+#: awkgram.y:2828
+#, c-format
+msgid "PEBKAC error: invalid character '\\%03o' in source code"
+msgstr ""
+
+#: awkgram.y:2959
 msgid "source file does not end in newline"
 msgstr "kildefilen slutter ikke med en ny linje"
 
-#: awkgram.y:3042
+#: awkgram.y:3062
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "uafsluttet regulært udtryk slutter med '\\' i slutningen af filen"
 
-#: awkgram.y:3066
+#: awkgram.y:3089
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr "%s: %d: regex-ændringstegn '/.../%c' fra tawk virker ikke i gawk"
 
-#: awkgram.y:3070
+#: awkgram.y:3093
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr "regex-ændringstegn '/.../%c' fra tawk virker ikke i gawk"
 
-#: awkgram.y:3077
+#: awkgram.y:3100
 msgid "unterminated regexp"
 msgstr "uafsluttet regulært udtryk"
 
-#: awkgram.y:3081
+#: awkgram.y:3104
 msgid "unterminated regexp at end of file"
 msgstr "uafsluttet regulært udtryk i slutningen af filen"
 
-#: awkgram.y:3140
+#: awkgram.y:3162
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "brug af '\\ #...' for linjefortsættelse er ikke portabelt"
 
-#: awkgram.y:3156
+#: awkgram.y:3178
 msgid "backslash not last character on line"
 msgstr "sidste tegn på linjen er ikke en omvendt skråstreg"
 
-#: awkgram.y:3217
+#: awkgram.y:3239
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX tillader ikke operatoren '**='"
 
-#: awkgram.y:3219
+#: awkgram.y:3241
 msgid "old awk does not support operator `**='"
 msgstr "gamle versioner af awk understøtter ikke operatoren '**='"
 
-#: awkgram.y:3228
+#: awkgram.y:3250
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX tillader ikke operatoren '**'"
 
-#: awkgram.y:3230
+#: awkgram.y:3252
 msgid "old awk does not support operator `**'"
 msgstr "gamle versioner af awk understøtter ikke operatoren '**'"
 
-#: awkgram.y:3265
+#: awkgram.y:3287
 msgid "operator `^=' is not supported in old awk"
 msgstr "operatoren '^=' understøttes ikke i gamle versioner af awk"
 
-#: awkgram.y:3273
+#: awkgram.y:3295
 msgid "operator `^' is not supported in old awk"
 msgstr "operatoren '^' understøttes ikke i gamle versioner af awk"
 
-#: awkgram.y:3366 awkgram.y:3382 command.y:1178
+#: awkgram.y:3392 awkgram.y:3410 command.y:1180
 msgid "unterminated string"
 msgstr "uafsluttet streng"
 
-#: awkgram.y:3603
+#: awkgram.y:3631
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "ugyldigt tegn '%c' i udtryk"
 
-#: awkgram.y:3650
+#: awkgram.y:3678
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "'%s' er en gawk-udvidelse"
 
-#: awkgram.y:3655
+#: awkgram.y:3683
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX tillader ikke '%s'"
 
-#: awkgram.y:3663
+#: awkgram.y:3691
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "'%s' understøttes ikke i gamle versioner af awk"
 
-#: awkgram.y:3753
+#: awkgram.y:3781
 msgid "`goto' considered harmful!\n"
 msgstr "'goto' anses for skadelig!\n"
 
-#: awkgram.y:3787
+#: awkgram.y:3815
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d er et ugyldigt antal argumenter for %s"
 
-#: awkgram.y:3822
+#: awkgram.y:3850
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 "%s: bogstavelig streng som sidste argument til erstatning har ingen effekt"
 
-#: awkgram.y:3827
+#: awkgram.y:3855
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "%s: tredje argument er ikke et ændringsbart objekt"
 
-#: awkgram.y:3910 awkgram.y:3913
+#: awkgram.y:3938 awkgram.y:3941
 msgid "match: third argument is a gawk extension"
 msgstr "match: tredje argument er en gawk-udvidelse"
 
-#: awkgram.y:3967 awkgram.y:3970
+#: awkgram.y:3995 awkgram.y:3998
 msgid "close: second argument is a gawk extension"
 msgstr "close: andet argument er en gawk-udvidelse"
 
-#: awkgram.y:3982
+#: awkgram.y:4010
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "brug af dcgettext(_\"...\") er forkert: fjern det indledende "
 "understregningstegn"
 
-#: awkgram.y:3997
+#: awkgram.y:4025
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "brug af dcgettext(_\"...\") er forkert: fjern det indledende "
 "understregningstegn"
 
-#: awkgram.y:4016
+#: awkgram.y:4044
 #, fuzzy
 msgid "index: regexp constant as second argument is not allowed"
 msgstr "indeks: andet argument er ikke en streng"
 
-#: awkgram.y:4069
+#: awkgram.y:4097
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "funktionen '%s': parameteren '%s' overskygger en global variabel"
 
-#: awkgram.y:4126 debug.c:4041 debug.c:4084 debug.c:5204
+#: awkgram.y:4154 debug.c:4041 debug.c:4084 debug.c:5204
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "kunne ikke åbne '%s' for skrivning (%s)"
 
-#: awkgram.y:4127
+#: awkgram.y:4155
 msgid "sending variable list to standard error"
 msgstr "sender variabelliste til standard fejl"
 
-#: awkgram.y:4135
+#: awkgram.y:4163
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: lukning mislykkedes (%s)"
 
-#: awkgram.y:4160
+#: awkgram.y:4188
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() kaldt to gange!"
 
-#: awkgram.y:4168
+#: awkgram.y:4196
 msgid "there were shadowed variables."
 msgstr "der var skyggede variable."
 
-#: awkgram.y:4239
+#: awkgram.y:4267
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "funktionsnavnet '%s' er allerede defineret"
 
-#: awkgram.y:4285
+#: awkgram.y:4313
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "funktionen '%s': kan ikke bruge funktionsnavn som parameternavn"
 
-#: awkgram.y:4288
+#: awkgram.y:4316
 #, c-format
 msgid "function `%s': can't use special variable `%s' as a function parameter"
 msgstr ""
 "funktionen '%s': kan ikke bruge specialvariabel '%s' som en "
 "funktionsparameter"
 
-#: awkgram.y:4296
+#: awkgram.y:4324
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "funktionen '%s': parameter %d, '%s', er samme som parameter %d"
 
-#: awkgram.y:4383 awkgram.y:4389
+#: awkgram.y:4411 awkgram.y:4417
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "funktionen '%s' kaldt, men aldrig defineret"
 
-#: awkgram.y:4393
+#: awkgram.y:4421
 #, c-format
 msgid "function `%s' defined but never called directly"
 msgstr "funktionen '%s' defineret, men aldrig kaldt direkte"
 
-#: awkgram.y:4425
+#: awkgram.y:4453
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr "konstant regulært udtryk for parameter %d giver en boolesk værdi"
 
-#: awkgram.y:4484
+#: awkgram.y:4468
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -515,21 +520,21 @@ msgstr ""
 "funktionen '%s' kaldt med blanktegn mellem navnet og '(',\n"
 "eller brugt som en variabel eller et array"
 
-#: awkgram.y:4720
+#: awkgram.y:4674
 msgid "division by zero attempted"
 msgstr "forsøgte at dividere med nul"
 
-#: awkgram.y:4729
+#: awkgram.y:4683
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "forsøgte at dividere med nul i '%%'"
 
-#: awkgram.y:5049
+#: awkgram.y:5003
 msgid ""
 "cannot assign a value to the result of a field post-increment expression"
 msgstr ""
 
-#: awkgram.y:5052
+#: awkgram.y:5006
 #, fuzzy, c-format
 msgid "invalid target of assignment (opcode %s)"
 msgstr "%d er et ugyldigt antal argumenter for %s"
@@ -568,189 +573,199 @@ msgstr "fflush: kan ikke rense: filen '%s' åbnet for læsning, ikke skrivning"
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: '%s' er ikke en åben fil, datakanal eller ko-proces"
 
-#: builtin.c:362
+#: builtin.c:351
 msgid "index: received non-string first argument"
 msgstr "indeks: første argument er ikke en streng"
 
-#: builtin.c:364
+#: builtin.c:353
 msgid "index: received non-string second argument"
 msgstr "indeks: andet argument er ikke en streng"
 
-#: builtin.c:488 mpfr.c:757
+#: builtin.c:466 mpfr.c:777
 msgid "int: received non-numeric argument"
 msgstr "int: fik et ikke-numerisk argument"
 
-#: builtin.c:525
+#: builtin.c:503
 msgid "length: received array argument"
 msgstr "length: fik et array-argument"
 
-#: builtin.c:528
+#: builtin.c:506
 msgid "`length(array)' is a gawk extension"
 msgstr "'length(array)' er en gawk-udvidelse"
 
-#: builtin.c:544
+#: builtin.c:525
 msgid "length: received non-string argument"
 msgstr "length: fik et argument som ikke er en streng"
 
-#: builtin.c:575
+#: builtin.c:554
 msgid "log: received non-numeric argument"
 msgstr "log: fik et ikke-numerisk argument"
 
-#: builtin.c:578
+#: builtin.c:557
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: fik et negativt argument %g"
 
-#: builtin.c:776 builtin.c:781
+#: builtin.c:755 builtin.c:760 builtin.c:911
 msgid "fatal: must use `count$' on all formats or none"
 msgstr "fatal: skal bruge 'count$' på alle formater eller ikke nogen"
 
-#: builtin.c:851
+#: builtin.c:830
 #, c-format
 msgid "field width is ignored for `%%' specifier"
 msgstr "feltbredde ignoreret for '%%'-angivelse"
 
-#: builtin.c:853
+#: builtin.c:832
 #, c-format
 msgid "precision is ignored for `%%' specifier"
 msgstr "præcision ignoreret for '%%'-angivelse"
 
-#: builtin.c:855
+#: builtin.c:834
 #, c-format
 msgid "field width and precision are ignored for `%%' specifier"
 msgstr "feltbredde og præcision ignoreret for '%%'-angivelse"
 
-#: builtin.c:906
+#: builtin.c:885
 msgid "fatal: `$' is not permitted in awk formats"
 msgstr "fatal: '$' tillades ikke i awk-formater"
 
-#: builtin.c:915
+#: builtin.c:894
 msgid "fatal: arg count with `$' must be > 0"
 msgstr "fatal: argumentantallet med '$' skal være > 0"
 
-#: builtin.c:919
+#: builtin.c:898
 #, c-format
 msgid "fatal: arg count %ld greater than total number of supplied arguments"
 msgstr "fatal: argumentantallet %ld er større end antal givne argumenter"
 
-#: builtin.c:923
+#: builtin.c:902
 msgid "fatal: `$' not permitted after period in format"
 msgstr "fatal: '$' tillades ikke efter et punktum i formatet"
 
-#: builtin.c:939
+#: builtin.c:921
 msgid "fatal: no `$' supplied for positional field width or precision"
 msgstr ""
 "fatal: intet '$' angivet for bredde eller præcision af positionsangivet felt"
 
-#: builtin.c:1009
+#: builtin.c:991
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "'l' er meningsløst i awk-formater, ignoreret"
 
-#: builtin.c:1013
+#: builtin.c:995
 msgid "fatal: `l' is not permitted in POSIX awk formats"
 msgstr "fatal: 'l' tillades ikke i POSIX awk-formater"
 
-#: builtin.c:1026
+#: builtin.c:1008
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "'L' er meningsløst i awk-formater, ignoreret"
 
-#: builtin.c:1030
+#: builtin.c:1012
 msgid "fatal: `L' is not permitted in POSIX awk formats"
 msgstr "fatal: 'L' tillades ikke i POSIX awk-formater"
 
-#: builtin.c:1043
+#: builtin.c:1025
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "'h' er meningsløst i awk-formater, ignoreret"
 
-#: builtin.c:1047
+#: builtin.c:1029
 msgid "fatal: `h' is not permitted in POSIX awk formats"
 msgstr "fatal: 'h' tillades ikke i POSIX awk-formater"
 
-#: builtin.c:1463
+#: builtin.c:1055
+#, fuzzy, c-format
+msgid "[s]printf: value %g is too big for %%c format"
+msgstr "[s]printf: værdi %g er uden for område for '%%%c'-format"
+
+#: builtin.c:1068
+#, fuzzy, c-format
+msgid "[s]printf: value %g is not a valid wide character"
+msgstr "[s]printf: værdi %g er uden for område for '%%%c'-format"
+
+#: builtin.c:1454
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf: værdi %g er uden for område for '%%%c'-format"
 
-#: builtin.c:1561
+#: builtin.c:1552
 #, c-format
 msgid "ignoring unknown format specifier character `%c': no argument converted"
 msgstr ""
 "ignorerer ukendt formatspecificeringstegn '%c': intet argument konverteret"
 
-#: builtin.c:1566
+#: builtin.c:1557
 msgid "fatal: not enough arguments to satisfy format string"
 msgstr "fatal: for få argumenter til formatstrengen"
 
-#: builtin.c:1568
+#: builtin.c:1559
 msgid "^ ran out for this one"
 msgstr "^ sluttede her"
 
-#: builtin.c:1575
+#: builtin.c:1566
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: formatspecifikation har intet kommandobogstav"
 
-#: builtin.c:1578
+#: builtin.c:1569
 msgid "too many arguments supplied for format string"
 msgstr "for mange argumenter til formatstrengen"
 
-#: builtin.c:1634
+#: builtin.c:1625
 #, fuzzy
 msgid "sprintf: no arguments"
 msgstr "printf: ingen argumenter"
 
-#: builtin.c:1657 builtin.c:1668
+#: builtin.c:1648 builtin.c:1659
 msgid "printf: no arguments"
 msgstr "printf: ingen argumenter"
 
-#: builtin.c:1711
+#: builtin.c:1702
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: fik ikke-numerisk argument"
 
-#: builtin.c:1715
+#: builtin.c:1706
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: kaldt med negativt argument %g"
 
-#: builtin.c:1746
+#: builtin.c:1737
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: længden %g er ikke >= 1"
 
-#: builtin.c:1748
+#: builtin.c:1739
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: længden %g er ikke >= 0"
 
-#: builtin.c:1755
+#: builtin.c:1753
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: længden %g som ikke er et heltal vil blive trunkeret"
 
-#: builtin.c:1760
+#: builtin.c:1758
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr "substr: længden %g for stor til strengindeksering, trunkerer til %g"
 
-#: builtin.c:1772
+#: builtin.c:1770
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: startindeks %g er ugyldigt, bruger 1"
 
-#: builtin.c:1777
+#: builtin.c:1775
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: startindeks %g som ikke er et heltal vil blive trunkeret"
 
-#: builtin.c:1802
+#: builtin.c:1798
 msgid "substr: source string is zero length"
 msgstr "substr: kildestrengen er tom"
 
-#: builtin.c:1818
+#: builtin.c:1812
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: startindeks %g er forbi slutningen på strengen"
 
-#: builtin.c:1826
+#: builtin.c:1820
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -758,191 +773,197 @@ msgstr ""
 "substr: længden %g ved startindeks %g overskrider længden af første argument "
 "(%lu)"
 
-#: builtin.c:1900
+#: builtin.c:1890
 msgid "strftime: format value in PROCINFO[\"strftime\"] has numeric type"
 msgstr "strftime: formatværdi i PROCINFO[\"strftime\"] har numerisk type"
 
-#: builtin.c:1923
+#: builtin.c:1913
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: fik et ikke-numerisk andet argument"
 
-#: builtin.c:1927
+#: builtin.c:1917
 msgid "strftime: second argument less than 0 or too big for time_t"
 msgstr "strftime: andet argument mindre end 0 eller for stort til time_t"
 
-#: builtin.c:1934
+#: builtin.c:1924
 msgid "strftime: received non-string first argument"
 msgstr "strftime: fik et første argument som ikke er en streng"
 
-#: builtin.c:1941
+#: builtin.c:1931
 msgid "strftime: received empty format string"
 msgstr "strftime: fik en tom formatstreng"
 
-#: builtin.c:2007
+#: builtin.c:1997
 msgid "mktime: received non-string argument"
 msgstr "mktime: fik et argument som ikke er en streng"
 
-#: builtin.c:2024
+#: builtin.c:2014
 msgid "mktime: at least one of the values is out of the default range"
 msgstr "mktime: mindst én af værdierne er udenfor standardområdet"
 
-#: builtin.c:2059
+#: builtin.c:2049
 msgid "'system' function not allowed in sandbox mode"
 msgstr "'system'-funktion ikke tilladt i sandkasse-tilstand"
 
-#: builtin.c:2064
+#: builtin.c:2054
 msgid "system: received non-string argument"
 msgstr "system: fik et argument som ikke er en streng"
 
-#: builtin.c:2184
+#: builtin.c:2174
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "reference til ikke-initieret felt '$%d'"
 
-#: builtin.c:2271
+#: builtin.c:2259
 msgid "tolower: received non-string argument"
 msgstr "tolower: fik et argument som ikke er en streng"
 
-#: builtin.c:2305
+#: builtin.c:2290
 msgid "toupper: received non-string argument"
 msgstr "toupper: fik et argument som ikke er en streng"
 
-#: builtin.c:2341 mpfr.c:672
+#: builtin.c:2323 mpfr.c:679
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: fik et ikke-numerisk første argument"
 
-#: builtin.c:2343 mpfr.c:674
+#: builtin.c:2325 mpfr.c:681
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: fik et ikke-numerisk andet argument"
 
-#: builtin.c:2362
+#: builtin.c:2344
 msgid "sin: received non-numeric argument"
 msgstr "sin: fik et ikke-numerisk argument"
 
-#: builtin.c:2378
+#: builtin.c:2360
 msgid "cos: received non-numeric argument"
 msgstr "cos: fik et ikke-numerisk argument"
 
-#: builtin.c:2431 mpfr.c:1156
+#: builtin.c:2413 mpfr.c:1176
 msgid "srand: received non-numeric argument"
 msgstr "srand: fik et ikke-numerisk argument"
 
-#: builtin.c:2462
+#: builtin.c:2444
 msgid "match: third argument is not an array"
 msgstr "match: tredje argument er ikke et array"
 
-#: builtin.c:2734
-msgid "gensub: third argument of 0 treated as 1"
+#: builtin.c:2705
+#, fuzzy, c-format
+msgid "gensub: third argument `%.*s' treated as 1"
+msgstr "gensub: 0 i tredje argument behandlet som 1"
+
+#: builtin.c:2720
+#, fuzzy, c-format
+msgid "gensub: third argument %g treated as 1"
 msgstr "gensub: 0 i tredje argument behandlet som 1"
 
-#: builtin.c:3030
+#: builtin.c:3020
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: fik et ikke-numerisk første argument"
 
-#: builtin.c:3032
+#: builtin.c:3022
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift: fik et ikke-numerisk andet argument"
 
-#: builtin.c:3038
+#: builtin.c:3028
 #, fuzzy, c-format
 msgid "lshift(%f, %f): negative values will give strange results"
 msgstr "lshift(%lf, %lf): negative værdier vil give mærkelige resultater"
 
-#: builtin.c:3040
+#: builtin.c:3030
 #, fuzzy, c-format
 msgid "lshift(%f, %f): fractional values will be truncated"
 msgstr "lshift(%lf, %lf): kommatalsværdier vil blive trunkeret"
 
-#: builtin.c:3042
+#: builtin.c:3032
 #, fuzzy, c-format
 msgid "lshift(%f, %f): too large shift value will give strange results"
 msgstr ""
 "lshift(%lf, %lf): for store skifteværdier vil give mærkelige resultater"
 
-#: builtin.c:3067
+#: builtin.c:3057
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: fik et ikke-numerisk første argument"
 
-#: builtin.c:3069
+#: builtin.c:3059
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift: fik et ikke-numerisk andet argument"
 
-#: builtin.c:3075
+#: builtin.c:3065
 #, fuzzy, c-format
 msgid "rshift(%f, %f): negative values will give strange results"
 msgstr "rshift(%lf, %lf): negative værdier vil give mærkelige resultater"
 
-#: builtin.c:3077
+#: builtin.c:3067
 #, fuzzy, c-format
 msgid "rshift(%f, %f): fractional values will be truncated"
 msgstr "rshift(%lf, %lf): kommatalsværdier vil blive trunkeret"
 
-#: builtin.c:3079
+#: builtin.c:3069
 #, fuzzy, c-format
 msgid "rshift(%f, %f): too large shift value will give strange results"
 msgstr ""
 "rshift(%lf, %lf): for store skifteværdier vil give mærkelige resultater"
 
-#: builtin.c:3104 mpfr.c:968
+#: builtin.c:3094 mpfr.c:988
 #, fuzzy
 msgid "and: called with less than two arguments"
 msgstr "sqrt: kaldt med negativt argument %g"
 
-#: builtin.c:3109
+#: builtin.c:3099
 #, fuzzy, c-format
 msgid "and: argument %d is non-numeric"
 msgstr "exp: argumentet %g er uden for det tilladte område"
 
-#: builtin.c:3113
+#: builtin.c:3103
 #, fuzzy, c-format
 msgid "and: argument %d negative value %g will give strange results"
 msgstr "and(%lf, %lf): negative værdier vil give mærkelige resultater"
 
-#: builtin.c:3136 mpfr.c:1000
+#: builtin.c:3126 mpfr.c:1020
 #, fuzzy
 msgid "or: called with less than two arguments"
 msgstr "sqrt: kaldt med negativt argument %g"
 
-#: builtin.c:3141
+#: builtin.c:3131
 #, fuzzy, c-format
 msgid "or: argument %d is non-numeric"
 msgstr "exp: argumentet %g er uden for det tilladte område"
 
-#: builtin.c:3145
+#: builtin.c:3135
 #, fuzzy, c-format
 msgid "or: argument %d negative value %g will give strange results"
 msgstr "compl(%lf): negative værdier vil give mærkelige resultater"
 
-#: builtin.c:3167 mpfr.c:1031
+#: builtin.c:3157 mpfr.c:1051
 #, fuzzy
 msgid "xor: called with less than two arguments"
 msgstr "sqrt: kaldt med negativt argument %g"
 
-#: builtin.c:3173
+#: builtin.c:3163
 #, fuzzy, c-format
 msgid "xor: argument %d is non-numeric"
 msgstr "exp: argumentet %g er uden for det tilladte område"
 
-#: builtin.c:3177
+#: builtin.c:3167
 #, fuzzy, c-format
 msgid "xor: argument %d negative value %g will give strange results"
 msgstr "xor(%lf, %lf): negative værdier vil give mærkelige resultater"
 
-#: builtin.c:3202 mpfr.c:787
+#: builtin.c:3192 mpfr.c:807
 msgid "compl: received non-numeric argument"
 msgstr "compl: fik et ikke-numerisk argument"
 
-#: builtin.c:3208
+#: builtin.c:3198
 #, fuzzy, c-format
 msgid "compl(%f): negative value will give strange results"
 msgstr "compl(%lf): negative værdier vil give mærkelige resultater"
 
-#: builtin.c:3210
+#: builtin.c:3200
 #, fuzzy, c-format
 msgid "compl(%f): fractional value will be truncated"
 msgstr "compl(%lf): kommatalsværdier vil blive trunkeret"
 
-#: builtin.c:3379
+#: builtin.c:3369
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: '%s' er ikke en gyldig lokalitetskategori"
@@ -1224,42 +1245,48 @@ msgstr ""
 msgid "watch var - set a watchpoint for a variable."
 msgstr ""
 
-#: command.y:1011 debug.c:401 msg.c:135
+#: command.y:901
+msgid ""
+"where [N] - (same as backtrace) print trace of all or N innermost (outermost "
+"if N < 0) frames."
+msgstr ""
+
+#: command.y:1013 debug.c:401 msg.c:135
 #, c-format
 msgid "error: "
 msgstr "fejl: "
 
-#: command.y:1051
+#: command.y:1053
 #, fuzzy, c-format
 msgid "can't read command (%s)\n"
 msgstr "kan ikke omdirigere fra '%s' (%s)"
 
-#: command.y:1065
+#: command.y:1067
 #, fuzzy, c-format
 msgid "can't read command (%s)"
 msgstr "kan ikke omdirigere fra '%s' (%s)"
 
-#: command.y:1116
+#: command.y:1118
 #, fuzzy
 msgid "invalid character in command"
 msgstr "Ugyldigt tegnklassenavn"
 
-#: command.y:1152
+#: command.y:1154
 #, c-format
 msgid "unknown command - \"%.*s\", try help"
 msgstr ""
 
-#: command.y:1222
+#: command.y:1224
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: command.y:1284
+#: command.y:1286
 #, fuzzy
 msgid "invalid character"
 msgstr "Ugyldigt sorteringstegn"
 
-#: command.y:1455
+#: command.y:1457
 #, c-format
 msgid "undefined command: %s\n"
 msgstr ""
@@ -1775,69 +1802,71 @@ msgstr "'exit' kan ikke kaldes i den aktuelle kontekst"
 msgid "`return' not allowed in current context; statement ignored"
 msgstr "'exit' kan ikke kaldes i den aktuelle kontekst"
 
-#: debug.c:5590
+#: debug.c:5604
 #, fuzzy, c-format
 msgid "No symbol `%s' in current context"
 msgstr "forsøg på at bruge array '%s' i skalarsammenhæng"
 
-#: dfa.c:1118 dfa.c:1121 dfa.c:1142 dfa.c:1150 dfa.c:1162 dfa.c:1197
-#: dfa.c:1206 dfa.c:1209 dfa.c:1214 dfa.c:1228 dfa.c:1275
+#: dfa.c:1063 dfa.c:1066 dfa.c:1085 dfa.c:1095 dfa.c:1107 dfa.c:1143
+#: dfa.c:1152 dfa.c:1155 dfa.c:1160 dfa.c:1174 dfa.c:1222
 msgid "unbalanced ["
 msgstr ""
 
-#: dfa.c:1174
+#: dfa.c:1119
 #, fuzzy
 msgid "invalid character class"
 msgstr "Ugyldigt tegnklassenavn"
 
-#: dfa.c:1316
+#: dfa.c:1265
 msgid "character class syntax is [[:space:]], not [:space:]"
 msgstr ""
 
-#: dfa.c:1366
+#: dfa.c:1327
 msgid "unfinished \\ escape"
 msgstr ""
 
-#: dfa.c:1513 regcomp.c:161
-msgid "Invalid content of \\{\\}"
+#: dfa.c:1474
+#, fuzzy
+msgid "invalid content of \\{\\}"
 msgstr "Ugyldigt indhold i \\{\\}"
 
-#: dfa.c:1516 regcomp.c:176
-msgid "Regular expression too big"
+#: dfa.c:1477
+#, fuzzy
+msgid "regular expression too big"
 msgstr "Regulært udtryk for stort"
 
-#: dfa.c:1936
+#: dfa.c:1912
 msgid "unbalanced ("
 msgstr ""
 
-#: dfa.c:2062
+#: dfa.c:2038
 msgid "no syntax specified"
 msgstr ""
 
-#: dfa.c:2070
+#: dfa.c:2046
 msgid "unbalanced )"
 msgstr ""
 
-#: eval.c:394
+#: eval.c:396
 #, c-format
 msgid "unknown nodetype %d"
 msgstr "ukendt nodetype %d"
 
-#: eval.c:405 eval.c:419
+#: eval.c:407 eval.c:421
 #, c-format
 msgid "unknown opcode %d"
 msgstr "ukendt opkode %d"
 
-#: eval.c:416
+#: eval.c:418
 #, c-format
 msgid "opcode %s not an operator or keyword"
 msgstr "opkode %s er ikke en operator eller et nøgleord"
 
-#: eval.c:472
+#: eval.c:474
 msgid "buffer overflow in genflags2str"
 msgstr "bufferoverløb i genflags2str"
 
-#: eval.c:675
+#: eval.c:676
 #, c-format
 msgid ""
 "\n"
@@ -1848,94 +1877,94 @@ msgstr ""
 "\t# Funktionskaldsstak:\n"
 "\n"
 
-#: eval.c:704
+#: eval.c:705
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "'IGNORECASE' er en gawk-udvidelse"
 
-#: eval.c:736
+#: eval.c:737
 msgid "`BINMODE' is a gawk extension"
 msgstr "'BINMODE' er en gawk-udvidelse"
 
-#: eval.c:794
+#: eval.c:795
 #, c-format
 msgid "BINMODE value `%s' is invalid, treated as 3"
 msgstr "BINMODE værdi '%s' er ugyldig, behandles som 3"
 
-#: eval.c:885
+#: eval.c:912
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "forkert '%sFMT'-specifikation '%s'"
 
-#: eval.c:969
+#: eval.c:996
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "deaktiverer '--lint' på grund af en tildeling til 'LINT'"
 
-#: eval.c:1147
+#: eval.c:1174
 #, c-format
 msgid "reference to uninitialized argument `%s'"
 msgstr "reference til ikke-initieret argument '%s'"
 
-#: eval.c:1148
+#: eval.c:1175
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "reference til ikke-initieret variabel '%s'"
 
-#: eval.c:1166
+#: eval.c:1193
 msgid "attempt to field reference from non-numeric value"
 msgstr "forsøg på at referere til et felt fra ikke-numerisk værdi"
 
-#: eval.c:1168
+#: eval.c:1195
 msgid "attempt to field reference from null string"
 msgstr "forsøg på at referere til et felt fra tom streng"
 
-#: eval.c:1176
+#: eval.c:1203
 #, c-format
 msgid "attempt to access field %ld"
 msgstr "forsøg på at få adgang til felt %ld"
 
-#: eval.c:1185
+#: eval.c:1212
 #, c-format
 msgid "reference to uninitialized field `$%ld'"
 msgstr "reference til ikke-initieret felt '$%ld'"
 
-#: eval.c:1272
+#: eval.c:1299
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "funktionen '%s' kaldt med flere argumenter end deklareret"
 
-#: eval.c:1473
+#: eval.c:1500
 #, c-format
 msgid "unwind_stack: unexpected type `%s'"
 msgstr "unwind_stack: uventet type `%s'"
 
-#: eval.c:1569
+#: eval.c:1596
 msgid "division by zero attempted in `/='"
 msgstr "forsøgte at dividere med nul i '/='"
 
-#: eval.c:1576
+#: eval.c:1603
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "forsøgte at dividere med nul i '%%='"
 
-#: ext.c:89 ext.c:171
+#: ext.c:65 ext.c:147
 msgid "extensions are not allowed in sandbox mode"
 msgstr "udvidelser er ikke tilladt i sandkasse-tilstand"
 
-#: ext.c:92
+#: ext.c:68
 #, fuzzy
 msgid "-l / @load are gawk extensions"
 msgstr "@include er en gawk-udvidelse"
 
-#: ext.c:95
+#: ext.c:71
 msgid "load_ext: received NULL lib_name"
 msgstr ""
 
-#: ext.c:98
+#: ext.c:74
 #, fuzzy, c-format
 msgid "load_ext: cannot open library `%s' (%s)\n"
 msgstr "atalt: extension: kan ikke åbne '%s' (%s)\n"
 
-#: ext.c:104
+#: ext.c:80
 #, fuzzy, c-format
 msgid ""
 "load_ext: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
@@ -1943,31 +1972,31 @@ msgstr ""
 "fatalt: extension: bibliotek '%s': definer ikke "
 "'plugin_is_GPL_compatible' (%s)\n"
 
-#: ext.c:110
+#: ext.c:86
 #, fuzzy, c-format
 msgid "load_ext: library `%s': cannot call function `%s' (%s)\n"
 msgstr ""
 "fatalt: extension: bibliotek '%s': kan ikke kalde funktionen '%s' (%s)\n"
 
-#: ext.c:114
+#: ext.c:90
 #, c-format
 msgid "load_ext: library `%s' initialization routine `%s' failed\n"
 msgstr ""
 
-#: ext.c:174
+#: ext.c:150
 msgid "`extension' is a gawk extension"
 msgstr "'extension' er en gawk-udvidelse"
 
-#: ext.c:177
+#: ext.c:153
 msgid "extension: received NULL lib_name"
 msgstr ""
 
-#: ext.c:180
+#: ext.c:156
 #, fuzzy, c-format
 msgid "extension: cannot open library `%s' (%s)"
 msgstr "atalt: extension: kan ikke åbne '%s' (%s)\n"
 
-#: ext.c:186
+#: ext.c:162
 #, fuzzy, c-format
 msgid ""
 "extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)"
@@ -1975,95 +2004,95 @@ msgstr ""
 "fatalt: extension: bibliotek '%s': definer ikke "
 "'plugin_is_GPL_compatible' (%s)\n"
 
-#: ext.c:190
+#: ext.c:166
 #, fuzzy, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)"
 msgstr ""
 "fatalt: extension: bibliotek '%s': kan ikke kalde funktionen '%s' (%s)\n"
 
-#: ext.c:221
+#: ext.c:197
 #, fuzzy
 msgid "make_builtin: missing function name"
 msgstr "extension: mangler funktionsnavn"
 
-#: ext.c:236
+#: ext.c:212
 #, fuzzy, c-format
 msgid "make_builtin: can't redefine function `%s'"
 msgstr "extension: kan ikke omdefinere funktion '%s'"
 
-#: ext.c:240
+#: ext.c:216
 #, fuzzy, c-format
 msgid "make_builtin: function `%s' already defined"
 msgstr "extension: funktionen '%s' er allerede defineret"
 
-#: ext.c:244
+#: ext.c:220
 #, fuzzy, c-format
 msgid "make_builtin: function name `%s' previously defined"
 msgstr "extension: funktionsnavnet '%s' er defineret tidligere"
 
-#: ext.c:246
+#: ext.c:222
 #, fuzzy, c-format
 msgid "make_builtin: can't use gawk built-in `%s' as function name"
 msgstr "extension: kan ikke bruge gawk's indbyggede '%s' som funktionsnavn"
 
-#: ext.c:249 ext.c:304
+#: ext.c:225 ext.c:280
 #, c-format
 msgid "make_builtin: negative argument count for function `%s'"
 msgstr "make_builtin: negativt argumentantal for funktion '%s'"
 
-#: ext.c:276
+#: ext.c:252
 #, fuzzy
 msgid "extension: missing function name"
 msgstr "extension: mangler funktionsnavn"
 
-#: ext.c:279 ext.c:283
+#: ext.c:255 ext.c:259
 #, fuzzy, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: ugyldigt tegn '%c' i funktionsnavn '%s'"
 
-#: ext.c:291
+#: ext.c:267
 #, fuzzy, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: kan ikke omdefinere funktion '%s'"
 
-#: ext.c:295
+#: ext.c:271
 #, fuzzy, c-format
 msgid "extension: function `%s' already defined"
 msgstr "extension: funktionen '%s' er allerede defineret"
 
-#: ext.c:299
+#: ext.c:275
 #, fuzzy, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "funktionsnavnet '%s' er allerede defineret"
 
-#: ext.c:301
+#: ext.c:277
 #, fuzzy, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr "extension: kan ikke bruge gawk's indbyggede '%s' som funktionsnavn"
 
-#: ext.c:375
+#: ext.c:351
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "funktionen '%s' defineret til at tage ikke mere end %d argumenter"
 
-#: ext.c:378
+#: ext.c:354
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "funktion '%s': mangler argument nummer %d"
 
-#: ext.c:395
+#: ext.c:371
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr ""
 "funktion '%s': argument nummer %d: forsøg på at bruge skalar som et array"
 
-#: ext.c:399
+#: ext.c:375
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 "funktion '%s': argument nummer %d: forsøg på at bruge array som en skalar"
 
-#: ext.c:413
+#: ext.c:389
 msgid "dynamic loading of library not supported"
 msgstr ""
 
@@ -2226,7 +2255,7 @@ msgstr "sqrt: kaldt med negativt argument %g"
 msgid "inplace_begin: in-place editing already active"
 msgstr ""
 
-#: extension/inplace.c:133 extension/inplace.c:207
+#: extension/inplace.c:133 extension/inplace.c:210
 #, c-format
 msgid "inplace_begin: expects 2 arguments but called with %d"
 msgstr ""
@@ -2255,55 +2284,55 @@ msgstr "'%s' er ikke et gyldigt variabelnavn"
 msgid "inplace_begin: mkstemp(`%s') failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:178
+#: extension/inplace.c:181
 #, fuzzy, c-format
 msgid "inplace_begin: chmod failed (%s)"
 msgstr "%s: lukning mislykkedes (%s)"
 
-#: extension/inplace.c:185
+#: extension/inplace.c:188
 #, c-format
 msgid "inplace_begin: dup(stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:188
+#: extension/inplace.c:191
 #, c-format
 msgid "inplace_begin: dup2(%d, stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:191
+#: extension/inplace.c:194
 #, fuzzy, c-format
 msgid "inplace_begin: close(%d) failed (%s)"
 msgstr "%s: lukning mislykkedes (%s)"
 
-#: extension/inplace.c:210
+#: extension/inplace.c:213
 msgid "inplace_end: cannot retrieve 1st argument as a string filename"
 msgstr ""
 
-#: extension/inplace.c:217
+#: extension/inplace.c:220
 msgid "inplace_end: in-place editing not active"
 msgstr ""
 
-#: extension/inplace.c:223
+#: extension/inplace.c:226
 #, c-format
 msgid "inplace_end: dup2(%d, stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:226
+#: extension/inplace.c:229
 #, fuzzy, c-format
 msgid "inplace_end: close(%d) failed (%s)"
 msgstr "%s: lukning mislykkedes (%s)"
 
-#: extension/inplace.c:230
+#: extension/inplace.c:233
 #, c-format
 msgid "inplace_end: fsetpos(stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:243
+#: extension/inplace.c:246
 #, fuzzy, c-format
 msgid "inplace_end: link(`%s', `%s') failed (%s)"
 msgstr "datakanalsrensning af '%s' mislykkedes (%s)."
 
-#: extension/inplace.c:253
+#: extension/inplace.c:256
 #, fuzzy, c-format
 msgid "inplace_end: rename(`%s', `%s') failed (%s)"
 msgstr "lukning af fd %d ('%s') mislykkedes (%s)"
@@ -2353,52 +2382,56 @@ msgstr "sqrt: kaldt med negativt argument %g"
 msgid "readfile: called with no arguments"
 msgstr "sqrt: kaldt med negativt argument %g"
 
-#: extension/rwarray.c:124
+#: extension/revoutput.c:125
+msgid "revoutput: could not initialize REVOUT variable"
+msgstr ""
+
+#: extension/rwarray.c:124 extension/rwarray0.c:109
 #, fuzzy
 msgid "writea: called with too many arguments"
 msgstr "sqrt: kaldt med negativt argument %g"
 
-#: extension/rwarray.c:131
+#: extension/rwarray.c:131 extension/rwarray0.c:116
 #, fuzzy, c-format
 msgid "do_writea: argument 0 is not a string\n"
 msgstr "exp: argumentet %g er uden for det tilladte område\n"
 
-#: extension/rwarray.c:137
+#: extension/rwarray.c:137 extension/rwarray0.c:122
 #, fuzzy, c-format
 msgid "do_writea: argument 1 is not an array\n"
 msgstr "split: fjerde argument er ikke et array\n"
 
-#: extension/rwarray.c:184
+#: extension/rwarray.c:184 extension/rwarray0.c:169
 #, c-format
 msgid "write_array: could not flatten array\n"
 msgstr ""
 
-#: extension/rwarray.c:198
+#: extension/rwarray.c:198 extension/rwarray0.c:183
 #, c-format
 msgid "write_array: could not release flattened array\n"
 msgstr ""
 
-#: extension/rwarray.c:280
+#: extension/rwarray.c:280 extension/rwarray0.c:265
 #, fuzzy
 msgid "reada: called with too many arguments"
 msgstr "sqrt: kaldt med negativt argument %g"
 
-#: extension/rwarray.c:287
+#: extension/rwarray.c:287 extension/rwarray0.c:272
 #, fuzzy, c-format
 msgid "do_reada: argument 0 is not a string\n"
 msgstr "exp: argumentet %g er uden for det tilladte område"
 
-#: extension/rwarray.c:293
+#: extension/rwarray.c:293 extension/rwarray0.c:278
 #, fuzzy, c-format
 msgid "do_reada: argument 1 is not an array\n"
 msgstr "match: tredje argument er ikke et array"
 
-#: extension/rwarray.c:337
+#: extension/rwarray.c:337 extension/rwarray0.c:322
 #, c-format
 msgid "do_reada: clear_array failed\n"
 msgstr ""
 
-#: extension/rwarray.c:374
+#: extension/rwarray.c:374 extension/rwarray0.c:358
 #, c-format
 msgid "read_array: set_array_element failed\n"
 msgstr ""
@@ -2431,84 +2464,84 @@ msgstr "exp: argumentet %g er uden for det tilladte område"
 msgid "sleep: not supported on this platform"
 msgstr ""
 
-#: field.c:345
+#: field.c:346
 msgid "NF set to negative value"
 msgstr "NF sat til en negativ værdi"
 
-#: field.c:971 field.c:978 field.c:982
+#: field.c:958 field.c:965 field.c:969
 msgid "split: fourth argument is a gawk extension"
 msgstr "split: fjerde argument er en gawk-udvidelse"
 
-#: field.c:975
+#: field.c:962
 msgid "split: fourth argument is not an array"
 msgstr "split: fjerde argument er ikke et array"
 
-#: field.c:989
+#: field.c:976
 msgid "split: second argument is not an array"
 msgstr "split: andet argument er ikke et array"
 
-#: field.c:993
+#: field.c:980
 msgid "split: cannot use the same array for second and fourth args"
 msgstr "split: kan ikke bruge det samme array som andet og fjerde argument"
 
-#: field.c:998
+#: field.c:985
 msgid "split: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "split: kan ikke bruge et underarray af andet argument som fjerde argument"
 
-#: field.c:1001
+#: field.c:988
 msgid "split: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "split: kan ikke bruge et underarray af fjerde argument som andet argument"
 
-#: field.c:1032
+#: field.c:1019
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: tom streng som tredje argument er en gawk-udvidelse"
 
-#: field.c:1072
+#: field.c:1059
 msgid "patsplit: fourth argument is not an array"
 msgstr "patsplit: fjerde argument er ikke et array"
 
-#: field.c:1077
+#: field.c:1064
 msgid "patsplit: second argument is not an array"
 msgstr "patsplit: andet argument er ikke et array"
 
-#: field.c:1083
+#: field.c:1070
 msgid "patsplit: third argument must be non-null"
 msgstr "patmatch: tredje argument er ikke et array"
 
-#: field.c:1087
+#: field.c:1074
 msgid "patsplit: cannot use the same array for second and fourth args"
 msgstr "patsplit: kan ikke bruge det samme array som andet og fjerde argument"
 
-#: field.c:1092
+#: field.c:1079
 msgid "patsplit: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "patsplit: kan ikke bruge et underarray af andet argument som fjerde argument"
 
-#: field.c:1095
+#: field.c:1082
 msgid "patsplit: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "patsplit: kan ikke bruge et underarray af fjerde argument som andet argument"
 
-#: field.c:1133
+#: field.c:1120
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "'FIELDWIDTHS' er en gawk-udvidelse"
 
-#: field.c:1197
+#: field.c:1184
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "ugyldig FIELDWIDTHS værdi, nær '%s"
 
-#: field.c:1270
+#: field.c:1257
 msgid "null string for `FS' is a gawk extension"
 msgstr "tom streng som 'FS' er en gawk-udvidelse"
 
-#: field.c:1274
+#: field.c:1261
 msgid "old awk does not support regexps as value of `FS'"
 msgstr "gamle versioner af awk understøtter ikke regexp'er som værdi for 'FS'"
 
-#: field.c:1393
+#: field.c:1380
 msgid "`FPAT' is a gawk extension"
 msgstr "'FPAT' er en gawk-udvidelse"
 
@@ -2524,21 +2557,21 @@ msgstr ""
 msgid "node_to_awk_value: received null val"
 msgstr ""
 
-#: gawkapi.c:807
+#: gawkapi.c:809
 #, fuzzy
 msgid "remove_element: received null array"
 msgstr "length: fik et array-argument"
 
-#: gawkapi.c:810
+#: gawkapi.c:812
 msgid "remove_element: received null subscript"
 msgstr ""
 
-#: gawkapi.c:947
+#: gawkapi.c:949
 #, c-format
 msgid "api_flatten_array: could not convert index %d\n"
 msgstr ""
 
-#: gawkapi.c:952
+#: gawkapi.c:954
 #, c-format
 msgid "api_flatten_array: could not convert value %d\n"
 msgstr ""
@@ -2598,516 +2631,485 @@ msgstr "%s: flaget '-W %s' tillader ikke noget argument\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: flaget '-W %s' kræver et argument\n"
 
-#: io.c:392
+#: io.c:423
 #, c-format
 msgid "command line argument `%s' is a directory: skipped"
 msgstr "kommandolinjeargument '%s' er et katalog, oversprunget"
 
-#: io.c:395 io.c:513
+#: io.c:426 io.c:544
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "kan ikke åbne filen '%s' for læsning (%s)"
 
-#: io.c:640
+#: io.c:671
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "lukning af fd %d ('%s') mislykkedes (%s)"
 
-#: io.c:716
+#: io.c:749
 msgid "redirection not allowed in sandbox mode"
 msgstr "omdirigering ikke tilladt i sandkasse-tilstand"
 
-#: io.c:750
+#: io.c:783
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "udtrykket i '%s'-omdirigering har kun numerisk værdi"
 
-#: io.c:756
+#: io.c:789
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "udtrykket for '%s'-omdirigering har en tom streng som værdi"
 
-#: io.c:761
+#: io.c:794
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "filnavnet '%s' for '%s'-omdirigering kan være resultatet af et logisk udtryk"
 
-#: io.c:809
+#: io.c:842
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "unødig blanding af '>' og '>>' for filen '%.*s'"
 
-#: io.c:863
+#: io.c:896
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "kan ikke åbne datakanalen '%s' for udskrivning (%s)"
 
-#: io.c:873
+#: io.c:906
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "kan ikke åbne datakanalen '%s' for indtastning (%s)"
 
-#: io.c:904
+#: io.c:937
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr "kan ikke åbne tovejsdatakanalen '%s' for ind-/uddata (%s)"
 
-#: io.c:986
+#: io.c:1019
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "kan ikke omdirigere fra '%s' (%s)"
 
-#: io.c:989
+#: io.c:1022
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "kan ikke omdirigere til '%s' (%s)"
 
-#: io.c:1040
+#: io.c:1073
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "nåede systembegrænsningen for åbne filer: begynder at multiplekse "
 "fildeskriptorer"
 
-#: io.c:1056
+#: io.c:1089
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "lukning af '%s' mislykkedes (%s)."
 
-#: io.c:1064
+#: io.c:1097
 msgid "too many pipes or input files open"
 msgstr "for mange datakanaler eller inddatafiler åbne"
 
-#: io.c:1086
+#: io.c:1119
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: andet argument skal være 'to' eller 'from'"
 
-#: io.c:1103
+#: io.c:1136
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: '%.*s' er ikke en åben fil, datakanal eller ko-proces"
 
-#: io.c:1108
+#: io.c:1141
 msgid "close of redirection that was never opened"
 msgstr "lukning af omdirigering som aldrig blev åbnet"
 
-#: io.c:1205
+#: io.c:1238
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: omdirigeringen '%s' blev ikke åbnet med '|&', andet argument ignoreret"
 
-#: io.c:1222
+#: io.c:1255
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "fejlstatus (%d) fra lukning af datakanalen '%s' (%s)"
 
-#: io.c:1225
+#: io.c:1258
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "fejlstatus (%d) fra fillukning af '%s' (%s)"
 
-#: io.c:1245
+#: io.c:1278
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "ingen eksplicit lukning af soklen '%s' angivet"
 
-#: io.c:1248
+#: io.c:1281
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "ingen eksplicit lukning af ko-processen '%s' angivet"
 
-#: io.c:1251
+#: io.c:1284
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "ingen eksplicit lukning af datakanalen '%s' angivet"
 
-#: io.c:1254
+#: io.c:1287
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "ingen eksplicit lukning af filen '%s' angivet"
 
-#: io.c:1284 io.c:1342 main.c:864 main.c:906
+#: io.c:1317 io.c:1375 main.c:628 main.c:670
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "fejl ved skrivning til standard ud (%s)"
 
-#: io.c:1289 io.c:1348 main.c:866
+#: io.c:1322 io.c:1381 main.c:630
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "fejl ved skrivning til standard fejl (%s)"
 
-#: io.c:1297
+#: io.c:1330
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "datakanalsrensning af '%s' mislykkedes (%s)."
 
-#: io.c:1300
+#: io.c:1333
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "ko-procesrensning af datakanalen til '%s' mislykkedes (%s)."
 
-#: io.c:1303
+#: io.c:1336
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "filrensning af '%s' mislykkedes (%s)."
 
-#: io.c:1420
+#: io.c:1453
 #, c-format
 msgid "local port %s invalid in `/inet'"
 msgstr "lokal port %s ugyldig i '/inet'"
 
-#: io.c:1438
+#: io.c:1471
 #, c-format
 msgid "remote host and port information (%s, %s) invalid"
 msgstr "fjernvært og portinformation (%s, %s) ugyldige"
 
-#: io.c:1590
-#, c-format
-msgid "no (known) protocol supplied in special filename `%s'"
-msgstr "ingen (kendt) protokol opgivet i special-filnavn '%s'"
-
-#: io.c:1604
-#, c-format
-msgid "special file name `%s' is incomplete"
-msgstr "special-filnavn '%s' er ufuldstændigt"
-
-#: io.c:1621
-msgid "must supply a remote hostname to `/inet'"
-msgstr "fjernmaskinenavn til '/inet' skal angives"
-
-#: io.c:1639
-msgid "must supply a remote port to `/inet'"
-msgstr "fjernport til '/inet' skal angives"
-
-#: io.c:1685
+#: io.c:1673
 msgid "TCP/IP communications are not supported"
 msgstr "TCP/IP-kommunikation understøttes ikke"
 
-#: io.c:1867
+#: io.c:1854
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "kunne ikke åbne '%s', tilstand '%s'"
 
-#: io.c:1917
+#: io.c:1904
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "lukning af master-pty mislykkedes (%s)"
 
-#: io.c:1919 io.c:2105 io.c:2305
+#: io.c:1906 io.c:2092 io.c:2293
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "lukning af standard ud i underproces mislykkedes (%s)"
 
-#: io.c:1922
+#: io.c:1909
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 "flytning af slave-pty til standard ud i underproces mislykkedes (dup: %s)"
 
-#: io.c:1924 io.c:2110
+#: io.c:1911 io.c:2097
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "lukning af standard ind i underproces mislykkedes (%s)"
 
-#: io.c:1927
+#: io.c:1914
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 "flytning af slave-pty til standard ind i underproces mislykkedes (dup: %s)"
 
-#: io.c:1929 io.c:1951
+#: io.c:1916 io.c:1938
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "lukning af slave-pty mislykkedes (%s)"
 
-#: io.c:2040 io.c:2108 io.c:2276 io.c:2308
+#: io.c:2027 io.c:2095 io.c:2264 io.c:2296
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr ""
 "flytning af datakanal til standard ud i underproces mislykkedes (dup: %s)"
 
-#: io.c:2047 io.c:2113
+#: io.c:2034 io.c:2100
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr ""
 "flytning af datakanalen til standard ind i underproces mislykkedes (dup: %s)"
 
-#: io.c:2073 io.c:2298
+#: io.c:2060 io.c:2286
 msgid "restoring stdout in parent process failed\n"
 msgstr "genskabelse af standard ud i forælderprocessen mislykkedes\n"
 
-#: io.c:2081
+#: io.c:2068
 msgid "restoring stdin in parent process failed\n"
 msgstr "genskabelse af standard ind i forælderprocessen mislykkedes\n"
 
-#: io.c:2116 io.c:2310 io.c:2324
+#: io.c:2103 io.c:2298 io.c:2313
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "lukning af datakanalen mislykkedes (%s)"
 
-#: io.c:2174
+#: io.c:2162
 msgid "`|&' not supported"
 msgstr "'|&' understøttes ikke"
 
-#: io.c:2261
+#: io.c:2249
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "kan ikke åbne datakanalen '%s' (%s)"
 
-#: io.c:2318
+#: io.c:2307
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "kan ikke oprette barneproces for '%s' (fork: %s)"
 
-#: io.c:2790
+#: io.c:2734
 msgid "register_input_parser: received NULL pointer"
 msgstr ""
 
-#: io.c:2818
+#: io.c:2762
 #, c-format
 msgid "input parser `%s' conflicts with previously installed input parser `%s'"
 msgstr ""
 
-#: io.c:2825
+#: io.c:2769
 #, c-format
 msgid "input parser `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:2845
+#: io.c:2789
 msgid "register_output_wrapper: received NULL pointer"
 msgstr ""
 
-#: io.c:2873
+#: io.c:2817
 #, c-format
 msgid ""
 "output wrapper `%s' conflicts with previously installed output wrapper `%s'"
 msgstr ""
 
-#: io.c:2880
+#: io.c:2824
 #, c-format
 msgid "output wrapper `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:2901
+#: io.c:2845
 msgid "register_output_processor: received NULL pointer"
 msgstr ""
 
-#: io.c:2930
+#: io.c:2874
 #, c-format
 msgid ""
 "two-way processor `%s' conflicts with previously installed two-way processor "
 "`%s'"
 msgstr ""
 
-#: io.c:2939
+#: io.c:2883
 #, c-format
 msgid "two way processor `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:3064
+#: io.c:3008
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "datafilen '%s' er tom"
 
-#: io.c:3106 io.c:3114
+#: io.c:3050 io.c:3058
 msgid "could not allocate more input memory"
 msgstr "kunne ikke allokere mere hukommelse til inddata"
 
-#: io.c:3682
+#: io.c:3636
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "'RS' som flertegnsværdi er en gawk-udvidelse"
 
-#: io.c:3771
+#: io.c:3783
 msgid "IPv6 communication is not supported"
 msgstr "IPv6-kommunikation understøttes ikke"
 
-#: main.c:405
-msgid "empty argument to `-e/--source' ignored"
-msgstr "tomt argument til '-e/--source' ignoreret"
-
-#: main.c:495
-#, c-format
-msgid "%s: option `-W %s' unrecognized, ignored\n"
-msgstr "%s: flaget '-W %s' ukendt, ignoreret\n"
-
-#: main.c:541
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: flaget kræver et argument -- %c\n"
-
-#: main.c:562
+#: main.c:321
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr "miljøvariablen 'POSIXLY_CORRECT' sat: aktiverer '--posix'"
 
-#: main.c:568
+#: main.c:327
 msgid "`--posix' overrides `--traditional'"
 msgstr "'--posix' tilsidesætter '--traditional'"
 
-#: main.c:579
+#: main.c:338
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "'--posix'/'--traditional' tilsidesætter '--non-decimal-data'"
 
-#: main.c:583
+#: main.c:342
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "at køre %s setuid root kan være et sikkerhedsproblem"
 
-#: main.c:588
+#: main.c:346
 #, fuzzy
 msgid "`--posix' overrides `--characters-as-bytes'"
 msgstr "'--posix' tilsidesætter '--binary'"
 
-#: main.c:647
+#: main.c:404
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "kan ikke sætte binær tilstand på standard ind (%s)"
 
-#: main.c:650
+#: main.c:407
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "kan ikke sætte binær tilstand på standard ud (%s)"
 
-#: main.c:652
+#: main.c:409
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "kan ikke sætte binær tilstand på standard fejl (%s)"
 
-#: main.c:710
+#: main.c:469
 msgid "no program text at all!"
 msgstr "ingen programtekst overhovedet!"
 
-#: main.c:799
+#: main.c:563
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr "Brug: %s [flag i POSIX- eller GNU-stil] -f progfil [--] fil ...\n"
 
-#: main.c:801
+#: main.c:565
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr "Brug: %s [flag i POSIX- eller GNU-stil] %cprogram%c fil ...\n"
 
-#: main.c:806
+#: main.c:570
 msgid "POSIX options:\t\tGNU long options: (standard)\n"
 msgstr "POSIX-flag:\t\tlange GNU-flag: (standard)\n"
 
-#: main.c:807
+#: main.c:571
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f progfil\t\t--file=progfil\n"
 
-#: main.c:808
+#: main.c:572
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F fs\t\t\t--field-separator=fs\n"
 
-#: main.c:809
+#: main.c:573
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=værdi\t\t--assign=var=værdi\n"
 
-#: main.c:810
+#: main.c:574
 msgid "Short options:\t\tGNU long options: (extensions)\n"
 msgstr "POSIX-flag:\t\tlange GNU-flag: (udvidelser)\n"
 
-#: main.c:811
+#: main.c:575
 msgid "\t-b\t\t\t--characters-as-bytes\n"
 msgstr "\t-b\t\t\t--characters-as-bytes\n"
 
-#: main.c:812
+#: main.c:576
 msgid "\t-c\t\t\t--traditional\n"
 msgstr "\t-c\t\t\t--traditional\n"
 
-#: main.c:813
+#: main.c:577
 msgid "\t-C\t\t\t--copyright\n"
 msgstr "\t-C\t\t\t--copyright\n"
 
-#: main.c:814
+#: main.c:578
 msgid "\t-d[file]\t\t--dump-variables[=file]\n"
 msgstr "\t-d[fil]\t\t--dump-variables[=fil]\n"
 
-#: main.c:815
+#: main.c:579
 #, fuzzy
 msgid "\t-D[file]\t\t--debug[=file]\n"
 msgstr "\t-p[fil]\t\t--profile[=fil]\n"
 
-#: main.c:816
+#: main.c:580
 msgid "\t-e 'program-text'\t--source='program-text'\n"
 msgstr "\t-e 'programtekst'\t--source='programtekst'\n"
 
-#: main.c:817
+#: main.c:581
 msgid "\t-E file\t\t\t--exec=file\n"
 msgstr "\t-E fil\t\t\t--exec=fil\n"
 
-#: main.c:818
+#: main.c:582
 msgid "\t-g\t\t\t--gen-pot\n"
 msgstr "\t-g\t\t\t--gen-pot\n"
 
-#: main.c:819
+#: main.c:583
 msgid "\t-h\t\t\t--help\n"
 msgstr "\t-h\t\t\t--help\n"
 
-#: main.c:820
+#: main.c:584
 msgid "\t-i includefile\t\t--include=includefile\n"
 msgstr ""
 
-#: main.c:821
+#: main.c:585
 msgid "\t-l library\t\t--load=library\n"
 msgstr ""
 
-#: main.c:822
-msgid "\t-L [fatal]\t\t--lint[=fatal]\n"
+#: main.c:586
+#, fuzzy
+msgid "\t-L[fatal|invalid]\t--lint[=fatal|invalid]\n"
 msgstr "\t-L [fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:823
-msgid "\t-n\t\t\t--non-decimal-data\n"
-msgstr "\t-n\t\t\t--non-decimal-data\n"
-
-#: main.c:824
+#: main.c:587
 #, fuzzy
 msgid "\t-M\t\t\t--bignum\n"
 msgstr "\t-g\t\t\t--gen-pot\n"
 
-#: main.c:825
+#: main.c:588
 msgid "\t-N\t\t\t--use-lc-numeric\n"
 msgstr "\t-N\t\t\t--use-lc-numeric\n"
 
-#: main.c:826
+#: main.c:589
+msgid "\t-n\t\t\t--non-decimal-data\n"
+msgstr "\t-n\t\t\t--non-decimal-data\n"
+
+#: main.c:590
 #, fuzzy
 msgid "\t-o[file]\t\t--pretty-print[=file]\n"
 msgstr "\t-p[fil]\t\t--profile[=fil]\n"
 
-#: main.c:827
+#: main.c:591
 msgid "\t-O\t\t\t--optimize\n"
 msgstr "\t-O\t\t\t--optimize\n"
 
-#: main.c:828
+#: main.c:592
 msgid "\t-p[file]\t\t--profile[=file]\n"
 msgstr "\t-p[fil]\t\t--profile[=fil]\n"
 
-#: main.c:829
+#: main.c:593
 msgid "\t-P\t\t\t--posix\n"
 msgstr "\t-P\t\t\t--posix\n"
 
-#: main.c:830
+#: main.c:594
 msgid "\t-r\t\t\t--re-interval\n"
 msgstr "\t-r\t\t\t--re-interval\n"
 
-#: main.c:831
+#: main.c:595
 msgid "\t-S\t\t\t--sandbox\n"
 msgstr "\t-S\t\t\t--sandbox\n"
 
-#: main.c:832
+#: main.c:596
 msgid "\t-t\t\t\t--lint-old\n"
 msgstr "\t-t\t\t\t--lint-old\n"
 
-#: main.c:833
+#: main.c:597
 msgid "\t-V\t\t\t--version\n"
 msgstr "\t-V\t\t\t--version\n"
 
-#: main.c:835
+#: main.c:599
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:838
+#: main.c:602
 msgid "\t-Y\t\t--parsedebug\n"
 msgstr "\t-Y\t\t--parsedebug\n"
 
@@ -3116,7 +3118,7 @@ msgstr "\t-Y\t\t--parsedebug\n"
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: main.c:847
+#: main.c:611
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -3129,7 +3131,7 @@ msgstr ""
 "\n"
 "Rapportér kommentarer til oversættelsen til <dansk@dansk-gruppen.dk>.\n"
 
-#: main.c:851
+#: main.c:615
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -3139,7 +3141,7 @@ msgstr ""
 "Almindeligvis læser gawk fra standard ind og skriver til standard ud.\n"
 "\n"
 
-#: main.c:855
+#: main.c:619
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -3149,7 +3151,7 @@ msgstr ""
 "\tgawk '{ sum += $1 }; END { print sum }' fil\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:880
+#: main.c:644
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
@@ -3169,7 +3171,7 @@ msgstr ""
 "enhver senere version.\n"
 "\n"
 
-#: main.c:888
+#: main.c:652
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3183,7 +3185,7 @@ msgstr ""
 "General Public License for yderligere information.\n"
 "\n"
 
-#: main.c:894
+#: main.c:658
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program. If not, see http://www.gnu.org/licenses/.\n"
@@ -3191,16 +3193,16 @@ msgstr ""
 "Du bør have fået en kopi af GNU General Public License sammen\n"
 "med dette program. Hvis ikke, så se http://www.gnu.org/licenses/.\n"
 
-#: main.c:931
+#: main.c:695
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft sætter ikke FS til tab i POSIX-awk"
 
-#: main.c:1208
+#: main.c:982
 #, c-format
 msgid "unknown value for field spec: %d\n"
 msgstr "ukendt værdi for felt-spec: %d\n"
 
-#: main.c:1306
+#: main.c:1080
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -3209,102 +3211,120 @@ msgstr ""
 "%s: '%s' argument til '-v' ikke på formen 'var=værdi'\n"
 "\n"
 
-#: main.c:1332
+#: main.c:1106
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "'%s' er ikke et gyldigt variabelnavn"
 
-#: main.c:1335
+#: main.c:1109
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "'%s' er ikke et variabelnavn, leder efter fil '%s=%s'"
 
-#: main.c:1339
+#: main.c:1113
 #, c-format
 msgid "cannot use gawk builtin `%s' as variable name"
 msgstr "kan ikke bruge gawk's indbyggede '%s' som variabelnavn"
 
-#: main.c:1344
+#: main.c:1118
 #, c-format
 msgid "cannot use function `%s' as variable name"
 msgstr "kan ikke bruge funktion '%s' som variabelnavn"
 
-#: main.c:1397
+#: main.c:1171
 msgid "floating point exception"
 msgstr "flydendetalsundtagelse"
 
-#: main.c:1404
+#: main.c:1178
 msgid "fatal error: internal error"
 msgstr "fatal fejl: intern fejl"
 
-#: main.c:1419
+#: main.c:1193
 msgid "fatal error: internal error: segfault"
 msgstr "fatal fejl: intern fejl: segmentfejl"
 
-#: main.c:1431
+#: main.c:1205
 msgid "fatal error: internal error: stack overflow"
 msgstr "fatal fejl: intern fejl: stakoverløb"
 
-#: main.c:1490
+#: main.c:1264
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "ingen fd %d åbnet i forvejen"
 
-#: main.c:1497
+#: main.c:1271
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "kunne ikke i forvejen åbne /dev/null for fd %d"
 
-#: mpfr.c:550
+#: main.c:1485
+msgid "empty argument to `-e/--source' ignored"
+msgstr "tomt argument til '-e/--source' ignoreret"
+
+#: main.c:1556
+msgid "-M ignored: MPFR/GMP support not compiled in"
+msgstr ""
+
+#: main.c:1577
+#, c-format
+msgid "%s: option `-W %s' unrecognized, ignored\n"
+msgstr "%s: flaget '-W %s' ukendt, ignoreret\n"
+
+#: main.c:1630
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: flaget kræver et argument -- %c\n"
+
+#: mpfr.c:557
 #, fuzzy, c-format
 msgid "PREC value `%.*s' is invalid"
 msgstr "BINMODE værdi '%s' er ugyldig, behandles som 3"
 
-#: mpfr.c:608
+#: mpfr.c:615
 #, fuzzy, c-format
 msgid "RNDMODE value `%.*s' is invalid"
 msgstr "BINMODE værdi '%s' er ugyldig, behandles som 3"
 
-#: mpfr.c:698
+#: mpfr.c:711
 #, fuzzy, c-format
 msgid "%s: received non-numeric argument"
 msgstr "cos: fik et ikke-numerisk argument"
 
-#: mpfr.c:800
+#: mpfr.c:820
 #, fuzzy
 msgid "compl(%Rg): negative value will give strange results"
 msgstr "compl(%lf): negative værdier vil give mærkelige resultater"
 
-#: mpfr.c:804
+#: mpfr.c:824
 #, fuzzy
 msgid "comp(%Rg): fractional value will be truncated"
 msgstr "compl(%lf): kommatalsværdier vil blive trunkeret"
 
-#: mpfr.c:816
+#: mpfr.c:836
 #, fuzzy, c-format
 msgid "cmpl(%Zd): negative values will give strange results"
 msgstr "compl(%lf): negative værdier vil give mærkelige resultater"
 
-#: mpfr.c:835
+#: mpfr.c:855
 #, fuzzy, c-format
 msgid "%s: received non-numeric argument #%d"
 msgstr "cos: fik et ikke-numerisk argument"
 
-#: mpfr.c:845
+#: mpfr.c:865
 msgid "%s: argument #%d has invalid value %Rg, using 0"
 msgstr ""
 
-#: mpfr.c:857
+#: mpfr.c:877
 #, fuzzy
 msgid "%s: argument #%d negative value %Rg will give strange results"
 msgstr "compl(%lf): negative værdier vil give mærkelige resultater"
 
-#: mpfr.c:863
+#: mpfr.c:883
 #, fuzzy
 msgid "%s: argument #%d fractional value %Rg will be truncated"
 msgstr "or(%lf, %lf): kommatalsværdier vil blive trunkeret"
 
-#: mpfr.c:878
+#: mpfr.c:898
 #, fuzzy, c-format
 msgid "%s: argument #%d negative value %Zd will give strange results"
 msgstr "compl(%lf): negative værdier vil give mærkelige resultater"
@@ -3314,24 +3334,24 @@ msgstr "compl(%lf): negative værdier vil give mærkelige resultater"
 msgid "cmd. line:"
 msgstr "kommandolinje:"
 
-#: node.c:421
+#: node.c:409
 msgid "backslash at end of string"
 msgstr "omvendt skråstreg i slutningen af strengen"
 
-#: node.c:500
+#: node.c:488
 #, c-format
 msgid "old awk does not support the `\\%c' escape sequence"
 msgstr "gamle versioner af awk understøtter ikke '\\%c' undvigesekvens"
 
-#: node.c:551
+#: node.c:539
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX tillader ikke '\\x'-kontrolsekvenser"
 
-#: node.c:557
+#: node.c:545
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "ingen heksadecimale cifre i '\\x'-kontrolsekvenser"
 
-#: node.c:579
+#: node.c:567
 #, c-format
 msgid ""
 "hex escape \\x%.*s of %d characters probably not interpreted the way you "
@@ -3340,12 +3360,12 @@ msgstr ""
 "den heksadecimale sekvens \\x%.*s på %d tegn nok ikke forstået som du "
 "forventer det"
 
-#: node.c:594
+#: node.c:582
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "kontrolsekvensen '\\%c' behandlet som kun '%c'"
 
-#: node.c:739
+#: node.c:726
 msgid ""
 "Invalid multibyte data detected. There may be a mismatch between your data "
 "and your locale."
@@ -3373,12 +3393,12 @@ msgid "sending profile to standard error"
 msgstr "sender profilen til standard fejl"
 
 #: profile.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t# %s block(s)\n"
+"\t# %s rule(s)\n"
 "\n"
 msgstr ""
-"\t# %s blokke\n"
+"\t# Regler\n"
 "\n"
 
 #: profile.c:198
@@ -3395,24 +3415,24 @@ msgstr ""
 msgid "internal error: %s with null vname"
 msgstr "intern fejl: %s med null vname"
 
-#: profile.c:537
+#: profile.c:538
 #, fuzzy
 msgid "internal error: builtin with null fname"
 msgstr "intern fejl: %s med null vname"
 
-#: profile.c:949
+#: profile.c:958
 #, c-format
 msgid ""
 "\t# Loaded extensions (-l and/or @load)\n"
 "\n"
 msgstr ""
 
-#: profile.c:972
+#: profile.c:981
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# profil til gawk oprettet %s\n"
 
-#: profile.c:1475
+#: profile.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -3421,7 +3441,7 @@ msgstr ""
 "\n"
 "\t# Funktioner, listede alfabetisk\n"
 
-#: profile.c:1513
+#: profile.c:1559
 #, c-format
 msgid "redir2str: unknown redirection type %d"
 msgstr "redir2str: uykendt omdirigeringstype %d"
@@ -3431,74 +3451,113 @@ msgstr "redir2str: uykendt omdirigeringstype %d"
 msgid "regexp component `%.*s' should probably be `[%.*s]'"
 msgstr "regexp-komponent `%.*s' skulle nok være `[%.*s]'"
 
-#: regcomp.c:131
+#: regcomp.c:139
 msgid "Success"
 msgstr "Lykkedes"
 
-#: regcomp.c:134
+#: regcomp.c:142
 msgid "No match"
 msgstr "Mislykkedes"
 
-#: regcomp.c:137
+#: regcomp.c:145
 msgid "Invalid regular expression"
 msgstr "Ugyldigt regulært udtryk"
 
-#: regcomp.c:140
+#: regcomp.c:148
 msgid "Invalid collation character"
 msgstr "Ugyldigt sorteringstegn"
 
-#: regcomp.c:143
+#: regcomp.c:151
 msgid "Invalid character class name"
 msgstr "Ugyldigt tegnklassenavn"
 
-#: regcomp.c:146
+#: regcomp.c:154
 msgid "Trailing backslash"
 msgstr "Efterfølgende omvendt skråstreg"
 
-#: regcomp.c:149
+#: regcomp.c:157
 msgid "Invalid back reference"
 msgstr "Ugyldig bagudreference"
 
-#: regcomp.c:152
-msgid "Unmatched [ or [^"
+#: regcomp.c:160
+#, fuzzy
+msgid "Unmatched [, [^, [:, [., or [="
 msgstr "Ubalanceret [ eller [^"
 
-#: regcomp.c:155
+#: regcomp.c:163
 msgid "Unmatched ( or \\("
 msgstr "Ubalanceret ( eller \\("
 
-#: regcomp.c:158
+#: regcomp.c:166
 msgid "Unmatched \\{"
 msgstr "Ubalanceret \\{"
 
-#: regcomp.c:164
+#: regcomp.c:169
+msgid "Invalid content of \\{\\}"
+msgstr "Ugyldigt indhold i \\{\\}"
+
+#: regcomp.c:172
 msgid "Invalid range end"
 msgstr "Ugyldig intervalslutning"
 
-#: regcomp.c:167
+#: regcomp.c:175
 msgid "Memory exhausted"
 msgstr "Hukommelsen opbrugt"
 
-#: regcomp.c:170
+#: regcomp.c:178
 msgid "Invalid preceding regular expression"
 msgstr "Ugyldigt foregående regulært udtryk"
 
-#: regcomp.c:173
+#: regcomp.c:181
 msgid "Premature end of regular expression"
 msgstr "For tidligt slut på regulært udtryk"
 
-#: regcomp.c:179
+#: regcomp.c:184
+msgid "Regular expression too big"
+msgstr "Regulært udtryk for stort"
+
+#: regcomp.c:187
 msgid "Unmatched ) or \\)"
 msgstr "Ubalanceret ) eller \\)"
 
-#: regcomp.c:704
+#: regcomp.c:712
 msgid "No previous regular expression"
 msgstr "Intet foregående regulært udtryk"
 
-#: symbol.c:741
+#: symbol.c:677
+#, fuzzy, c-format
+msgid "function `%s': can't use function `%s' as a parameter name"
+msgstr "funktionen '%s': kan ikke bruge funktionsnavn som parameternavn"
+
+#: symbol.c:809
 msgid "can not pop main context"
 msgstr ""
 
+#~ msgid "`getline var' invalid inside `%s' rule"
+#~ msgstr "'getline var' ugyldig inden i '%s' regel"
+
+#~ msgid "`getline' invalid inside `%s' rule"
+#~ msgstr "'getline' ugyldig inden i '%s' regel"
+
+#~ msgid "no (known) protocol supplied in special filename `%s'"
+#~ msgstr "ingen (kendt) protokol opgivet i special-filnavn '%s'"
+
+#~ msgid "special file name `%s' is incomplete"
+#~ msgstr "special-filnavn '%s' er ufuldstændigt"
+
+#~ msgid "must supply a remote hostname to `/inet'"
+#~ msgstr "fjernmaskinenavn til '/inet' skal angives"
+
+#~ msgid "must supply a remote port to `/inet'"
+#~ msgstr "fjernport til '/inet' skal angives"
+
+#~ msgid ""
+#~ "\t# %s block(s)\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\t# %s blokke\n"
+#~ "\n"
+
 #~ msgid "range of the form `[%c-%c]' is locale dependent"
 #~ msgstr "område på formen `[%c-%c]' er locale-afhængig"
 
@@ -3570,9 +3629,6 @@ msgstr ""
 #~ msgid "Operation Not Supported"
 #~ msgstr "Operationen understøttes ikke"
 
-#~ msgid "attempt to use function `%s' as an array"
-#~ msgstr "forsøg på at bruge funktionen '%s' som et array"
-
 #~ msgid "reference to uninitialized element `%s[\"%.*s\"]'"
 #~ msgstr "reference til ikke-initieret element '%s[\"%.*s\"]'"
 
@@ -3615,9 +3671,6 @@ msgstr ""
 #~ msgid "function `%s' not defined"
 #~ msgstr "funktionen '%s' er ikke defineret"
 
-#~ msgid "non-redirected `getline' invalid inside `%s' rule"
-#~ msgstr "ikke-omdirigeret 'getline' ugyldig inden i '%s'-regel"
-
 #~ msgid "`nextfile' cannot be called from a `%s' rule"
 #~ msgstr "'nextfile' kan ikke kaldes fra en '%s'-regel"
 
diff --git a/po/de.gmo b/po/de.gmo
index e46946bb..7aa9e12b 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index f92c3bb7..fcb31d2a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gawk package.
 #
-# Philipp Thomas <pth@suse.de>, 2011 2012
+# Philipp Thomas <pth@suse.de>, 2011, 2012, 2014
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gawk 4.0.0h\n"
-"Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2014-04-08 19:23+0300\n"
-"PO-Revision-Date: 2012-01-30 16:21+0100\n"
+"Project-Id-Version: gawk 4.1.0b\n"
+"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
+"POT-Creation-Date: 2015-02-26 20:05+0200\n"
+"PO-Revision-Date: 2014-10-23 17:31+0200\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
@@ -36,9 +36,9 @@ msgstr "Es wird versucht, den skalaren Parameter »%s« als Feld zu verwenden"
 msgid "attempt to use scalar `%s' as an array"
 msgstr "Es wird versucht, den Skalar »%s« als Array zu verwenden"
 
-#: array.c:409 array.c:576 builtin.c:85 builtin.c:1615 builtin.c:1661
-#: builtin.c:1674 builtin.c:2102 builtin.c:2116 eval.c:1122 eval.c:1126
-#: eval.c:1531
+#: array.c:409 array.c:576 builtin.c:85 builtin.c:1606 builtin.c:1652
+#: builtin.c:1665 builtin.c:2092 builtin.c:2106 eval.c:1149 eval.c:1153
+#: eval.c:1558
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "Es wird versucht, das Feld »%s« in einem Skalarkontext zu verwenden"
@@ -54,9 +54,8 @@ msgid "attempt to use scalar `%s[\"%.*s\"]' as an array"
 msgstr "Es wird versucht, den Skalar »%s[\"%.*s\"]« als Feld zu verwenden"
 
 #: array.c:776
-#, fuzzy
 msgid "adump: first argument not an array"
-msgstr "adump: Das Argument ist kein Feld"
+msgstr "adump: Das erste Argument ist kein Feld"
 
 #: array.c:815
 msgid "asort: second argument not an array"
@@ -98,427 +97,430 @@ msgstr ""
 "asorti: ein untergeordnetes Feld des zweiten Arguments kann nicht als erstes "
 "Argument verwendet werden"
 
-#: array.c:1314
+#: array.c:1313
 #, c-format
 msgid "`%s' is invalid as a function name"
 msgstr "»%s« ist ein unzulässiger Funktionsname"
 
-#: array.c:1318
+#: array.c:1317
 #, c-format
 msgid "sort comparison function `%s' is not defined"
 msgstr "Die Vergleichsfunktion »%s« für das Sortieren ist nicht definiert"
 
-#: awkgram.y:233
+#: awkgram.y:226
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "%s-Blöcke müssen einen Aktionsteil haben"
 
-#: awkgram.y:236
+#: awkgram.y:229
 msgid "each rule must have a pattern or an action part"
 msgstr "Jede Regel muss entweder ein Muster oder einen Aktionsteil haben"
 
-#: awkgram.y:325 awkgram.y:336
+#: awkgram.y:320 awkgram.y:331
 msgid "old awk does not support multiple `BEGIN' or `END' rules"
 msgstr "Das alte awk erlaubt keine mehrfachen »BEGIN«- oder »END«-Regeln"
 
-#: awkgram.y:373
+#: awkgram.y:368
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "»%s« ist eine eingebaute Funktion und kann nicht umdefiniert werden"
 
-#: awkgram.y:419
+#: awkgram.y:417
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr ""
 "Die Regulärer-Ausdruck-Konstante »//« sieht wie ein C-Kommentar aus, ist "
 "aber keiner"
 
-#: awkgram.y:423
+#: awkgram.y:421
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr ""
 "Die Regulärer-Ausdruck-Konstante »/%s/« sieht wie ein C-Kommentar aus, ist "
 "aber keiner"
 
-#: awkgram.y:515
+#: awkgram.y:513
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "doppelte Case-Werte im Switch-Block: %s"
 
-#: awkgram.y:536
+#: awkgram.y:534
 msgid "duplicate `default' detected in switch body"
 msgstr "doppeltes »default« im Switch-Block gefunden"
 
-#: awkgram.y:796 awkgram.y:3723
+#: awkgram.y:794 awkgram.y:3751
 msgid "`break' is not allowed outside a loop or switch"
 msgstr ""
 "»break« ist außerhalb einer Schleife oder eines Switch-Blocks nicht zulässig"
 
-#: awkgram.y:805 awkgram.y:3715
+#: awkgram.y:803 awkgram.y:3743
 msgid "`continue' is not allowed outside a loop"
 msgstr "»continue« ist außerhalb einer Schleife nicht zulässig"
 
-#: awkgram.y:815
+#: awkgram.y:813
 #, c-format
 msgid "`next' used in %s action"
 msgstr "»next« wird in %s-Aktion verwendet"
 
-#: awkgram.y:824
+#: awkgram.y:822
 #, c-format
 msgid "`nextfile' used in %s action"
 msgstr "»nextfile« wird in %s-Aktion verwendet"
 
-#: awkgram.y:848
+#: awkgram.y:846
 msgid "`return' used outside function context"
 msgstr "»return« wird außerhalb einer Funktion verwendet"
 
-#: awkgram.y:922
+#: awkgram.y:920
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "Einfaches »print« in BEGIN- oder END-Regel soll vermutlich »print \"\"« sein"
 
-#: awkgram.y:988 awkgram.y:1037
+#: awkgram.y:986 awkgram.y:1035
 msgid "`delete' is not allowed with SYMTAB"
-msgstr ""
+msgstr "»delete« ist in Zusammenhang mit SYMTAB nicht zulässig"
 
-#: awkgram.y:990 awkgram.y:1039
+#: awkgram.y:988 awkgram.y:1037
 msgid "`delete' is not allowed with FUNCTAB"
-msgstr ""
+msgstr "»delete« ist in Zusammenhang mit FUNCTAB nicht zulässig"
 
-#: awkgram.y:1024 awkgram.y:1028
+#: awkgram.y:1022 awkgram.y:1026
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "»delete(array)« ist eine gawk-Erweiterung"
 
-#: awkgram.y:1149
+#: awkgram.y:1147
 msgid "multistage two-way pipelines don't work"
 msgstr "mehrstufige Zweiwege-Pipes funktionieren nicht"
 
-#: awkgram.y:1264
+#: awkgram.y:1262
 msgid "regular expression on right of assignment"
 msgstr "Regulärer Ausdruck auf der rechten Seite einer Zuweisung"
 
-#: awkgram.y:1275
+#: awkgram.y:1273
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "Regulärer Ausdruck links vom »~«- oder »!~«-Operator"
 
-#: awkgram.y:1291 awkgram.y:1442
+#: awkgram.y:1289 awkgram.y:1431
 msgid "old awk does not support the keyword `in' except after `for'"
 msgstr "Das alte awk unterstützt das Schlüsselwort »in« nur nach »for«"
 
-#: awkgram.y:1301
+#: awkgram.y:1299
 msgid "regular expression on right of comparison"
 msgstr "Regulärer Ausdruck rechts von einem Vergleich"
 
-#: awkgram.y:1417
-#, c-format
-msgid "`getline var' invalid inside `%s' rule"
-msgstr "»getline var« ist ungültig innerhalb der »%s«-Regel"
-
-#: awkgram.y:1420
-#, c-format
-msgid "`getline' invalid inside `%s' rule"
+#: awkgram.y:1411
+#, fuzzy, c-format
+msgid "non-redirected `getline' invalid inside `%s' rule"
 msgstr "»getline« ist ungültig innerhalb der »%s«-Regel"
 
-#: awkgram.y:1425
+#: awkgram.y:1414
 msgid "non-redirected `getline' undefined inside END action"
 msgstr ""
 "Nicht-umgelenktes »getline« ist innerhalb der END-Aktion nicht definiert"
 
-#: awkgram.y:1444
+#: awkgram.y:1433
 msgid "old awk does not support multidimensional arrays"
 msgstr "Das alte awk unterstützt keine mehrdimensionalen Felder"
 
-#: awkgram.y:1541
+#: awkgram.y:1530
 msgid "call of `length' without parentheses is not portable"
 msgstr "Aufruf von »length« ohne Klammern ist nicht portabel"
 
-#: awkgram.y:1607
+#: awkgram.y:1596
 msgid "indirect function calls are a gawk extension"
 msgstr "indirekte Funktionsaufrufe sind eine gawk-Erweiterung"
 
-#: awkgram.y:1620
+#: awkgram.y:1609
 #, c-format
 msgid "can not use special variable `%s' for indirect function call"
 msgstr ""
 "die besondere Variable »%s« kann nicht für den indirekten Funktionsaufruf "
 "verwendet werden"
 
-#: awkgram.y:1698
+#: awkgram.y:1635
+#, c-format
+msgid "attempt to use non-function `%s' in function call"
+msgstr ""
+
+#: awkgram.y:1699
 msgid "invalid subscript expression"
 msgstr "Ungültiger Index-Ausdruck"
 
-#: awkgram.y:2048 awkgram.y:2068 gawkapi.c:206 gawkapi.c:224 msg.c:126
+#: awkgram.y:2045 awkgram.y:2065 gawkapi.c:206 gawkapi.c:224 msg.c:126
 msgid "warning: "
 msgstr "Warnung: "
 
-#: awkgram.y:2066 gawkapi.c:192 gawkapi.c:221 msg.c:158
+#: awkgram.y:2063 gawkapi.c:192 gawkapi.c:221 msg.c:158
 msgid "fatal: "
 msgstr "Fatal: "
 
-#: awkgram.y:2116
+#: awkgram.y:2113
 msgid "unexpected newline or end of string"
 msgstr "Unerwarteter Zeilenumbruch oder Ende der Zeichenkette"
 
-#: awkgram.y:2383 awkgram.y:2459 awkgram.y:2682 debug.c:523 debug.c:539
+#: awkgram.y:2392 awkgram.y:2468 awkgram.y:2691 debug.c:523 debug.c:539
 #: debug.c:2812 debug.c:5055
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "Quelldatei »%s« kann nicht zum Lesen geöffnet werden (%s)"
 
-#: awkgram.y:2384 awkgram.y:2509
-#, fuzzy, c-format
+#: awkgram.y:2393 awkgram.y:2518
+#, c-format
 msgid "can't open shared library `%s' for reading (%s)"
-msgstr "Quelldatei »%s« kann nicht zum Lesen geöffnet werden (%s)"
+msgstr ""
+"Die dynamische Bibliothek »%s« kann nicht zum Lesen geöffnet werden (%s)"
 
-#: awkgram.y:2386 awkgram.y:2460 awkgram.y:2510 builtin.c:135 debug.c:5206
+#: awkgram.y:2395 awkgram.y:2469 awkgram.y:2519 builtin.c:135 debug.c:5206
 msgid "reason unknown"
 msgstr "Unbekannte Ursache"
 
-#: awkgram.y:2395 awkgram.y:2419
+#: awkgram.y:2404 awkgram.y:2428
 #, c-format
 msgid "can't include `%s' and use it as a program file"
-msgstr ""
+msgstr "»%s« kann nicht eingebunden und als Programmdatei verwendet werden"
 
-#: awkgram.y:2408
+#: awkgram.y:2417
 #, c-format
 msgid "already included source file `%s'"
 msgstr "Quelldatei »%s« wurde bereits eingebunden"
 
-#: awkgram.y:2409
-#, fuzzy, c-format
+#: awkgram.y:2418
+#, c-format
 msgid "already loaded shared library `%s'"
-msgstr "Quelldatei »%s« wurde bereits eingebunden"
+msgstr "Die dynamische Bibliothek »%s« wurde bereits eingebunden"
 
-#: awkgram.y:2444
+#: awkgram.y:2453
 msgid "@include is a gawk extension"
 msgstr "»@include« ist eine gawk-Erweiterung"
 
-#: awkgram.y:2450
+#: awkgram.y:2459
 msgid "empty filename after @include"
 msgstr "leerer Dateiname nach @include"
 
-#: awkgram.y:2494
-#, fuzzy
+#: awkgram.y:2503
 msgid "@load is a gawk extension"
-msgstr "»@include« ist eine gawk-Erweiterung"
+msgstr "»@load« ist eine Gawk-Erweiterung"
 
-#: awkgram.y:2500
-#, fuzzy
+#: awkgram.y:2509
 msgid "empty filename after @load"
-msgstr "leerer Dateiname nach @include"
+msgstr "leerer Dateiname nach @load"
 
-#: awkgram.y:2634
+#: awkgram.y:2643
 msgid "empty program text on command line"
 msgstr "Kein Programmtext auf der Kommandozeile"
 
-#: awkgram.y:2749
+#: awkgram.y:2758
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "Die Quelldatei »%s« kann nicht gelesen werden (%s)"
 
-#: awkgram.y:2760
+#: awkgram.y:2769
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "Die Quelldatei »%s« ist leer"
 
-#: awkgram.y:2937
+#: awkgram.y:2828
+#, c-format
+msgid "PEBKAC error: invalid character '\\%03o' in source code"
+msgstr ""
+
+#: awkgram.y:2959
 msgid "source file does not end in newline"
 msgstr "Die Quelldatei hört nicht mit einem Zeilenende auf"
 
-#: awkgram.y:3042
+#: awkgram.y:3062
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr ""
 "Nicht beendeter regulärer Ausdruck (hört mit '\\' auf) am Ende der Datei"
 
-#: awkgram.y:3066
+#: awkgram.y:3089
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 "%s: %d: der tawk-Modifizierer für reguläre Ausdrücke »/.../%c« funktioniert "
 "nicht in gawk"
 
-#: awkgram.y:3070
+#: awkgram.y:3093
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 "Der tawk-Modifizierer für reguläre Ausdrücke »/.../%c« funktioniert nicht in "
 "gawk"
 
-#: awkgram.y:3077
+#: awkgram.y:3100
 msgid "unterminated regexp"
 msgstr "Nicht beendeter regulärer Ausdruck"
 
-#: awkgram.y:3081
+#: awkgram.y:3104
 msgid "unterminated regexp at end of file"
 msgstr "Nicht beendeter regulärer Ausdruck am Dateiende"
 
-#: awkgram.y:3140
+#: awkgram.y:3162
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr ""
 "Die Verwendung von »\\#...« zur Fortsetzung von Zeilen ist nicht portabel"
 
-#: awkgram.y:3156
+#: awkgram.y:3178
 msgid "backslash not last character on line"
 msgstr "das letzte Zeichen auf der Zeile ist kein Backslash (»\\«)"
 
-#: awkgram.y:3217
+#: awkgram.y:3239
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX erlaubt den Operator »**=« nicht"
 
-#: awkgram.y:3219
+#: awkgram.y:3241
 msgid "old awk does not support operator `**='"
 msgstr "Das alte awk unterstützt den Operator »**=« nicht"
 
-#: awkgram.y:3228
+#: awkgram.y:3250
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX erlaubt den Operator »**« nicht"
 
-#: awkgram.y:3230
+#: awkgram.y:3252
 msgid "old awk does not support operator `**'"
 msgstr "Das alte awk unterstützt den Operator »**« nicht"
 
-#: awkgram.y:3265
+#: awkgram.y:3287
 msgid "operator `^=' is not supported in old awk"
 msgstr "Das alte awk unterstützt den Operator »^=« nicht"
 
-#: awkgram.y:3273
+#: awkgram.y:3295
 msgid "operator `^' is not supported in old awk"
 msgstr "Das alte awk unterstützt den Operator »^« nicht"
 
-#: awkgram.y:3366 awkgram.y:3382 command.y:1178
+#: awkgram.y:3392 awkgram.y:3410 command.y:1180
 msgid "unterminated string"
 msgstr "Nicht beendete Zeichenkette"
 
-#: awkgram.y:3603
+#: awkgram.y:3631
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "Ungültiges Zeichen »%c« in einem Ausdruck"
 
-#: awkgram.y:3650
+#: awkgram.y:3678
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "»%s« ist eine gawk-Erweiterung"
 
-#: awkgram.y:3655
+#: awkgram.y:3683
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX erlaubt »%s« nicht"
 
-#: awkgram.y:3663
+#: awkgram.y:3691
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "»%s« wird im alten awk nicht unterstützt"
 
-#: awkgram.y:3753
+#: awkgram.y:3781
 msgid "`goto' considered harmful!\n"
 msgstr "»goto« gilt als schlechter Stil!\n"
 
-#: awkgram.y:3787
+#: awkgram.y:3815
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "Unzulässige Argumentzahl %d für %s"
 
-#: awkgram.y:3822
+#: awkgram.y:3850
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr "%s: Ein String als letztes Argument von substitute hat keinen Effekt"
 
-#: awkgram.y:3827
+#: awkgram.y:3855
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "Der dritte Parameter von %s ist ein unveränderliches Objekt"
 
-#: awkgram.y:3910 awkgram.y:3913
+#: awkgram.y:3938 awkgram.y:3941
 msgid "match: third argument is a gawk extension"
 msgstr "match: Das dritte Argument ist eine gawk-Erweiterung"
 
-#: awkgram.y:3967 awkgram.y:3970
+#: awkgram.y:3995 awkgram.y:3998
 msgid "close: second argument is a gawk extension"
 msgstr "close: Das zweite Argument ist eine gawk-Erweiterung"
 
-#: awkgram.y:3982
+#: awkgram.y:4010
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "Fehlerhafte Verwendung von dcgettext(_\"...\"): \n"
 "Entfernen Sie den führenden Unterstrich"
 
-#: awkgram.y:3997
+#: awkgram.y:4025
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "Fehlerhafte Verwendung von dcngettext(_\"...\"): \n"
 "Entfernen Sie den führenden Unterstrich"
 
-#: awkgram.y:4016
-#, fuzzy
+#: awkgram.y:4044
 msgid "index: regexp constant as second argument is not allowed"
-msgstr "index: Zweites Argument ist kein string"
+msgstr "index: eine Regexp-Konstante als zweites Argument ist unzulässig"
 
-#: awkgram.y:4069
+#: awkgram.y:4097
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "Funktion »%s«: Parameter »%s« verdeckt eine globale Variable"
 
-#: awkgram.y:4126 debug.c:4041 debug.c:4084 debug.c:5204
+#: awkgram.y:4154 debug.c:4041 debug.c:4084 debug.c:5204
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "»%s« kann nicht zum Schreiben geöffne werden(%s)"
 
-#: awkgram.y:4127
+#: awkgram.y:4155
 msgid "sending variable list to standard error"
 msgstr "Die Liste der Variablen wird auf der Standardfehlerausgabe ausgegeben"
 
-#: awkgram.y:4135
+#: awkgram.y:4163
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: close ist gescheitert (%s)"
 
-#: awkgram.y:4160
+#: awkgram.y:4188
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() zweimal aufgerufen!"
 
-#: awkgram.y:4168
+#: awkgram.y:4196
 msgid "there were shadowed variables."
 msgstr "es sind verdeckte Variablen vorhanden"
 
-#: awkgram.y:4239
+#: awkgram.y:4267
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "Funktion »%s« wurde bereits definiert"
 
-#: awkgram.y:4285
+#: awkgram.y:4313
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "Funktion »%s«: Funktionsnamen können nicht als Parameternamen benutzen"
 
-#: awkgram.y:4288
+#: awkgram.y:4316
 #, c-format
 msgid "function `%s': can't use special variable `%s' as a function parameter"
 msgstr ""
 "Funktion »%s«: die spezielle Variable »%s« kann nicht als Parameter "
 "verwendet werden"
 
-#: awkgram.y:4296
+#: awkgram.y:4324
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "Funktion »%s«: Parameter #%d, »%s« wiederholt Parameter #%d"
 
-#: awkgram.y:4383 awkgram.y:4389
+#: awkgram.y:4411 awkgram.y:4417
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "Aufgerufene Funktion »%s« ist nirgends definiert"
 
-#: awkgram.y:4393
+#: awkgram.y:4421
 #, c-format
 msgid "function `%s' defined but never called directly"
 msgstr "Funktion »%s« wurde definiert aber nirgends aufgerufen"
 
-#: awkgram.y:4425
+#: awkgram.y:4453
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr ""
 "Regulärer-Ausdruck-Konstante für Parameter #%d ergibt einen \n"
 "logischen Wert"
 
-#: awkgram.y:4484
+#: awkgram.y:4468
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -527,24 +529,26 @@ msgstr ""
 "Funktion »%s« wird mit Leerzeichen zwischen Name und »(« aufgerufen, \n"
 "oder als Variable oder Feld verwendet"
 
-#: awkgram.y:4720
+#: awkgram.y:4674
 msgid "division by zero attempted"
 msgstr "Division durch Null wurde versucht"
 
-#: awkgram.y:4729
+#: awkgram.y:4683
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "Division durch Null versucht in »%%«"
 
-#: awkgram.y:5049
+#: awkgram.y:5003
 msgid ""
 "cannot assign a value to the result of a field post-increment expression"
 msgstr ""
+"dem Ergebnis eines Feld-Postinkrementausdruck kann kein Wert zugewiesen "
+"werden"
 
-#: awkgram.y:5052
-#, fuzzy, c-format
+#: awkgram.y:5006
+#, c-format
 msgid "invalid target of assignment (opcode %s)"
-msgstr "Unzulässige Argumentzahl %d für %s"
+msgstr "Unzulässiges Ziel für eine Zuweisung (Opcode %s)"
 
 #: builtin.c:133
 #, c-format
@@ -582,193 +586,202 @@ msgstr ""
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: »%s« ist keine geöffnete Datei, Pipe oder Prozess"
 
-#: builtin.c:362
+#: builtin.c:351
 msgid "index: received non-string first argument"
 msgstr "index: Erstes Argument ist kein String"
 
-#: builtin.c:364
+#: builtin.c:353
 msgid "index: received non-string second argument"
 msgstr "index: Zweites Argument ist kein string"
 
-#: builtin.c:488 mpfr.c:757
+#: builtin.c:466 mpfr.c:777
 msgid "int: received non-numeric argument"
 msgstr "Argument ist keine Zahl"
 
-#: builtin.c:525
+#: builtin.c:503
 msgid "length: received array argument"
 msgstr "length: Argument ist ein Feld"
 
-#: builtin.c:528
+#: builtin.c:506
 msgid "`length(array)' is a gawk extension"
 msgstr "»length(array)« ist eine gawk-Erweiterung"
 
-#: builtin.c:544
+#: builtin.c:525
 msgid "length: received non-string argument"
 msgstr "length: Argument ist kein String"
 
-#: builtin.c:575
+#: builtin.c:554
 msgid "log: received non-numeric argument"
 msgstr "log: Argument ist keine Zahl"
 
-#: builtin.c:578
+#: builtin.c:557
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: Negatives Argument %g"
 
-#: builtin.c:776 builtin.c:781
+#: builtin.c:755 builtin.c:760 builtin.c:911
 msgid "fatal: must use `count$' on all formats or none"
 msgstr "Fatal: »count$« muss auf alle Formate angewandt werden oder auf keines"
 
-#: builtin.c:851
+#: builtin.c:830
 #, c-format
 msgid "field width is ignored for `%%' specifier"
 msgstr "Feldbreite wird für die »%%«-Angabe ignoriert"
 
-#: builtin.c:853
+#: builtin.c:832
 #, c-format
 msgid "precision is ignored for `%%' specifier"
 msgstr "Genauigkeit wird für die »%%«-Angabe ignoriert"
 
-#: builtin.c:855
+#: builtin.c:834
 #, c-format
 msgid "field width and precision are ignored for `%%' specifier"
 msgstr "Feldbreite und Genauigkeit werden für die »%%«-Angabe ignoriert"
 
-#: builtin.c:906
+#: builtin.c:885
 msgid "fatal: `$' is not permitted in awk formats"
 msgstr "Fatal: »$« ist in awk-Formaten nicht zulässig"
 
-#: builtin.c:915
+#: builtin.c:894
 msgid "fatal: arg count with `$' must be > 0"
 msgstr "Fatal: die Anzahl der Argumen bei »$« muss > 0 sein"
 
-#: builtin.c:919
+#: builtin.c:898
 #, c-format
 msgid "fatal: arg count %ld greater than total number of supplied arguments"
 msgstr ""
 "Fatal: Argumentenanzahl %ld ist größer als die Gesamtzahl angegebener "
 "Argumente"
 
-#: builtin.c:923
+#: builtin.c:902
 msgid "fatal: `$' not permitted after period in format"
 msgstr "Fatal: »$« nach Punkt in Formatangabe nicht zulässig"
 
-#: builtin.c:939
+#: builtin.c:921
 msgid "fatal: no `$' supplied for positional field width or precision"
 msgstr "Fatal: »$« fehlt in positionsabhängiger Feldbreite oder Genauigkeit"
 
 #
-#: builtin.c:1009
+#: builtin.c:991
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "»l« ist in awk-Formaten bedeutungslos, ignoriert"
 
-#: builtin.c:1013
+#: builtin.c:995
 msgid "fatal: `l' is not permitted in POSIX awk formats"
 msgstr "Fatal: »l« ist in POSIX-awk-Formaten nicht zulässig"
 
-#: builtin.c:1026
+#: builtin.c:1008
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "»L« ist in awk-Formaten bedeutungslos, ignoriert"
 
-#: builtin.c:1030
+#: builtin.c:1012
 msgid "fatal: `L' is not permitted in POSIX awk formats"
 msgstr "Fatal: »L« ist in POSIX-awk-Formaten nicht zulässig"
 
-#: builtin.c:1043
+#: builtin.c:1025
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "»h« ist in awk-Formaten bedeutungslos, ignoriert"
 
-#: builtin.c:1047
+#: builtin.c:1029
 msgid "fatal: `h' is not permitted in POSIX awk formats"
 msgstr "Fatal: »h« ist in POSIX-awk-Formaten nicht zulässig"
 
-#: builtin.c:1463
+#: builtin.c:1055
+#, fuzzy, c-format
+msgid "[s]printf: value %g is too big for %%c format"
+msgstr "[s]printf: Wert %g ist außerhalb des Bereichs für Format »%%%c«"
+
+#: builtin.c:1068
+#, fuzzy, c-format
+msgid "[s]printf: value %g is not a valid wide character"
+msgstr "[s]printf: Wert %g ist außerhalb des Bereichs für Format »%%%c«"
+
+#: builtin.c:1454
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf: Wert %g ist außerhalb des Bereichs für Format »%%%c«"
 
-#: builtin.c:1561
+#: builtin.c:1552
 #, c-format
 msgid "ignoring unknown format specifier character `%c': no argument converted"
 msgstr ""
 "das unbekannte Zeichen »%c« in der Formatspezifikation wird ignoriert: keine "
 "Argumente umgewandelt"
 
-#: builtin.c:1566
+#: builtin.c:1557
 msgid "fatal: not enough arguments to satisfy format string"
 msgstr "Fatal: Nicht genügend Argumente für die Formatangabe"
 
-#: builtin.c:1568
+#: builtin.c:1559
 msgid "^ ran out for this one"
 msgstr "^ hierfür fehlte es"
 
-#: builtin.c:1575
+#: builtin.c:1566
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: Format-Spezifikation hat keinen Controlcode"
 
-#: builtin.c:1578
+#: builtin.c:1569
 msgid "too many arguments supplied for format string"
 msgstr "Zu viele Argumente für den Formatstring"
 
-#: builtin.c:1634
-#, fuzzy
+#: builtin.c:1625
 msgid "sprintf: no arguments"
-msgstr "printf: Keine Argumente"
+msgstr "sprintf: Keine Argumente"
 
-#: builtin.c:1657 builtin.c:1668
+#: builtin.c:1648 builtin.c:1659
 msgid "printf: no arguments"
 msgstr "printf: Keine Argumente"
 
-#: builtin.c:1711
+#: builtin.c:1702
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: das Argument ist keine Zahl"
 
-#: builtin.c:1715
+#: builtin.c:1706
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: das Argument %g ist negativ"
 
-#: builtin.c:1746
+#: builtin.c:1737
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: Länge %g ist nicht >= 1"
 
-#: builtin.c:1748
+#: builtin.c:1739
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: Länge %g ist nicht >= 0"
 
-#: builtin.c:1755
+#: builtin.c:1753
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: Nicht ganzzahlige Länge %g wird abgeschnitten"
 
-#: builtin.c:1760
+#: builtin.c:1758
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
 "substr: Länge %g ist zu groß für Stringindizierung, wird auf %g gekürzt"
 
-#: builtin.c:1772
+#: builtin.c:1770
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: Start-Index %g ist ungültig, 1 wird verwendet"
 
-#: builtin.c:1777
+#: builtin.c:1775
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: Nicht ganzzahliger Start-Wert %g wird abgeschnitten"
 
-#: builtin.c:1802
+#: builtin.c:1798
 msgid "substr: source string is zero length"
 msgstr "substr: Quellstring ist leer"
 
-#: builtin.c:1818
+#: builtin.c:1812
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: Start-Wert %g liegt hinter dem Ende des Strings"
 
-#: builtin.c:1826
+#: builtin.c:1820
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -776,197 +789,205 @@ msgstr ""
 "substr: Länge %g am Start-Wert %g überschreitet die Länge des ersten "
 "Arguments (%lu)"
 
-#: builtin.c:1900
+#: builtin.c:1890
 msgid "strftime: format value in PROCINFO[\"strftime\"] has numeric type"
 msgstr "strftime: Formatwert in PROCINFO[\"strftime\"] ist numerischen Typs"
 
-#: builtin.c:1923
+#: builtin.c:1913
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: Das zweite Argument ist keine Zahl"
 
-#: builtin.c:1927
+#: builtin.c:1917
 msgid "strftime: second argument less than 0 or too big for time_t"
 msgstr ""
 "strftime: das zweite Argument ist kleiner als 0 oder zu groß für time_t"
 
-#: builtin.c:1934
+#: builtin.c:1924
 msgid "strftime: received non-string first argument"
 msgstr "strftime: Das erste Argument ist kein String"
 
-#: builtin.c:1941
+#: builtin.c:1931
 msgid "strftime: received empty format string"
 msgstr "strftime: Der Format-String ist leer"
 
-#: builtin.c:2007
+#: builtin.c:1997
 msgid "mktime: received non-string argument"
 msgstr "mktime: Das Argument ist kein String"
 
-#: builtin.c:2024
+#: builtin.c:2014
 msgid "mktime: at least one of the values is out of the default range"
 msgstr "mktime: mindestens einer der Werte ist außerhalb des normalen Bereichs"
 
-#: builtin.c:2059
+#: builtin.c:2049
 msgid "'system' function not allowed in sandbox mode"
 msgstr "Die Funktion »system« ist im Sandbox-Modus nicht erlaubt"
 
-#: builtin.c:2064
+#: builtin.c:2054
 msgid "system: received non-string argument"
 msgstr "system: Das Argument ist kein String"
 
-#: builtin.c:2184
+#: builtin.c:2174
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "Referenz auf das nicht initialisierte Feld »$%d«"
 
-#: builtin.c:2271
+#: builtin.c:2259
 msgid "tolower: received non-string argument"
 msgstr "tolower: das Argument ist kein String"
 
-#: builtin.c:2305
+#: builtin.c:2290
 msgid "toupper: received non-string argument"
 msgstr "toupper: das Argument ist kein String"
 
-#: builtin.c:2341 mpfr.c:672
+#: builtin.c:2323 mpfr.c:679
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: das erste Argument ist keine Zahl"
 
-#: builtin.c:2343 mpfr.c:674
+#: builtin.c:2325 mpfr.c:681
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: das zweite Argument ist keine Zahl"
 
-#: builtin.c:2362
+#: builtin.c:2344
 msgid "sin: received non-numeric argument"
 msgstr "sin: das Argument ist keine Zahl"
 
-#: builtin.c:2378
+#: builtin.c:2360
 msgid "cos: received non-numeric argument"
 msgstr "cos: das Argument ist keine Zahl"
 
-#: builtin.c:2431 mpfr.c:1156
+#: builtin.c:2413 mpfr.c:1176
 msgid "srand: received non-numeric argument"
 msgstr "srand: das Argument ist keine Zahl"
 
-#: builtin.c:2462
+#: builtin.c:2444
 msgid "match: third argument is not an array"
 msgstr "match: das dritte Argument ist kein Array"
 
-#: builtin.c:2734
-msgid "gensub: third argument of 0 treated as 1"
+#: builtin.c:2705
+#, fuzzy, c-format
+msgid "gensub: third argument `%.*s' treated as 1"
 msgstr "gensub: 0 als drittes Argument wird als 1 interpretiert"
 
-#: builtin.c:3030
+#: builtin.c:2720
+#, fuzzy, c-format
+msgid "gensub: third argument %g treated as 1"
+msgstr "gensub: 0 als drittes Argument wird als 1 interpretiert"
+
+#: builtin.c:3020
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: das erste Argument ist keine Zahl"
 
-#: builtin.c:3032
+#: builtin.c:3022
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift: das zweite Argument ist keine Zahl"
 
-#: builtin.c:3038
-#, fuzzy, c-format
+#: builtin.c:3028
+#, c-format
 msgid "lshift(%f, %f): negative values will give strange results"
 msgstr ""
-"lshift(%lf, %lf): Negative Werte werden zu merkwürdigen Ergebnissen führen"
+"lshift(%f, %f): Negative Werte werden zu merkwürdigen Ergebnissen führen"
 
-#: builtin.c:3040
-#, fuzzy, c-format
+#: builtin.c:3030
+#, c-format
 msgid "lshift(%f, %f): fractional values will be truncated"
-msgstr "lshift(%lf, %lf): Dezimalteil wird abgeschnitten"
+msgstr "lshift(%f, %f): Dezimalteil wird abgeschnitten"
 
-#: builtin.c:3042
-#, fuzzy, c-format
+#: builtin.c:3032
+#, c-format
 msgid "lshift(%f, %f): too large shift value will give strange results"
 msgstr ""
-"lshift(%lf, %lf): Zu große Shift-Werte werden zu merkwürdigen Ergebnissen "
+"lshift(%f, %f): Zu große Shift-Werte werden zu merkwürdigen Ergebnissen "
 "führen"
 
-#: builtin.c:3067
+#: builtin.c:3057
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: das erste Argument ist keine Zahl"
 
-#: builtin.c:3069
+#: builtin.c:3059
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift: das zweite Argument ist keine Zahl"
 
-#: builtin.c:3075
-#, fuzzy, c-format
+#: builtin.c:3065
+#, c-format
 msgid "rshift(%f, %f): negative values will give strange results"
 msgstr ""
-"rshift (%lf, %lf): Negative Werte werden zu merkwürdigen Ergebnissen führen"
+"rshift (%f, %f): Negative Werte werden zu merkwürdigen Ergebnissen führen"
 
-#: builtin.c:3077
-#, fuzzy, c-format
+#: builtin.c:3067
+#, c-format
 msgid "rshift(%f, %f): fractional values will be truncated"
-msgstr "rshift(%lf, %lf): Dezimalteil wird abgeschnitten"
+msgstr "rshift(%f, %f): Dezimalteil wird abgeschnitten"
 
-#: builtin.c:3079
-#, fuzzy, c-format
+#: builtin.c:3069
+#, c-format
 msgid "rshift(%f, %f): too large shift value will give strange results"
 msgstr ""
-"rshift(%lf, %lf): Zu große Shift-Werte werden zu merkwürdigen Ergebnissen "
+"rshift(%f, %f): Zu große Shift-Werte werden zu merkwürdigen Ergebnissen "
 "führen"
 
-#: builtin.c:3104 mpfr.c:968
-#, fuzzy
+#: builtin.c:3094 mpfr.c:988
 msgid "and: called with less than two arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "and: wird mit weniger als zwei Argumenten aufgerufen"
 
-#: builtin.c:3109
-#, fuzzy, c-format
+#: builtin.c:3099
+#, c-format
 msgid "and: argument %d is non-numeric"
-msgstr "exp: das Argument %g liegt außerhalb des gültigen Bereichs"
+msgstr "and: das Argument %d ist nicht numerisch"
 
-#: builtin.c:3113
-#, fuzzy, c-format
+#: builtin.c:3103
+#, c-format
 msgid "and: argument %d negative value %g will give strange results"
 msgstr ""
-"and(%lf, %lf): Negative Werte werden zu merkwürdigen Ergebnissen führen"
+"and: der negative Wert %2$g von Argument %1$d wird zu merkwürdigen "
+"Ergebnissen führen"
 
-#: builtin.c:3136 mpfr.c:1000
-#, fuzzy
+#: builtin.c:3126 mpfr.c:1020
 msgid "or: called with less than two arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "or: wird mit weniger als zwei Argumenten aufgerufen"
 
-#: builtin.c:3141
-#, fuzzy, c-format
+#: builtin.c:3131
+#, c-format
 msgid "or: argument %d is non-numeric"
-msgstr "exp: das Argument %g liegt außerhalb des gültigen Bereichs"
+msgstr "or: das Argument %d ist nicht numerisch"
 
-#: builtin.c:3145
-#, fuzzy, c-format
+#: builtin.c:3135
+#, c-format
 msgid "or: argument %d negative value %g will give strange results"
-msgstr "compl(%lf): Negativer Wert wird zu merkwürdigen Ergebnissen führen"
+msgstr ""
+"or: der negative Wert %2$g von Argument %1$d wird zu merkwürdigen "
+"Ergebnissen führen"
 
-#: builtin.c:3167 mpfr.c:1031
-#, fuzzy
+#: builtin.c:3157 mpfr.c:1051
 msgid "xor: called with less than two arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "xor: wird mit weniger als zwei Argumenten aufgerufen"
 
-#: builtin.c:3173
-#, fuzzy, c-format
+#: builtin.c:3163
+#, c-format
 msgid "xor: argument %d is non-numeric"
-msgstr "exp: das Argument %g liegt außerhalb des gültigen Bereichs"
+msgstr "xor: das Argument %d ist nicht numerisch"
 
-#: builtin.c:3177
-#, fuzzy, c-format
+#: builtin.c:3167
+#, c-format
 msgid "xor: argument %d negative value %g will give strange results"
-msgstr "xor(%lf, %lf: Negative Werte werden zu merkwürdigen Ergebnissen führen"
+msgstr ""
+"xor: der negative Wert %2$g von Argument %1$d wird zu merkwürdigen "
+"Ergebnissen führen"
 
-#: builtin.c:3202 mpfr.c:787
+#: builtin.c:3192 mpfr.c:807
 msgid "compl: received non-numeric argument"
 msgstr "compl: das erste Argument ist keine Zahl"
 
-#: builtin.c:3208
-#, fuzzy, c-format
+#: builtin.c:3198
+#, c-format
 msgid "compl(%f): negative value will give strange results"
-msgstr "compl(%lf): Negativer Wert wird zu merkwürdigen Ergebnissen führen"
+msgstr "compl(%f): Der negative Wert wird zu merkwürdigen Ergebnissen führen"
 
-#: builtin.c:3210
-#, fuzzy, c-format
+#: builtin.c:3200
+#, c-format
 msgid "compl(%f): fractional value will be truncated"
-msgstr "compl(%lf): Dezimalteil wird abgeschnitten"
+msgstr "compl(%f): der Dezimalteil wird abgeschnitten"
 
-#: builtin.c:3379
+#: builtin.c:3369
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: »%s« ist keine gültige Locale-Kategorie"
@@ -974,557 +995,611 @@ msgstr "dcgettext: »%s« ist keine gültige Locale-Kategorie"
 #: command.y:225
 #, c-format
 msgid "Type (g)awk statement(s). End with the command \"end\"\n"
-msgstr ""
+msgstr "Geben Sie »(g)awk Ausdrücke« und zum Abschluss \"end\" ein\n"
 
 #: command.y:289
-#, fuzzy, c-format
+#, c-format
 msgid "invalid frame number: %d"
-msgstr "Ungültiges Bereichsende"
+msgstr "Ungültige Frame-Nummer: %d"
 
 #: command.y:295
-#, fuzzy, c-format
+#, c-format
 msgid "info: invalid option - \"%s\""
-msgstr "%s: Ungültige Option -- »%c«\n"
+msgstr "info: Ungültige Option - »%s«"
 
 #: command.y:321
 #, c-format
 msgid "source \"%s\": already sourced."
-msgstr ""
+msgstr "Quelle »%s«: wurde bereits eingelesen."
 
 #: command.y:326
 #, c-format
 msgid "save \"%s\": command not permitted."
-msgstr ""
+msgstr "save »%s«: Der Befehl ist nicht zulässig."
 
 #: command.y:339
 msgid "Can't use command `commands' for breakpoint/watchpoint commands"
 msgstr ""
+"Der Befehl »commands« kann nicht für Break- bzw. Watchpoints verwendet werden"
 
 #: command.y:341
 msgid "no breakpoint/watchpoint has been set yet"
-msgstr ""
+msgstr "es wurden noch keine Break-/Watchpoints gesetzt"
 
 #: command.y:343
 msgid "invalid breakpoint/watchpoint number"
-msgstr ""
+msgstr "ungültige Break-/Watchpoint/Nummer"
 
 #: command.y:348
 #, c-format
 msgid "Type commands for when %s %d is hit, one per line.\n"
 msgstr ""
+"Befehle eingeben, die bei Erreichen von %s %d ausgeführt werden sollen, "
+"einer pro Zeile.\n"
 
 #: command.y:350
 #, c-format
 msgid "End with the command \"end\"\n"
-msgstr ""
+msgstr "Abschließen mit dem Befehl »end«\n"
 
 #: command.y:357
 msgid "`end' valid only in command `commands' or `eval'"
-msgstr ""
+msgstr "»end« ist nur innerhalb der Befehle »commands« oder »eval« zulässig"
 
 #: command.y:367
 msgid "`silent' valid only in command `commands'"
-msgstr ""
+msgstr "»silent« ist nur innerhalb des Befehls »commands« zuzlässig"
 
 #: command.y:373
-#, fuzzy, c-format
+#, c-format
 msgid "trace: invalid option - \"%s\""
-msgstr "%s: Ungültige Option -- »%c«\n"
+msgstr "trace: Ungültige Option - »%s«"
 
 #: command.y:387
 msgid "condition: invalid breakpoint/watchpoint number"
-msgstr ""
+msgstr "condition: Unzulässige Break-/Watchpoint-Nummer"
 
 #: command.y:449
-#, fuzzy
 msgid "argument not a string"
-msgstr "exp: das Argument %g liegt außerhalb des gültigen Bereichs"
+msgstr "Das Argument ist keine Zeichenkette"
 
 #: command.y:459 command.y:464
 #, c-format
 msgid "option: invalid parameter - \"%s\""
-msgstr ""
+msgstr "option: ungültiger Parameter - »%s«"
 
 #: command.y:474
 #, c-format
 msgid "no such function - \"%s\""
-msgstr ""
+msgstr "Unbekannte Funktion - »%s«"
 
 #: command.y:531
-#, fuzzy, c-format
+#, c-format
 msgid "enable: invalid option - \"%s\""
-msgstr "%s: Ungültige Option -- »%c«\n"
+msgstr "enable: Ungültige Option - »%s«"
 
 #: command.y:597
-#, fuzzy, c-format
+#, c-format
 msgid "invalid range specification: %d - %d"
-msgstr "Ungültiges Bereichsende"
+msgstr "Ungültige Bereichsangabe: %d - %d"
 
 #: command.y:659
-#, fuzzy
 msgid "non-numeric value for field number"
-msgstr "unbekannter Wert für eine Feldangabe: %d\n"
+msgstr "nichtnumerischer Wert als Feldnummer"
 
 #: command.y:680 command.y:687
 msgid "non-numeric value found, numeric expected"
-msgstr ""
+msgstr "nichtnumerischer Wert wo ein numerischer erwartet wurde"
 
 #: command.y:712 command.y:718
 msgid "non-zero integer value"
-msgstr ""
+msgstr "ganyzahliger Wert ungleich Null"
 
 #: command.y:817
 msgid ""
 "backtrace [N] - print trace of all or N innermost (outermost if N < 0) "
 "frames."
 msgstr ""
+"backtrace [N] - log von allen oder den N innersten (äußersten wenn N < 0) "
+"Rahmen."
 
 #: command.y:819
 msgid ""
 "break [[filename:]N|function] - set breakpoint at the specified location."
 msgstr ""
+"break [[Dateiname:]N|funktion - Breakpoint an der angegebenen Stelle setzen.]"
 
 #: command.y:821
 msgid "clear [[filename:]N|function] - delete breakpoints previously set."
-msgstr ""
+msgstr "clear [[Dateiname:]N|Funktion - zuvor gesetzte Breakpoints löschen."
 
 #: command.y:823
 msgid ""
 "commands [num] - starts a list of commands to be executed at a "
 "breakpoint(watchpoint) hit."
 msgstr ""
+"commands [Nr] - startet eine Liste von Befehlen, die bei Erreichen eines "
+"Break- bzw. Watchpoints ausgeführt werden."
 
 #: command.y:825
 msgid "condition num [expr] - set or clear breakpoint or watchpoint condition."
 msgstr ""
+"condition Nr [Ausdruck] - Bedingungen für einen Break-/Watchpoint setzen "
+"oder löschen."
 
 #: command.y:827
 msgid "continue [COUNT] - continue program being debugged."
-msgstr ""
+msgstr "continue [ANZAHL] - zu debuggendes Programm fortsetzen."
 
 #: command.y:829
 msgid "delete [breakpoints] [range] - delete specified breakpoints."
-msgstr ""
+msgstr "delete [Breakpoints] [Bereich] - angegebene Breakpoints entfernen."
 
 #: command.y:831
 msgid "disable [breakpoints] [range] - disable specified breakpoints."
-msgstr ""
+msgstr "disable [Breakpoints] [Bereich] - angegebene Breakpoints deaktivieren."
 
 #: command.y:833
 msgid "display [var] - print value of variable each time the program stops."
 msgstr ""
+"display [Var] - den Wert der Variablen bei jedem Programmstop ausgeben."
 
 #: command.y:835
 msgid "down [N] - move N frames down the stack."
-msgstr ""
+msgstr "down [N] - N Rahmen nach unten im Stack gehen."
 
 #: command.y:837
 msgid "dump [filename] - dump instructions to file or stdout."
 msgstr ""
+"dump [Dateiname] - Befehle in eine Datei oder auf der Standardausgabe "
+"ausgeben"
 
 #: command.y:839
 msgid "enable [once|del] [breakpoints] [range] - enable specified breakpoints."
 msgstr ""
+"enable [once|del] [Breakpoints] [Bereich] - die angegebenen Breakpoints "
+"aktivieren."
 
 #: command.y:841
 msgid "end - end a list of commands or awk statements."
-msgstr ""
+msgstr "end - beendet eine Liste von Befehlen oder AWK/Ausdrücken."
 
 #: command.y:843
 msgid "eval stmt|[p1, p2, ...] - evaluate awk statement(s)."
-msgstr ""
+msgstr "eval stmt[p1, p2, ...] - Awk-Ausdrücke auswerten."
 
 #: command.y:845
 msgid "finish - execute until selected stack frame returns."
 msgstr ""
+"finish - mit Ausführung fortfahren bis auisgewählter Rahmen verlassen wird."
 
 #: command.y:847
 msgid "frame [N] - select and print stack frame number N."
-msgstr ""
+msgstr "frame [N] - den Stackrahmen Nummer N auswählen und ausgeben."
 
 #: command.y:849
 msgid "help [command] - print list of commands or explanation of command."
 msgstr ""
+"help [Befehl] - gibt eine Liste der Befehle oder die Beschreibung eines "
+"einzelnen Befehls aus."
 
 #: command.y:851
 msgid "ignore N COUNT - set ignore-count of breakpoint number N to COUNT."
 msgstr ""
+"ignore N ZÄHLER - setzt den Ignorieren-Zähler von Breakpoint N auf ZÄHLER"
 
 #: command.y:853
 msgid ""
 "info topic - source|sources|variables|functions|break|frame|args|locals|"
 "display|watch."
 msgstr ""
+"info Thema - source|sources|variables|functions|break|frame|args|locals|"
+"display|watch."
 
 #: command.y:855
 msgid "list [-|+|[filename:]lineno|function|range] - list specified line(s)."
 msgstr ""
+"list [-|+|[Dateiname:]Zeilennr|Funktion|Breich] - die angegebenen Zeilen "
+"ausgeben"
 
 #: command.y:857
 msgid "next [COUNT] - step program, proceeding through subroutine calls."
 msgstr ""
+"next [ZÄHLER] - Programm schrittweise ausführen aber Subroutinen in einem "
+"Rutsch ausführen"
 
 #: command.y:859
 msgid ""
 "nexti [COUNT] - step one instruction, but proceed through subroutine calls."
 msgstr ""
+"nexti [ZÄHLER] - einen Befehl abarbeiten. aber Subroutinen in einem Rutsch "
+"ausführen"
 
 #: command.y:861
 msgid "option [name[=value]] - set or display debugger option(s)."
-msgstr ""
+msgstr "option [Name[=Wer]] - Debuggeroptionen setzen oder anzeigen."
 
 #: command.y:863
 msgid "print var [var] - print value of a variable or array."
-msgstr ""
+msgstr "print Var [Var] - den Wert einer Variablen oder eines Feldes ausgeben."
 
 #: command.y:865
 msgid "printf format, [arg], ... - formatted output."
-msgstr ""
+msgstr "printf Format, [Arg], ... - formatierte Ausgabe."
 
 #: command.y:867
 msgid "quit - exit debugger."
-msgstr ""
+msgstr "quit - Debugger verlassen"
 
 #: command.y:869
 msgid "return [value] - make selected stack frame return to its caller."
 msgstr ""
+"return [Wert] - den ausgewählten Stapelrahmen yu seinem Aufrufer zurück "
+"kehren lassen"
 
 #: command.y:871
 msgid "run - start or restart executing program."
-msgstr ""
+msgstr "run - startet die (erneute) Ausführung des Programms."
 
 #: command.y:874
 msgid "save filename - save commands from the session to file."
-msgstr ""
+msgstr "save Dateineme - sichert die Befehle der Sitzung in einer Datei."
 
 #: command.y:877
 msgid "set var = value - assign value to a scalar variable."
-msgstr ""
+msgstr "set Var = Wert - einer skalaren Variablen einen  Wert zuweisen"
 
 #: command.y:879
 msgid ""
 "silent - suspends usual message when stopped at a breakpoint/watchpoint."
 msgstr ""
+"silent - unterdrückt die übliche Nachricht, wenn ein Break- bzw. Watchpoint "
+"erreicht wird."
 
 #: command.y:881
 msgid "source file - execute commands from file."
-msgstr ""
+msgstr "source Datei - die Befehle in Datei ausführen"
 
 #: command.y:883
 msgid "step [COUNT] - step program until it reaches a different source line."
 msgstr ""
+"step [ZÄHLER - Programm schrittweise ausführen bis es eine andere Quellzeile "
+"erricht."
 
 #: command.y:885
 msgid "stepi [COUNT] - step one instruction exactly."
-msgstr ""
+msgstr "stepi [ZÄHLER - genau eine Instruktion ausführen"
 
 #: command.y:887
 msgid "tbreak [[filename:]N|function] - set a temporary breakpoint."
-msgstr ""
+msgstr "tbreak [[Dateinem:]N|Funktion] - einen temporären Breakpoint setzen."
 
 #: command.y:889
 msgid "trace on|off - print instruction before executing."
-msgstr ""
+msgstr "trace on|off - Instruktionen vor der Ausführung ausgeben."
 
 #: command.y:891
 msgid "undisplay [N] - remove variable(s) from automatic display list."
 msgstr ""
+"undisplay [N] - Variablen von der Liste der automatisch Anzuzeigenden "
+"entfernen."
 
 #: command.y:893
 msgid ""
 "until [[filename:]N|function] - execute until program reaches a different "
 "line or line N within current frame."
 msgstr ""
+"until [[Dateiname:]N|Funktion - Ausführen bis das Programm eine andere Zeile "
+"erreicht oder N Zeilen im aktuellen Rahmen."
 
 #: command.y:895
 msgid "unwatch [N] - remove variable(s) from watch list."
-msgstr ""
+msgstr "unwatch [N} - Variablen von der Beobachtungsliste löschen"
 
 #: command.y:897
 msgid "up [N] - move N frames up the stack."
-msgstr ""
+msgstr "up [N] - N Rahmen im Kellerspeicher nach oben gehen."
 
 #: command.y:899
 msgid "watch var - set a watchpoint for a variable."
+msgstr "watch Var - einen Watchpoint für eine Variable setzen."
+
+#: command.y:901
+#, fuzzy
+msgid ""
+"where [N] - (same as backtrace) print trace of all or N innermost (outermost "
+"if N < 0) frames."
 msgstr ""
+"backtrace [N] - log von allen oder den N innersten (äußersten wenn N < 0) "
+"Rahmen."
 
-#: command.y:1011 debug.c:401 msg.c:135
+#: command.y:1013 debug.c:401 msg.c:135
 #, c-format
 msgid "error: "
 msgstr "Fehler: "
 
-#: command.y:1051
-#, fuzzy, c-format
+#: command.y:1053
+#, c-format
 msgid "can't read command (%s)\n"
-msgstr "Von »%s« kann nicht umgelenkt werden (%s)"
+msgstr "der Befehl kann nicht gelesen werden (»%s«)\n"
 
-#: command.y:1065
-#, fuzzy, c-format
+#: command.y:1067
+#, c-format
 msgid "can't read command (%s)"
-msgstr "Von »%s« kann nicht umgelenkt werden (%s)"
+msgstr "der Befehl kann nicht gelesen werden (»%s«)"
 
-#: command.y:1116
-#, fuzzy
+#: command.y:1118
 msgid "invalid character in command"
-msgstr "Ungültiger Name für eine Zeichenklasse"
+msgstr "Ungültiges Zeichen im Befehl"
 
-#: command.y:1152
+#: command.y:1154
 #, c-format
 msgid "unknown command - \"%.*s\", try help"
-msgstr ""
+msgstr "unbekannter Befehl - »%.*s«, versuchen Sie es mit help"
 
-#: command.y:1222
+#: command.y:1224
 #, c-format
 msgid "%s"
-msgstr ""
+msgstr "%s"
 
-#: command.y:1284
-#, fuzzy
+#: command.y:1286
 msgid "invalid character"
 msgstr "Ungültiges Zeichen"
 
-#: command.y:1455
+#: command.y:1457
 #, c-format
 msgid "undefined command: %s\n"
-msgstr ""
+msgstr "undefinierter Befehl: %s\n"
 
 #: debug.c:252
 msgid "set or show the number of lines to keep in history file."
 msgstr ""
+"die Anzahl von Zeilen setzen oder anzeigen, die in der Historydatei "
+"gespeichert werden sollen."
 
 #: debug.c:254
 msgid "set or show the list command window size."
-msgstr ""
+msgstr "die Größe des Fensters für den Befehl list setzen oder anzeigen."
 
 #: debug.c:256
 msgid "set or show gawk output file."
-msgstr ""
+msgstr "die gawk Ausgabedatei setzen oder anzeigen."
 
 #: debug.c:258
 msgid "set or show debugger prompt."
-msgstr ""
+msgstr "das Debugger-Prompt setzen oder anzeigen."
 
 #: debug.c:260
 msgid "(un)set or show saving of command history (value=on|off)."
-msgstr ""
+msgstr "(rück)setzen des Sicherns der Befehlshistorie (on oder off)."
 
 #: debug.c:262
 msgid "(un)set or show saving of options (value=on|off)."
-msgstr ""
+msgstr "(rück)setzen des Sicherns von Optionen (on oder off)."
 
 #: debug.c:264
 msgid "(un)set or show instruction tracing (value=on|off)."
-msgstr ""
+msgstr "(rück)setzen des Verfolgens von Instruktionen (on oder off)."
 
 #: debug.c:345
 msgid "program not running."
-msgstr ""
+msgstr "Das Programm läuft nicht."
 
 #: debug.c:448 debug.c:606
-#, fuzzy, c-format
+#, c-format
 msgid "can't read source file `%s' (%s)"
 msgstr "Die Quelldatei »%s« kann nicht gelesen werden (%s)"
 
 #: debug.c:453
-#, fuzzy, c-format
+#, c-format
 msgid "source file `%s' is empty.\n"
-msgstr "Die Quelldatei »%s« ist leer"
+msgstr "Die Quelldatei »%s« ist leer.\n"
 
 #: debug.c:480
 msgid "no current source file."
-msgstr ""
+msgstr "keine aktuelle Quelldatei"
 
 #: debug.c:505
-#, fuzzy, c-format
+#, c-format
 msgid "cannot find source file named `%s' (%s)"
-msgstr "Die Quelldatei »%s« kann nicht gelesen werden (%s)"
+msgstr "Die Quelldatei »%s« kann nicht gefunden werden (%s)"
 
 #: debug.c:529
 #, c-format
 msgid "WARNING: source file `%s' modified since program compilation.\n"
 msgstr ""
+"WARNUNG: Quelldatei »%s« wurde seit der Programmübersetzung verändert.\n"
 
 #: debug.c:551
 #, c-format
 msgid "line number %d out of range; `%s' has %d lines"
 msgstr ""
+"die Zeilennummer %d ist außerhalb des gültigen Bereichs: »%s« hat %d Zeilen"
 
 #: debug.c:611
-#, fuzzy, c-format
+#, c-format
 msgid "unexpected eof while reading file `%s', line %d"
-msgstr "Unerwarteter Zeilenumbruch oder Ende der Zeichenkette"
+msgstr "Unerwartetes Dateiende beim Lesen von Datei »%s<<, Zeile %d"
 
 #: debug.c:620
 #, c-format
 msgid "source file `%s' modified since start of program execution"
-msgstr ""
+msgstr "Quelldatei »%s« wurde seit dem Start des Programmes verändert"
 
 #: debug.c:732
-#, fuzzy, c-format
+#, c-format
 msgid "Current source file: %s\n"
-msgstr "Quelldatei »%s« wurde bereits eingebunden"
+msgstr "Derzeitige Quelldatei: %s\n"
 
 #: debug.c:733
 #, c-format
 msgid "Number of lines: %d\n"
-msgstr ""
+msgstr "Anzahl von Zeilen: %d\n"
 
 #: debug.c:740
 #, c-format
 msgid "Source file (lines): %s (%d)\n"
-msgstr ""
+msgstr "Quelldatei (Zeilen): %s (%d)\n"
 
 #: debug.c:754
 msgid ""
 "Number  Disp  Enabled  Location\n"
 "\n"
 msgstr ""
+"Nummer  Anz.  Aktiv    Ort\n"
+"\n"
 
 #: debug.c:765
 #, c-format
 msgid "\tno of hits = %ld\n"
-msgstr ""
+msgstr "\tAnzahl Treffer = %ld\n"
 
 #: debug.c:767
 #, c-format
 msgid "\tignore next %ld hit(s)\n"
-msgstr ""
+msgstr "\tdie nächsten %ld Treffer\n"
 
 #: debug.c:769 debug.c:909
 #, c-format
 msgid "\tstop condition: %s\n"
-msgstr ""
+msgstr "\tStopbedingung: %s\n"
 
 #: debug.c:771 debug.c:911
 msgid "\tcommands:\n"
-msgstr ""
+msgstr "\tBefehle:\n"
 
 #: debug.c:793
 #, c-format
 msgid "Current frame: "
-msgstr ""
+msgstr "Derzeitiger Stapelrahmen"
 
 #: debug.c:796
 #, c-format
 msgid "Called by frame: "
-msgstr ""
+msgstr "Aufgerufen aus Rahmen: "
 
 #: debug.c:800
 #, c-format
 msgid "Caller of frame: "
-msgstr ""
+msgstr "Aufrufer des Rahmens: "
 
 #: debug.c:818
 #, c-format
 msgid "None in main().\n"
-msgstr ""
+msgstr "Keine in  main().\n"
 
 #: debug.c:848
-#, fuzzy
 msgid "No arguments.\n"
-msgstr "printf: Keine Argumente"
+msgstr "Keine Argumente.\n"
 
 #: debug.c:849
 msgid "No locals.\n"
-msgstr ""
+msgstr "Keine lokalen.\n"
 
 #: debug.c:857
 msgid ""
 "All defined variables:\n"
 "\n"
 msgstr ""
+"Alle definierten Variablen:\n"
+"\n"
 
 #: debug.c:867
 msgid ""
 "All defined functions:\n"
 "\n"
 msgstr ""
+"Alle definierten Funktionen:\n"
+"\n"
 
 #: debug.c:886
 msgid ""
 "Auto-display variables:\n"
 "\n"
 msgstr ""
+"Auto-display-Variablen:\n"
+"\n"
 
 #: debug.c:889
 msgid ""
 "Watch variables:\n"
 "\n"
 msgstr ""
+"Yu überwachende Variablen:\n"
+"\n"
 
 #: debug.c:1029
-#, fuzzy, c-format
+#, c-format
 msgid "no symbol `%s' in current context\n"
-msgstr "»exit« kann im aktuellen Kontext nicht aufgerufen werden"
+msgstr "im aktuellen Kontext gibt es kein Symbol mit Namen »%s«\n"
 
 #: debug.c:1041 debug.c:1427
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' is not an array\n"
-msgstr "»%s« ist kein gültiger Variablenname"
+msgstr "»%s« ist kein Feld\n"
 
 #: debug.c:1055
-#, fuzzy, c-format
+#, c-format
 msgid "$%ld = uninitialized field\n"
-msgstr "Referenz auf das nicht initialisierte Feld »$%d«"
+msgstr "$%ld = nicht initialisiertes Feld\n"
 
 #: debug.c:1076
-#, fuzzy, c-format
+#, c-format
 msgid "array `%s' is empty\n"
-msgstr "Die Datei »%s« ist leer"
+msgstr "Das Feld »%s« ist leer\n"
 
 #: debug.c:1119 debug.c:1171
-#, fuzzy, c-format
+#, c-format
 msgid "[\"%s\"] not in array `%s'\n"
-msgstr "delete: Index »%s« ist in Feld »%s« nicht vorhanden"
+msgstr "[\"%s\"] ist in Feld »%s« nicht vorhanden\n"
 
 #: debug.c:1175
 #, c-format
 msgid "`%s[\"%s\"]' is not an array\n"
-msgstr ""
+msgstr "»%s[\"%s\"]« ist kein Feld\n"
 
 #: debug.c:1236 debug.c:4964
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' is not a scalar variable"
-msgstr "»%s« ist kein gültiger Variablenname"
+msgstr "»%s« ist keine skalare Variable"
 
 #: debug.c:1258 debug.c:4994
-#, fuzzy, c-format
+#, c-format
 msgid "attempt to use array `%s[\"%s\"]' in a scalar context"
 msgstr ""
-"Es wird versucht, das Feld »%s[\"%.*s\"]« in einem Skalarkontext zu verwenden"
+"Es wird versucht, das Feld »%s[\"%s\"]« in einem Skalarkontext zu verwenden"
 
 #: debug.c:1280 debug.c:5005
-#, fuzzy, c-format
+#, c-format
 msgid "attempt to use scalar `%s[\"%s\"]' as array"
-msgstr "Es wird versucht, den Skalar »%s[\"%.*s\"]« als Feld zu verwenden"
+msgstr "Es wird versucht, den Skalar »%s[\"%s\"]« als Feld zu verwenden"
 
 #: debug.c:1423
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' is a function"
-msgstr "»%s« ist ein unzulässiger Funktionsname"
+msgstr "»%s« ist eine Funktion"
 
 #: debug.c:1465
 #, c-format
 msgid "watchpoint %d is unconditional\n"
-msgstr ""
+msgstr "Watchpoint %d ist bedingungslos\n"
 
 #: debug.c:1499
 #, c-format
 msgid "No display item numbered %ld"
-msgstr ""
+msgstr "Kein anzuzeigendes Element mit Nummer %ld"
 
 #: debug.c:1502
 #, c-format
 msgid "No watch item numbered %ld"
-msgstr ""
+msgstr "Kein zu beobachtendes Element mit Nummer %ld"
 
 #: debug.c:1528
-#, fuzzy, c-format
+#, c-format
 msgid "%d: [\"%s\"] not in array `%s'\n"
-msgstr "delete: Index »%s« ist in Feld »%s« nicht vorhanden"
+msgstr "%d: [\"%s\"] ist in Feld »%s« nicht vorhanden\n"
 
 #: debug.c:1767
-#, fuzzy
 msgid "attempt to use scalar value as array"
 msgstr "Es wird versucht, einen Skalar als Feld zu verwenden"
 
@@ -1532,337 +1607,352 @@ msgstr "Es wird versucht, einen Skalar als Feld zu verwenden"
 #, c-format
 msgid "Watchpoint %d deleted because parameter is out of scope.\n"
 msgstr ""
+"Watchpoint %d wurde gelöscht, weil der Parameter außerhalb des "
+"Gültigkeitsbereichs ist.\n"
 
 #: debug.c:1867
 #, c-format
 msgid "Display %d deleted because parameter is out of scope.\n"
 msgstr ""
+"Anzuzeigendes Element %d wurde gelöscht, weil der Parameter außerhalb des "
+"Gültigkeitsbereichs ist.\n"
 
 #: debug.c:1900
 #, c-format
 msgid " in file `%s', line %d\n"
-msgstr ""
+msgstr " in Datei »%s«, Zeile %d\n"
 
 #: debug.c:1921
 #, c-format
 msgid " at `%s':%d"
-msgstr ""
+msgstr " bei »%s«:%d"
 
 #: debug.c:1937 debug.c:2000
 #, c-format
 msgid "#%ld\tin "
-msgstr ""
+msgstr "#%ld\tin "
 
 #: debug.c:1974
 #, c-format
 msgid "More stack frames follow ...\n"
-msgstr ""
+msgstr "Weitere Stapelrahmen folgen ...\n"
 
 #: debug.c:2017
-#, fuzzy
 msgid "invalid frame number"
-msgstr "Ungültiges Bereichsende"
+msgstr "Ungültige Rahmennummer"
 
 #: debug.c:2200
 #, c-format
 msgid "Note: breakpoint %d (enabled, ignore next %ld hits), also set at %s:%d"
 msgstr ""
+"Hinweis: Breakpont %d (aktiv, ignoriert für die nächsten %ld Treffer) wird "
+"auch an %s:%d gesetzt"
 
 #: debug.c:2207
 #, c-format
 msgid "Note: breakpoint %d (enabled), also set at %s:%d"
-msgstr ""
+msgstr "Hinweis: Breakpont %d (aktiv) wird auch an %s:%d gesetzt"
 
 #: debug.c:2214
 #, c-format
 msgid "Note: breakpoint %d (disabled, ignore next %ld hits), also set at %s:%d"
 msgstr ""
+"Hinweis: Breakpont %d (inaktiv, ignoriert für die nächsten %ld Treffer) wird "
+"auch von %s:%d gesetzt"
 
 #: debug.c:2221
 #, c-format
 msgid "Note: breakpoint %d (disabled), also set at %s:%d"
-msgstr ""
+msgstr "Hinweis: Breakpont %d (inaktiv) wird auch an %s:%d gesetzt"
 
 #: debug.c:2238
 #, c-format
 msgid "Breakpoint %d set at file `%s', line %d\n"
-msgstr ""
+msgstr "Breakpont %d wird auf Datei %s, Zeile %d gesetzt\n"
 
 #: debug.c:2340
 #, c-format
 msgid "Can't set breakpoint in file `%s'\n"
-msgstr ""
+msgstr "In Datei »%s« kann kein Breakpoint gesetzt werden\n"
 
 #: debug.c:2369 debug.c:2492 debug.c:3350
-#, fuzzy, c-format
+#, c-format
 msgid "line number %d in file `%s' out of range"
-msgstr "exp: das Argument %g liegt außerhalb des gültigen Bereichs"
+msgstr "Zeile Nummer %d in Datei »%s« liegt außerhalb des gültigen Bereichs"
 
 #: debug.c:2373
 #, c-format
 msgid "Can't find rule!!!\n"
-msgstr ""
+msgstr "Die Regel kann nicht gefunden werden!!!\n"
 
 #: debug.c:2375
 #, c-format
 msgid "Can't set breakpoint at `%s':%d\n"
-msgstr ""
+msgstr "In »%s«:%d kann kein Breakpoint gesetzt werden\n"
 
 #: debug.c:2387
 #, c-format
 msgid "Can't set breakpoint in function `%s'\n"
-msgstr ""
+msgstr "In Funktion »%s« kann kein Breakpoint gesetzt werden\n"
 
 #: debug.c:2403
 #, c-format
 msgid "breakpoint %d set at file `%s', line %d is unconditional\n"
-msgstr ""
+msgstr "Breakpoint %d gestzt auf Datei »%s« Zeile %d ist bedingungslos\n"
 
 #: debug.c:2508 debug.c:2530
 #, c-format
 msgid "Deleted breakpoint %d"
-msgstr ""
+msgstr "Breakpoint %d wurde gelöscht"
 
 #: debug.c:2514
 #, c-format
 msgid "No breakpoint(s) at entry to function `%s'\n"
-msgstr ""
+msgstr "Am Beginn von Funktion »%s« gibt es keine Breakpoints\n"
 
 #: debug.c:2541
-#, fuzzy, c-format
+#, c-format
 msgid "No breakpoint at file `%s', line #%d\n"
-msgstr "Fehler beim Lesen der Eingabedatei »%s«: %s"
+msgstr "Bei Datei »%s« Zeile %d gibt es keine Breakpoints\n"
 
 #: debug.c:2596 debug.c:2637 debug.c:2657 debug.c:2700
 msgid "invalid breakpoint number"
-msgstr ""
+msgstr "Ungtige Breakpoint/Nummer"
 
 #: debug.c:2612
 msgid "Delete all breakpoints? (y or n) "
-msgstr ""
+msgstr "Alle Breakpoints löschen? (j oder n) "
 
 #: debug.c:2613 debug.c:2923 debug.c:2976
 msgid "y"
-msgstr ""
+msgstr "j"
 
 #: debug.c:2662
 #, c-format
 msgid "Will ignore next %ld crossing(s) of breakpoint %d.\n"
 msgstr ""
+"die nächsten %ld Überschreitungen von Breakpoint %d werden ignoriert.\n"
 
 #: debug.c:2666
 #, c-format
 msgid "Will stop next time breakpoint %d is reached.\n"
-msgstr ""
+msgstr "wenn Breakpoint %d das nächste mal erreicht wird, wird angehalten\n"
 
 #: debug.c:2783
 #, c-format
 msgid "Can only debug programs provided with the `-f' option.\n"
 msgstr ""
+"Es können nur Programme untersucht werden, die mittels der Option »-f« "
+"übergeben wurden.\n"
 
 #: debug.c:2908
 #, c-format
 msgid "Failed to restart debugger"
-msgstr ""
+msgstr "Der Debugger konnte nicht neu gestartet werden"
 
 #: debug.c:2922
 msgid "Program already running. Restart from beginning (y/n)? "
-msgstr ""
+msgstr "das Programm läfut bereits. Neu starten (j/n}? "
 
 #: debug.c:2926
 #, c-format
 msgid "Program not restarted\n"
-msgstr ""
+msgstr "Das Programm wurde nicht neu gestartet\n"
 
 #: debug.c:2936
 #, c-format
 msgid "error: cannot restart, operation not allowed\n"
-msgstr ""
+msgstr "Fehler: Neustart nicht möglich da die Operation verboten ist\n"
 
 #: debug.c:2942
 #, c-format
 msgid "error (%s): cannot restart, ignoring rest of the commands\n"
 msgstr ""
+"Fehler (%s): Neustart nicht möglich, der Rest der Befehle wird ignoriert\n"
 
 #: debug.c:2950
 #, c-format
 msgid "Starting program: \n"
-msgstr ""
+msgstr "Das Programm wird gestartet: \n"
 
 #: debug.c:2959
 #, c-format
 msgid "Program exited %s with exit value: %d\n"
-msgstr ""
+msgstr "Das Programm verließ %s mit einem Rückgabewert: %d\n"
 
 #: debug.c:2975
 msgid "The program is running. Exit anyway (y/n)? "
-msgstr ""
+msgstr "Das Prgramm läuft. Trotzdem beenden (j/n) "
 
 #: debug.c:3010
 #, c-format
 msgid "Not stopped at any breakpoint; argument ignored.\n"
-msgstr ""
+msgstr "Es wird an keinem Breakpoint gestoppt; das Argument wird ignoriert.\n"
 
 #: debug.c:3015
 #, c-format
 msgid "invalid breakpoint number %d."
-msgstr ""
+msgstr "ungültige Breakpointnummer %d."
 
 #: debug.c:3020
 #, c-format
 msgid "Will ignore next %ld crossings of breakpoint %d.\n"
 msgstr ""
+"Die nächsten %ld Überschreitungen von Breakpoint %d werden ignoriert.\n"
 
 #: debug.c:3207
 #, c-format
 msgid "'finish' not meaningful in the outermost frame main()\n"
-msgstr ""
+msgstr "»finish« hat in main() des äußersten Rahmens keine Bedeutung\n"
 
 #: debug.c:3212
 #, c-format
 msgid "Run till return from "
-msgstr ""
+msgstr "Laufen bis zur Rückkehr von "
 
 #: debug.c:3255
 #, c-format
 msgid "'return' not meaningful in the outermost frame main()\n"
-msgstr ""
+msgstr "»return« hat in main() des äußersten Rahmens keine Bedeutung\n"
 
 #: debug.c:3369
 #, c-format
 msgid "Can't find specified location in function `%s'\n"
-msgstr ""
+msgstr "Die angegebene Position in Funktion »%s« kann nicht gefunden werden\n"
 
 #: debug.c:3377
-#, fuzzy, c-format
+#, c-format
 msgid "invalid source line %d in file `%s'"
-msgstr "Quelldatei »%s« wurde bereits eingebunden"
+msgstr "ungültige Quellzeilennummer %d in Datei »%s«"
 
 #: debug.c:3392
 #, c-format
 msgid "Can't find specified location %d in file `%s'\n"
-msgstr ""
+msgstr "Der Zielpunkt %d in Datei »%s« ist nicht auffindbar\n"
 
 #: debug.c:3424
-#, fuzzy, c-format
+#, c-format
 msgid "element not in array\n"
-msgstr "delete: Index »%s« ist in Feld »%s« nicht vorhanden"
+msgstr "Das Element ist kein Feld\n"
 
 #: debug.c:3424
 #, c-format
 msgid "untyped variable\n"
-msgstr ""
+msgstr "untypisierte Variable\n"
 
 #: debug.c:3466
 #, c-format
 msgid "Stopping in %s ...\n"
-msgstr ""
+msgstr "Stopp in %s ...\n"
 
 #: debug.c:3543
 #, c-format
 msgid "'finish' not meaningful with non-local jump '%s'\n"
-msgstr ""
+msgstr "»finish« hat bei dem nichtlokalen Sprung »%s« keine Bedeutung\n"
 
 #: debug.c:3550
 #, c-format
 msgid "'until' not meaningful with non-local jump '%s'\n"
-msgstr ""
+msgstr "»finish« hat bei dem nichtlokalen Sprung »%s« keine Bedeutung\n"
 
 #: debug.c:4185
 msgid "\t------[Enter] to continue or q [Enter] to quit------"
-msgstr ""
+msgstr "\t-[Eingabe] um fort zu fahren oder b [Eingabe] für geenden -"
 
 #: debug.c:4186
 msgid "q"
-msgstr ""
+msgstr "b"
 
 #: debug.c:5001
-#, fuzzy, c-format
+#, c-format
 msgid "[\"%s\"] not in array `%s'"
-msgstr "delete: Index »%s« ist in Feld »%s« nicht vorhanden"
+msgstr "[\"%s\"] ist in Feld »%s« nicht vorhanden"
 
 #: debug.c:5207
 #, c-format
 msgid "sending output to stdout\n"
-msgstr ""
+msgstr "Ausgabe wird an die Standardausgabe geschickt\n"
 
 #: debug.c:5247
 msgid "invalid number"
-msgstr ""
+msgstr "ungültige Zahl"
 
 #: debug.c:5381
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' not allowed in current context; statement ignored"
-msgstr "»exit« kann im aktuellen Kontext nicht aufgerufen werden"
+msgstr ""
+"»%s« ist im aktuellen Kontext nicht zulässig; der Ausdruck wird ignoriert"
 
 #: debug.c:5389
-#, fuzzy
 msgid "`return' not allowed in current context; statement ignored"
-msgstr "»exit« kann im aktuellen Kontext nicht aufgerufen werden"
+msgstr ""
+"»reeturn« ist im aktuellen Kontext nicht zulässig; der Ausdruck wird "
+"ignoriert"
 
-#: debug.c:5590
+#: debug.c:5604
 #, c-format
 msgid "No symbol `%s' in current context"
-msgstr ""
+msgstr "Im aktuelln Kontext gibt es kein Symbol »%s«"
 
-#: dfa.c:1118 dfa.c:1121 dfa.c:1142 dfa.c:1150 dfa.c:1162 dfa.c:1197
-#: dfa.c:1206 dfa.c:1209 dfa.c:1214 dfa.c:1228 dfa.c:1275
+#: dfa.c:1063 dfa.c:1066 dfa.c:1085 dfa.c:1095 dfa.c:1107 dfa.c:1143
+#: dfa.c:1152 dfa.c:1155 dfa.c:1160 dfa.c:1174 dfa.c:1222
 msgid "unbalanced ["
-msgstr ""
+msgstr "nicht geschlossene ["
 
-#: dfa.c:1174
-#, fuzzy
+#: dfa.c:1119
 msgid "invalid character class"
-msgstr "Ungültiger Name für eine Zeichenklasse"
+msgstr "ungültige Zeichenklasse"
 
-#: dfa.c:1316
+#: dfa.c:1265
 msgid "character class syntax is [[:space:]], not [:space:]"
-msgstr ""
+msgstr "Die Syntax für Zeichenklassen ist [[:space:]], nicht [:space:]"
 
-#: dfa.c:1366
+#: dfa.c:1327
 msgid "unfinished \\ escape"
-msgstr ""
+msgstr "nicht beendetes \\ Escape"
 
-#: dfa.c:1513 regcomp.c:161
-msgid "Invalid content of \\{\\}"
+#: dfa.c:1474
+#, fuzzy
+msgid "invalid content of \\{\\}"
 msgstr "Ungültiger Inhalt von \\{\\}"
 
-#: dfa.c:1516 regcomp.c:176
-msgid "Regular expression too big"
+#: dfa.c:1477
+#, fuzzy
+msgid "regular expression too big"
 msgstr "Regulärer Ausdruck ist zu groß"
 
-#: dfa.c:1936
+#: dfa.c:1912
 msgid "unbalanced ("
-msgstr ""
+msgstr "nicht geschlossene ("
 
-#: dfa.c:2062
+#: dfa.c:2038
 msgid "no syntax specified"
-msgstr ""
+msgstr "keine Syntax angegeben"
 
-#: dfa.c:2070
+#: dfa.c:2046
 msgid "unbalanced )"
-msgstr ""
+msgstr "nicht geöffnete )"
 
-#: eval.c:394
+#: eval.c:396
 #, c-format
 msgid "unknown nodetype %d"
 msgstr "Unbekannter Knotentyp %d"
 
-#: eval.c:405 eval.c:419
+#: eval.c:407 eval.c:421
 #, c-format
 msgid "unknown opcode %d"
 msgstr "Unbekannter Opcode %d"
 
-#: eval.c:416
+#: eval.c:418
 #, c-format
 msgid "opcode %s not an operator or keyword"
 msgstr "Opcode %s ist weder ein Operator noch ein Schlüsselwort"
 
-#: eval.c:472
+#: eval.c:474
 msgid "buffer overflow in genflags2str"
 msgstr "Pufferüberlauf in genflags2str"
 
-#: eval.c:675
+#: eval.c:676
 #, c-format
 msgid ""
 "\n"
@@ -1873,723 +1963,693 @@ msgstr ""
 "\t# Funktions-Aufruf-Stack\n"
 "\n"
 
-#: eval.c:704
+#: eval.c:705
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "»IGNORECASE« ist eine gawk-Erweiterung"
 
-#: eval.c:736
+#: eval.c:737
 msgid "`BINMODE' is a gawk extension"
 msgstr "»BINMODE« ist eine gawk-Erweiterung"
 
-#: eval.c:794
+#: eval.c:795
 #, c-format
 msgid "BINMODE value `%s' is invalid, treated as 3"
 msgstr "BINMODE Wert »%s« ist ungültig und wird als 3 behandelt"
 
-#: eval.c:885
+#: eval.c:912
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "Falsche »%sFMT«-Angabe »%s«"
 
-#: eval.c:969
+#: eval.c:996
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "»--lint« wird abgeschaltet, da an »LINT« zugewiesen wird"
 
-#: eval.c:1147
+#: eval.c:1174
 #, c-format
 msgid "reference to uninitialized argument `%s'"
 msgstr "Referenz auf nicht initialisiertes Argument »%s«"
 
-#: eval.c:1148
+#: eval.c:1175
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "Referenz auf die nicht initialisierte Variable »%s«"
 
-#: eval.c:1166
+#: eval.c:1193
 msgid "attempt to field reference from non-numeric value"
 msgstr "Nicht numerischer Wert für Feldreferenz verwendet"
 
-#: eval.c:1168
+#: eval.c:1195
 msgid "attempt to field reference from null string"
 msgstr "Referenz auf ein Feld von einem Null-String"
 
-#: eval.c:1176
+#: eval.c:1203
 #, c-format
 msgid "attempt to access field %ld"
 msgstr "Versuch des Zugriffs auf Feld %ld"
 
-#: eval.c:1185
+#: eval.c:1212
 #, c-format
 msgid "reference to uninitialized field `$%ld'"
 msgstr "Referenz auf das nicht initialisierte Feld »$%ld«"
 
-#: eval.c:1272
+#: eval.c:1299
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "Funktion »%s« mit zu vielen Argumenten aufgerufen"
 
-#: eval.c:1473
+#: eval.c:1500
 #, c-format
 msgid "unwind_stack: unexpected type `%s'"
 msgstr "unwind_stack: unerwarteter Typ »%s«"
 
-#: eval.c:1569
+#: eval.c:1596
 msgid "division by zero attempted in `/='"
 msgstr "Division durch Null versucht in »/=«"
 
-#: eval.c:1576
+#: eval.c:1603
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "Division durch Null versucht in »%%=«"
 
-#: ext.c:89 ext.c:171
+#: ext.c:65 ext.c:147
 msgid "extensions are not allowed in sandbox mode"
 msgstr "Erweiterungen sind im Sandbox-Modus nicht erlaubt"
 
-#: ext.c:92
-#, fuzzy
+#: ext.c:68
 msgid "-l / @load are gawk extensions"
-msgstr "»@include« ist eine gawk-Erweiterung"
+msgstr "-l / @load sind gawk-Erweiterungen"
 
-#: ext.c:95
+#: ext.c:71
 msgid "load_ext: received NULL lib_name"
-msgstr ""
+msgstr "load_ext: NULL lib_name erhalten"
 
-#: ext.c:98
-#, fuzzy, c-format
+#: ext.c:74
+#, c-format
 msgid "load_ext: cannot open library `%s' (%s)\n"
-msgstr "Fatal: extension: »%s« kann nicht geöffnet werden (%s)\n"
+msgstr "load_ext: Bibliothek »%s« kann nicht geöffnet werden (%s)\n"
 
-#: ext.c:104
-#, fuzzy, c-format
+#: ext.c:80
+#, c-format
 msgid ""
 "load_ext: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
 msgstr ""
-"Fatal: Erweiterung: Bibliothek »%s«: definiert »plugin_is_GPL_compatible« "
-"nicht (%s)\n"
+"load_ext: Bibliothek »%s«: definiert »plugin_is_GPL_compatible« nicht (%s)\n"
 
-#: ext.c:110
-#, fuzzy, c-format
+#: ext.c:86
+#, c-format
 msgid "load_ext: library `%s': cannot call function `%s' (%s)\n"
 msgstr ""
-"Fatal: Erweiterung: Bibliothek »%s«: Funktion »%s« kann nicht aufgerufen "
-"werden (%s)\n"
+"load_ext: Bibliothek »%s«: Funktion »%s« kann nicht aufgerufen werden (%s)\n"
 
-#: ext.c:114
+#: ext.c:90
 #, c-format
 msgid "load_ext: library `%s' initialization routine `%s' failed\n"
 msgstr ""
+"load_ext: die Initialisierungsroutine %2$s von Bibliothek »%1$s« ist "
+"gescheitert\n"
 
-#: ext.c:174
+#: ext.c:150
 msgid "`extension' is a gawk extension"
 msgstr "»extension« ist eine gawk-Erweiterung"
 
-#: ext.c:177
+#: ext.c:153
 msgid "extension: received NULL lib_name"
-msgstr ""
+msgstr "extension: NULL lib_name erhalten"
 
-#: ext.c:180
-#, fuzzy, c-format
+#: ext.c:156
+#, c-format
 msgid "extension: cannot open library `%s' (%s)"
-msgstr "Fatal: extension: »%s« kann nicht geöffnet werden (%s)\n"
+msgstr "extension: Bibliothek »%s« kann nicht geöffnet werden (%s)"
 
-#: ext.c:186
-#, fuzzy, c-format
+#: ext.c:162
+#, c-format
 msgid ""
 "extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)"
 msgstr ""
-"Fatal: Erweiterung: Bibliothek »%s«: definiert »plugin_is_GPL_compatible« "
-"nicht (%s)\n"
+"extension: Bibliothek »%s«: definiert »plugin_is_GPL_compatible« nicht (%s)"
 
-#: ext.c:190
-#, fuzzy, c-format
+#: ext.c:166
+#, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)"
 msgstr ""
-"Fatal: Erweiterung: Bibliothek »%s«: Funktion »%s« kann nicht aufgerufen "
-"werden (%s)\n"
+"extension: Bibliothek »%s«: Funktion »%s« kann nicht aufgerufen werden (%s)"
 
-#: ext.c:221
-#, fuzzy
+#: ext.c:197
 msgid "make_builtin: missing function name"
-msgstr "Erweiterung: Funktionsname fehlt"
+msgstr "make_builtin: Funktionsname fehlt"
 
-#: ext.c:236
-#, fuzzy, c-format
+#: ext.c:212
+#, c-format
 msgid "make_builtin: can't redefine function `%s'"
-msgstr "Erweiterung: Funktion »%s« kann nicht neu definiert werden"
+msgstr "make_builtin: Funktion »%s« kann nicht neu definiert werden"
 
-#: ext.c:240
-#, fuzzy, c-format
+#: ext.c:216
+#, c-format
 msgid "make_builtin: function `%s' already defined"
-msgstr "Erweiterung: Funktion »%s« wurde bereits definiert"
+msgstr "make_builtin: Funktion »%s« wurde bereits definiert"
 
-#: ext.c:244
-#, fuzzy, c-format
+#: ext.c:220
+#, c-format
 msgid "make_builtin: function name `%s' previously defined"
-msgstr "Erweiterung: Funktion »%s« wurde bereits vorher definiert"
+msgstr "make_builtin: Funktion »%s« wurde bereits vorher definiert"
 
-#: ext.c:246
-#, fuzzy, c-format
+#: ext.c:222
+#, c-format
 msgid "make_builtin: can't use gawk built-in `%s' as function name"
 msgstr ""
-"Erweiterung: die eingebaute Funktion »%s« kann nicht als Funktionsname "
-"verwendet werden"
+"make_builtin: die in gawk eingebaute Funktion »%s« kann nicht als "
+"Funktionsname verwendet werden"
 
-#: ext.c:249 ext.c:304
+#: ext.c:225 ext.c:280
 #, c-format
 msgid "make_builtin: negative argument count for function `%s'"
 msgstr "make_builtin: negative Anzahl von Argumenten für Funktion »%s«"
 
-#: ext.c:276
-#, fuzzy
+#: ext.c:252
 msgid "extension: missing function name"
 msgstr "Erweiterung: Funktionsname fehlt"
 
-#: ext.c:279 ext.c:283
-#, fuzzy, c-format
+#: ext.c:255 ext.c:259
+#, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
-msgstr "Erweiterung: unzulässiges Zeichen »%c« in Funktionsname »%s«"
+msgstr "extension: unzulässiges Zeichen »%c« in Funktionsname »%s«"
 
-#: ext.c:291
-#, fuzzy, c-format
+#: ext.c:267
+#, c-format
 msgid "extension: can't redefine function `%s'"
-msgstr "Erweiterung: Funktion »%s« kann nicht neu definiert werden"
+msgstr "extension: Funktion »%s« kann nicht neu definiert werden"
 
-#: ext.c:295
-#, fuzzy, c-format
+#: ext.c:271
+#, c-format
 msgid "extension: function `%s' already defined"
-msgstr "Erweiterung: Funktion »%s« wurde bereits definiert"
+msgstr "extension: Funktion »%s« wurde bereits definiert"
 
-#: ext.c:299
-#, fuzzy, c-format
+#: ext.c:275
+#, c-format
 msgid "extension: function name `%s' previously defined"
-msgstr "Funktion »%s« wurde bereits definiert"
+msgstr "extension: Funktion »%s« wurde bereits vorher definiert"
 
-#: ext.c:301
-#, fuzzy, c-format
+#: ext.c:277
+#, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
-"Erweiterung: die eingebaute Funktion »%s« kann nicht als Funktionsname "
+"extension: die eingebaute Funktion »%s« kann nicht als Funktionsname "
 "verwendet werden"
 
-#: ext.c:375
+#: ext.c:351
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr ""
 "Funktion »%s« wird als Funktion definiert, die nie mehr als %d Argument(e) "
 "akzeptiert"
 
-#: ext.c:378
+#: ext.c:354
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "Funktion »%s«: fehlendes Argument #%d"
 
-#: ext.c:395
+#: ext.c:371
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr ""
 "Funktion »%s«: Argument #%d: Es wird versucht, einen Skalar als Feld zu "
 "verwenden"
 
-#: ext.c:399
+#: ext.c:375
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 "Funktion »%s«: Argument #%d: Es wird versucht, ein Feld als Skalar zu "
 "verwenden"
 
-#: ext.c:413
+#: ext.c:389
 msgid "dynamic loading of library not supported"
-msgstr ""
+msgstr "das dynamische Laden von Bibliotheken wird nicht unterstützt"
 
 #: extension/filefuncs.c:159
-#, fuzzy
 msgid "chdir: called with incorrect number of arguments, expecting 1"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr ""
+"chdir: Aufgruf mit einer ungültigen Anzahl von Argumenten, 1 wird erwartet"
 
 #: extension/filefuncs.c:439
 #, c-format
 msgid "stat: unable to read symbolic link `%s'"
-msgstr ""
+msgstr "stst: die symbolische Verknüpfung »%s« kann nicht gelesenb werden"
 
 #: extension/filefuncs.c:472
-#, fuzzy
 msgid "stat: called with wrong number of arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "stat: Aufruf mit falscher Anzahl Argumenten"
 
 #: extension/filefuncs.c:479
-#, fuzzy
 msgid "stat: bad parameters"
-msgstr "%s: ist ein Parameter\n"
+msgstr "stat: ungültige Parameter"
 
 #: extension/filefuncs.c:533
-#, fuzzy, c-format
+#, c-format
 msgid "fts init: could not create variable %s"
-msgstr "index: Zweites Argument ist kein string"
+msgstr "fts_init: Variable %s konnte nicht angelegt werden"
 
 #: extension/filefuncs.c:554
-#, fuzzy
 msgid "fts is not supported on this system"
-msgstr "»%s« wird im alten awk nicht unterstützt"
+msgstr "fts wird auf diesem System nicht unterstützt"
 
 #: extension/filefuncs.c:573
 msgid "fill_stat_element: could not create array"
-msgstr ""
+msgstr "fill_stat_element: das Feld konnte nicht angelegt werden"
 
 #: extension/filefuncs.c:582
 msgid "fill_stat_element: could not set element"
-msgstr ""
+msgstr "fill_stat_element: das Element konnte nicht gesetzt werden"
 
 #: extension/filefuncs.c:597
-#, fuzzy
 msgid "fill_path_element: could not set element"
-msgstr "index: Zweites Argument ist kein string"
+msgstr "fill_path_element: das Element konnte nicht gesetzt werden"
 
 #: extension/filefuncs.c:613
 msgid "fill_error_element: could not set element"
-msgstr ""
+msgstr "fill_error_element: das Element konnte nicht gesetzt werden"
 
 #: extension/filefuncs.c:660 extension/filefuncs.c:707
 msgid "fts-process: could not create array"
-msgstr ""
+msgstr "fts-process: das Feld konnte nicht anglegt werden"
 
 #: extension/filefuncs.c:670 extension/filefuncs.c:717
 #: extension/filefuncs.c:735
-#, fuzzy
 msgid "fts-process: could not set element"
-msgstr "index: Zweites Argument ist kein string"
+msgstr "fts-process: das Element konnte nicht gesetzt werden"
 
 #: extension/filefuncs.c:784
-#, fuzzy
 msgid "fts: called with incorrect number of arguments, expecting 3"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "fts: Aufruf mit falscher Anzahl an Argumenten, es werden 3 erwartet"
 
 #: extension/filefuncs.c:787
-#, fuzzy
 msgid "fts: bad first parameter"
-msgstr "%s: ist ein Parameter\n"
+msgstr "fts: ungültiger Parameter"
 
 #: extension/filefuncs.c:793
-#, fuzzy
 msgid "fts: bad second parameter"
-msgstr "%s: ist ein Parameter\n"
+msgstr "fts: ungültiger zweiter Parameter"
 
 #: extension/filefuncs.c:799
-#, fuzzy
 msgid "fts: bad third parameter"
-msgstr "%s: ist ein Parameter\n"
+msgstr "%s: ist ein Parameter"
 
 #: extension/filefuncs.c:806
-#, fuzzy
 msgid "fts: could not flatten array\n"
-msgstr "»%s« ist kein gültiger Variablenname"
+msgstr "fts: ungültiger dritter Parameter\n"
 
 #: extension/filefuncs.c:824
 msgid "fts: ignoring sneaky FTS_NOSTAT flag. nyah, nyah, nyah."
 msgstr ""
+"fts: die heimtückische Kennung FTS_NOSTAT wird ignoriert, ätsch bätsch."
 
 #: extension/filefuncs.c:841
 msgid "fts: clear_array() failed\n"
-msgstr ""
+msgstr "fts: clear_array() ist gescheitert\n"
 
 #: extension/fnmatch.c:112
-#, fuzzy
 msgid "fnmatch: called with less than three arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "fnmatch: Aufruf mit weniger als drei Argumenten"
 
 #: extension/fnmatch.c:115
-#, fuzzy
 msgid "fnmatch: called with more than three arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "fnmatch: Aufruf mit mehr als drei Argumenten"
 
 #: extension/fnmatch.c:118
-#, fuzzy
 msgid "fnmatch: could not get first argument"
-msgstr "strftime: Das erste Argument ist kein String"
+msgstr "fnmatch: Das erste Argument konnte nicht gelesen werden"
 
 #: extension/fnmatch.c:123
-#, fuzzy
 msgid "fnmatch: could not get second argument"
-msgstr "index: Zweites Argument ist kein string"
+msgstr "fnmatch: Das zweite  Argument konnte nicht gelesen werden"
 
 #: extension/fnmatch.c:128
 msgid "fnmatch: could not get third argument"
-msgstr ""
+msgstr "fnmatch: Das dritte  Argument konnte nicht gelesen werden"
 
 #: extension/fnmatch.c:141
 msgid "fnmatch is not implemented on this system\n"
-msgstr ""
+msgstr "fnmatch ist auf diesem System nicht implementiert\n"
 
 #: extension/fnmatch.c:173
 msgid "fnmatch init: could not add FNM_NOMATCH variable"
 msgstr ""
+"fnmatch_init: eine FNM_NOMATCH-Variable konnte nicht hinzu gefügt werden"
 
 #: extension/fnmatch.c:183
 #, c-format
 msgid "fnmatch init: could not set array element %s"
-msgstr ""
+msgstr "fnmatch_init: das Feldelement %s konnte nicht initialisiert werden"
 
 #: extension/fnmatch.c:193
 msgid "fnmatch init: could not install FNM array"
-msgstr ""
+msgstr "fnmatch_init: das FNM-Feld konnte nicht gesetzt werden."
 
 #: extension/fork.c:81
-#, fuzzy
 msgid "fork: called with too many arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "fork: Aufruf mit zu vielen Argumenten"
 
 #: extension/fork.c:94
 msgid "fork: PROCINFO is not an array!"
-msgstr ""
+msgstr "fork: PROCINFO ist kein Feld!"
 
 #: extension/fork.c:118
-#, fuzzy
 msgid "waitpid: called with too many arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "waitpid: Aufruf mit zu vielen Argumenten"
 
 #: extension/fork.c:126
-#, fuzzy
 msgid "wait: called with no arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "wait: Aufruf ohne Argumente"
 
 #: extension/fork.c:143
-#, fuzzy
 msgid "wait: called with too many arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "wait: Aufruf mit zu vielen Argumenten"
 
 #: extension/inplace.c:130
 msgid "inplace_begin: in-place editing already active"
-msgstr ""
+msgstr "inplace_begin: direktes Editieren ist bereits aktiv"
 
-#: extension/inplace.c:133 extension/inplace.c:207
+#: extension/inplace.c:133 extension/inplace.c:210
 #, c-format
 msgid "inplace_begin: expects 2 arguments but called with %d"
-msgstr ""
+msgstr "inplace_begin: erwartet 2 Argumente aber wurde aufgerufen mit %d"
 
 #: extension/inplace.c:136
 msgid "inplace_begin: cannot retrieve 1st argument as a string filename"
-msgstr ""
+msgstr "inplace_begin: das erste Argument ist kein Dateiname"
 
 #: extension/inplace.c:144
 #, c-format
 msgid "inplace_begin: disabling in-place editing for invalid FILENAME `%s'"
 msgstr ""
+"inplace_begin: direktes Editieren wird deaktiviert wegen des ungültigen "
+"Dateinamens »%s«"
 
 #: extension/inplace.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "inplace_begin: Cannot stat `%s' (%s)"
-msgstr "Fatal: extension: »%s« kann nicht geöffnet werden (%s)\n"
+msgstr "inplace_begin: Status von »%s« kann nicht ermittelt werden (%s)"
 
 #: extension/inplace.c:158
-#, fuzzy, c-format
+#, c-format
 msgid "inplace_begin: `%s' is not a regular file"
-msgstr "»%s« ist kein gültiger Variablenname"
+msgstr "inplace_begin: »%s« ist keine reguläre Datei"
 
 #: extension/inplace.c:169
 #, c-format
 msgid "inplace_begin: mkstemp(`%s') failed (%s)"
-msgstr ""
+msgstr "inplace_begin: mkstemp(»%s«) ist gescheitert (%s)"
 
-#: extension/inplace.c:178
-#, fuzzy, c-format
+#: extension/inplace.c:181
+#, c-format
 msgid "inplace_begin: chmod failed (%s)"
-msgstr "%s: close ist gescheitert (%s)"
+msgstr "inplace_begin:: chmod ist gescheitert (%s)"
 
-#: extension/inplace.c:185
+#: extension/inplace.c:188
 #, c-format
 msgid "inplace_begin: dup(stdout) failed (%s)"
-msgstr ""
+msgstr "inplace_begin: dup(stdout) ist gescheitert (%s)"
 
-#: extension/inplace.c:188
+#: extension/inplace.c:191
 #, c-format
 msgid "inplace_begin: dup2(%d, stdout) failed (%s)"
-msgstr ""
+msgstr "inplace_begin: dup2(%d, stdout) ist gescheitert (%s)"
 
-#: extension/inplace.c:191
-#, fuzzy, c-format
+#: extension/inplace.c:194
+#, c-format
 msgid "inplace_begin: close(%d) failed (%s)"
-msgstr "%s: close ist gescheitert (%s)"
+msgstr "inplace_begin: close(%d) ist gescheitert (%s)"
 
-#: extension/inplace.c:210
+#: extension/inplace.c:213
 msgid "inplace_end: cannot retrieve 1st argument as a string filename"
-msgstr ""
+msgstr "inplace_end: das erste Argument ist kein Dateiname"
 
-#: extension/inplace.c:217
+#: extension/inplace.c:220
 msgid "inplace_end: in-place editing not active"
-msgstr ""
+msgstr "inplace_end: direktes Editieren ist nicht aktiv"
 
-#: extension/inplace.c:223
+#: extension/inplace.c:226
 #, c-format
 msgid "inplace_end: dup2(%d, stdout) failed (%s)"
-msgstr ""
+msgstr "inplace_end: dup2(%d, stdout) ist gescheitert (%s)"
 
-#: extension/inplace.c:226
-#, fuzzy, c-format
+#: extension/inplace.c:229
+#, c-format
 msgid "inplace_end: close(%d) failed (%s)"
-msgstr "%s: close ist gescheitert (%s)"
+msgstr "inplace_end: close(%d) ist gescheitert (%s)"
 
-#: extension/inplace.c:230
+#: extension/inplace.c:233
 #, c-format
 msgid "inplace_end: fsetpos(stdout) failed (%s)"
-msgstr ""
+msgstr "inplace_end: fsetpos(stdout) ist gescheitert (%s)"
 
-#: extension/inplace.c:243
-#, fuzzy, c-format
+#: extension/inplace.c:246
+#, c-format
 msgid "inplace_end: link(`%s', `%s') failed (%s)"
-msgstr "Das Leeren der Pipe »%s« ist gescheitert (%s)"
+msgstr "inplace_end: link(»%s«, »%s«) ist gescheitert (%s)"
 
-#: extension/inplace.c:253
-#, fuzzy, c-format
+#: extension/inplace.c:256
+#, c-format
 msgid "inplace_end: rename(`%s', `%s') failed (%s)"
-msgstr "Das Schließen des Dateideskriptors %d (»%s«) ist gescheitert (%s)"
+msgstr "inplace_end: rename(»%s«, »%s«) ist gescheitert (%s)"
 
 #: extension/ordchr.c:69
-#, fuzzy
 msgid "ord: called with too many arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "ord: Aufruf mit yu vielen Argumenten"
 
 #: extension/ordchr.c:75
-#, fuzzy
 msgid "ord: called with no arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "ord: Aufruf ohne Argumente"
 
 #: extension/ordchr.c:77
-#, fuzzy
 msgid "ord: called with inappropriate argument(s)"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "ord: Aufruf mit ungeeigneten Argumenten"
 
 #: extension/ordchr.c:99
-#, fuzzy
 msgid "chr: called with too many arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "chr: Aufruf mit zu vielen Argumenten"
 
 #: extension/ordchr.c:109
-#, fuzzy
 msgid "chr: called with no arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "chr: Aufruf ohne Argumente"
 
 #: extension/ordchr.c:111
-#, fuzzy
 msgid "chr: called with inappropriate argument(s)"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "chr: Aufruf mit ungeeigneten Argumenten"
 
 #: extension/readdir.c:281
 #, c-format
 msgid "dir_take_control_of: opendir/fdopendir failed: %s"
-msgstr ""
+msgstr "dir_take_control_of: opendir/fdopendir ist gescheitert: %s"
 
 #: extension/readfile.c:113
-#, fuzzy
 msgid "readfile: called with too many arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "readfile: Aufruf mit zu vielen Argumenten"
 
 #: extension/readfile.c:137
-#, fuzzy
 msgid "readfile: called with no arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "readfile: Aufruf ohen Argumente"
 
-#: extension/rwarray.c:124
-#, fuzzy
+#: extension/revoutput.c:125
+msgid "revoutput: could not initialize REVOUT variable"
+msgstr ""
+
+#: extension/rwarray.c:124 extension/rwarray0.c:109
 msgid "writea: called with too many arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "writea: Aufruf mit zu vielen Argumenten"
 
-#: extension/rwarray.c:131
-#, fuzzy, c-format
+#: extension/rwarray.c:131 extension/rwarray0.c:116
+#, c-format
 msgid "do_writea: argument 0 is not a string\n"
-msgstr "exp: das Argument %g liegt außerhalb des gültigen Bereichs"
+msgstr "do_writea: das Argument 0 ist keine Zeichenkette\n"
 
-#: extension/rwarray.c:137
-#, fuzzy, c-format
+#: extension/rwarray.c:137 extension/rwarray0.c:122
+#, c-format
 msgid "do_writea: argument 1 is not an array\n"
-msgstr "split: das vierte Argument ist kein Feld"
+msgstr "do_writea: das Argument 1 ist kein Feld\n"
 
-#: extension/rwarray.c:184
+#: extension/rwarray.c:184 extension/rwarray0.c:169
 #, c-format
 msgid "write_array: could not flatten array\n"
-msgstr ""
+msgstr "write_array: das Feld konnte nicht niveliert werden\n"
 
-#: extension/rwarray.c:198
+#: extension/rwarray.c:198 extension/rwarray0.c:183
 #, c-format
 msgid "write_array: could not release flattened array\n"
-msgstr ""
+msgstr "write_array: das nivelierte Feld konnte nicht frei gegeben werden\n"
 
-#: extension/rwarray.c:280
-#, fuzzy
+#: extension/rwarray.c:280 extension/rwarray0.c:265
 msgid "reada: called with too many arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "reada: Aufruf mit zu vielen Argumenten"
 
-#: extension/rwarray.c:287
-#, fuzzy, c-format
+#: extension/rwarray.c:287 extension/rwarray0.c:272
+#, c-format
 msgid "do_reada: argument 0 is not a string\n"
-msgstr "exp: das Argument %g liegt außerhalb des gültigen Bereichs"
+msgstr "do_reada: Argument 0 ist keine Zeichenkette\n"
 
-#: extension/rwarray.c:293
-#, fuzzy, c-format
+#: extension/rwarray.c:293 extension/rwarray0.c:278
+#, c-format
 msgid "do_reada: argument 1 is not an array\n"
-msgstr "match: das dritte Argument ist kein Array"
+msgstr "do_reada: Argument 1 ist kein Feld\n"
 
-#: extension/rwarray.c:337
+#: extension/rwarray.c:337 extension/rwarray0.c:322
 #, c-format
 msgid "do_reada: clear_array failed\n"
-msgstr ""
+msgstr "do_reada: clear_array ist gescheitert\n"
 
-#: extension/rwarray.c:374
+#: extension/rwarray.c:374 extension/rwarray0.c:358
 #, c-format
 msgid "read_array: set_array_element failed\n"
-msgstr ""
+msgstr "read_array: set_array_element ist gescheitert\n"
 
 #: extension/time.c:113
-#, fuzzy
 msgid "gettimeofday: ignoring arguments"
-msgstr "mktime: Das Argument ist kein String"
+msgstr "gettimeofday: die Argumente werden ignoriert"
 
 #: extension/time.c:144
 msgid "gettimeofday: not supported on this platform"
-msgstr ""
+msgstr "gettimeofday: wird auf dieser Plattform nicht unterstützt"
 
 #: extension/time.c:165
-#, fuzzy
 msgid "sleep: called with too many arguments"
-msgstr "sqrt: das Argument %g ist negativ"
+msgstr "sleep: Aufruf mit zu vielen Argumenten"
 
 #: extension/time.c:168
-#, fuzzy
 msgid "sleep: missing required numeric argument"
-msgstr "exp: das Argument ist keine Zahl"
+msgstr "sleep: das erforderliche numerische Argument fehlt"
 
 #: extension/time.c:174
-#, fuzzy
 msgid "sleep: argument is negative"
-msgstr "exp: das Argument %g liegt außerhalb des gültigen Bereichs"
+msgstr "sleep: das Argument ist negativ"
 
 #: extension/time.c:208
 msgid "sleep: not supported on this platform"
-msgstr ""
+msgstr "sleep: wird auf dieser Plattform nicht unterstützt"
 
-#: field.c:345
+#: field.c:346
 msgid "NF set to negative value"
 msgstr "NF wird ein negativer Wert zugewiesen"
 
-#: field.c:971 field.c:978 field.c:982
+#: field.c:958 field.c:965 field.c:969
 msgid "split: fourth argument is a gawk extension"
 msgstr "split: das vierte Argument ist eine gawk-Erweiterung"
 
-#: field.c:975
+#: field.c:962
 msgid "split: fourth argument is not an array"
 msgstr "split: das vierte Argument ist kein Feld"
 
-#: field.c:989
+#: field.c:976
 msgid "split: second argument is not an array"
 msgstr "split: das zweite Argument ist kein Feld"
 
-#: field.c:993
+#: field.c:980
 msgid "split: cannot use the same array for second and fourth args"
 msgstr ""
 "split: als zweites und viertes Argument kann nicht das gleiche Feld "
 "verwendet werden"
 
-#: field.c:998
+#: field.c:985
 msgid "split: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "split: Ein untergeordnetes Feld des zweiten Arguments kann nicht als viertes "
 "Argument verwendet werden"
 
-#: field.c:1001
+#: field.c:988
 msgid "split: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "split: Ein untergeordnetes Feld des vierten Arguments kann nicht als zweites "
 "Argument verwendet werden"
 
-#: field.c:1032
+#: field.c:1019
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: Null-String als drittes Argument ist eine gawk-Erweiterung"
 
-#: field.c:1072
+#: field.c:1059
 msgid "patsplit: fourth argument is not an array"
 msgstr "patsplit: Das vierte Argument ist kein Feld"
 
-#: field.c:1077
+#: field.c:1064
 msgid "patsplit: second argument is not an array"
 msgstr "patsplit: Das zweite Argument ist kein Feld"
 
-#: field.c:1083
+#: field.c:1070
 msgid "patsplit: third argument must be non-null"
 msgstr "patsplit: Das dritte Argument darf nicht Null sein"
 
-#: field.c:1087
+#: field.c:1074
 msgid "patsplit: cannot use the same array for second and fourth args"
 msgstr ""
 "patsplit: als zweites und viertes Argument kann nicht das gleiche Feld "
 "verwendet werden"
 
-#: field.c:1092
+#: field.c:1079
 msgid "patsplit: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "patsplit: Ein untergeordnetes Feld des zweiten Arguments kann nicht als "
 "viertes Argument verwendet werden"
 
-#: field.c:1095
+#: field.c:1082
 msgid "patsplit: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "patsplit: Ein untergeordnetes Feld des vierten Arguments kann nicht als "
 "zweites Argument verwendet werden"
 
-#: field.c:1133
+#: field.c:1120
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "»FIELDWIDTHS« ist eine gawk-Erweiterung"
 
-#: field.c:1197
+#: field.c:1184
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "ungültiger FIELDWIDTHS-Wert nah bei »%s«"
 
-#: field.c:1270
+#: field.c:1257
 msgid "null string for `FS' is a gawk extension"
 msgstr "Null-String für »FS« ist eine gawk-Erweiterung"
 
-#: field.c:1274
+#: field.c:1261
 msgid "old awk does not support regexps as value of `FS'"
 msgstr "Das alte awk unterstützt keine regulären Ausdrücke als Wert von »FS«"
 
-#: field.c:1393
+#: field.c:1380
 msgid "`FPAT' is a gawk extension"
 msgstr "»FPAT« ist eine gawk-Erweiterung"
 
 #: gawkapi.c:146
 msgid "awk_value_to_node: received null retval"
-msgstr ""
+msgstr "awk_value_to_node: Rückgabewert Null erhalten"
 
 #: gawkapi.c:384
 msgid "node_to_awk_value: received null node"
-msgstr ""
+msgstr "node_to_awk_value: Null-Knoten erhalten"
 
 #: gawkapi.c:387
 msgid "node_to_awk_value: received null val"
-msgstr ""
+msgstr "node_to_awk_value: Null-Wert erhalten"
 
-#: gawkapi.c:807
-#, fuzzy
+#: gawkapi.c:809
 msgid "remove_element: received null array"
-msgstr "length: Argument ist ein Feld"
+msgstr "remove_element: Null-Feld erhalten"
 
-#: gawkapi.c:810
+#: gawkapi.c:812
 msgid "remove_element: received null subscript"
-msgstr ""
+msgstr "remove_element: Null-Index erhalten"
 
-#: gawkapi.c:947
+#: gawkapi.c:949
 #, c-format
 msgid "api_flatten_array: could not convert index %d\n"
-msgstr ""
+msgstr "api_flatten_array: Index %d konnte nicht umgewandelt werden\n"
 
-#: gawkapi.c:952
+#: gawkapi.c:954
 #, c-format
 msgid "api_flatten_array: could not convert value %d\n"
-msgstr ""
+msgstr "api_flatten_array: Wert %d konnte nicht umgewandelt werden\n"
 
 #: getopt.c:604 getopt.c:633
-#, fuzzy, c-format
+#, c-format
 msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: Option »%s« ist mehrdeutig\n"
+msgstr "%s: Option »%s« ist mehrdeutig; Mögliche Bedautung:"
 
 #: getopt.c:679 getopt.c:683
 #, c-format
@@ -2641,536 +2701,503 @@ msgstr "%s: Die Option »-W %s« hat keine Argumente\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: Die Option »-W %s« erfordert ein Argument\n"
 
-#: io.c:392
+#: io.c:423
 #, c-format
 msgid "command line argument `%s' is a directory: skipped"
 msgstr ""
 "das Kommandozeilen-Argument »%s« ist ein Verzeichnis: wird übersprungen"
 
-#: io.c:395 io.c:513
+#: io.c:426 io.c:544
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "Die Datei »%s« kann nicht zum Lesen geöffnet werden (%s)"
 
-#: io.c:640
+#: io.c:671
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "Das Schließen des Dateideskriptors %d (»%s«) ist gescheitert (%s)"
 
-#: io.c:716
+#: io.c:749
 msgid "redirection not allowed in sandbox mode"
 msgstr "Umlenkungen sind im Sandbox-Modus nicht erlaubt"
 
-#: io.c:750
+#: io.c:783
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr ""
 "Der Ausdruck in einer Umlenkung mittels »%s« hat nur einen numerischen Wert"
 
-#: io.c:756
+#: io.c:789
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "Der Ausdruck für eine Umlenkung mittels »%s« ist ein leerer String"
 
-#: io.c:761
+#: io.c:794
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "Der Dateiname »%s« für eine Umlenkung mittels »%s« kann das Ergebnis eines "
 "logischen Ausdrucks sein"
 
-#: io.c:809
+#: io.c:842
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "Unnötige Kombination von »>« und »>>« für Datei »%.*s«"
 
-#: io.c:863
+#: io.c:896
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "Die Pipe »%s« kann nicht für die Ausgabe geöffnet werden (%s)"
 
-#: io.c:873
+#: io.c:906
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "Die Pipe »%s« kann nicht für die Eingabe geöffnet werden (%s)"
 
-#: io.c:904
+#: io.c:937
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr ""
 "Die bidirektionale Pipe »%s« kann nicht für die Ein-/Ausgabe geöffnet werden "
 "(%s)"
 
-#: io.c:986
+#: io.c:1019
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "Von »%s« kann nicht umgelenkt werden (%s)"
 
-#: io.c:989
+#: io.c:1022
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "Zu »%s« kann nicht umgelenkt werden (%s)"
 
-#: io.c:1040
+#: io.c:1073
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "Die Systemgrenze offener Dateien ist erreicht, daher werden nun "
 "Dateideskriptoren mehrfach verwendet"
 
-#: io.c:1056
+#: io.c:1089
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "Das Schließen von »%s« ist gescheitert (%s)."
 
-#: io.c:1064
+#: io.c:1097
 msgid "too many pipes or input files open"
 msgstr "Zu viele Pipes oder Eingabedateien offen"
 
-#: io.c:1086
+#: io.c:1119
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: Das zweite Argument muss »to« oder »from« sein"
 
-#: io.c:1103
+#: io.c:1136
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: »%.*s« ist weder offene Datei, noch Pipe oder Ko-Prozess"
 
-#: io.c:1108
+#: io.c:1141
 msgid "close of redirection that was never opened"
 msgstr "»close« für eine Umlenkung, die nie geöffnet wurde"
 
-#: io.c:1205
+#: io.c:1238
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: Umlenkung »%s« wurde nicht mit »[&« geöffnet, das zweite Argument "
 "wird ignoriert"
 
-#: io.c:1222
+#: io.c:1255
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "Fehlerstatus (%d) beim Schließen der Pipe »%s« (%s)"
 
-#: io.c:1225
+#: io.c:1258
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "Fehlerstatus (%d) beim Schließen der Datei »%s« (%s)"
 
-#: io.c:1245
+#: io.c:1278
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "Das explizite Schließen des Sockets »%s« fehlt"
 
-#: io.c:1248
+#: io.c:1281
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "Das explizite Schließen des Ko-Prozesses »%s« fehlt"
 
-#: io.c:1251
+#: io.c:1284
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "Das explizite Schließen der Pipe »%s« fehlt"
 
-#: io.c:1254
+#: io.c:1287
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "Das explizite Schließen der Datei »%s« fehlt"
 
-#: io.c:1284 io.c:1342 main.c:864 main.c:906
+#: io.c:1317 io.c:1375 main.c:628 main.c:670
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "Fehler beim Schreiben auf die Standardausgabe (%s)"
 
-#: io.c:1289 io.c:1348 main.c:866
+#: io.c:1322 io.c:1381 main.c:630
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "Fehler beim Schreiben auf die Standardfehlerausgabe (%s)"
 
-#: io.c:1297
+#: io.c:1330
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "Das Leeren der Pipe »%s« ist gescheitert (%s)"
 
-#: io.c:1300
+#: io.c:1333
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "Ko-Prozess: Das Leeren der Pipe zu »%s« ist gescheitert (%s)"
 
-#: io.c:1303
+#: io.c:1336
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "Das Leeren der Datei »%s« ist gescheitert (%s)"
 
-#: io.c:1420
+#: io.c:1453
 #, c-format
 msgid "local port %s invalid in `/inet'"
 msgstr "Der lokale Port »%s« ist ungültig in »/inet«"
 
-#: io.c:1438
+#: io.c:1471
 #, c-format
 msgid "remote host and port information (%s, %s) invalid"
 msgstr "Die Angaben zu entferntem Host und Port (%s, %s) sind ungültig"
 
-#: io.c:1590
-#, c-format
-msgid "no (known) protocol supplied in special filename `%s'"
-msgstr "Es wurde kein (bekanntes) Protokoll im Dateinamen »%s« angegeben"
-
-#: io.c:1604
-#, c-format
-msgid "special file name `%s' is incomplete"
-msgstr "Der Dateiname »%s« ist unvollständig"
-
-#: io.c:1621
-msgid "must supply a remote hostname to `/inet'"
-msgstr "Sie müssen in /inet einen Rechnernamen angeben"
-
-#: io.c:1639
-msgid "must supply a remote port to `/inet'"
-msgstr "Sie müssen in »/inet« einen Port angeben"
-
-#: io.c:1685
+#: io.c:1673
 msgid "TCP/IP communications are not supported"
 msgstr "TCP/IP-Verbindungen werden nicht unterstützt"
 
-#: io.c:1867
+#: io.c:1854
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "»%s« konnte nicht geöffnet werden, Modus »%s«"
 
-#: io.c:1917
+#: io.c:1904
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr ""
 "Das Schließen der übergeordneten Terminal-Gerätedatei ist gescheitert (%s)"
 
-#: io.c:1919 io.c:2105 io.c:2305
+#: io.c:1906 io.c:2092 io.c:2293
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "Das Schließen der Standardausgabe im Kindprozess ist gescheitert (%s)"
 
-#: io.c:1922
+#: io.c:1909
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 "Das Verschieben der untergeordneten Terminal-Gerätedatei zur Standardausgabe "
 "im Kindprozess ist gescheitert (dup: %s)"
 
-#: io.c:1924 io.c:2110
+#: io.c:1911 io.c:2097
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "Schließen von stdin im Kindprozess gescheitert (%s)"
 
-#: io.c:1927
+#: io.c:1914
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 "Das Verschieben der untergeordneten Terminal-Gerätedatei zur Standardeingabe "
 "im Kindprozess ist gescheitert (dup: %s)"
 
-#: io.c:1929 io.c:1951
+#: io.c:1916 io.c:1938
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr ""
 "Das Schließen der untergeordneten Terminal-Gerätedatei ist gescheitert (%s)"
 
-#: io.c:2040 io.c:2108 io.c:2276 io.c:2308
+#: io.c:2027 io.c:2095 io.c:2264 io.c:2296
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr ""
 "Das Verschieben der Pipe zur Standardausgabe im Kindprozess ist gescheitert "
 "(dup: %s)"
 
-#: io.c:2047 io.c:2113
+#: io.c:2034 io.c:2100
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr ""
 "Das Verschieben der Pipe zur Standardeingabe im Kindprozess ist gescheitert "
 "(dup: %s)"
 
-#: io.c:2073 io.c:2298
+#: io.c:2060 io.c:2286
 msgid "restoring stdout in parent process failed\n"
 msgstr ""
 "Das Wiederherstellen der Standardausgabe im Elternprozess ist gescheitert\n"
 
-#: io.c:2081
+#: io.c:2068
 msgid "restoring stdin in parent process failed\n"
 msgstr ""
 "Das Wiederherstellen der Standardeingabe im Elternprozess ist gescheitert\n"
 
-#: io.c:2116 io.c:2310 io.c:2324
+#: io.c:2103 io.c:2298 io.c:2313
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "Das Schließen der Pipe ist gescheitert (%s)"
 
-#: io.c:2174
+#: io.c:2162
 msgid "`|&' not supported"
 msgstr "»|&« wird nicht unterstützt"
 
-#: io.c:2261
+#: io.c:2249
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "Pipe »%s« kann nicht geöffnet werden (%s)"
 
-#: io.c:2318
+#: io.c:2307
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "Kindprozess für »%s« kann nicht erzeugt werden (fork: %s)"
 
-#: io.c:2790
+#: io.c:2734
 msgid "register_input_parser: received NULL pointer"
-msgstr ""
+msgstr "register_input_parser: NULL-Zeiger erhalten"
 
-#: io.c:2818
+#: io.c:2762
 #, c-format
 msgid "input parser `%s' conflicts with previously installed input parser `%s'"
 msgstr ""
+"Eingabeparser »%s« steht im Konflikt mit dem vorher installierten "
+"Eingabeparser »%s«"
 
-#: io.c:2825
+#: io.c:2769
 #, c-format
 msgid "input parser `%s' failed to open `%s'"
-msgstr ""
+msgstr "Eingabeparser »%s« konnte »%s« nicht öffnen"
 
-#: io.c:2845
+#: io.c:2789
 msgid "register_output_wrapper: received NULL pointer"
-msgstr ""
+msgstr "register_output_wrapper: NULL-Zeiger erhalten"
 
-#: io.c:2873
+#: io.c:2817
 #, c-format
 msgid ""
 "output wrapper `%s' conflicts with previously installed output wrapper `%s'"
-msgstr ""
+msgstr "Ausgabeverpackung »%s« steht im Konflikt mit Ausgabeverpackung »%s«"
 
-#: io.c:2880
+#: io.c:2824
 #, c-format
 msgid "output wrapper `%s' failed to open `%s'"
-msgstr ""
+msgstr "Ausgabeverpackung »%s« konnte »%s« nicht öffnen"
 
-#: io.c:2901
+#: io.c:2845
 msgid "register_output_processor: received NULL pointer"
-msgstr ""
+msgstr "register_output_processor: NULL-Zeiger erhalten"
 
-#: io.c:2930
+#: io.c:2874
 #, c-format
 msgid ""
 "two-way processor `%s' conflicts with previously installed two-way processor "
 "`%s'"
-msgstr ""
+msgstr "Zweiwegeprozessor »%s« steht im Konflikt mit Zweiwegeprozessor »%s«"
 
-#: io.c:2939
+#: io.c:2883
 #, c-format
 msgid "two way processor `%s' failed to open `%s'"
-msgstr ""
+msgstr "Zweiwegeprozessor »%s« konnte »%s« nicht öffnen"
 
-#: io.c:3064
+#: io.c:3008
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "Die Datei »%s« ist leer"
 
-#: io.c:3106 io.c:3114
+#: io.c:3050 io.c:3058
 msgid "could not allocate more input memory"
 msgstr "Es konnte kein weiterer Speicher für die Eingabe beschafft werden"
 
-#: io.c:3682
+#: io.c:3636
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "Multicharacter-Wert von »RS« ist eine gawk-Erweiterung"
 
-#: io.c:3771
+#: io.c:3783
 msgid "IPv6 communication is not supported"
 msgstr "IPv6-Verbindungen werden nicht unterstützt"
 
-#: main.c:405
-msgid "empty argument to `-e/--source' ignored"
-msgstr "Das leere Argument für »--source« wird ignoriert"
-
-#: main.c:495
-#, c-format
-msgid "%s: option `-W %s' unrecognized, ignored\n"
-msgstr "%s: Die Option »-W %s« ist unbekannt und wird ignoriert\n"
-
-#: main.c:541
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: Die Option %c erfordert ein Argument\n"
-
-#: main.c:562
+#: main.c:321
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
 "Die Umgebungsvariable »POSIXLY_CORRECT« ist gesetzt: »--posix« wird "
 "eingeschaltet"
 
-#: main.c:568
+#: main.c:327
 msgid "`--posix' overrides `--traditional'"
 msgstr "»--posix« hat Vorrang vor »--traditional«"
 
-#: main.c:579
+#: main.c:338
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "»--posix« /»--traditional« hat Vorrang vor »--non-decimal-data«"
 
-#: main.c:583
+#: main.c:342
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "%s als setuid root auszuführen kann zu Sicherheitsproblemen führen"
 
-#: main.c:588
-#, fuzzy
+#: main.c:346
 msgid "`--posix' overrides `--characters-as-bytes'"
-msgstr "»--posix« hat Vorrang vor »--binary«"
+msgstr "»--posix« hat Vorrang vor »--characters-as-bytes«"
 
-#: main.c:647
+#: main.c:404
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr ""
 "Das Setzen des Binärermodus für die Standardeingabe ist nicht möglich (%s)"
 
-#: main.c:650
+#: main.c:407
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr ""
 "Das Setzen des Binärermodus für die Standardausgabe ist nicht möglich (%s)"
 
-#: main.c:652
+#: main.c:409
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr ""
 "Das Setzen des Binärermodus für die Standardfehlerausgabe ist nicht möglich "
 "(%s)"
 
-#: main.c:710
+#: main.c:469
 msgid "no program text at all!"
 msgstr "Es wurde überhaupt kein Programmtext angegeben!"
 
-#: main.c:799
+#: main.c:563
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr "Aufruf: %s [POSIX- oder GNU-Optionen] -f PROGRAMM [--] Datei ...\n"
 
-#: main.c:801
+#: main.c:565
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr "Aufruf: %s [POSIX- oder GNU-Optionen] -- %cPROGRAMM%c Datei ...\n"
 
-#: main.c:806
+#: main.c:570
 msgid "POSIX options:\t\tGNU long options: (standard)\n"
 msgstr "POSIX-Optionen\t\tlange GNU-Optionen: (standard)\n"
 
-#: main.c:807
+#: main.c:571
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f PROGRAMM\t\t--file=PROGRAMM\n"
 
-#: main.c:808
+#: main.c:572
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F Feldtrenner\t\t\t--field-separator=Feldtrenner\n"
 
-#: main.c:809
+#: main.c:573
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=Wert\t\t--assign=var=Wert\n"
 
-#: main.c:810
+#: main.c:574
 msgid "Short options:\t\tGNU long options: (extensions)\n"
 msgstr "POSIX-Optionen\t\tGNU-Optionen (lang): (Erweiterungen)\n"
 
-#: main.c:811
+#: main.c:575
 msgid "\t-b\t\t\t--characters-as-bytes\n"
 msgstr "\t-b\t\t\t--characters-as-bytes\n"
 
-#: main.c:812
+#: main.c:576
 msgid "\t-c\t\t\t--traditional\n"
 msgstr "\t-c\t\t\t--traditional\n"
 
-#: main.c:813
+#: main.c:577
 msgid "\t-C\t\t\t--copyright\n"
 msgstr "\t-C\t\t\t--copyright\n"
 
-#: main.c:814
+#: main.c:578
 msgid "\t-d[file]\t\t--dump-variables[=file]\n"
 msgstr "\t-d [Datei]\t\t--dump-variables[=Datei]\n"
 
-#: main.c:815
-#, fuzzy
+#: main.c:579
 msgid "\t-D[file]\t\t--debug[=file]\n"
-msgstr "\t-p [Datei]\t\t--profile[=Datei]\n"
+msgstr "\t-D[Datei]\t\t--debug[=Datei]\n"
 
-#: main.c:816
+#: main.c:580
 msgid "\t-e 'program-text'\t--source='program-text'\n"
 msgstr "\t-e 'Programmtext'\t--source=Programmtext\n"
 
-#: main.c:817
+#: main.c:581
 msgid "\t-E file\t\t\t--exec=file\n"
 msgstr "\t-E Datei\t\t\t--exec=Datei\n"
 
-#: main.c:818
+#: main.c:582
 msgid "\t-g\t\t\t--gen-pot\n"
 msgstr "\t-g\t\t\t--gen-pot\n"
 
-#: main.c:819
+#: main.c:583
 msgid "\t-h\t\t\t--help\n"
 msgstr "\t-h\t\t\t--help\n"
 
-#: main.c:820
+#: main.c:584
 msgid "\t-i includefile\t\t--include=includefile\n"
-msgstr ""
+msgstr "\t-i einzubindende_datei\t\t--include=einzubindende_datei\n"
 
-#: main.c:821
+#: main.c:585
 msgid "\t-l library\t\t--load=library\n"
-msgstr ""
+msgstr "\t-l Bibliothek\t\t--load=Bibliothek\n"
 
-#: main.c:822
-msgid "\t-L [fatal]\t\t--lint[=fatal]\n"
+#: main.c:586
+#, fuzzy
+msgid "\t-L[fatal|invalid]\t--lint[=fatal|invalid]\n"
 msgstr "\t-L [fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:823
-msgid "\t-n\t\t\t--non-decimal-data\n"
-msgstr "\t-n\t\t\t--non-decimal-data\n"
-
-#: main.c:824
-#, fuzzy
+#: main.c:587
 msgid "\t-M\t\t\t--bignum\n"
-msgstr "\t-g\t\t\t--gen-pot\n"
+msgstr "\t-M\t\t\t--bignum\n"
 
-#: main.c:825
+#: main.c:588
 msgid "\t-N\t\t\t--use-lc-numeric\n"
 msgstr "\t-N\t\t\t--use-lc-numeric\n"
 
-#: main.c:826
-#, fuzzy
+#: main.c:589
+msgid "\t-n\t\t\t--non-decimal-data\n"
+msgstr "\t-n\t\t\t--non-decimal-data\n"
+
+#: main.c:590
 msgid "\t-o[file]\t\t--pretty-print[=file]\n"
-msgstr "\t-p [Datei]\t\t--profile[=Datei]\n"
+msgstr "\t-o[Datei]\t\t--pretty-print[=Datei]\n"
 
-#: main.c:827
+#: main.c:591
 msgid "\t-O\t\t\t--optimize\n"
 msgstr "\t-O\t\t\t--optimize\n"
 
-#: main.c:828
+#: main.c:592
 msgid "\t-p[file]\t\t--profile[=file]\n"
 msgstr "\t-p [Datei]\t\t--profile[=Datei]\n"
 
-#: main.c:829
+#: main.c:593
 msgid "\t-P\t\t\t--posix\n"
 msgstr "\t-P\t\t\t--posix\n"
 
-#: main.c:830
+#: main.c:594
 msgid "\t-r\t\t\t--re-interval\n"
 msgstr "\t-r\t\t\t--re-interval\n"
 
-#: main.c:831
+#: main.c:595
 msgid "\t-S\t\t\t--sandbox\n"
 msgstr "\t-S\t\t\t--sandbox\n"
 
-#: main.c:832
+#: main.c:596
 msgid "\t-t\t\t\t--lint-old\n"
 msgstr "\t-t\t\t\t--lint-old\n"
 
-#: main.c:833
+#: main.c:597
 msgid "\t-V\t\t\t--version\n"
 msgstr "\t-V\t\t\t--version\n"
 
-#: main.c:835
+#: main.c:599
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:838
+#: main.c:602
 msgid "\t-Y\t\t--parsedebug\n"
 msgstr "\t-Y\t\t--parsedebug\n"
 
@@ -3179,7 +3206,7 @@ msgstr "\t-Y\t\t--parsedebug\n"
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: main.c:847
+#: main.c:611
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -3191,11 +3218,11 @@ msgstr ""
 "in »gawk.info«, den Sie als Kapitel »Reporting Problems and Bugs«\n"
 "in der gedruckten Version finden.\n"
 "\n"
-"Fehler in der Ãœbersetzuung senden Sie bitte als E-Mail an\n"
-"an translation-team-de@lists.sourceforge.net\n"
+"Fehler in der Ãœbersetzung senden Sie bitte als E-Mail an\n"
+"translation-team-de@lists.sourceforge.net\n"
 "\n"
 
-#: main.c:851
+#: main.c:615
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -3206,7 +3233,7 @@ msgstr ""
 "auf der Standardausgabe aus.\n"
 "\n"
 
-#: main.c:855
+#: main.c:619
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -3216,7 +3243,7 @@ msgstr ""
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:880
+#: main.c:644
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
@@ -3236,7 +3263,7 @@ msgstr ""
 "spätere Version.\n"
 "\n"
 
-#: main.c:888
+#: main.c:652
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3249,7 +3276,7 @@ msgstr ""
 "leistung einer HANDELBARKEIT oder der EIGNUNG FÃœR EINEN BESTIMMTEN ZWECK.\n"
 "Sehen Sie bitte die GNU General Public License für weitere Details.\n"
 
-#: main.c:894
+#: main.c:658
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program. If not, see http://www.gnu.org/licenses/.\n"
@@ -3258,16 +3285,16 @@ msgstr ""
 "diesem Programm erhalten haben. Wenn nicht, lesen Sie bitte\n"
 "http://www.gnu.org/licenses/.\n"
 
-#: main.c:931
+#: main.c:695
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft setzt FS im POSIX-awk nicht auf Tab"
 
-#: main.c:1208
+#: main.c:982
 #, c-format
 msgid "unknown value for field spec: %d\n"
 msgstr "unbekannter Wert für eine Feldangabe: %d\n"
 
-#: main.c:1306
+#: main.c:1080
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -3276,131 +3303,151 @@ msgstr ""
 "%s: Argument »%s« von »-v« ist nicht in der Form »Variable=Wert«\n"
 "\n"
 
-#: main.c:1332
+#: main.c:1106
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "»%s« ist kein gültiger Variablenname"
 
-#: main.c:1335
+#: main.c:1109
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "»%s« ist kein Variablenname, es wird nach der Datei »%s=%s« gesucht"
 
-#: main.c:1339
+#: main.c:1113
 #, c-format
 msgid "cannot use gawk builtin `%s' as variable name"
 msgstr ""
 "die eingebaute Funktion »%s« kann nicht als Variablenname verwendet werden"
 
 # c-format
-#: main.c:1344
+#: main.c:1118
 #, c-format
 msgid "cannot use function `%s' as variable name"
 msgstr "Funktion »%s« kann nicht als Name einer Variablen verwendet werden"
 
-#: main.c:1397
+#: main.c:1171
 msgid "floating point exception"
 msgstr "Fließkomma-Ausnahme"
 
-#: main.c:1404
+#: main.c:1178
 msgid "fatal error: internal error"
 msgstr "Fataler Fehler: interner Fehler"
 
-#: main.c:1419
+#: main.c:1193
 msgid "fatal error: internal error: segfault"
 msgstr "Fataler Fehler: interner Fehler: Speicherbegrenzungsfehler"
 
-#: main.c:1431
+#: main.c:1205
 msgid "fatal error: internal error: stack overflow"
 msgstr "Fataler Fehler: interner Fehler: Stapelüberlauf"
 
-#: main.c:1490
+#: main.c:1264
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "Kein bereits geöffneter Dateideskriptor %d"
 
-#: main.c:1497
+#: main.c:1271
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "/dev/null konnte nicht für Dateideskriptor %d geöffnet werden"
 
-#: mpfr.c:550
-#, fuzzy, c-format
+#: main.c:1485
+msgid "empty argument to `-e/--source' ignored"
+msgstr "Das leere Argument für »--source« wird ignoriert"
+
+#: main.c:1556
+msgid "-M ignored: MPFR/GMP support not compiled in"
+msgstr ""
+
+#: main.c:1577
+#, c-format
+msgid "%s: option `-W %s' unrecognized, ignored\n"
+msgstr "%s: Die Option »-W %s« ist unbekannt und wird ignoriert\n"
+
+#: main.c:1630
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: Die Option %c erfordert ein Argument\n"
+
+#: mpfr.c:557
+#, c-format
 msgid "PREC value `%.*s' is invalid"
-msgstr "BINMODE Wert »%s« ist ungültig und wird als 3 behandelt"
+msgstr "PREC Wert »%.*s« ist ungültig"
 
-#: mpfr.c:608
-#, fuzzy, c-format
+#: mpfr.c:615
+#, c-format
 msgid "RNDMODE value `%.*s' is invalid"
-msgstr "BINMODE Wert »%s« ist ungültig und wird als 3 behandelt"
+msgstr "BINMODE Wert »%.*s« ist ungültig"
 
-#: mpfr.c:698
-#, fuzzy, c-format
+#: mpfr.c:711
+#, c-format
 msgid "%s: received non-numeric argument"
-msgstr "cos: das Argument ist keine Zahl"
+msgstr "%s: das Argument ist keine Zahl"
 
-#: mpfr.c:800
-#, fuzzy
+#: mpfr.c:820
 msgid "compl(%Rg): negative value will give strange results"
-msgstr "compl(%lf): Negativer Wert wird zu merkwürdigen Ergebnissen führen"
+msgstr "compl(%Rg): ein negativer Wert wird zu merkwürdigen Ergebnissen führen"
 
-#: mpfr.c:804
-#, fuzzy
+#: mpfr.c:824
 msgid "comp(%Rg): fractional value will be truncated"
-msgstr "compl(%lf): Dezimalteil wird abgeschnitten"
+msgstr "compl(%Rg): Dezimalteil wird abgeschnitten"
 
-#: mpfr.c:816
-#, fuzzy, c-format
+#: mpfr.c:836
+#, c-format
 msgid "cmpl(%Zd): negative values will give strange results"
-msgstr "compl(%lf): Negativer Wert wird zu merkwürdigen Ergebnissen führen"
+msgstr "cmpl(%Zd): Negative Werte führen zu merkwürdigen Ergebnissen"
 
-#: mpfr.c:835
-#, fuzzy, c-format
+#: mpfr.c:855
+#, c-format
 msgid "%s: received non-numeric argument #%d"
-msgstr "cos: das Argument ist keine Zahl"
+msgstr "%s: das Argument Nr. %d ist keine Zahl"
 
-#: mpfr.c:845
+#: mpfr.c:865
 msgid "%s: argument #%d has invalid value %Rg, using 0"
 msgstr ""
+"%s: Argument Nr. %d hat den ungültigen Wert %Rg, es wird stattdessen 0 "
+"verwendet"
 
-#: mpfr.c:857
-#, fuzzy
+#: mpfr.c:877
 msgid "%s: argument #%d negative value %Rg will give strange results"
-msgstr "compl(%lf): Negativer Wert wird zu merkwürdigen Ergebnissen führen"
+msgstr ""
+"%s: der negative Wert %2$Rg in Argument Nr. %1$d wird zu merkwürdigen "
+"Ergebnissen führen"
 
-#: mpfr.c:863
-#, fuzzy
+#: mpfr.c:883
 msgid "%s: argument #%d fractional value %Rg will be truncated"
-msgstr "or(%lf, %lf): Dezimalteil wird abgeschnitten"
+msgstr "%s: der Nachkommateil %2$Rg in Argument Nr. %1$d wird abgeschnitten"
 
-#: mpfr.c:878
-#, fuzzy, c-format
+#: mpfr.c:898
+#, c-format
 msgid "%s: argument #%d negative value %Zd will give strange results"
-msgstr "compl(%lf): Negativer Wert wird zu merkwürdigen Ergebnissen führen"
+msgstr ""
+"%1$s: der negative Wert %3$Zd in Argument Nr. %2$d wird zu merkwürdigen "
+"Ergebnissen führen"
 
 #: msg.c:68
 #, c-format
 msgid "cmd. line:"
 msgstr "Kommandozeile:"
 
-#: node.c:421
+#: node.c:409
 msgid "backslash at end of string"
 msgstr "Backslash am Ende der Zeichenkette"
 
-#: node.c:500
+#: node.c:488
 #, c-format
 msgid "old awk does not support the `\\%c' escape sequence"
-msgstr "Das alte awk unterstützt die Fluchsequenz »\\%c« nicht"
+msgstr "Das alte awk unterstützt die Escapesequenz »\\%c« nicht"
 
-#: node.c:551
+#: node.c:539
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX erlaubt keine »\\x«-Escapes"
 
-#: node.c:557
+#: node.c:545
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "In der »\\x«-Fluchtsequenz sind keine hexadezimalen Zahlen"
 
-#: node.c:579
+#: node.c:567
 #, c-format
 msgid ""
 "hex escape \\x%.*s of %d characters probably not interpreted the way you "
@@ -3409,12 +3456,12 @@ msgstr ""
 "Die Hex-Sequenz \\x%.*s aus %d Zeichen wird wahrscheinlich nicht wie "
 "gewünscht interpretiert"
 
-#: node.c:594
+#: node.c:582
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "Fluchtsequenz »\\%c« wird wie ein normales »%c« behandelt"
 
-#: node.c:739
+#: node.c:726
 msgid ""
 "Invalid multibyte data detected. There may be a mismatch between your data "
 "and your locale."
@@ -3445,12 +3492,12 @@ msgid "sending profile to standard error"
 msgstr "Das Profil wird auf der Standardfehlerausgabe ausgegeben"
 
 #: profile.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t# %s block(s)\n"
+"\t# %s rule(s)\n"
 "\n"
 msgstr ""
-"\t# %s Blöcke\n"
+"\t# Regeln(s)\n"
 "\n"
 
 #: profile.c:198
@@ -3467,24 +3514,25 @@ msgstr ""
 msgid "internal error: %s with null vname"
 msgstr "Interner Fehler: %s mit null vname"
 
-#: profile.c:537
-#, fuzzy
+#: profile.c:538
 msgid "internal error: builtin with null fname"
-msgstr "Interner Fehler: %s mit null vname"
+msgstr "Interner Fehler: eingebaute Fuktion  mit leerem fname"
 
-#: profile.c:949
+#: profile.c:958
 #, c-format
 msgid ""
 "\t# Loaded extensions (-l and/or @load)\n"
 "\n"
 msgstr ""
+"\t# Erweiterungen geladen (-l und/oder @load)\n"
+"\n"
 
-#: profile.c:972
+#: profile.c:981
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# gawk-Profil, erzeugt %s\n"
 
-#: profile.c:1475
+#: profile.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -3493,7 +3541,7 @@ msgstr ""
 "\n"
 "\t# Funktionen in alphabetischer Reihenfolge\n"
 
-#: profile.c:1513
+#: profile.c:1559
 #, c-format
 msgid "redir2str: unknown redirection type %d"
 msgstr "redir2str: unbekannter Umlenkungstyp %d"
@@ -3504,214 +3552,106 @@ msgid "regexp component `%.*s' should probably be `[%.*s]'"
 msgstr ""
 "Regulärer-Ausdruck-Komponente »%.*s« sollte wahrscheinlich »[%.*s]« sein"
 
-#: regcomp.c:131
+#: regcomp.c:139
 msgid "Success"
 msgstr "Erfolg"
 
-#: regcomp.c:134
+#: regcomp.c:142
 msgid "No match"
 msgstr "Kein Treffer"
 
-#: regcomp.c:137
+#: regcomp.c:145
 msgid "Invalid regular expression"
 msgstr "Ungültiger Regulärer Ausdruck"
 
-#: regcomp.c:140
+#: regcomp.c:148
 msgid "Invalid collation character"
 msgstr "Ungültiges Zeichen"
 
-#: regcomp.c:143
+#: regcomp.c:151
 msgid "Invalid character class name"
 msgstr "Ungültiger Name für eine Zeichenklasse"
 
-#: regcomp.c:146
+#: regcomp.c:154
 msgid "Trailing backslash"
 msgstr "Angehängter Backslash"
 
-#: regcomp.c:149
+#: regcomp.c:157
 msgid "Invalid back reference"
 msgstr "Ungültige Rück-Referenz"
 
-#: regcomp.c:152
-msgid "Unmatched [ or [^"
+#: regcomp.c:160
+#, fuzzy
+msgid "Unmatched [, [^, [:, [., or [="
 msgstr "[ oder [^ werden nicht geschlossen"
 
-#: regcomp.c:155
+#: regcomp.c:163
 msgid "Unmatched ( or \\("
 msgstr "( oder \\( werden nicht geschlossen"
 
-#: regcomp.c:158
+#: regcomp.c:166
 msgid "Unmatched \\{"
 msgstr "\\{ wird nicht geschlossen"
 
-#: regcomp.c:164
+#: regcomp.c:169
+msgid "Invalid content of \\{\\}"
+msgstr "Ungültiger Inhalt von \\{\\}"
+
+#: regcomp.c:172
 msgid "Invalid range end"
 msgstr "Ungültiges Bereichsende"
 
-#: regcomp.c:167
+#: regcomp.c:175
 msgid "Memory exhausted"
 msgstr "Kein freier Speicher mehr vorhanden"
 
-#: regcomp.c:170
+#: regcomp.c:178
 msgid "Invalid preceding regular expression"
 msgstr "Vorangehender regulärer Ausdruck ist ungültig"
 
-#: regcomp.c:173
+#: regcomp.c:181
 msgid "Premature end of regular expression"
 msgstr "Vorzeitiges Ende des regulären Ausdrucks"
 
-#: regcomp.c:179
+#: regcomp.c:184
+msgid "Regular expression too big"
+msgstr "Regulärer Ausdruck ist zu groß"
+
+#: regcomp.c:187
 msgid "Unmatched ) or \\)"
 msgstr ") oder \\) werden nicht geöffnet"
 
-#: regcomp.c:704
+#: regcomp.c:712
 msgid "No previous regular expression"
 msgstr "Kein vorangehender regulärer Ausdruck"
 
-#: symbol.c:741
-msgid "can not pop main context"
-msgstr ""
-
-#~ msgid "range of the form `[%c-%c]' is locale dependent"
-#~ msgstr ""
-#~ "Ein Bereich in der Form »[%c-%c]« ist abhängig von der gesetzten Locale"
-
-#, fuzzy
-#~ msgid "[s]printf called with no arguments"
-#~ msgstr "sqrt: das Argument %g ist negativ"
-
-#~ msgid "`-m[fr]' option irrelevant in gawk"
-#~ msgstr "Die Option »-m[fr]« ist in gawk bedeutungslos"
-
-#~ msgid "-m option usage: `-m[fr] nnn'"
-#~ msgstr "Anwendung der Option -m: »-m[fr] nnn«"
-
-#, fuzzy
-#~ msgid "%s: received non-numeric first argument"
-#~ msgstr "or: das erste Argument ist keine Zahl"
-
-#, fuzzy
-#~ msgid "%s: received non-numeric second argument"
-#~ msgstr "or: das zweite Argument ist keine Zahl"
-
-#, fuzzy
-#~ msgid "%s(%Rg, ..): negative values will give strange results"
-#~ msgstr ""
-#~ "or(%lf, %lf): Negative Werte werden zu merkwürdigen Ergebnissen führen"
-
-#, fuzzy
-#~ msgid "%s(%Rg, ..): fractional values will be truncated"
-#~ msgstr "or(%lf, %lf): Dezimalteil wird abgeschnitten"
-
-#, fuzzy
-#~ msgid "%s(%Zd, ..): negative values will give strange results"
-#~ msgstr ""
-#~ "or(%lf, %lf): Negative Werte werden zu merkwürdigen Ergebnissen führen"
-
-#, fuzzy
-#~ msgid "%s(.., %Rg): negative values will give strange results"
-#~ msgstr ""
-#~ "or(%lf, %lf): Negative Werte werden zu merkwürdigen Ergebnissen führen"
-
-#, fuzzy
-#~ msgid "%s(.., %Zd): negative values will give strange results"
-#~ msgstr ""
-#~ "or(%lf, %lf): Negative Werte werden zu merkwürdigen Ergebnissen führen"
-
-#~ msgid "`%s' is a Bell Labs extension"
-#~ msgstr "»%s« ist eine Erweiterung der Bell Labs"
-
-#~ msgid "`nextfile' is a gawk extension"
-#~ msgstr "»nextfile« ist eine gawk-Erweiterung"
-
-#~ msgid "`delete array' is a gawk extension"
-#~ msgstr "»delete array« ist eine gawk-Erweiterung"
-
-#~ msgid "and: received non-numeric first argument"
-#~ msgstr "and: das erste Argument ist keine Zahl"
-
-#~ msgid "and: received non-numeric second argument"
-#~ msgstr "and: das zweite Argument ist keine Zahl"
-
-#~ msgid "and(%lf, %lf): fractional values will be truncated"
-#~ msgstr "and(%lf, %lf): Dezimalteil wird abgeschnitten"
-
-#~ msgid "xor: received non-numeric first argument"
-#~ msgstr "xor: das erste Argument ist keine Zahl"
-
-#~ msgid "xor: received non-numeric second argument"
-#~ msgstr "xor: das zweite Argument ist keine Zahl"
-
-#~ msgid "xor(%lf, %lf): fractional values will be truncated"
-#~ msgstr "xor(%lf, %lf): Dezimalteil wird abgeschnitten"
-
-#~ msgid "Operation Not Supported"
-#~ msgstr "Die Operation wird nicht unterstützt"
-
-#~ msgid "attempt to use function `%s' as an array"
-#~ msgstr "Es wird versucht, die Funktion »%s« als Feld zu verwenden"
-
-#~ msgid "reference to uninitialized element `%s[\"%.*s\"]'"
-#~ msgstr "Bezug auf ein nicht initialisiertes Element »%s[\"%.*s\"]«"
-
-#~ msgid "subscript of array `%s' is null string"
-#~ msgstr "Der Index von Feld »%s« ist ein Nullstring"
-
-#~ msgid "%s: empty (null)\n"
-#~ msgstr "%s: leer (Null)\n"
-
-#~ msgid "%s: empty (zero)\n"
-#~ msgstr "%s: leer (0)\n"
+#: symbol.c:677
+#, fuzzy, c-format
+msgid "function `%s': can't use function `%s' as a parameter name"
+msgstr "Funktion »%s«: Funktionsnamen können nicht als Parameternamen benutzen"
 
-#~ msgid "%s: table_size = %d, array_size = %d\n"
-#~ msgstr "%s: Tabellengröße = %d, Feldgröße = %d\n"
+#: symbol.c:809
+msgid "can not pop main context"
+msgstr "der Hauptkontext kann nicht entfernt werden"
 
-#~ msgid "%s: array_ref to %s\n"
-#~ msgstr "%s: Feld-Referenz auf %s\n"
+#~ msgid "`getline var' invalid inside `%s' rule"
+#~ msgstr "»getline var« ist ungültig innerhalb der »%s«-Regel"
 
-#~ msgid "use of non-array as array"
-#~ msgstr "Verwendung eines Nicht-Feldes als Feld"
+#~ msgid "no (known) protocol supplied in special filename `%s'"
+#~ msgstr "Es wurde kein (bekanntes) Protokoll im Dateinamen »%s« angegeben"
 
-#~ msgid "can't use function name `%s' as variable or array"
-#~ msgstr "Funktion »%s« kann nicht als Variable oder Feld verwendet werden"
+#~ msgid "special file name `%s' is incomplete"
+#~ msgstr "Der Dateiname »%s« ist unvollständig"
 
-#~ msgid "assignment used in conditional context"
-#~ msgstr "Zuweisung in einer Bedingung"
+#~ msgid "must supply a remote hostname to `/inet'"
+#~ msgstr "Sie müssen in /inet einen Rechnernamen angeben"
 
-#~ msgid "statement has no effect"
-#~ msgstr "Anweisung hat keinen Effekt"
+#~ msgid "must supply a remote port to `/inet'"
+#~ msgstr "Sie müssen in »/inet« einen Port angeben"
 
 #~ msgid ""
-#~ "for loop: array `%s' changed size from %ld to %ld during loop execution"
-#~ msgstr ""
-#~ "for-Schleife: Feld »%s« ändert seine Größe von %ld innerhalb der Schleife "
-#~ "zu %ld"
-
-#~ msgid "function called indirectly through `%s' does not exist"
-#~ msgstr "die durch »%s« indirekt aufgerufene Funktion existiert nicht"
-
-#~ msgid "function `%s' not defined"
-#~ msgstr "Funktion »%s« ist nicht definiert"
-
-#~ msgid "non-redirected `getline' invalid inside `%s' rule"
-#~ msgstr "Nicht umgelenktes »getline« ist innerhalb der »%s«-Aktion unzuässig"
-
-#~ msgid "`nextfile' cannot be called from a `%s' rule"
-#~ msgstr "»nextfile« kann nicht aus einer »«%s-Regel aufgerufen werden"
-
-#~ msgid "`next' cannot be called from a `%s' rule"
-#~ msgstr "»next« kann nicht in einer »%s«-Regel verwendet werden"
-
-#~ msgid "Sorry, don't know how to interpret `%s'"
-#~ msgstr ""
-#~ "Entschuldigung, aber es ist unbekannt, wie »%s« zu interpretieren ist"
-
-#~ msgid "\t-R file\t\t\t--command=file\n"
-#~ msgstr "\t-R Datei\t\t\t--command=Datei\n"
-
-#~ msgid "could not find groups: %s"
-#~ msgstr "Die Gruppen konnten nicht gefunden werden: %s"
-
-#~ msgid "assignment is not allowed to result of builtin function"
+#~ "\t# %s block(s)\n"
+#~ "\n"
 #~ msgstr ""
-#~ "Zuweisungen an das Ergebnis einer eingebauten Funktion sind nicht erlaubt"
+#~ "\t# %s Blöcke\n"
+#~ "\n"
diff --git a/po/es.gmo b/po/es.gmo
index 0bfebbae..09828034 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index d16109a9..9c8c9064 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gawk 4.0.0h\n"
-"Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2014-04-08 19:23+0300\n"
+"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
+"POT-Creation-Date: 2015-02-26 20:05+0200\n"
 "PO-Revision-Date: 2012-01-30 07:42-0600\n"
 "Last-Translator: Cristian Othón Martínez Vera <cfuga@cfuga.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -35,9 +35,9 @@ msgstr "se intentó usar el parámetro escalar `%s como una matriz'"
 msgid "attempt to use scalar `%s' as an array"
 msgstr "se intentó usar el escalar `%s' como una matriz"
 
-#: array.c:409 array.c:576 builtin.c:85 builtin.c:1615 builtin.c:1661
-#: builtin.c:1674 builtin.c:2102 builtin.c:2116 eval.c:1122 eval.c:1126
-#: eval.c:1531
+#: array.c:409 array.c:576 builtin.c:85 builtin.c:1606 builtin.c:1652
+#: builtin.c:1665 builtin.c:2092 builtin.c:2106 eval.c:1149 eval.c:1153
+#: eval.c:1558
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "se intentó usar la matriz `%s' en un contexto escalar"
@@ -97,421 +97,426 @@ msgstr ""
 "asorti: no se puede usar una submatriz del segundo argumento para el primer "
 "argumento"
 
-#: array.c:1314
+#: array.c:1313
 #, c-format
 msgid "`%s' is invalid as a function name"
 msgstr "`%s' es inválido como un nombre de función"
 
-#: array.c:1318
+#: array.c:1317
 #, c-format
 msgid "sort comparison function `%s' is not defined"
 msgstr "la función de comparación de ordenamiento `%s' no está definida"
 
-#: awkgram.y:233
+#: awkgram.y:226
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "los bloques %s deben tener una parte de acción"
 
-#: awkgram.y:236
+#: awkgram.y:229
 msgid "each rule must have a pattern or an action part"
 msgstr "cada regla debe tener un patrón o una parte de acción"
 
-#: awkgram.y:325 awkgram.y:336
+#: awkgram.y:320 awkgram.y:331
 msgid "old awk does not support multiple `BEGIN' or `END' rules"
 msgstr "el awk antiguo no admite múltiples reglas `BEGIN' o `END'"
 
-#: awkgram.y:373
+#: awkgram.y:368
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "`%s' es una función interna, no se puede redefinir"
 
-#: awkgram.y:419
+#: awkgram.y:417
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr ""
 "la constante de expresión regular `//' parece un comentario de C++, pero no "
 "lo es"
 
-#: awkgram.y:423
+#: awkgram.y:421
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr ""
 "la constante de expresión regular `/%s/' parece un comentario de C, pero no "
 "lo es"
 
-#: awkgram.y:515
+#: awkgram.y:513
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "valores case duplicados en el cuerpo de un switch: %s"
 
-#: awkgram.y:536
+#: awkgram.y:534
 msgid "duplicate `default' detected in switch body"
 msgstr "se detectó un `default' duplicado en el cuerpo de un switch"
 
-#: awkgram.y:796 awkgram.y:3723
+#: awkgram.y:794 awkgram.y:3751
 msgid "`break' is not allowed outside a loop or switch"
 msgstr "no se permite `break' fuera de un bucle o switch"
 
-#: awkgram.y:805 awkgram.y:3715
+#: awkgram.y:803 awkgram.y:3743
 msgid "`continue' is not allowed outside a loop"
 msgstr "no se permite `continue' fuera de un bucle"
 
-#: awkgram.y:815
+#: awkgram.y:813
 #, c-format
 msgid "`next' used in %s action"
 msgstr "se usó `next' en la acción %s"
 
-#: awkgram.y:824
+#: awkgram.y:822
 #, c-format
 msgid "`nextfile' used in %s action"
 msgstr "se usó `nextfile' en la acción %s"
 
-#: awkgram.y:848
+#: awkgram.y:846
 msgid "`return' used outside function context"
 msgstr "se usó `return' fuera del contexto de la función"
 
-#: awkgram.y:922
+#: awkgram.y:920
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "el `print' simple en la regla BEGIN o END probablemente debe ser `print \"\"'"
 
-#: awkgram.y:988 awkgram.y:1037
+#: awkgram.y:986 awkgram.y:1035
 msgid "`delete' is not allowed with SYMTAB"
 msgstr ""
 
-#: awkgram.y:990 awkgram.y:1039
+#: awkgram.y:988 awkgram.y:1037
 msgid "`delete' is not allowed with FUNCTAB"
 msgstr ""
 
-#: awkgram.y:1024 awkgram.y:1028
+#: awkgram.y:1022 awkgram.y:1026
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "`delete(array)' es una extensión de tawk que no es transportable"
 
-#: awkgram.y:1149
+#: awkgram.y:1147
 msgid "multistage two-way pipelines don't work"
 msgstr "las líneas de trabajo de dos vías multiestado no funcionan"
 
-#: awkgram.y:1264
+#: awkgram.y:1262
 msgid "regular expression on right of assignment"
 msgstr "expresión regular del lado derecho de una asignación"
 
-#: awkgram.y:1275
+#: awkgram.y:1273
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "expresión regular a la izquierda del operador `~' o `!~'"
 
-#: awkgram.y:1291 awkgram.y:1442
+#: awkgram.y:1289 awkgram.y:1431
 msgid "old awk does not support the keyword `in' except after `for'"
 msgstr ""
 "el awk antiguo no admite la palabra clave `in' excepto después de `for'"
 
-#: awkgram.y:1301
+#: awkgram.y:1299
 msgid "regular expression on right of comparison"
 msgstr "expresión regular a la derecha de una comparación"
 
-#: awkgram.y:1417
-#, c-format
-msgid "`getline var' invalid inside `%s' rule"
-msgstr "`getline var' inválido dentro de la regla `%s'"
-
-#: awkgram.y:1420
+#: awkgram.y:1411
 #, c-format
-msgid "`getline' invalid inside `%s' rule"
-msgstr "`getline' inválido dentro de la regla `%s'"
+msgid "non-redirected `getline' invalid inside `%s' rule"
+msgstr "`getline' no redirigido es inválido dentro de la regla `%s'"
 
-#: awkgram.y:1425
+#: awkgram.y:1414
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "`getline' no redirigido indefinido dentro de la acción de END"
 
-#: awkgram.y:1444
+#: awkgram.y:1433
 msgid "old awk does not support multidimensional arrays"
 msgstr "el awk antiguo no admite matrices multidimensionales"
 
-#: awkgram.y:1541
+#: awkgram.y:1530
 msgid "call of `length' without parentheses is not portable"
 msgstr "la llamada de `length' sin paréntesis no es transportable"
 
-#: awkgram.y:1607
+#: awkgram.y:1596
 msgid "indirect function calls are a gawk extension"
 msgstr "las llamadas indirectas a función son una extensión de gawk"
 
-#: awkgram.y:1620
+#: awkgram.y:1609
 #, c-format
 msgid "can not use special variable `%s' for indirect function call"
 msgstr ""
 "no se puede usar la variable especial `%s' como llamada indirecta a función"
 
-#: awkgram.y:1698
+#: awkgram.y:1635
+#, fuzzy, c-format
+msgid "attempt to use non-function `%s' in function call"
+msgstr "se intentó usar la función `%s' como una matriz"
+
+#: awkgram.y:1699
 msgid "invalid subscript expression"
 msgstr "expresión de subíndice inválida"
 
-#: awkgram.y:2048 awkgram.y:2068 gawkapi.c:206 gawkapi.c:224 msg.c:126
+#: awkgram.y:2045 awkgram.y:2065 gawkapi.c:206 gawkapi.c:224 msg.c:126
 msgid "warning: "
 msgstr "aviso: "
 
-#: awkgram.y:2066 gawkapi.c:192 gawkapi.c:221 msg.c:158
+#: awkgram.y:2063 gawkapi.c:192 gawkapi.c:221 msg.c:158
 msgid "fatal: "
 msgstr "fatal: "
 
-#: awkgram.y:2116
+#: awkgram.y:2113
 msgid "unexpected newline or end of string"
 msgstr "nueva línea o fin de la cadena inesperados"
 
-#: awkgram.y:2383 awkgram.y:2459 awkgram.y:2682 debug.c:523 debug.c:539
+#: awkgram.y:2392 awkgram.y:2468 awkgram.y:2691 debug.c:523 debug.c:539
 #: debug.c:2812 debug.c:5055
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "no se puede abrir el fichero fuente `%s' para lectura (%s)"
 
-#: awkgram.y:2384 awkgram.y:2509
+#: awkgram.y:2393 awkgram.y:2518
 #, fuzzy, c-format
 msgid "can't open shared library `%s' for reading (%s)"
 msgstr "no se puede abrir el fichero fuente `%s' para lectura (%s)"
 
-#: awkgram.y:2386 awkgram.y:2460 awkgram.y:2510 builtin.c:135 debug.c:5206
+#: awkgram.y:2395 awkgram.y:2469 awkgram.y:2519 builtin.c:135 debug.c:5206
 msgid "reason unknown"
 msgstr "razón desconocida"
 
-#: awkgram.y:2395 awkgram.y:2419
+#: awkgram.y:2404 awkgram.y:2428
 #, c-format
 msgid "can't include `%s' and use it as a program file"
 msgstr ""
 
-#: awkgram.y:2408
+#: awkgram.y:2417
 #, c-format
 msgid "already included source file `%s'"
 msgstr "ya se incluyó el fichero fuente `%s'"
 
-#: awkgram.y:2409
+#: awkgram.y:2418
 #, fuzzy, c-format
 msgid "already loaded shared library `%s'"
 msgstr "ya se incluyó el fichero fuente `%s'"
 
-#: awkgram.y:2444
+#: awkgram.y:2453
 msgid "@include is a gawk extension"
 msgstr "@include es una extensión de gawk"
 
-#: awkgram.y:2450
+#: awkgram.y:2459
 msgid "empty filename after @include"
 msgstr "nombre de fichero vacío después de @include"
 
-#: awkgram.y:2494
+#: awkgram.y:2503
 #, fuzzy
 msgid "@load is a gawk extension"
 msgstr "@include es una extensión de gawk"
 
-#: awkgram.y:2500
+#: awkgram.y:2509
 #, fuzzy
 msgid "empty filename after @load"
 msgstr "nombre de fichero vacío después de @include"
 
-#: awkgram.y:2634
+#: awkgram.y:2643
 msgid "empty program text on command line"
 msgstr "texto de programa vacío en la linea de órdenes"
 
-#: awkgram.y:2749
+#: awkgram.y:2758
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "no se puede leer el fichero fuente `%s' (%s)"
 
-#: awkgram.y:2760
+#: awkgram.y:2769
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "el fichero fuente `%s' está vacío"
 
-#: awkgram.y:2937
+#: awkgram.y:2828
+#, c-format
+msgid "PEBKAC error: invalid character '\\%03o' in source code"
+msgstr ""
+
+#: awkgram.y:2959
 msgid "source file does not end in newline"
 msgstr "el fichero fuente no termina con línea nueva"
 
-#: awkgram.y:3042
+#: awkgram.y:3062
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "expresión regular sin terminar termina con `\\` al final del fichero"
 
-#: awkgram.y:3066
+#: awkgram.y:3089
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 "%s: %d: el modificador de expresión regular `/.../%c` de tawk no funciona en "
 "gawk"
 
-#: awkgram.y:3070
+#: awkgram.y:3093
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 "el modificador de expresión regular `/.../%c` de tawk no funciona en gawk"
 
-#: awkgram.y:3077
+#: awkgram.y:3100
 msgid "unterminated regexp"
 msgstr "expresión regular sin terminar"
 
-#: awkgram.y:3081
+#: awkgram.y:3104
 msgid "unterminated regexp at end of file"
 msgstr "expresión regular sin terminar al final del fichero"
 
-#: awkgram.y:3140
+#: awkgram.y:3162
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "el uso de la continuación de línea `\\ #...' no es transportable"
 
-#: awkgram.y:3156
+#: awkgram.y:3178
 msgid "backslash not last character on line"
 msgstr "la barra invertida no es el último caracter en la línea"
 
-#: awkgram.y:3217
+#: awkgram.y:3239
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX no permite el operador `**='"
 
-#: awkgram.y:3219
+#: awkgram.y:3241
 msgid "old awk does not support operator `**='"
 msgstr "el awk antiguo no admite el operador `**='"
 
-#: awkgram.y:3228
+#: awkgram.y:3250
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX no permite el operador `**'"
 
-#: awkgram.y:3230
+#: awkgram.y:3252
 msgid "old awk does not support operator `**'"
 msgstr "el awk antiguo no admite el operador `**='"
 
-#: awkgram.y:3265
+#: awkgram.y:3287
 msgid "operator `^=' is not supported in old awk"
 msgstr "el operador `^=' no se admite en el awk antiguo"
 
-#: awkgram.y:3273
+#: awkgram.y:3295
 msgid "operator `^' is not supported in old awk"
 msgstr "el operador `^' no se admite en el awk antiguo"
 
-#: awkgram.y:3366 awkgram.y:3382 command.y:1178
+#: awkgram.y:3392 awkgram.y:3410 command.y:1180
 msgid "unterminated string"
 msgstr "cadena sin terminar"
 
-#: awkgram.y:3603
+#: awkgram.y:3631
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "caracter '%c' inválido en la expresión"
 
-#: awkgram.y:3650
+#: awkgram.y:3678
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "`%s' es una extensión de gawk"
 
-#: awkgram.y:3655
+#: awkgram.y:3683
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX no permite `%s'"
 
-#: awkgram.y:3663
+#: awkgram.y:3691
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "`%s' no se admite en el awk antiguo"
 
-#: awkgram.y:3753
+#: awkgram.y:3781
 msgid "`goto' considered harmful!\n"
 msgstr "¡`goto' se considera dañino!\n"
 
-#: awkgram.y:3787
+#: awkgram.y:3815
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d es inválido como número de argumentos para %s"
 
-#: awkgram.y:3822
+#: awkgram.y:3850
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 "%s: la literal de cadena como último argumento de substitute no tiene efecto"
 
-#: awkgram.y:3827
+#: awkgram.y:3855
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "el tercer argumento de %s no es un objecto modificable"
 
-#: awkgram.y:3910 awkgram.y:3913
+#: awkgram.y:3938 awkgram.y:3941
 msgid "match: third argument is a gawk extension"
 msgstr "match: el tercer argumento es una extensión de gawk"
 
-#: awkgram.y:3967 awkgram.y:3970
+#: awkgram.y:3995 awkgram.y:3998
 msgid "close: second argument is a gawk extension"
 msgstr "close: el segundo argumento es una extensión de gawk"
 
-#: awkgram.y:3982
+#: awkgram.y:4010
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "el uso de dcgettext(_\"...\") es incorrecto: quite el subrayado inicial"
 
-#: awkgram.y:3997
+#: awkgram.y:4025
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "el uso de dcngettext(_\"...\") es incorrecto: quite el subrayado inicial"
 
-#: awkgram.y:4016
+#: awkgram.y:4044
 #, fuzzy
 msgid "index: regexp constant as second argument is not allowed"
 msgstr "index: el segundo argumento recibido no es una cadena"
 
-#: awkgram.y:4069
+#: awkgram.y:4097
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "función `%s': parámetro `%s' oscurece la variable global"
 
-#: awkgram.y:4126 debug.c:4041 debug.c:4084 debug.c:5204
+#: awkgram.y:4154 debug.c:4041 debug.c:4084 debug.c:5204
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "no se puede abrir `%s' para escritura (%s)"
 
-#: awkgram.y:4127
+#: awkgram.y:4155
 msgid "sending variable list to standard error"
 msgstr "se envía la lista de variables a la salida estándar de error"
 
-#: awkgram.y:4135
+#: awkgram.y:4163
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: falló close (%s)"
 
-#: awkgram.y:4160
+#: awkgram.y:4188
 msgid "shadow_funcs() called twice!"
 msgstr "¡se llamó shadow_funcs() dos veces!"
 
-#: awkgram.y:4168
+#: awkgram.y:4196
 msgid "there were shadowed variables."
 msgstr "hay variables opacadas."
 
-#: awkgram.y:4239
+#: awkgram.y:4267
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "el nombre de función `%s' se definió previamente"
 
-#: awkgram.y:4285
+#: awkgram.y:4313
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr ""
 "función `%s': no se puede usar un nombre de función como nombre de parámetro"
 
-#: awkgram.y:4288
+#: awkgram.y:4316
 #, c-format
 msgid "function `%s': can't use special variable `%s' as a function parameter"
 msgstr ""
 "función `%s': no se puede usar la variable especial `%s' como un parámetro "
 "de función"
 
-#: awkgram.y:4296
+#: awkgram.y:4324
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "función `%s': parámetro #%d, `%s', duplica el parámetro #%d"
 
-#: awkgram.y:4383 awkgram.y:4389
+#: awkgram.y:4411 awkgram.y:4417
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "se llamó a la función `%s' pero nunca se definió"
 
-#: awkgram.y:4393
+#: awkgram.y:4421
 #, c-format
 msgid "function `%s' defined but never called directly"
 msgstr "se definió la función `%s' pero nunca se llamó directamente"
 
-#: awkgram.y:4425
+#: awkgram.y:4453
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr ""
 "la constante de expresión regular para el parámetro #%d da un valor booleano"
 
-#: awkgram.y:4484
+#: awkgram.y:4468
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -520,21 +525,21 @@ msgstr ""
 "se llamó la función `%s' con espacio entre el nombre y el `(',\n"
 "o se usó como una variable o una matriz"
 
-#: awkgram.y:4720
+#: awkgram.y:4674
 msgid "division by zero attempted"
 msgstr "se intentó una división por cero"
 
-#: awkgram.y:4729
+#: awkgram.y:4683
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "se intentó una división por cero en `%%'"
 
-#: awkgram.y:5049
+#: awkgram.y:5003
 msgid ""
 "cannot assign a value to the result of a field post-increment expression"
 msgstr ""
 
-#: awkgram.y:5052
+#: awkgram.y:5006
 #, fuzzy, c-format
 msgid "invalid target of assignment (opcode %s)"
 msgstr "%d es inválido como número de argumentos para %s"
@@ -576,197 +581,207 @@ msgstr ""
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: `%s' no es un fichero abierto, tubería o co-proceso"
 
-#: builtin.c:362
+#: builtin.c:351
 msgid "index: received non-string first argument"
 msgstr "index: el primer argumento recibido no es una cadena"
 
-#: builtin.c:364
+#: builtin.c:353
 msgid "index: received non-string second argument"
 msgstr "index: el segundo argumento recibido no es una cadena"
 
-#: builtin.c:488 mpfr.c:757
+#: builtin.c:466 mpfr.c:777
 msgid "int: received non-numeric argument"
 msgstr "int: se recibió un argumento que no es númerico"
 
-#: builtin.c:525
+#: builtin.c:503
 msgid "length: received array argument"
 msgstr "length: se recibió un argumento de matriz"
 
-#: builtin.c:528
+#: builtin.c:506
 msgid "`length(array)' is a gawk extension"
 msgstr "`length(array)' es una extensión de gawk"
 
-#: builtin.c:544
+#: builtin.c:525
 msgid "length: received non-string argument"
 msgstr "length: se recibió un argumento que no es una cadena"
 
-#: builtin.c:575
+#: builtin.c:554
 msgid "log: received non-numeric argument"
 msgstr "log: se recibió un argumento que no es númerico"
 
-#: builtin.c:578
+#: builtin.c:557
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: se recibió el argumento negativo %g"
 
-#: builtin.c:776 builtin.c:781
+#: builtin.c:755 builtin.c:760 builtin.c:911
 msgid "fatal: must use `count$' on all formats or none"
 msgstr "fatal: se debe utilizar `count$' en todos los formatos o en ninguno"
 
-#: builtin.c:851
+#: builtin.c:830
 #, c-format
 msgid "field width is ignored for `%%' specifier"
 msgstr "se descarta la anchura del campo para el especificador `%%'"
 
-#: builtin.c:853
+#: builtin.c:832
 #, c-format
 msgid "precision is ignored for `%%' specifier"
 msgstr "se descarta la precisión para el especificador `%%'"
 
-#: builtin.c:855
+#: builtin.c:834
 #, c-format
 msgid "field width and precision are ignored for `%%' specifier"
 msgstr ""
 "se descartan la anchura del campo y la precisión para el especificador `%%'"
 
-#: builtin.c:906
+#: builtin.c:885
 msgid "fatal: `$' is not permitted in awk formats"
 msgstr "fatal: no se permite `$' en los formatos de awk"
 
-#: builtin.c:915
+#: builtin.c:894
 msgid "fatal: arg count with `$' must be > 0"
 msgstr "fatal: la cuenta de argumentos con `$' debe ser > 0"
 
-#: builtin.c:919
+#: builtin.c:898
 #, c-format
 msgid "fatal: arg count %ld greater than total number of supplied arguments"
 msgstr ""
 "fatal: la cuenta de argumentos %ld es mayor que el número total de "
 "argumentos proporcionados"
 
-#: builtin.c:923
+#: builtin.c:902
 msgid "fatal: `$' not permitted after period in format"
 msgstr "fatal: no se permite `$' después de un punto en el formato"
 
-#: builtin.c:939
+#: builtin.c:921
 msgid "fatal: no `$' supplied for positional field width or precision"
 msgstr ""
 "fatal: no se proporciona `$' para la anchura o la precisión del campo "
 "posicional"
 
-#: builtin.c:1009
+#: builtin.c:991
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "`l' no tiene significado en los formatos de awk; se descarta"
 
-#: builtin.c:1013
+#: builtin.c:995
 msgid "fatal: `l' is not permitted in POSIX awk formats"
 msgstr "fatal: no se permite `l' en los formatos POSIX de awk"
 
-#: builtin.c:1026
+#: builtin.c:1008
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "`L' no tiene significado en los formatos de awk; se descarta"
 
-#: builtin.c:1030
+#: builtin.c:1012
 msgid "fatal: `L' is not permitted in POSIX awk formats"
 msgstr "fatal: no se permite `L' en los formatos POSIX de awk"
 
-#: builtin.c:1043
+#: builtin.c:1025
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "`h' no tiene significado en los formatos de awk; se descarta"
 
-#: builtin.c:1047
+#: builtin.c:1029
 msgid "fatal: `h' is not permitted in POSIX awk formats"
 msgstr "fatal: no se permite `h' en los formatos POSIX de awk"
 
-#: builtin.c:1463
+#: builtin.c:1055
+#, fuzzy, c-format
+msgid "[s]printf: value %g is too big for %%c format"
+msgstr "[s]printf: el valor %g está fuera del rango para el formato `%%%c'"
+
+#: builtin.c:1068
+#, fuzzy, c-format
+msgid "[s]printf: value %g is not a valid wide character"
+msgstr "[s]printf: el valor %g está fuera del rango para el formato `%%%c'"
+
+#: builtin.c:1454
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf: el valor %g está fuera del rango para el formato `%%%c'"
 
-#: builtin.c:1561
+#: builtin.c:1552
 #, c-format
 msgid "ignoring unknown format specifier character `%c': no argument converted"
 msgstr ""
 "se descarta el carácter especificador de formato `%c' desconocido: no se "
 "convirtió ningún argumento"
 
-#: builtin.c:1566
+#: builtin.c:1557
 msgid "fatal: not enough arguments to satisfy format string"
 msgstr ""
 "fatal: no hay suficientes argumentos para satisfacer a la cadena de formato"
 
-#: builtin.c:1568
+#: builtin.c:1559
 msgid "^ ran out for this one"
 msgstr "se acabó ^ para éste"
 
-#: builtin.c:1575
+#: builtin.c:1566
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: el especificador de formato no tiene letras de control"
 
-#: builtin.c:1578
+#: builtin.c:1569
 msgid "too many arguments supplied for format string"
 msgstr "se proporcionaron demasiados argumentos para la cadena de formato"
 
-#: builtin.c:1634
+#: builtin.c:1625
 #, fuzzy
 msgid "sprintf: no arguments"
 msgstr "printf: sin argumentos"
 
-#: builtin.c:1657 builtin.c:1668
+#: builtin.c:1648 builtin.c:1659
 msgid "printf: no arguments"
 msgstr "printf: sin argumentos"
 
-#: builtin.c:1711
+#: builtin.c:1702
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: se recibió un argumento que no es un númerico"
 
-#: builtin.c:1715
+#: builtin.c:1706
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: se llamó con el argumento negativo %g"
 
-#: builtin.c:1746
+#: builtin.c:1737
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: la longitud %g no es >= 1"
 
-#: builtin.c:1748
+#: builtin.c:1739
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: la longitud %g no es >= 0"
 
-#: builtin.c:1755
+#: builtin.c:1753
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: se truncará la longitud no entera %g"
 
-#: builtin.c:1760
+#: builtin.c:1758
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
 "substr: la longitud %g es demasiado grande para ser índice de cadena, se "
 "trunca a %g"
 
-#: builtin.c:1772
+#: builtin.c:1770
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: el índice de inicio %g es inválido, se usa 1"
 
-#: builtin.c:1777
+#: builtin.c:1775
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: se truncará el índice de inicio no entero %g"
 
-#: builtin.c:1802
+#: builtin.c:1798
 msgid "substr: source string is zero length"
 msgstr "substr: la cadena de origen es de longitud cero"
 
-#: builtin.c:1818
+#: builtin.c:1812
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: el índice de inicio %g está después del fin de la cadena"
 
-#: builtin.c:1826
+#: builtin.c:1820
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -774,196 +789,202 @@ msgstr ""
 "substr: la cadena %g en el índice de inicio %g excede la longitud del primer "
 "argumento (%lu)"
 
-#: builtin.c:1900
+#: builtin.c:1890
 msgid "strftime: format value in PROCINFO[\"strftime\"] has numeric type"
 msgstr ""
 "strftime: el valor de formato en PROCINFO[\"strftime\"] tiene tipo numérico"
 
-#: builtin.c:1923
+#: builtin.c:1913
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: el segundo argumento recibido no es númerico"
 
-#: builtin.c:1927
+#: builtin.c:1917
 msgid "strftime: second argument less than 0 or too big for time_t"
 msgstr ""
 "strftime: el segundo argumento es menor que 0 o demasiado grande para time_t"
 
-#: builtin.c:1934
+#: builtin.c:1924
 msgid "strftime: received non-string first argument"
 msgstr "strftime: el primer argumento recibido no es una cadena"
 
-#: builtin.c:1941
+#: builtin.c:1931
 msgid "strftime: received empty format string"
 msgstr "strftime: se recibió una cadena de formato vacía"
 
-#: builtin.c:2007
+#: builtin.c:1997
 msgid "mktime: received non-string argument"
 msgstr "mktime: se recibió un argumento que no es una cadena"
 
-#: builtin.c:2024
+#: builtin.c:2014
 msgid "mktime: at least one of the values is out of the default range"
 msgstr ""
 "mktime: por lo menos uno de los valores está fuera del rango por defecto"
 
-#: builtin.c:2059
+#: builtin.c:2049
 msgid "'system' function not allowed in sandbox mode"
 msgstr "no se permite la función 'system' en modo sandbox"
 
-#: builtin.c:2064
+#: builtin.c:2054
 msgid "system: received non-string argument"
 msgstr "system: se recibió un argumento que no es una cadena"
 
-#: builtin.c:2184
+#: builtin.c:2174
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "referencia al campo sin inicializar `$%d'"
 
-#: builtin.c:2271
+#: builtin.c:2259
 msgid "tolower: received non-string argument"
 msgstr "tolower: se recibió un argumento que no es una cadena"
 
-#: builtin.c:2305
+#: builtin.c:2290
 msgid "toupper: received non-string argument"
 msgstr "toupper: se recibió un argumento que no es una cadena"
 
-#: builtin.c:2341 mpfr.c:672
+#: builtin.c:2323 mpfr.c:679
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: el primer argumento recibido no es númerico"
 
-#: builtin.c:2343 mpfr.c:674
+#: builtin.c:2325 mpfr.c:681
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: el segundo argumento recibido no es númerico"
 
-#: builtin.c:2362
+#: builtin.c:2344
 msgid "sin: received non-numeric argument"
 msgstr "sin: se recibió un argumento que no es númerico"
 
-#: builtin.c:2378
+#: builtin.c:2360
 msgid "cos: received non-numeric argument"
 msgstr "cos: se recibió un argumento que no es númerico"
 
-#: builtin.c:2431 mpfr.c:1156
+#: builtin.c:2413 mpfr.c:1176
 msgid "srand: received non-numeric argument"
 msgstr "srand: se recibió un argumento que no es númerico"
 
-#: builtin.c:2462
+#: builtin.c:2444
 msgid "match: third argument is not an array"
 msgstr "match: el tercer argumento no es una matriz"
 
-#: builtin.c:2734
-msgid "gensub: third argument of 0 treated as 1"
+#: builtin.c:2705
+#, fuzzy, c-format
+msgid "gensub: third argument `%.*s' treated as 1"
+msgstr "gensub: el tercer argumento de 0 se trata como 1"
+
+#: builtin.c:2720
+#, fuzzy, c-format
+msgid "gensub: third argument %g treated as 1"
 msgstr "gensub: el tercer argumento de 0 se trata como 1"
 
-#: builtin.c:3030
+#: builtin.c:3020
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: el primer argumento recibido no es númerico"
 
-#: builtin.c:3032
+#: builtin.c:3022
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift: el segundo argumento recibido no es númerico"
 
-#: builtin.c:3038
+#: builtin.c:3028
 #, fuzzy, c-format
 msgid "lshift(%f, %f): negative values will give strange results"
 msgstr "lshift(%lf, %lf): los valores negativos darán resultados extraños"
 
-#: builtin.c:3040
+#: builtin.c:3030
 #, fuzzy, c-format
 msgid "lshift(%f, %f): fractional values will be truncated"
 msgstr "lshift(%lf, %lf): los valores fraccionarios se truncarán"
 
-#: builtin.c:3042
+#: builtin.c:3032
 #, fuzzy, c-format
 msgid "lshift(%f, %f): too large shift value will give strange results"
 msgstr ""
 "lshift(%lf, %lf): un valor de desplazamiento muy grande dará resultados "
 "extraños"
 
-#: builtin.c:3067
+#: builtin.c:3057
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: el primer argumento recibido no es númerico"
 
-#: builtin.c:3069
+#: builtin.c:3059
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift: el segundo argumento recibido no es númerico"
 
-#: builtin.c:3075
+#: builtin.c:3065
 #, fuzzy, c-format
 msgid "rshift(%f, %f): negative values will give strange results"
 msgstr "rshift(%lf, %lf): los valores negativos darán resultados extraños"
 
-#: builtin.c:3077
+#: builtin.c:3067
 #, fuzzy, c-format
 msgid "rshift(%f, %f): fractional values will be truncated"
 msgstr "rshift(%lf, %lf): los valores fraccionarios serán truncados"
 
-#: builtin.c:3079
+#: builtin.c:3069
 #, fuzzy, c-format
 msgid "rshift(%f, %f): too large shift value will give strange results"
 msgstr ""
 "rshift(%lf, %lf): un valor de desplazamiento muy grande dará resultados "
 "extraños"
 
-#: builtin.c:3104 mpfr.c:968
+#: builtin.c:3094 mpfr.c:988
 #, fuzzy
 msgid "and: called with less than two arguments"
 msgstr "sqrt: se llamó con el argumento negativo %g"
 
-#: builtin.c:3109
+#: builtin.c:3099
 #, fuzzy, c-format
 msgid "and: argument %d is non-numeric"
 msgstr "exp: el argumento %g está fuera de rango"
 
-#: builtin.c:3113
+#: builtin.c:3103
 #, fuzzy, c-format
 msgid "and: argument %d negative value %g will give strange results"
 msgstr "and(%lf, %lf): los valores negativos darán resultados extraños"
 
-#: builtin.c:3136 mpfr.c:1000
+#: builtin.c:3126 mpfr.c:1020
 #, fuzzy
 msgid "or: called with less than two arguments"
 msgstr "sqrt: se llamó con el argumento negativo %g"
 
-#: builtin.c:3141
+#: builtin.c:3131
 #, fuzzy, c-format
 msgid "or: argument %d is non-numeric"
 msgstr "exp: el argumento %g está fuera de rango"
 
-#: builtin.c:3145
+#: builtin.c:3135
 #, fuzzy, c-format
 msgid "or: argument %d negative value %g will give strange results"
 msgstr "compl(%lf): el valor negativo dará resultados extraños"
 
-#: builtin.c:3167 mpfr.c:1031
+#: builtin.c:3157 mpfr.c:1051
 #, fuzzy
 msgid "xor: called with less than two arguments"
 msgstr "sqrt: se llamó con el argumento negativo %g"
 
-#: builtin.c:3173
+#: builtin.c:3163
 #, fuzzy, c-format
 msgid "xor: argument %d is non-numeric"
 msgstr "exp: el argumento %g está fuera de rango"
 
-#: builtin.c:3177
+#: builtin.c:3167
 #, fuzzy, c-format
 msgid "xor: argument %d negative value %g will give strange results"
 msgstr "xor(%lf, %lf): los valores negativos darán resultados extraños"
 
-#: builtin.c:3202 mpfr.c:787
+#: builtin.c:3192 mpfr.c:807
 msgid "compl: received non-numeric argument"
 msgstr "compl: se recibió un argumento que no es númerico"
 
-#: builtin.c:3208
+#: builtin.c:3198
 #, fuzzy, c-format
 msgid "compl(%f): negative value will give strange results"
 msgstr "compl(%lf): el valor negativo dará resultados extraños"
 
-#: builtin.c:3210
+#: builtin.c:3200
 #, fuzzy, c-format
 msgid "compl(%f): fractional value will be truncated"
 msgstr "compl(%lf): el valor fraccionario se truncará"
 
-#: builtin.c:3379
+#: builtin.c:3369
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: `%s' no es una categoría local válida"
@@ -1245,42 +1266,48 @@ msgstr ""
 msgid "watch var - set a watchpoint for a variable."
 msgstr ""
 
-#: command.y:1011 debug.c:401 msg.c:135
+#: command.y:901
+msgid ""
+"where [N] - (same as backtrace) print trace of all or N innermost (outermost "
+"if N < 0) frames."
+msgstr ""
+
+#: command.y:1013 debug.c:401 msg.c:135
 #, c-format
 msgid "error: "
 msgstr "error: "
 
-#: command.y:1051
+#: command.y:1053
 #, fuzzy, c-format
 msgid "can't read command (%s)\n"
 msgstr "no se puede redirigir desde `%s' (%s)"
 
-#: command.y:1065
+#: command.y:1067
 #, fuzzy, c-format
 msgid "can't read command (%s)"
 msgstr "no se puede redirigir desde `%s' (%s)"
 
-#: command.y:1116
+#: command.y:1118
 #, fuzzy
 msgid "invalid character in command"
 msgstr "Nombre de clase de caracter inválido"
 
-#: command.y:1152
+#: command.y:1154
 #, c-format
 msgid "unknown command - \"%.*s\", try help"
 msgstr ""
 
-#: command.y:1222
+#: command.y:1224
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: command.y:1284
+#: command.y:1286
 #, fuzzy
 msgid "invalid character"
 msgstr "Caracter de ordenación inválido"
 
-#: command.y:1455
+#: command.y:1457
 #, c-format
 msgid "undefined command: %s\n"
 msgstr ""
@@ -1796,74 +1823,76 @@ msgstr "`exit' no se puede llamar en el contexto actual"
 msgid "`return' not allowed in current context; statement ignored"
 msgstr "`exit' no se puede llamar en el contexto actual"
 
-#: debug.c:5590
+#: debug.c:5604
 #, fuzzy, c-format
 msgid "No symbol `%s' in current context"
 msgstr "se intentó usar la matriz `%s' en un contexto escalar"
 
-#: dfa.c:1118 dfa.c:1121 dfa.c:1142 dfa.c:1150 dfa.c:1162 dfa.c:1197
-#: dfa.c:1206 dfa.c:1209 dfa.c:1214 dfa.c:1228 dfa.c:1275
+#: dfa.c:1063 dfa.c:1066 dfa.c:1085 dfa.c:1095 dfa.c:1107 dfa.c:1143
+#: dfa.c:1152 dfa.c:1155 dfa.c:1160 dfa.c:1174 dfa.c:1222
 #, fuzzy
 msgid "unbalanced ["
 msgstr "[ desbalanceado"
 
-#: dfa.c:1174
+#: dfa.c:1119
 #, fuzzy
 msgid "invalid character class"
 msgstr "Nombre de clase de caracter inválido"
 
-#: dfa.c:1316
+#: dfa.c:1265
 msgid "character class syntax is [[:space:]], not [:space:]"
 msgstr ""
 
-#: dfa.c:1366
+#: dfa.c:1327
 #, fuzzy
 msgid "unfinished \\ escape"
 msgstr "Escape \\ sin terminar"
 
-#: dfa.c:1513 regcomp.c:161
-msgid "Invalid content of \\{\\}"
+#: dfa.c:1474
+#, fuzzy
+msgid "invalid content of \\{\\}"
 msgstr "Contenido inválido de \\{\\}"
 
-#: dfa.c:1516 regcomp.c:176
-msgid "Regular expression too big"
+#: dfa.c:1477
+#, fuzzy
+msgid "regular expression too big"
 msgstr "La expresión regular es demasiado grande"
 
-#: dfa.c:1936
+#: dfa.c:1912
 #, fuzzy
 msgid "unbalanced ("
 msgstr "( desbalanceado"
 
-#: dfa.c:2062
+#: dfa.c:2038
 #, fuzzy
 msgid "no syntax specified"
 msgstr "No se especifican los bits de sintaxis de la expresión regular"
 
-#: dfa.c:2070
+#: dfa.c:2046
 #, fuzzy
 msgid "unbalanced )"
 msgstr ") desbalanceado"
 
-#: eval.c:394
+#: eval.c:396
 #, c-format
 msgid "unknown nodetype %d"
 msgstr "tipo de nodo %d desconocido"
 
-#: eval.c:405 eval.c:419
+#: eval.c:407 eval.c:421
 #, c-format
 msgid "unknown opcode %d"
 msgstr "código de operación %d desconocido"
 
-#: eval.c:416
+#: eval.c:418
 #, c-format
 msgid "opcode %s not an operator or keyword"
 msgstr "el código de operación %s no es un operador o una palabra clave"
 
-#: eval.c:472
+#: eval.c:474
 msgid "buffer overflow in genflags2str"
 msgstr "desbordamiento de almacenamiento temporal en genflags2str"
 
-#: eval.c:675
+#: eval.c:676
 #, c-format
 msgid ""
 "\n"
@@ -1874,94 +1903,94 @@ msgstr ""
 "\t# Pila de Llamadas de Funciones:\n"
 "\n"
 
-#: eval.c:704
+#: eval.c:705
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "`IGNORECASE' es una extensión de gawk"
 
-#: eval.c:736
+#: eval.c:737
 msgid "`BINMODE' is a gawk extension"
 msgstr "`BINMODE' es una extensión de gawk"
 
-#: eval.c:794
+#: eval.c:795
 #, c-format
 msgid "BINMODE value `%s' is invalid, treated as 3"
 msgstr "el valor BINMODE `%s' es inválido; se trata como 3"
 
-#: eval.c:885
+#: eval.c:912
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "especificación `%sFMT' `%s' errónea"
 
-#: eval.c:969
+#: eval.c:996
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "se desactiva `--lint' debido a una asignación a `LINT'"
 
-#: eval.c:1147
+#: eval.c:1174
 #, c-format
 msgid "reference to uninitialized argument `%s'"
 msgstr "referencia al argumento sin inicializar `%s'"
 
-#: eval.c:1148
+#: eval.c:1175
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "referencia a la variable sin inicializar `%s'"
 
-#: eval.c:1166
+#: eval.c:1193
 msgid "attempt to field reference from non-numeric value"
 msgstr "se intentó una referencia de campo desde un valor que no es númerico"
 
-#: eval.c:1168
+#: eval.c:1195
 msgid "attempt to field reference from null string"
 msgstr "se intentó una referencia de campo desde una cadena nula"
 
-#: eval.c:1176
+#: eval.c:1203
 #, c-format
 msgid "attempt to access field %ld"
 msgstr "se intentó acceder al campo %ld"
 
-#: eval.c:1185
+#: eval.c:1212
 #, c-format
 msgid "reference to uninitialized field `$%ld'"
 msgstr "referencia al campo sin inicializar `$%ld'"
 
-#: eval.c:1272
+#: eval.c:1299
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "se llamó a la función `%s' con más argumentos de los declarados"
 
-#: eval.c:1473
+#: eval.c:1500
 #, c-format
 msgid "unwind_stack: unexpected type `%s'"
 msgstr "unwind_stack: tipo `%s' inesperado"
 
-#: eval.c:1569
+#: eval.c:1596
 msgid "division by zero attempted in `/='"
 msgstr "se intentó una división por cero en `/='"
 
-#: eval.c:1576
+#: eval.c:1603
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "se intentó una división por cero en `%%='"
 
-#: ext.c:89 ext.c:171
+#: ext.c:65 ext.c:147
 msgid "extensions are not allowed in sandbox mode"
 msgstr "no se permiten las extensiones en modo sandbox"
 
-#: ext.c:92
+#: ext.c:68
 #, fuzzy
 msgid "-l / @load are gawk extensions"
 msgstr "@include es una extensión de gawk"
 
-#: ext.c:95
+#: ext.c:71
 msgid "load_ext: received NULL lib_name"
 msgstr ""
 
-#: ext.c:98
+#: ext.c:74
 #, fuzzy, c-format
 msgid "load_ext: cannot open library `%s' (%s)\n"
 msgstr "fatal: extension: no se puede abrir `%s' (%s)\n"
 
-#: ext.c:104
+#: ext.c:80
 #, fuzzy, c-format
 msgid ""
 "load_ext: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
@@ -1969,32 +1998,32 @@ msgstr ""
 "fatal: extension: la biblioteca `%s': no define "
 "`plugin_is_GPL_compatible' (%s)\n"
 
-#: ext.c:110
+#: ext.c:86
 #, fuzzy, c-format
 msgid "load_ext: library `%s': cannot call function `%s' (%s)\n"
 msgstr ""
 "fatal: extension: la biblioteca `%s': no puede llamar a la función `"
 "%s' (%s)\n"
 
-#: ext.c:114
+#: ext.c:90
 #, c-format
 msgid "load_ext: library `%s' initialization routine `%s' failed\n"
 msgstr ""
 
-#: ext.c:174
+#: ext.c:150
 msgid "`extension' is a gawk extension"
 msgstr "`extension' es una extensión de gawk"
 
-#: ext.c:177
+#: ext.c:153
 msgid "extension: received NULL lib_name"
 msgstr ""
 
-#: ext.c:180
+#: ext.c:156
 #, fuzzy, c-format
 msgid "extension: cannot open library `%s' (%s)"
 msgstr "fatal: extension: no se puede abrir `%s' (%s)\n"
 
-#: ext.c:186
+#: ext.c:162
 #, fuzzy, c-format
 msgid ""
 "extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)"
@@ -2002,100 +2031,100 @@ msgstr ""
 "fatal: extension: la biblioteca `%s': no define "
 "`plugin_is_GPL_compatible' (%s)\n"
 
-#: ext.c:190
+#: ext.c:166
 #, fuzzy, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)"
 msgstr ""
 "fatal: extension: la biblioteca `%s': no puede llamar a la función `"
 "%s' (%s)\n"
 
-#: ext.c:221
+#: ext.c:197
 #, fuzzy
 msgid "make_builtin: missing function name"
 msgstr "extension: falta el nombre de la función"
 
-#: ext.c:236
+#: ext.c:212
 #, fuzzy, c-format
 msgid "make_builtin: can't redefine function `%s'"
 msgstr "extension: no se puede redefinir la función `%s'"
 
-#: ext.c:240
+#: ext.c:216
 #, fuzzy, c-format
 msgid "make_builtin: function `%s' already defined"
 msgstr "extension: la función `%s' ya está definida"
 
-#: ext.c:244
+#: ext.c:220
 #, fuzzy, c-format
 msgid "make_builtin: function name `%s' previously defined"
 msgstr "extension: el nombre de función `%s' se definió previamente"
 
-#: ext.c:246
+#: ext.c:222
 #, fuzzy, c-format
 msgid "make_builtin: can't use gawk built-in `%s' as function name"
 msgstr ""
 "extension: no se puede utilizar la orden interna de gawk `%s' como nombre de "
 "función"
 
-#: ext.c:249 ext.c:304
+#: ext.c:225 ext.c:280
 #, c-format
 msgid "make_builtin: negative argument count for function `%s'"
 msgstr "make_builtin: cuenta de argumento negativa para la función `%s'"
 
-#: ext.c:276
+#: ext.c:252
 #, fuzzy
 msgid "extension: missing function name"
 msgstr "extension: falta el nombre de la función"
 
-#: ext.c:279 ext.c:283
+#: ext.c:255 ext.c:259
 #, fuzzy, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: carácter ilegal `%c' en el nombre de la función `%s'"
 
-#: ext.c:291
+#: ext.c:267
 #, fuzzy, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: no se puede redefinir la función `%s'"
 
-#: ext.c:295
+#: ext.c:271
 #, fuzzy, c-format
 msgid "extension: function `%s' already defined"
 msgstr "extension: la función `%s' ya está definida"
 
-#: ext.c:299
+#: ext.c:275
 #, fuzzy, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "el nombre de función `%s' se definió previamente"
 
-#: ext.c:301
+#: ext.c:277
 #, fuzzy, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 "extension: no se puede utilizar la orden interna de gawk `%s' como nombre de "
 "función"
 
-#: ext.c:375
+#: ext.c:351
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "la función `%s' se definió para tomar no más de %d argumento(s)"
 
-#: ext.c:378
+#: ext.c:354
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "función `%s': falta el argumento #%d"
 
-#: ext.c:395
+#: ext.c:371
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr ""
 "función `%s': argumento #%d: se intentó usar un escalar como una matriz"
 
-#: ext.c:399
+#: ext.c:375
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 "función `%s': argumento #%d: se intentó usar una matriz como un escalar"
 
-#: ext.c:413
+#: ext.c:389
 msgid "dynamic loading of library not supported"
 msgstr ""
 
@@ -2258,7 +2287,7 @@ msgstr "sqrt: se llamó con el argumento negativo %g"
 msgid "inplace_begin: in-place editing already active"
 msgstr ""
 
-#: extension/inplace.c:133 extension/inplace.c:207
+#: extension/inplace.c:133 extension/inplace.c:210
 #, c-format
 msgid "inplace_begin: expects 2 arguments but called with %d"
 msgstr ""
@@ -2287,55 +2316,55 @@ msgstr "`%s' no es un nombre de variable legal"
 msgid "inplace_begin: mkstemp(`%s') failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:178
+#: extension/inplace.c:181
 #, fuzzy, c-format
 msgid "inplace_begin: chmod failed (%s)"
 msgstr "%s: falló close (%s)"
 
-#: extension/inplace.c:185
+#: extension/inplace.c:188
 #, c-format
 msgid "inplace_begin: dup(stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:188
+#: extension/inplace.c:191
 #, c-format
 msgid "inplace_begin: dup2(%d, stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:191
+#: extension/inplace.c:194
 #, fuzzy, c-format
 msgid "inplace_begin: close(%d) failed (%s)"
 msgstr "%s: falló close (%s)"
 
-#: extension/inplace.c:210
+#: extension/inplace.c:213
 msgid "inplace_end: cannot retrieve 1st argument as a string filename"
 msgstr ""
 
-#: extension/inplace.c:217
+#: extension/inplace.c:220
 msgid "inplace_end: in-place editing not active"
 msgstr ""
 
-#: extension/inplace.c:223
+#: extension/inplace.c:226
 #, c-format
 msgid "inplace_end: dup2(%d, stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:226
+#: extension/inplace.c:229
 #, fuzzy, c-format
 msgid "inplace_end: close(%d) failed (%s)"
 msgstr "%s: falló close (%s)"
 
-#: extension/inplace.c:230
+#: extension/inplace.c:233
 #, c-format
 msgid "inplace_end: fsetpos(stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:243
+#: extension/inplace.c:246
 #, fuzzy, c-format
 msgid "inplace_end: link(`%s', `%s') failed (%s)"
 msgstr "falló la limpieza de la tubería de `%s' (%s)."
 
-#: extension/inplace.c:253
+#: extension/inplace.c:256
 #, fuzzy, c-format
 msgid "inplace_end: rename(`%s', `%s') failed (%s)"
 msgstr "falló al cerrar el df %d (`%s') (%s)"
@@ -2385,52 +2414,56 @@ msgstr "sqrt: se llamó con el argumento negativo %g"
 msgid "readfile: called with no arguments"
 msgstr "sqrt: se llamó con el argumento negativo %g"
 
-#: extension/rwarray.c:124
+#: extension/revoutput.c:125
+msgid "revoutput: could not initialize REVOUT variable"
+msgstr ""
+
+#: extension/rwarray.c:124 extension/rwarray0.c:109
 #, fuzzy
 msgid "writea: called with too many arguments"
 msgstr "sqrt: se llamó con el argumento negativo %g"
 
-#: extension/rwarray.c:131
+#: extension/rwarray.c:131 extension/rwarray0.c:116
 #, fuzzy, c-format
 msgid "do_writea: argument 0 is not a string\n"
 msgstr "exp: el argumento %g está fuera de rango"
 
-#: extension/rwarray.c:137
+#: extension/rwarray.c:137 extension/rwarray0.c:122
 #, fuzzy, c-format
 msgid "do_writea: argument 1 is not an array\n"
 msgstr "split: el cuarto argumento no es una matriz"
 
-#: extension/rwarray.c:184
+#: extension/rwarray.c:184 extension/rwarray0.c:169
 #, c-format
 msgid "write_array: could not flatten array\n"
 msgstr ""
 
-#: extension/rwarray.c:198
+#: extension/rwarray.c:198 extension/rwarray0.c:183
 #, c-format
 msgid "write_array: could not release flattened array\n"
 msgstr ""
 
-#: extension/rwarray.c:280
+#: extension/rwarray.c:280 extension/rwarray0.c:265
 #, fuzzy
 msgid "reada: called with too many arguments"
 msgstr "sqrt: se llamó con el argumento negativo %g"
 
-#: extension/rwarray.c:287
+#: extension/rwarray.c:287 extension/rwarray0.c:272
 #, fuzzy, c-format
 msgid "do_reada: argument 0 is not a string\n"
 msgstr "exp: el argumento %g está fuera de rango"
 
-#: extension/rwarray.c:293
+#: extension/rwarray.c:293 extension/rwarray0.c:278
 #, fuzzy, c-format
 msgid "do_reada: argument 1 is not an array\n"
 msgstr "match: el tercer argumento no es una matriz"
 
-#: extension/rwarray.c:337
+#: extension/rwarray.c:337 extension/rwarray0.c:322
 #, c-format
 msgid "do_reada: clear_array failed\n"
 msgstr ""
 
-#: extension/rwarray.c:374
+#: extension/rwarray.c:374 extension/rwarray0.c:358
 #, c-format
 msgid "read_array: set_array_element failed\n"
 msgstr ""
@@ -2463,92 +2496,92 @@ msgstr "exp: el argumento %g está fuera de rango"
 msgid "sleep: not supported on this platform"
 msgstr ""
 
-#: field.c:345
+#: field.c:346
 msgid "NF set to negative value"
 msgstr "se definió NF con un valor negativo"
 
-#: field.c:971 field.c:978 field.c:982
+#: field.c:958 field.c:965 field.c:969
 msgid "split: fourth argument is a gawk extension"
 msgstr "split: el cuarto argumento es una extensión de gawk"
 
-#: field.c:975
+#: field.c:962
 msgid "split: fourth argument is not an array"
 msgstr "split: el cuarto argumento no es una matriz"
 
-#: field.c:989
+#: field.c:976
 msgid "split: second argument is not an array"
 msgstr "split: el segundo argumento no es una matriz"
 
-#: field.c:993
+#: field.c:980
 msgid "split: cannot use the same array for second and fourth args"
 msgstr ""
 "split: no se puede usar la misma matriz para el segundo y cuarto argumentos"
 
-#: field.c:998
+#: field.c:985
 msgid "split: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "split: no se puede usar una submatriz del segundo argumento para el cuarto "
 "argumento"
 
-#: field.c:1001
+#: field.c:988
 msgid "split: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "split: no se puede usar una submatriz del cuarto argumento para el segundo "
 "argumento"
 
-#: field.c:1032
+#: field.c:1019
 msgid "split: null string for third arg is a gawk extension"
 msgstr ""
 "split: la cadena nula para el tercer argumento es una extensión de gawk"
 
-#: field.c:1072
+#: field.c:1059
 msgid "patsplit: fourth argument is not an array"
 msgstr "patsplit: el cuarto argumento no es una matriz"
 
-#: field.c:1077
+#: field.c:1064
 msgid "patsplit: second argument is not an array"
 msgstr "patsplit: el segundo argumento no es una matriz"
 
-#: field.c:1083
+#: field.c:1070
 msgid "patsplit: third argument must be non-null"
 msgstr "patsplit: el tercer argumento no debe ser nulo"
 
-#: field.c:1087
+#: field.c:1074
 msgid "patsplit: cannot use the same array for second and fourth args"
 msgstr ""
 "patsplit: no se puede usar la misma matriz para el segundo y cuarto "
 "argumentos"
 
-#: field.c:1092
+#: field.c:1079
 msgid "patsplit: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "patsplit: no se puede usar una submatriz del segundo argumento para el "
 "cuarto argumento"
 
-#: field.c:1095
+#: field.c:1082
 msgid "patsplit: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "patsplit: no se puede usar una submatriz del cuarto argumento para el "
 "segundo argumento"
 
-#: field.c:1133
+#: field.c:1120
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "`FIELDWIDTHS' es una extensión gawk"
 
-#: field.c:1197
+#: field.c:1184
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "valor de FIELDWIDTHS inválido, cerca de `%s'"
 
-#: field.c:1270
+#: field.c:1257
 msgid "null string for `FS' is a gawk extension"
 msgstr "la cadena nula para `FS' es una extensión de gawk"
 
-#: field.c:1274
+#: field.c:1261
 msgid "old awk does not support regexps as value of `FS'"
 msgstr "el awk antiguo no admite expresiones regulares como valor de `FS'"
 
-#: field.c:1393
+#: field.c:1380
 msgid "`FPAT' is a gawk extension"
 msgstr "`FPAT' es una extensión de gawk"
 
@@ -2564,21 +2597,21 @@ msgstr ""
 msgid "node_to_awk_value: received null val"
 msgstr ""
 
-#: gawkapi.c:807
+#: gawkapi.c:809
 #, fuzzy
 msgid "remove_element: received null array"
 msgstr "length: se recibió un argumento de matriz"
 
-#: gawkapi.c:810
+#: gawkapi.c:812
 msgid "remove_element: received null subscript"
 msgstr ""
 
-#: gawkapi.c:947
+#: gawkapi.c:949
 #, c-format
 msgid "api_flatten_array: could not convert index %d\n"
 msgstr ""
 
-#: gawkapi.c:952
+#: gawkapi.c:954
 #, c-format
 msgid "api_flatten_array: could not convert value %d\n"
 msgstr ""
@@ -2638,528 +2671,495 @@ msgstr "%s: la opción '-W %s' no admite ningún argumento\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: la opción '-W %s' requiere un argumento\n"
 
-#: io.c:392
+#: io.c:423
 #, c-format
 msgid "command line argument `%s' is a directory: skipped"
 msgstr "el argumento de la línea de órdenes `%s' es un directorio: se salta"
 
-#: io.c:395 io.c:513
+#: io.c:426 io.c:544
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "no se puede abrir el fichero `%s' para lectura (%s)"
 
-#: io.c:640
+#: io.c:671
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "falló al cerrar el df %d (`%s') (%s)"
 
-#: io.c:716
+#: io.c:749
 msgid "redirection not allowed in sandbox mode"
 msgstr "no se permite la redirección en modo sandbox"
 
-#: io.c:750
+#: io.c:783
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "la expresión en la redirección `%s' sólo tiene valor numérico"
 
-#: io.c:756
+#: io.c:789
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "la expresión para la redirección `%s' tiene un valor de cadena nula"
 
-#: io.c:761
+#: io.c:794
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "el fichero `%s' para la redirección `%s' puede ser resultado de una "
 "expresión lógica"
 
-#: io.c:809
+#: io.c:842
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "mezcla innecesaria de `>' y `>>' para el fichero `%.*s'"
 
-#: io.c:863
+#: io.c:896
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "no se puede abrir la tubería `%s' para la salida (%s)"
 
-#: io.c:873
+#: io.c:906
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "no se puede abrir la tubería `%s' para la entrada (%s)"
 
-#: io.c:904
+#: io.c:937
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr "no se puede abrir la tubería de dos vías `%s' para entrada/salida (%s)"
 
-#: io.c:986
+#: io.c:1019
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "no se puede redirigir desde `%s' (%s)"
 
-#: io.c:989
+#: io.c:1022
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "no se puede redirigir a `%s' (%s)"
 
-#: io.c:1040
+#: io.c:1073
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "se alcanzó el límite del sistema para ficheros abiertos: comenzando a "
 "multiplexar los descriptores de fichero"
 
-#: io.c:1056
+#: io.c:1089
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "falló al cerrar `%s' (%s)."
 
-#: io.c:1064
+#: io.c:1097
 msgid "too many pipes or input files open"
 msgstr "demasiadas tuberías o ficheros de entrada abiertos"
 
-#: io.c:1086
+#: io.c:1119
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: el segundo argumento debe ser `to' o `from'"
 
-#: io.c:1103
+#: io.c:1136
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: `%.*s' no es un fichero abierto, tubería o co-proceso"
 
-#: io.c:1108
+#: io.c:1141
 msgid "close of redirection that was never opened"
 msgstr "se cerró una redirección que nunca se abrió"
 
-#: io.c:1205
+#: io.c:1238
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: la redirección `%s' no se abrió con `|&', se descarta el segundo "
 "argumento"
 
-#: io.c:1222
+#: io.c:1255
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "estado de fallo (%d) al cerrar la tubería de `%s' (%s)"
 
-#: io.c:1225
+#: io.c:1258
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "estado de fallo (%d) al cerrar el fichero de `%s' (%s)"
 
-#: io.c:1245
+#: io.c:1278
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "no se provee el cerrado explícito del `socket' `%s'"
 
-#: io.c:1248
+#: io.c:1281
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "no se provee el cerrado explícito del co-proceso `%s'"
 
-#: io.c:1251
+#: io.c:1284
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "no se provee el cerrado explícito del la tubería `%s'"
 
-#: io.c:1254
+#: io.c:1287
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "no se provee el cerrado explícito del fichero `%s'"
 
-#: io.c:1284 io.c:1342 main.c:864 main.c:906
+#: io.c:1317 io.c:1375 main.c:628 main.c:670
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "error al escribir en la salida estándar (%s)"
 
-#: io.c:1289 io.c:1348 main.c:866
+#: io.c:1322 io.c:1381 main.c:630
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "error al escribir en la salida estándar de error (%s)"
 
-#: io.c:1297
+#: io.c:1330
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "falló la limpieza de la tubería de `%s' (%s)."
 
-#: io.c:1300
+#: io.c:1333
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "falló la limpieza del co-proceso de la tubería a `%s' (%s)."
 
-#: io.c:1303
+#: io.c:1336
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "falló la limpieza del fichero de `%s' (%s)."
 
-#: io.c:1420
+#: io.c:1453
 #, c-format
 msgid "local port %s invalid in `/inet'"
 msgstr "puerto local %s inválido en `/inet'"
 
-#: io.c:1438
+#: io.c:1471
 #, c-format
 msgid "remote host and port information (%s, %s) invalid"
 msgstr "anfitrión remoto e información de puerto (%s, %s) inválidos"
 
-#: io.c:1590
-#, c-format
-msgid "no (known) protocol supplied in special filename `%s'"
-msgstr ""
-"no se proporciona algún protocolo (conocido) en el nombre de fichero "
-"especial `%s'"
-
-#: io.c:1604
-#, c-format
-msgid "special file name `%s' is incomplete"
-msgstr "el nombre de fichero especial `%s' está incompleto"
-
-#: io.c:1621
-msgid "must supply a remote hostname to `/inet'"
-msgstr "se debe proporcionar a `/inet' un nombre de anfitrión remoto"
-
-#: io.c:1639
-msgid "must supply a remote port to `/inet'"
-msgstr "se debe proporcionar a `/inet' un puerto remoto"
-
-#: io.c:1685
+#: io.c:1673
 msgid "TCP/IP communications are not supported"
 msgstr "no se admiten las comunicaciones TCP/IP"
 
-#: io.c:1867
+#: io.c:1854
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "no se puede abrir `%s', modo `%s'"
 
-#: io.c:1917
+#: io.c:1904
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "falló al cerrar el pty maestro (%s)"
 
-#: io.c:1919 io.c:2105 io.c:2305
+#: io.c:1906 io.c:2092 io.c:2293
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "falló al cerrar la salida estándar en el hijo (%s)"
 
-#: io.c:1922
+#: io.c:1909
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 "falló el movimiento del pty esclavo a la salida estándar en el hijo (dup: %s)"
 
-#: io.c:1924 io.c:2110
+#: io.c:1911 io.c:2097
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "falló al cerrar la entrada estándar en el hijo (%s)"
 
-#: io.c:1927
+#: io.c:1914
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 "falló el movimiento del pty esclavo a la entrada estándar en el hijo (dup: "
 "%s)"
 
-#: io.c:1929 io.c:1951
+#: io.c:1916 io.c:1938
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "falló al cerrar el pty esclavo (%s)"
 
-#: io.c:2040 io.c:2108 io.c:2276 io.c:2308
+#: io.c:2027 io.c:2095 io.c:2264 io.c:2296
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr "falló el movimiento a la salida estándar en el hijo (dup: %s)"
 
-#: io.c:2047 io.c:2113
+#: io.c:2034 io.c:2100
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr ""
 "falló el movimiento de la tubería a la entrada estándar en el hijo (dup: %s)"
 
-#: io.c:2073 io.c:2298
+#: io.c:2060 io.c:2286
 msgid "restoring stdout in parent process failed\n"
 msgstr "falló la restauración de la salida estándar en el proceso padre\n"
 
-#: io.c:2081
+#: io.c:2068
 msgid "restoring stdin in parent process failed\n"
 msgstr "falló la restauración de la entrada estándar en el proceso padre\n"
 
-#: io.c:2116 io.c:2310 io.c:2324
+#: io.c:2103 io.c:2298 io.c:2313
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "falló al cerrar la tubería (%s)"
 
-#: io.c:2174
+#: io.c:2162
 msgid "`|&' not supported"
 msgstr "no se admite `|&'"
 
-#: io.c:2261
+#: io.c:2249
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "no se puede abrir la tubería `%s' (%s)"
 
-#: io.c:2318
+#: io.c:2307
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "no se puede crear el proceso hijo para `%s' (fork: %s)"
 
-#: io.c:2790
+#: io.c:2734
 msgid "register_input_parser: received NULL pointer"
 msgstr ""
 
-#: io.c:2818
+#: io.c:2762
 #, c-format
 msgid "input parser `%s' conflicts with previously installed input parser `%s'"
 msgstr ""
 
-#: io.c:2825
+#: io.c:2769
 #, c-format
 msgid "input parser `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:2845
+#: io.c:2789
 msgid "register_output_wrapper: received NULL pointer"
 msgstr ""
 
-#: io.c:2873
+#: io.c:2817
 #, c-format
 msgid ""
 "output wrapper `%s' conflicts with previously installed output wrapper `%s'"
 msgstr ""
 
-#: io.c:2880
+#: io.c:2824
 #, c-format
 msgid "output wrapper `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:2901
+#: io.c:2845
 msgid "register_output_processor: received NULL pointer"
 msgstr ""
 
-#: io.c:2930
+#: io.c:2874
 #, c-format
 msgid ""
 "two-way processor `%s' conflicts with previously installed two-way processor "
 "`%s'"
 msgstr ""
 
-#: io.c:2939
+#: io.c:2883
 #, c-format
 msgid "two way processor `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:3064
+#: io.c:3008
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "el fichero de datos `%s' está vacío"
 
-#: io.c:3106 io.c:3114
+#: io.c:3050 io.c:3058
 msgid "could not allocate more input memory"
 msgstr "no se puede reservar más memoria de entrada"
 
-#: io.c:3682
+#: io.c:3636
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "el valor multicaracter de `RS' es una extensión de gawk"
 
-#: io.c:3771
+#: io.c:3783
 msgid "IPv6 communication is not supported"
 msgstr "no se admite la comunicación IPv6"
 
-#: main.c:405
-msgid "empty argument to `-e/--source' ignored"
-msgstr "se descarta el argumento vacío para `-e/--source'"
-
-#: main.c:495
-#, c-format
-msgid "%s: option `-W %s' unrecognized, ignored\n"
-msgstr "%s: no se reconoce la opción `-W %s', se descarta\n"
-
-#: main.c:541
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: la opción requiere un argumento -- %c\n"
-
-#: main.c:562
+#: main.c:321
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
 "la variable de ambiente `POSIXLY_CORRECT' está definida: se activa `--posix'"
 
-#: main.c:568
+#: main.c:327
 msgid "`--posix' overrides `--traditional'"
 msgstr "`--posix' se impone a `--traditional'"
 
-#: main.c:579
+#: main.c:338
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "`--posix'/`--traditional' se imponen a `--non-decimal-data'"
 
-#: main.c:583
+#: main.c:342
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "ejecutar %s como setuid root puede ser un problema de seguridad"
 
-#: main.c:588
+#: main.c:346
 #, fuzzy
 msgid "`--posix' overrides `--characters-as-bytes'"
 msgstr "`--posix' se impone a `--binary'"
 
-#: main.c:647
+#: main.c:404
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "no se puede establecer el modo binario en la entrada estándar (%s)"
 
-#: main.c:650
+#: main.c:407
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "no se puede establecer el modo binario en la salida estándar (%s)"
 
-#: main.c:652
+#: main.c:409
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr ""
 "no se puede establecer el modo binario en la salida estándar de error (%s)"
 
-#: main.c:710
+#: main.c:469
 msgid "no program text at all!"
 msgstr "¡No hay ningún programa de texto!"
 
-#: main.c:799
+#: main.c:563
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 "Modo de empleo: %s [opciones estilo POSIX o GNU] -f fichprog [--] "
 "fichero ...\n"
 
-#: main.c:801
+#: main.c:565
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
 "Modo de empleo: %s [opciones estilo POSIX o GNU] [--] %cprograma%c "
 "fichero ...\n"
 
-#: main.c:806
+#: main.c:570
 msgid "POSIX options:\t\tGNU long options: (standard)\n"
 msgstr "Opciones POSIX:\t\tOpciones largas GNU: (estándar)\n"
 
-#: main.c:807
+#: main.c:571
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f fichprog\t\t--file=fichprog\n"
 
-#: main.c:808
+#: main.c:572
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F sc\t\t\t--field-separator=sc\n"
 
-#: main.c:809
+#: main.c:573
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=valor\t\t--assign=var=valor\n"
 
-#: main.c:810
+#: main.c:574
 msgid "Short options:\t\tGNU long options: (extensions)\n"
 msgstr "Opciones cortas:\t\tOpciones largas GNU: (extensiones)\n"
 
-#: main.c:811
+#: main.c:575
 msgid "\t-b\t\t\t--characters-as-bytes\n"
 msgstr "\t-b\t\t\t--characters-as-bytes\n"
 
-#: main.c:812
+#: main.c:576
 msgid "\t-c\t\t\t--traditional\n"
 msgstr "\t-c\t\t\t--traditional\n"
 
-#: main.c:813
+#: main.c:577
 msgid "\t-C\t\t\t--copyright\n"
 msgstr "\t-C\t\t\t--copyright\n"
 
-#: main.c:814
+#: main.c:578
 msgid "\t-d[file]\t\t--dump-variables[=file]\n"
 msgstr "\t-d[fichero]\t\t--dump-variables[=fichero]\n"
 
-#: main.c:815
+#: main.c:579
 #, fuzzy
 msgid "\t-D[file]\t\t--debug[=file]\n"
 msgstr "\t-p[fichero]\t\t--profile[=fichero]\n"
 
 # Esta es la línea más larga de la lista de argumentos.
 # Probar con gawk para revisar tabuladores. cfuga
-#: main.c:816
+#: main.c:580
 msgid "\t-e 'program-text'\t--source='program-text'\n"
 msgstr "\t-e 'texto-prog'\t--source='texto-prog'\n"
 
-#: main.c:817
+#: main.c:581
 msgid "\t-E file\t\t\t--exec=file\n"
 msgstr "\t-E fichero\t\t--exec=fichero\n"
 
-#: main.c:818
+#: main.c:582
 msgid "\t-g\t\t\t--gen-pot\n"
 msgstr "\t-g\t\t\t--gen-pot\n"
 
-#: main.c:819
+#: main.c:583
 msgid "\t-h\t\t\t--help\n"
 msgstr "\t-h\t\t\t--help\n"
 
-#: main.c:820
+#: main.c:584
 msgid "\t-i includefile\t\t--include=includefile\n"
 msgstr ""
 
-#: main.c:821
+#: main.c:585
 msgid "\t-l library\t\t--load=library\n"
 msgstr ""
 
-#: main.c:822
-msgid "\t-L [fatal]\t\t--lint[=fatal]\n"
+#: main.c:586
+#, fuzzy
+msgid "\t-L[fatal|invalid]\t--lint[=fatal|invalid]\n"
 msgstr "\t-L [fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:823
-msgid "\t-n\t\t\t--non-decimal-data\n"
-msgstr "\t-n\t\t\t--non-decimal-data\n"
-
-#: main.c:824
+#: main.c:587
 #, fuzzy
 msgid "\t-M\t\t\t--bignum\n"
 msgstr "\t-g\t\t\t--gen-pot\n"
 
-#: main.c:825
+#: main.c:588
 msgid "\t-N\t\t\t--use-lc-numeric\n"
 msgstr "\t-N\t\t\t--use-lc-numeric\n"
 
-#: main.c:826
+#: main.c:589
+msgid "\t-n\t\t\t--non-decimal-data\n"
+msgstr "\t-n\t\t\t--non-decimal-data\n"
+
+#: main.c:590
 #, fuzzy
 msgid "\t-o[file]\t\t--pretty-print[=file]\n"
 msgstr "\t-p[fichero]\t\t--profile[=fichero]\n"
 
-#: main.c:827
+#: main.c:591
 msgid "\t-O\t\t\t--optimize\n"
 msgstr "\t-O\t\t\t--optimize\n"
 
-#: main.c:828
+#: main.c:592
 msgid "\t-p[file]\t\t--profile[=file]\n"
 msgstr "\t-p[fichero]\t\t--profile[=fichero]\n"
 
-#: main.c:829
+#: main.c:593
 msgid "\t-P\t\t\t--posix\n"
 msgstr "\t-P\t\t\t--posix\n"
 
-#: main.c:830
+#: main.c:594
 msgid "\t-r\t\t\t--re-interval\n"
 msgstr "\t-r\t\t\t--re-interval\n"
 
-#: main.c:831
+#: main.c:595
 msgid "\t-S\t\t\t--sandbox\n"
 msgstr "\t-S\t\t\t--sandbox\n"
 
-#: main.c:832
+#: main.c:596
 msgid "\t-t\t\t\t--lint-old\n"
 msgstr "\t-t\t\t\t--lint-old\n"
 
-#: main.c:833
+#: main.c:597
 msgid "\t-V\t\t\t--version\n"
 msgstr "\t-V\t\t\t--version\n"
 
-#: main.c:835
+#: main.c:599
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:838
+#: main.c:602
 msgid "\t-Y\t\t--parsedebug\n"
 msgstr "\t-Y\t\t--parsedebug\n"
 
@@ -3168,7 +3168,7 @@ msgstr "\t-Y\t\t--parsedebug\n"
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: main.c:847
+#: main.c:611
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -3182,7 +3182,7 @@ msgstr ""
 "Reporte los errores de los mensajes en español a <es@li.org>.\n"
 "\n"
 
-#: main.c:851
+#: main.c:615
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -3192,7 +3192,7 @@ msgstr ""
 "Por defecto lee la entrada estándar y escribe en la salida estándar.\n"
 "\n"
 
-#: main.c:855
+#: main.c:619
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -3202,7 +3202,7 @@ msgstr ""
 "\tgawk '{ sum += $1 }; END { print sum }' fichero\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:880
+#: main.c:644
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
@@ -3222,7 +3222,7 @@ msgstr ""
 "(a su elección) cualquier versión posterior.\n"
 "\n"
 
-#: main.c:888
+#: main.c:652
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3236,7 +3236,7 @@ msgstr ""
 "Licencia Pública General de GNU para más detalles.\n"
 "\n"
 
-#: main.c:894
+#: main.c:658
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program. If not, see http://www.gnu.org/licenses/.\n"
@@ -3245,16 +3245,16 @@ msgstr ""
 "junto con este programa. Si no es así, consulte\n"
 "http://www.gnu.org/licenses/.\n"
 
-#: main.c:931
+#: main.c:695
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft no establece FS a tabulador en el awk de POSIX"
 
-#: main.c:1208
+#: main.c:982
 #, c-format
 msgid "unknown value for field spec: %d\n"
 msgstr "valor desconocido para la especificación de campo: %d\n"
 
-#: main.c:1306
+#: main.c:1080
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -3263,103 +3263,121 @@ msgstr ""
 "%s: el argumento `%s' para `-v' no es de la forma `var=valor'\n"
 "\n"
 
-#: main.c:1332
+#: main.c:1106
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "`%s' no es un nombre de variable legal"
 
-#: main.c:1335
+#: main.c:1109
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "`%s' no es un nombre de variable, se busca el fichero `%s=%s'"
 
-#: main.c:1339
+#: main.c:1113
 #, c-format
 msgid "cannot use gawk builtin `%s' as variable name"
 msgstr ""
 "no se puede utilizar la orden interna de gawk `%s' como nombre de variable"
 
-#: main.c:1344
+#: main.c:1118
 #, c-format
 msgid "cannot use function `%s' as variable name"
 msgstr "no se puede usar la función `%s' como nombre de variable"
 
-#: main.c:1397
+#: main.c:1171
 msgid "floating point exception"
 msgstr "excepción de coma flotante"
 
-#: main.c:1404
+#: main.c:1178
 msgid "fatal error: internal error"
 msgstr "error fatal: error interno"
 
-#: main.c:1419
+#: main.c:1193
 msgid "fatal error: internal error: segfault"
 msgstr "error fatal: error interno: falla de segmentación"
 
-#: main.c:1431
+#: main.c:1205
 msgid "fatal error: internal error: stack overflow"
 msgstr "error fatal: error interno: desbordamiento de pila"
 
-#: main.c:1490
+#: main.c:1264
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "no existe el df %d abierto previamente"
 
-#: main.c:1497
+#: main.c:1271
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "no se puede abrir previamente /dev/null para el df %d"
 
-#: mpfr.c:550
+#: main.c:1485
+msgid "empty argument to `-e/--source' ignored"
+msgstr "se descarta el argumento vacío para `-e/--source'"
+
+#: main.c:1556
+msgid "-M ignored: MPFR/GMP support not compiled in"
+msgstr ""
+
+#: main.c:1577
+#, c-format
+msgid "%s: option `-W %s' unrecognized, ignored\n"
+msgstr "%s: no se reconoce la opción `-W %s', se descarta\n"
+
+#: main.c:1630
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: la opción requiere un argumento -- %c\n"
+
+#: mpfr.c:557
 #, fuzzy, c-format
 msgid "PREC value `%.*s' is invalid"
 msgstr "el valor BINMODE `%s' es inválido; se trata como 3"
 
-#: mpfr.c:608
+#: mpfr.c:615
 #, fuzzy, c-format
 msgid "RNDMODE value `%.*s' is invalid"
 msgstr "el valor BINMODE `%s' es inválido; se trata como 3"
 
-#: mpfr.c:698
+#: mpfr.c:711
 #, fuzzy, c-format
 msgid "%s: received non-numeric argument"
 msgstr "cos: se recibió un argumento que no es númerico"
 
-#: mpfr.c:800
+#: mpfr.c:820
 #, fuzzy
 msgid "compl(%Rg): negative value will give strange results"
 msgstr "compl(%lf): el valor negativo dará resultados extraños"
 
-#: mpfr.c:804
+#: mpfr.c:824
 #, fuzzy
 msgid "comp(%Rg): fractional value will be truncated"
 msgstr "compl(%lf): el valor fraccionario se truncará"
 
-#: mpfr.c:816
+#: mpfr.c:836
 #, fuzzy, c-format
 msgid "cmpl(%Zd): negative values will give strange results"
 msgstr "compl(%lf): el valor negativo dará resultados extraños"
 
-#: mpfr.c:835
+#: mpfr.c:855
 #, fuzzy, c-format
 msgid "%s: received non-numeric argument #%d"
 msgstr "cos: se recibió un argumento que no es númerico"
 
-#: mpfr.c:845
+#: mpfr.c:865
 msgid "%s: argument #%d has invalid value %Rg, using 0"
 msgstr ""
 
-#: mpfr.c:857
+#: mpfr.c:877
 #, fuzzy
 msgid "%s: argument #%d negative value %Rg will give strange results"
 msgstr "compl(%lf): el valor negativo dará resultados extraños"
 
-#: mpfr.c:863
+#: mpfr.c:883
 #, fuzzy
 msgid "%s: argument #%d fractional value %Rg will be truncated"
 msgstr "or(%lf, %lf): los valores fraccionarios serán truncados"
 
-#: mpfr.c:878
+#: mpfr.c:898
 #, fuzzy, c-format
 msgid "%s: argument #%d negative value %Zd will give strange results"
 msgstr "compl(%lf): el valor negativo dará resultados extraños"
@@ -3369,24 +3387,24 @@ msgstr "compl(%lf): el valor negativo dará resultados extraños"
 msgid "cmd. line:"
 msgstr "línea ord.:"
 
-#: node.c:421
+#: node.c:409
 msgid "backslash at end of string"
 msgstr "barra invertida al final de la cadena"
 
-#: node.c:500
+#: node.c:488
 #, c-format
 msgid "old awk does not support the `\\%c' escape sequence"
 msgstr "el awk antiguo no admite la secuencia de escape `\\%c'"
 
-#: node.c:551
+#: node.c:539
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX no permite escapes `\\x'"
 
-#: node.c:557
+#: node.c:545
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "no hay dígitos hexadecimales en la secuencia de escape `\\x'"
 
-#: node.c:579
+#: node.c:567
 #, c-format
 msgid ""
 "hex escape \\x%.*s of %d characters probably not interpreted the way you "
@@ -3395,12 +3413,12 @@ msgstr ""
 "el escape hexadecimal \\x%.*s de %d caracteres tal vez no se interprete de "
 "la forma esperada"
 
-#: node.c:594
+#: node.c:582
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "la secuencia de escape `\\%c' se trata como una simple `%c'"
 
-#: node.c:739
+#: node.c:726
 msgid ""
 "Invalid multibyte data detected. There may be a mismatch between your data "
 "and your locale."
@@ -3429,12 +3447,12 @@ msgid "sending profile to standard error"
 msgstr "se envía el perfil a la salida estándar de error"
 
 #: profile.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t# %s block(s)\n"
+"\t# %s rule(s)\n"
 "\n"
 msgstr ""
-"\t# bloque(s) %s\n"
+"\t# Regla(s)\n"
 "\n"
 
 #: profile.c:198
@@ -3451,24 +3469,24 @@ msgstr ""
 msgid "internal error: %s with null vname"
 msgstr "error interno: %s con vname nulo"
 
-#: profile.c:537
+#: profile.c:538
 #, fuzzy
 msgid "internal error: builtin with null fname"
 msgstr "error interno: %s con vname nulo"
 
-#: profile.c:949
+#: profile.c:958
 #, c-format
 msgid ""
 "\t# Loaded extensions (-l and/or @load)\n"
 "\n"
 msgstr ""
 
-#: profile.c:972
+#: profile.c:981
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# perfil de gawk, creado %s\n"
 
-#: profile.c:1475
+#: profile.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -3477,7 +3495,7 @@ msgstr ""
 "\n"
 "\t# Funciones, enumeradas alfabéticamente\n"
 
-#: profile.c:1513
+#: profile.c:1559
 #, c-format
 msgid "redir2str: unknown redirection type %d"
 msgstr "redir2str: tipo de redirección %d desconocida"
@@ -3488,74 +3506,116 @@ msgid "regexp component `%.*s' should probably be `[%.*s]'"
 msgstr ""
 "el componente de expresión regular `%.*s' probablemente debe ser `[%.*s]'"
 
-#: regcomp.c:131
+#: regcomp.c:139
 msgid "Success"
 msgstr "Éxito"
 
-#: regcomp.c:134
+#: regcomp.c:142
 msgid "No match"
 msgstr "No hay coincidencia"
 
-#: regcomp.c:137
+#: regcomp.c:145
 msgid "Invalid regular expression"
 msgstr "Expresión regular inválida"
 
-#: regcomp.c:140
+#: regcomp.c:148
 msgid "Invalid collation character"
 msgstr "Caracter de ordenación inválido"
 
-#: regcomp.c:143
+#: regcomp.c:151
 msgid "Invalid character class name"
 msgstr "Nombre de clase de caracter inválido"
 
-#: regcomp.c:146
+#: regcomp.c:154
 msgid "Trailing backslash"
 msgstr "Barra invertida extra al final"
 
-#: regcomp.c:149
+#: regcomp.c:157
 msgid "Invalid back reference"
 msgstr "Referencia hacia atrás inválida"
 
-#: regcomp.c:152
-msgid "Unmatched [ or [^"
+#: regcomp.c:160
+#, fuzzy
+msgid "Unmatched [, [^, [:, [., or [="
 msgstr "[ o [^ desemparejados"
 
-#: regcomp.c:155
+#: regcomp.c:163
 msgid "Unmatched ( or \\("
 msgstr "( o \\( desemparejados"
 
-#: regcomp.c:158
+#: regcomp.c:166
 msgid "Unmatched \\{"
 msgstr "\\{ desemparejado"
 
-#: regcomp.c:164
+#: regcomp.c:169
+msgid "Invalid content of \\{\\}"
+msgstr "Contenido inválido de \\{\\}"
+
+#: regcomp.c:172
 msgid "Invalid range end"
 msgstr "Final de rango inválido"
 
-#: regcomp.c:167
+#: regcomp.c:175
 msgid "Memory exhausted"
 msgstr "Memoria agotada"
 
-#: regcomp.c:170
+#: regcomp.c:178
 msgid "Invalid preceding regular expression"
 msgstr "Expresión regular precedente inválida"
 
-#: regcomp.c:173
+#: regcomp.c:181
 msgid "Premature end of regular expression"
 msgstr "Fin prematuro de la expresión regular"
 
-#: regcomp.c:179
+#: regcomp.c:184
+msgid "Regular expression too big"
+msgstr "La expresión regular es demasiado grande"
+
+#: regcomp.c:187
 msgid "Unmatched ) or \\)"
 msgstr ") o \\) desemparejados"
 
-#: regcomp.c:704
+#: regcomp.c:712
 msgid "No previous regular expression"
 msgstr "No hay una expresión regular previa"
 
-#: symbol.c:741
+#: symbol.c:677
+#, fuzzy, c-format
+msgid "function `%s': can't use function `%s' as a parameter name"
+msgstr ""
+"función `%s': no se puede usar un nombre de función como nombre de parámetro"
+
+#: symbol.c:809
 msgid "can not pop main context"
 msgstr ""
 
+#~ msgid "`getline var' invalid inside `%s' rule"
+#~ msgstr "`getline var' inválido dentro de la regla `%s'"
+
+#~ msgid "`getline' invalid inside `%s' rule"
+#~ msgstr "`getline' inválido dentro de la regla `%s'"
+
+#~ msgid "no (known) protocol supplied in special filename `%s'"
+#~ msgstr ""
+#~ "no se proporciona algún protocolo (conocido) en el nombre de fichero "
+#~ "especial `%s'"
+
+#~ msgid "special file name `%s' is incomplete"
+#~ msgstr "el nombre de fichero especial `%s' está incompleto"
+
+#~ msgid "must supply a remote hostname to `/inet'"
+#~ msgstr "se debe proporcionar a `/inet' un nombre de anfitrión remoto"
+
+#~ msgid "must supply a remote port to `/inet'"
+#~ msgstr "se debe proporcionar a `/inet' un puerto remoto"
+
+#~ msgid ""
+#~ "\t# %s block(s)\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\t# bloque(s) %s\n"
+#~ "\n"
+
 #~ msgid "range of the form `[%c-%c]' is locale dependent"
 #~ msgstr "el rango de la forma `[%c-%c]' depende del local"
 
@@ -3627,9 +3687,6 @@ msgstr ""
 #~ msgid "Operation Not Supported"
 #~ msgstr "No Se Admite La Operación"
 
-#~ msgid "attempt to use function `%s' as an array"
-#~ msgstr "se intentó usar la función `%s' como una matriz"
-
 #~ msgid "reference to uninitialized element `%s[\"%.*s\"]'"
 #~ msgstr "referencia al elemento sin inicializar `%s[\"%.*s\"]'"
 
@@ -3673,9 +3730,6 @@ msgstr ""
 #~ msgid "function `%s' not defined"
 #~ msgstr "la función `%s' no está definida"
 
-#~ msgid "non-redirected `getline' invalid inside `%s' rule"
-#~ msgstr "`getline' no redirigido es inválido dentro de la regla `%s'"
-
 #~ msgid "error reading input file `%s': %s"
 #~ msgstr "error al leer el fichero de entrada `%s': %s"
 
diff --git a/po/fi.gmo b/po/fi.gmo
index 478aa070..ccf63562 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index 49014233..96d03c23 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gawk 4.1.0b\n"
-"Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2014-04-08 19:23+0300\n"
+"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
+"POT-Creation-Date: 2015-02-26 20:05+0200\n"
 "PO-Revision-Date: 2014-01-16 13:32+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -37,9 +37,9 @@ msgstr "yritettiin käyttää skalaariparametria �%s� taulukkona"
 msgid "attempt to use scalar `%s' as an array"
 msgstr "yritettiin käyttää skalaaria �%s� taulukkona"
 
-#: array.c:409 array.c:576 builtin.c:85 builtin.c:1615 builtin.c:1661
-#: builtin.c:1674 builtin.c:2102 builtin.c:2116 eval.c:1122 eval.c:1126
-#: eval.c:1531
+#: array.c:409 array.c:576 builtin.c:85 builtin.c:1606 builtin.c:1652
+#: builtin.c:1665 builtin.c:2092 builtin.c:2106 eval.c:1149 eval.c:1153
+#: eval.c:1558
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "yritettiin käyttää taulukkoa �%s� skalaarikontekstissa"
@@ -98,408 +98,413 @@ msgstr ""
 "asorti: toisen argumentin alitaulukon käyttö ensimmäiselle argumentille "
 "epäonnistui"
 
-#: array.c:1314
+#: array.c:1313
 #, c-format
 msgid "`%s' is invalid as a function name"
 msgstr "�%s� on virheellinen funktionimenä"
 
-#: array.c:1318
+#: array.c:1317
 #, c-format
 msgid "sort comparison function `%s' is not defined"
 msgstr "lajitteluvertailufunktiota �%s� ei ole määritelty"
 
-#: awkgram.y:233
+#: awkgram.y:226
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "%s lohkoilla on oltava toiminto-osa"
 
-#: awkgram.y:236
+#: awkgram.y:229
 msgid "each rule must have a pattern or an action part"
 msgstr "jokaisella säännöllä on oltava malli tai toiminto-osa"
 
-#: awkgram.y:325 awkgram.y:336
+#: awkgram.y:320 awkgram.y:331
 msgid "old awk does not support multiple `BEGIN' or `END' rules"
 msgstr "vanha awk ei tue useita �BEGIN�- tai �END�-sääntöjä"
 
-#: awkgram.y:373
+#: awkgram.y:368
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "�%s� on sisäänrakennettu funktio. Sitä ei voi määritellä uudelleen"
 
-#: awkgram.y:419
+#: awkgram.y:417
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr ""
 "säännöllisen lausekkeen vakio �//� näyttää C++-kommentilta, mutta ei ole"
 
-#: awkgram.y:423
+#: awkgram.y:421
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr ""
 "säännöllisen lausekkeen vakio �/%s/� näyttää C-kommentilta, mutta ei ole"
 
-#: awkgram.y:515
+#: awkgram.y:513
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "kaksi samanlaista case-arvoa switch-rakenteen rungossa: %s"
 
-#: awkgram.y:536
+#: awkgram.y:534
 msgid "duplicate `default' detected in switch body"
 msgstr "kaksoiskappale �default� havaittu switch-rungossa"
 
-#: awkgram.y:796 awkgram.y:3723
+#: awkgram.y:794 awkgram.y:3751
 msgid "`break' is not allowed outside a loop or switch"
 msgstr "�break� ei ole sallittu silmukan tai switch-lauseen ulkopuolella"
 
-#: awkgram.y:805 awkgram.y:3715
+#: awkgram.y:803 awkgram.y:3743
 msgid "`continue' is not allowed outside a loop"
 msgstr "�continue� ei ole sallittu silmukan ulkopuolella"
 
-#: awkgram.y:815
+#: awkgram.y:813
 #, c-format
 msgid "`next' used in %s action"
 msgstr "�next� käytetty %s-toiminnossa"
 
-#: awkgram.y:824
+#: awkgram.y:822
 #, c-format
 msgid "`nextfile' used in %s action"
 msgstr "�nextfile� käytetty %s-toiminnossa"
 
-#: awkgram.y:848
+#: awkgram.y:846
 msgid "`return' used outside function context"
 msgstr "�return� käytetty funktiokontekstin ulkopuolella"
 
-#: awkgram.y:922
+#: awkgram.y:920
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "pelkkä �print� BEGIN- tai END-säännössä pitäisi luultavasti olla �print \"\"�"
 
-#: awkgram.y:988 awkgram.y:1037
+#: awkgram.y:986 awkgram.y:1035
 msgid "`delete' is not allowed with SYMTAB"
 msgstr "�delete� ei ole sallittu kohteessa SYMTAB"
 
-#: awkgram.y:990 awkgram.y:1039
+#: awkgram.y:988 awkgram.y:1037
 msgid "`delete' is not allowed with FUNCTAB"
 msgstr "�delete� ei ole sallittu kohteessa FUNCTAB"
 
-#: awkgram.y:1024 awkgram.y:1028
+#: awkgram.y:1022 awkgram.y:1026
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "�delete(array)� ei ole siirrettävä tawk-laajennus"
 
-#: awkgram.y:1149
+#: awkgram.y:1147
 msgid "multistage two-way pipelines don't work"
 msgstr "monivaiheiset kaksisuuntaiset putket eivät toimi"
 
-#: awkgram.y:1264
+#: awkgram.y:1262
 msgid "regular expression on right of assignment"
 msgstr "säännöllinen lauseke sijoituksen oikealla puolella"
 
-#: awkgram.y:1275
+#: awkgram.y:1273
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "säännöllinen lauseke �~�- tai �!~�-operaattorin vasemmalla puolella"
 
-#: awkgram.y:1291 awkgram.y:1442
+#: awkgram.y:1289 awkgram.y:1431
 msgid "old awk does not support the keyword `in' except after `for'"
 msgstr "vanha awk ei tue avainsanaa �in� paitsi �for�-sanan jälkeen"
 
-#: awkgram.y:1301
+#: awkgram.y:1299
 msgid "regular expression on right of comparison"
 msgstr "säännöllinen lauseke vertailun oikealla puolella"
 
-#: awkgram.y:1417
-#, c-format
-msgid "`getline var' invalid inside `%s' rule"
-msgstr "�getline var� virheellinen säännön �%s� sisällä"
-
-#: awkgram.y:1420
+#: awkgram.y:1411
 #, c-format
-msgid "`getline' invalid inside `%s' rule"
-msgstr "�getline� virheellinen säännön �%s� sisällä"
+msgid "non-redirected `getline' invalid inside `%s' rule"
+msgstr "edelleenohjaamaton �getline� virheellinen �%s�-säännön sisällä"
 
-#: awkgram.y:1425
+#: awkgram.y:1414
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "edelleenohjaamaton �getline� määrittelemätön END-toiminnon sisällä"
 
-#: awkgram.y:1444
+#: awkgram.y:1433
 msgid "old awk does not support multidimensional arrays"
 msgstr "vanha awk ei tue moniulotteisia taulukkoja"
 
-#: awkgram.y:1541
+#: awkgram.y:1530
 msgid "call of `length' without parentheses is not portable"
 msgstr "�length�-kutsu ilman sulkumerkkejä ei ole siirrettävä"
 
-#: awkgram.y:1607
+#: awkgram.y:1596
 msgid "indirect function calls are a gawk extension"
 msgstr "epäsuorat funktiokutsut ovat gawk-laajennus"
 
-#: awkgram.y:1620
+#: awkgram.y:1609
 #, c-format
 msgid "can not use special variable `%s' for indirect function call"
 msgstr "erikoismuuttujan �%s� käyttö epäsuoralle funktiokutsulle epäonnistui"
 
-#: awkgram.y:1698
+#: awkgram.y:1635
+#, fuzzy, c-format
+msgid "attempt to use non-function `%s' in function call"
+msgstr "yritettiin käyttää funktiota �%s� taulukkona"
+
+#: awkgram.y:1699
 msgid "invalid subscript expression"
 msgstr "virheellinen indeksointilauseke"
 
-#: awkgram.y:2048 awkgram.y:2068 gawkapi.c:206 gawkapi.c:224 msg.c:126
+#: awkgram.y:2045 awkgram.y:2065 gawkapi.c:206 gawkapi.c:224 msg.c:126
 msgid "warning: "
 msgstr "varoitus: "
 
-#: awkgram.y:2066 gawkapi.c:192 gawkapi.c:221 msg.c:158
+#: awkgram.y:2063 gawkapi.c:192 gawkapi.c:221 msg.c:158
 msgid "fatal: "
 msgstr "tuhoisa: "
 
-#: awkgram.y:2116
+#: awkgram.y:2113
 msgid "unexpected newline or end of string"
 msgstr "odottamaton rivinvaihto tai merkkijonon loppu"
 
-#: awkgram.y:2383 awkgram.y:2459 awkgram.y:2682 debug.c:523 debug.c:539
+#: awkgram.y:2392 awkgram.y:2468 awkgram.y:2691 debug.c:523 debug.c:539
 #: debug.c:2812 debug.c:5055
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "lähdetiedoston �%s� avaaminen lukemista varten (%s) epäonnistui"
 
-#: awkgram.y:2384 awkgram.y:2509
+#: awkgram.y:2393 awkgram.y:2518
 #, c-format
 msgid "can't open shared library `%s' for reading (%s)"
 msgstr "jaetun kirjaston �%s� avaaminen lukemista varten (%s) epäonnistui"
 
-#: awkgram.y:2386 awkgram.y:2460 awkgram.y:2510 builtin.c:135 debug.c:5206
+#: awkgram.y:2395 awkgram.y:2469 awkgram.y:2519 builtin.c:135 debug.c:5206
 msgid "reason unknown"
 msgstr "syy tuntematon"
 
-#: awkgram.y:2395 awkgram.y:2419
+#: awkgram.y:2404 awkgram.y:2428
 #, c-format
 msgid "can't include `%s' and use it as a program file"
 msgstr "kohteen �%s� sisällyttäminen ja käyttö ohjelmatiedostona epäonnistui"
 
-#: awkgram.y:2408
+#: awkgram.y:2417
 #, c-format
 msgid "already included source file `%s'"
 msgstr "on jo sisällytetty lähdetiedostoon �%s�"
 
-#: awkgram.y:2409
+#: awkgram.y:2418
 #, c-format
 msgid "already loaded shared library `%s'"
 msgstr "jaettu kirjasto �%s� on jo ladattu"
 
-#: awkgram.y:2444
+#: awkgram.y:2453
 msgid "@include is a gawk extension"
 msgstr "@include on gawk-laajennus"
 
-#: awkgram.y:2450
+#: awkgram.y:2459
 msgid "empty filename after @include"
 msgstr "tyhjä tiedostonimi @include:n jälkeen"
 
-#: awkgram.y:2494
+#: awkgram.y:2503
 msgid "@load is a gawk extension"
 msgstr "@load on gawk-laajennus"
 
-#: awkgram.y:2500
+#: awkgram.y:2509
 msgid "empty filename after @load"
 msgstr "tyhjä tiedostonimi @load:n jälkeen"
 
-#: awkgram.y:2634
+#: awkgram.y:2643
 msgid "empty program text on command line"
 msgstr "tyhjä ohjelmateksti komentorivillä"
 
-#: awkgram.y:2749
+#: awkgram.y:2758
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "lähdetiedoston �%s� (%s) lukeminen epäonnistui"
 
-#: awkgram.y:2760
+#: awkgram.y:2769
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "lähdetiedosto �%s� on tyhjä"
 
-#: awkgram.y:2937
+#: awkgram.y:2828
+#, c-format
+msgid "PEBKAC error: invalid character '\\%03o' in source code"
+msgstr ""
+
+#: awkgram.y:2959
 msgid "source file does not end in newline"
 msgstr "lähdetiedoston lopussa ei ole rivinvaihtoa"
 
-#: awkgram.y:3042
+#: awkgram.y:3062
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr ""
 "päättämätön säännöllinen lauseke loppuu �\\�-merkkeihin tiedoston lopussa"
 
-#: awkgram.y:3066
+#: awkgram.y:3089
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr "%s: %d: tawk:n regex-määre �/.../%c� ei toimi gawk:ssa"
 
-#: awkgram.y:3070
+#: awkgram.y:3093
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr "tawkin regex-määre �/.../%c� ei toimi gawkissa"
 
-#: awkgram.y:3077
+#: awkgram.y:3100
 msgid "unterminated regexp"
 msgstr "päättämätön säännöllinen lauseke"
 
-#: awkgram.y:3081
+#: awkgram.y:3104
 msgid "unterminated regexp at end of file"
 msgstr "päättämätön säännöllinen lauseke tiedoston lopussa"
 
-#: awkgram.y:3140
+#: awkgram.y:3162
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "�\\ #...�-rivijatkamisen käyttö ei ole siirrettävä"
 
-#: awkgram.y:3156
+#: awkgram.y:3178
 msgid "backslash not last character on line"
 msgstr "kenoviiva ei ole rivin viimeinen merkki"
 
-#: awkgram.y:3217
+#: awkgram.y:3239
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX ei salli operaattoria �**=�"
 
-#: awkgram.y:3219
+#: awkgram.y:3241
 msgid "old awk does not support operator `**='"
 msgstr "vanha awk ei tue operaattoria �**=�"
 
-#: awkgram.y:3228
+#: awkgram.y:3250
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX ei salli operaattoria �**�"
 
-#: awkgram.y:3230
+#: awkgram.y:3252
 msgid "old awk does not support operator `**'"
 msgstr "vanha awk ei tue operaattoria �**�"
 
-#: awkgram.y:3265
+#: awkgram.y:3287
 msgid "operator `^=' is not supported in old awk"
 msgstr "operaattoria �^=� ei tueta vanhassa awk:ssa"
 
-#: awkgram.y:3273
+#: awkgram.y:3295
 msgid "operator `^' is not supported in old awk"
 msgstr "operaattoria �^� ei tueta vanhassa awk:ssa"
 
-#: awkgram.y:3366 awkgram.y:3382 command.y:1178
+#: awkgram.y:3392 awkgram.y:3410 command.y:1180
 msgid "unterminated string"
 msgstr "päättämätön merkkijono"
 
-#: awkgram.y:3603
+#: awkgram.y:3631
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "virheellinen merkki ’%c’ lausekkeessa"
 
-#: awkgram.y:3650
+#: awkgram.y:3678
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "�%s� on gawk-laajennus"
 
-#: awkgram.y:3655
+#: awkgram.y:3683
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX ei salli operaattoria �%s�"
 
-#: awkgram.y:3663
+#: awkgram.y:3691
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "�%s� ei ole tuettu vanhassa awk-ohjelmassa"
 
-#: awkgram.y:3753
+#: awkgram.y:3781
 msgid "`goto' considered harmful!\n"
 msgstr "�goto�-käskyä pidetään haitallisena!\n"
 
-#: awkgram.y:3787
+#: awkgram.y:3815
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d on virheellinen argumenttilukumäärä operaattorille %s"
 
-#: awkgram.y:3822
+#: awkgram.y:3850
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 "%s: merkkijonoliteraalilla ei ole vaikutusta korvauksen viimeisenä "
 "argumenttina"
 
-#: awkgram.y:3827
+#: awkgram.y:3855
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "%s kolmas parametri ei ole vaihdettava objekti"
 
-#: awkgram.y:3910 awkgram.y:3913
+#: awkgram.y:3938 awkgram.y:3941
 msgid "match: third argument is a gawk extension"
 msgstr "match: kolmas argumentti on gawk-laajennus"
 
-#: awkgram.y:3967 awkgram.y:3970
+#: awkgram.y:3995 awkgram.y:3998
 msgid "close: second argument is a gawk extension"
 msgstr "close: toinen argumentti on gawk-laajennus"
 
-#: awkgram.y:3982
+#: awkgram.y:4010
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "dcgettext(_\"...\")-käyttö on virheellinen: poista alaviiva alusta"
 
-#: awkgram.y:3997
+#: awkgram.y:4025
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "dcngettext(_\"...\")-käyttö on virheellinen: poista alaviiva alusta"
 
-#: awkgram.y:4016
+#: awkgram.y:4044
 msgid "index: regexp constant as second argument is not allowed"
 msgstr "index: regexp-vakio toisena argumenttina ei ole sallittu"
 
-#: awkgram.y:4069
+#: awkgram.y:4097
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "funktio �%s�: parametri �%s� varjostaa yleismuuttujaa"
 
-#: awkgram.y:4126 debug.c:4041 debug.c:4084 debug.c:5204
+#: awkgram.y:4154 debug.c:4041 debug.c:4084 debug.c:5204
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "tiedoston �%s� avaaminen kirjoittamista varten (%s) epäonnistui"
 
-#: awkgram.y:4127
+#: awkgram.y:4155
 msgid "sending variable list to standard error"
 msgstr "lähetetään muuttujaluettelo vakiovirheeseen"
 
-#: awkgram.y:4135
+#: awkgram.y:4163
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: sulkeminen epäonnistui (%s)"
 
-#: awkgram.y:4160
+#: awkgram.y:4188
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() kutsuttu kahdesti!"
 
-#: awkgram.y:4168
+#: awkgram.y:4196
 msgid "there were shadowed variables."
 msgstr "siellä oli varjostettuja muuttujia."
 
-#: awkgram.y:4239
+#: awkgram.y:4267
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "funktionimi �%s� on jo aikaisemmin määritelty"
 
-#: awkgram.y:4285
+#: awkgram.y:4313
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "funktio �%s�: funktionimen käyttö parametrinimenä epäonnistui"
 
-#: awkgram.y:4288
+#: awkgram.y:4316
 #, c-format
 msgid "function `%s': can't use special variable `%s' as a function parameter"
 msgstr ""
 "funktio �%s�: erikoismuuttujan �%s� käyttö funktioparametrina epäonnistui"
 
-#: awkgram.y:4296
+#: awkgram.y:4324
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "funktio �%s�: parametri #%d, �%s�, samanlainen parametri #%d"
 
-#: awkgram.y:4383 awkgram.y:4389
+#: awkgram.y:4411 awkgram.y:4417
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "funktiota �%s� kutsuttiin, mutta sitä ei ole koskaan määritelty"
 
-#: awkgram.y:4393
+#: awkgram.y:4421
 #, c-format
 msgid "function `%s' defined but never called directly"
 msgstr "funktio �%s� määriteltiin, mutta sitä ei ole koskaan kutsuttu suoraan"
 
-#: awkgram.y:4425
+#: awkgram.y:4453
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr "säännöllisen lausekkeen vakio parametrille #%d antaa boolean-arvon"
 
-#: awkgram.y:4484
+#: awkgram.y:4468
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -508,21 +513,21 @@ msgstr ""
 "funktio �%s� kutsuttu välilyönnillä nimen ja �(�-merkin\n"
 "välillä, tai käytetty muuttujana tai taulukkona"
 
-#: awkgram.y:4720
+#: awkgram.y:4674
 msgid "division by zero attempted"
 msgstr "nollalla jakoa yritettiin"
 
-#: awkgram.y:4729
+#: awkgram.y:4683
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "jakoa nollalla yritettiin operaattorissa �%%�"
 
-#: awkgram.y:5049
+#: awkgram.y:5003
 msgid ""
 "cannot assign a value to the result of a field post-increment expression"
 msgstr "arvon liittäminen kenttäjälkiaskelkasvatuslausekkeeseen epäonnistui"
 
-#: awkgram.y:5052
+#: awkgram.y:5006
 #, c-format
 msgid "invalid target of assignment (opcode %s)"
 msgstr "virheellinen liittämiskohde (käskykoodi %s)"
@@ -565,192 +570,202 @@ msgstr ""
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: �%s� ei ole avoin tiedosto, putki tai apuprosessi"
 
-#: builtin.c:362
+#: builtin.c:351
 msgid "index: received non-string first argument"
 msgstr "index: ensimmäinen vastaanotettu argumentti ei ole merkkijono"
 
-#: builtin.c:364
+#: builtin.c:353
 msgid "index: received non-string second argument"
 msgstr "index: toinen vastaanotettu argumentti ei ole merkkijono"
 
-#: builtin.c:488 mpfr.c:757
+#: builtin.c:466 mpfr.c:777
 msgid "int: received non-numeric argument"
 msgstr "int: vastaanotettu argumentti ei ole numeerinen"
 
-#: builtin.c:525
+#: builtin.c:503
 msgid "length: received array argument"
 msgstr "length: vastaanotettu taulukkoargumentti"
 
-#: builtin.c:528
+#: builtin.c:506
 msgid "`length(array)' is a gawk extension"
 msgstr "�length(array)� on gawk-laajennus"
 
-#: builtin.c:544
+#: builtin.c:525
 msgid "length: received non-string argument"
 msgstr "length: vastaanotettu argumentti ei ole merkkijono"
 
-#: builtin.c:575
+#: builtin.c:554
 msgid "log: received non-numeric argument"
 msgstr "log: vastaanotettu argumentti ei ole numeerinen"
 
-#: builtin.c:578
+#: builtin.c:557
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: vastaanotettu negatiivinen argumentti %g"
 
-#: builtin.c:776 builtin.c:781
+#: builtin.c:755 builtin.c:760 builtin.c:911
 msgid "fatal: must use `count$' on all formats or none"
 msgstr "kohtalokas: on käytettävä �count$� kaikilla muodoilla tai ei missään"
 
-#: builtin.c:851
+#: builtin.c:830
 #, c-format
 msgid "field width is ignored for `%%' specifier"
 msgstr "kenttäleveys ohitetaan �%%%%�-määritteelle"
 
-#: builtin.c:853
+#: builtin.c:832
 #, c-format
 msgid "precision is ignored for `%%' specifier"
 msgstr "tarkkuus ohitetaan �%%%%�-määritteelle"
 
-#: builtin.c:855
+#: builtin.c:834
 #, c-format
 msgid "field width and precision are ignored for `%%' specifier"
 msgstr "kenttäleveys ja tarkkuus ohitetaan �%%%%�-määritteelle"
 
-#: builtin.c:906
+#: builtin.c:885
 msgid "fatal: `$' is not permitted in awk formats"
 msgstr "kohtalokas: �$�-argumentti ei ole sallittu awk-muodoissa"
 
-#: builtin.c:915
+#: builtin.c:894
 msgid "fatal: arg count with `$' must be > 0"
 msgstr "kohtalokas: argumenttilukumäärän argumentilla �$� on oltava > 0"
 
-#: builtin.c:919
+#: builtin.c:898
 #, c-format
 msgid "fatal: arg count %ld greater than total number of supplied arguments"
 msgstr ""
 "kohtalokas: argumenttilukumäärä %ld on suurempi kuin toimitettujen "
 "argumenttien lukumäärä"
 
-#: builtin.c:923
+#: builtin.c:902
 msgid "fatal: `$' not permitted after period in format"
 msgstr "kohtalokas: �$�-argumentti ei ole sallittu pisteen jälkeen muodossa"
 
-#: builtin.c:939
+#: builtin.c:921
 msgid "fatal: no `$' supplied for positional field width or precision"
 msgstr ""
 "kohtalokas: ei �$�-argumenttia tarjottu sijantikenttäleveydelle tai "
 "tarkkuudelle"
 
-#: builtin.c:1009
+#: builtin.c:991
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "�l� on merkityksetön awk-muodoissa; ohitetaan"
 
-#: builtin.c:1013
+#: builtin.c:995
 msgid "fatal: `l' is not permitted in POSIX awk formats"
 msgstr "kohtalokas: �l� ei ole sallittu POSIX awk -muodoissa"
 
-#: builtin.c:1026
+#: builtin.c:1008
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "�L� on merkityksetön awk-muodoissa; ohitetaan"
 
-#: builtin.c:1030
+#: builtin.c:1012
 msgid "fatal: `L' is not permitted in POSIX awk formats"
 msgstr "kohtalokas: �L� ei ole sallittu POSIX awk -muodoissa"
 
-#: builtin.c:1043
+#: builtin.c:1025
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "�h� on merkityksetön awk-muodoissa; ohitetaan"
 
-#: builtin.c:1047
+#: builtin.c:1029
 msgid "fatal: `h' is not permitted in POSIX awk formats"
 msgstr "kohtalokas: �h� ei ole sallittu POSIX awk -muodoissa"
 
-#: builtin.c:1463
+#: builtin.c:1055
+#, fuzzy, c-format
+msgid "[s]printf: value %g is too big for %%c format"
+msgstr "[s]printf: arvo %g on lukualueen ulkopuolella �%%%c�-muodolle"
+
+#: builtin.c:1068
+#, fuzzy, c-format
+msgid "[s]printf: value %g is not a valid wide character"
+msgstr "[s]printf: arvo %g on lukualueen ulkopuolella �%%%c�-muodolle"
+
+#: builtin.c:1454
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf: arvo %g on lukualueen ulkopuolella �%%%c�-muodolle"
 
-#: builtin.c:1561
+#: builtin.c:1552
 #, c-format
 msgid "ignoring unknown format specifier character `%c': no argument converted"
 msgstr ""
 "ohitetaan tuntematon muotoargumenttimerkki �%c�: ei muunnettu argumenttia"
 
-#: builtin.c:1566
+#: builtin.c:1557
 msgid "fatal: not enough arguments to satisfy format string"
 msgstr "kohtalokas: ei kylliksi argumentteja muotomerkkijonon tyydyttämiseksi"
 
-#: builtin.c:1568
+#: builtin.c:1559
 msgid "^ ran out for this one"
 msgstr "^ tällainen loppui kesken"
 
-#: builtin.c:1575
+#: builtin.c:1566
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: muotoargumentilla ei ole ohjauskirjainta"
 
-#: builtin.c:1578
+#: builtin.c:1569
 msgid "too many arguments supplied for format string"
 msgstr "muotomerkkijonoon toimitettu liian monta argumenttia"
 
-#: builtin.c:1634
+#: builtin.c:1625
 msgid "sprintf: no arguments"
 msgstr "sprintf: ei argumentteja"
 
-#: builtin.c:1657 builtin.c:1668
+#: builtin.c:1648 builtin.c:1659
 msgid "printf: no arguments"
 msgstr "printf: ei argumentteja"
 
-#: builtin.c:1711
+#: builtin.c:1702
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: vastaanotettu argumentti ei ole numeerinen"
 
-#: builtin.c:1715
+#: builtin.c:1706
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: kutsuttu negatiivisella argumentilla %g"
 
-#: builtin.c:1746
+#: builtin.c:1737
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: pituus %g ei ole >= 1"
 
-#: builtin.c:1748
+#: builtin.c:1739
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: pituus %g ei ole >= 0"
 
-#: builtin.c:1755
+#: builtin.c:1753
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: typistetään pituus %g, joka ei ole kokonaisluku"
 
-#: builtin.c:1760
+#: builtin.c:1758
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
 "substr: pituus %g liian suuri merkkijononindeksointiin, typistetään arvoon %g"
 
-#: builtin.c:1772
+#: builtin.c:1770
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: aloitusindeksi %g on virheellinen, käytetään 1:tä"
 
-#: builtin.c:1777
+#: builtin.c:1775
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: typistetään aloitusindeksi %g, joka ei ole kokonaisluku"
 
-#: builtin.c:1802
+#: builtin.c:1798
 msgid "substr: source string is zero length"
 msgstr "substr: lähdemerkkijono on nollapituinen"
 
-#: builtin.c:1818
+#: builtin.c:1812
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: aloitusindeksi %g on merkkijonon lopun jälkeen"
 
-#: builtin.c:1826
+#: builtin.c:1820
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -758,189 +773,195 @@ msgstr ""
 "substr: pituus %g alkuindeksissä %g ylittää ensimmäisen argumentin pituuden "
 "(%lu)"
 
-#: builtin.c:1900
+#: builtin.c:1890
 msgid "strftime: format value in PROCINFO[\"strftime\"] has numeric type"
 msgstr ""
 "strftime: muotoarvolla kohteessa PROCINFO[\"strftime\"] on numerotyyppi"
 
-#: builtin.c:1923
+#: builtin.c:1913
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: toinen vastaanotettu argumentti ei ole numeerinen"
 
-#: builtin.c:1927
+#: builtin.c:1917
 msgid "strftime: second argument less than 0 or too big for time_t"
 msgstr ""
 "strftime: toinen argumentti on pienempi kuin 0 tai liian suuri time_t-"
 "rakenteeseen"
 
-#: builtin.c:1934
+#: builtin.c:1924
 msgid "strftime: received non-string first argument"
 msgstr "strftime: ensimmäinen vastaanotettu argumentti ei ole merkkijono"
 
-#: builtin.c:1941
+#: builtin.c:1931
 msgid "strftime: received empty format string"
 msgstr "strftime: vastaanotettu tyhjä muotomerkkijono"
 
-#: builtin.c:2007
+#: builtin.c:1997
 msgid "mktime: received non-string argument"
 msgstr "mktime: vastaanotettu argumentti ei ole merkkijono"
 
-#: builtin.c:2024
+#: builtin.c:2014
 msgid "mktime: at least one of the values is out of the default range"
 msgstr "mktime: vähintään yksi arvoista on oletuslukualueen ulkopuolella"
 
-#: builtin.c:2059
+#: builtin.c:2049
 msgid "'system' function not allowed in sandbox mode"
 msgstr "’system’-funktio ei ole sallittu hiekkalaatikkotilassa"
 
-#: builtin.c:2064
+#: builtin.c:2054
 msgid "system: received non-string argument"
 msgstr "system: vastaanotettu argumentti ei ole merkkijono"
 
-#: builtin.c:2184
+#: builtin.c:2174
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "viite alustamattomaan kenttään �$%d�"
 
-#: builtin.c:2271
+#: builtin.c:2259
 msgid "tolower: received non-string argument"
 msgstr "tolower: vastaanotettu argumentti ei ole merkkijono"
 
-#: builtin.c:2305
+#: builtin.c:2290
 msgid "toupper: received non-string argument"
 msgstr "toupper: vastaanotettu argumentti ei ole merkkijono"
 
-#: builtin.c:2341 mpfr.c:672
+#: builtin.c:2323 mpfr.c:679
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: ensimmäinen vastaanotettu argumentti ei ole numeerinen"
 
-#: builtin.c:2343 mpfr.c:674
+#: builtin.c:2325 mpfr.c:681
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: toinen vastaanotettu argumentti ei ole numeerinen"
 
-#: builtin.c:2362
+#: builtin.c:2344
 msgid "sin: received non-numeric argument"
 msgstr "sin: vastaanotettu argumentti ei ole numeerinen"
 
-#: builtin.c:2378
+#: builtin.c:2360
 msgid "cos: received non-numeric argument"
 msgstr "cos: vastaanotettu argumentti ei ole numeerinen"
 
-#: builtin.c:2431 mpfr.c:1156
+#: builtin.c:2413 mpfr.c:1176
 msgid "srand: received non-numeric argument"
 msgstr "srand: vastaanotettu argumentti ei ole numeerinen"
 
-#: builtin.c:2462
+#: builtin.c:2444
 msgid "match: third argument is not an array"
 msgstr "match: kolmas argumentti ei ole taulukko"
 
-#: builtin.c:2734
-msgid "gensub: third argument of 0 treated as 1"
+#: builtin.c:2705
+#, fuzzy, c-format
+msgid "gensub: third argument `%.*s' treated as 1"
 msgstr "gensub: 0-arvoinen kolmas argumentti käsitellään kuin 1"
 
-#: builtin.c:3030
+#: builtin.c:2720
+#, fuzzy, c-format
+msgid "gensub: third argument %g treated as 1"
+msgstr "gensub: 0-arvoinen kolmas argumentti käsitellään kuin 1"
+
+#: builtin.c:3020
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: ensimmäinen vastaanotettu argumentti ei ole numeerinen"
 
-#: builtin.c:3032
+#: builtin.c:3022
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift: toinen vastaanotettu argumentti ei ole numeerinen"
 
-#: builtin.c:3038
+#: builtin.c:3028
 #, c-format
 msgid "lshift(%f, %f): negative values will give strange results"
 msgstr "lshift(%f, %f): negatiiviset arvot antavat outoja tuloksia"
 
-#: builtin.c:3040
+#: builtin.c:3030
 #, c-format
 msgid "lshift(%f, %f): fractional values will be truncated"
 msgstr "lshift(%f, %f): jaosarvot typistetään"
 
-#: builtin.c:3042
+#: builtin.c:3032
 #, c-format
 msgid "lshift(%f, %f): too large shift value will give strange results"
 msgstr "lshift(%f, %f): liian suuri siirrosarvo antaa outoja tuloksia"
 
-#: builtin.c:3067
+#: builtin.c:3057
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: ensimmäinen vastaanotettu argumentti ei ole numeerinen"
 
-#: builtin.c:3069
+#: builtin.c:3059
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift: toinen vastaanotettu argumentti ei ole numeerinen"
 
-#: builtin.c:3075
+#: builtin.c:3065
 #, c-format
 msgid "rshift(%f, %f): negative values will give strange results"
 msgstr "rshift(%f, %f): negatiiviset arvot antavat outoja tuloksia"
 
-#: builtin.c:3077
+#: builtin.c:3067
 #, c-format
 msgid "rshift(%f, %f): fractional values will be truncated"
 msgstr "rshift(%f, %f): jaosarvot typistetään"
 
-#: builtin.c:3079
+#: builtin.c:3069
 #, c-format
 msgid "rshift(%f, %f): too large shift value will give strange results"
 msgstr "rshift(%f, %f): liian suuri siirrosarvo antaa outoja tuloksia"
 
-#: builtin.c:3104 mpfr.c:968
+#: builtin.c:3094 mpfr.c:988
 msgid "and: called with less than two arguments"
 msgstr "and: kutsuttu vähemmällä kuin kahdella argumentilla"
 
-#: builtin.c:3109
+#: builtin.c:3099
 #, c-format
 msgid "and: argument %d is non-numeric"
 msgstr "and: argumentti %d ei ole numeeraaliargumentti"
 
-#: builtin.c:3113
+#: builtin.c:3103
 #, c-format
 msgid "and: argument %d negative value %g will give strange results"
 msgstr "and: argumentin %d negatiivinen arvo %g antaa outoja tuloksia"
 
-#: builtin.c:3136 mpfr.c:1000
+#: builtin.c:3126 mpfr.c:1020
 msgid "or: called with less than two arguments"
 msgstr "or: kutsuttu vähemmällä kuin kahdella argumentilla"
 
-#: builtin.c:3141
+#: builtin.c:3131
 #, c-format
 msgid "or: argument %d is non-numeric"
 msgstr "or: argumentti %d ei ole numeraaliargumentti"
 
-#: builtin.c:3145
+#: builtin.c:3135
 #, c-format
 msgid "or: argument %d negative value %g will give strange results"
 msgstr "or: argumentin %d negatiivinen arvo %g antaa outoja tuloksia"
 
-#: builtin.c:3167 mpfr.c:1031
+#: builtin.c:3157 mpfr.c:1051
 msgid "xor: called with less than two arguments"
 msgstr "xor: kutsuttu vähemmällä kuin kahdella argumentilla"
 
-#: builtin.c:3173
+#: builtin.c:3163
 #, c-format
 msgid "xor: argument %d is non-numeric"
 msgstr "xor: argumentti %d ei ole numeraaliargumentti"
 
-#: builtin.c:3177
+#: builtin.c:3167
 #, c-format
 msgid "xor: argument %d negative value %g will give strange results"
 msgstr "xor: argumentin %d negatiivinen arvo %g antaa outoja tuloksia"
 
-#: builtin.c:3202 mpfr.c:787
+#: builtin.c:3192 mpfr.c:807
 msgid "compl: received non-numeric argument"
 msgstr "compl: vastaanotettu argumentti ei ole numeerinen"
 
-#: builtin.c:3208
+#: builtin.c:3198
 #, c-format
 msgid "compl(%f): negative value will give strange results"
 msgstr "compl(%f): negatiivinen arvo antaa outoja tuloksia"
 
-#: builtin.c:3210
+#: builtin.c:3200
 #, c-format
 msgid "compl(%f): fractional value will be truncated"
 msgstr "compl(%f): jaosarvo typistetään"
 
-#: builtin.c:3379
+#: builtin.c:3369
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: �%s� ei ole kelvollinen paikallinen kategoria"
@@ -1245,40 +1266,49 @@ msgstr "up [N] - siirrä N kehystä ylöspäin pinossa."
 msgid "watch var - set a watchpoint for a variable."
 msgstr "watch muuttuja - aseta vahtikohta muuttujalle."
 
-#: command.y:1011 debug.c:401 msg.c:135
+#: command.y:901
+#, fuzzy
+msgid ""
+"where [N] - (same as backtrace) print trace of all or N innermost (outermost "
+"if N < 0) frames."
+msgstr ""
+"backtrace [N] - tulosta kaikkien tai N:n sisimmäisen (ulommaisin, jos N < 0) "
+"kehyksen jäljet."
+
+#: command.y:1013 debug.c:401 msg.c:135
 #, c-format
 msgid "error: "
 msgstr "virhe: "
 
-#: command.y:1051
+#: command.y:1053
 #, c-format
 msgid "can't read command (%s)\n"
 msgstr "komennon (%s) lukeminen epäonnistui\n"
 
-#: command.y:1065
+#: command.y:1067
 #, c-format
 msgid "can't read command (%s)"
 msgstr "komennon (%s) lukeminen epäonnistui"
 
-#: command.y:1116
+#: command.y:1118
 msgid "invalid character in command"
 msgstr "virheellinen merkki komennossa"
 
-#: command.y:1152
+#: command.y:1154
 #, c-format
 msgid "unknown command - \"%.*s\", try help"
 msgstr "tuntematon komento - \"%.*s\", kokeile käskyä help"
 
-#: command.y:1222
+#: command.y:1224
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.y:1284
+#: command.y:1286
 msgid "invalid character"
 msgstr "virheellinen merkki"
 
-#: command.y:1455
+#: command.y:1457
 #, c-format
 msgid "undefined command: %s\n"
 msgstr "määrittelemätön komento: %s\n"
@@ -1817,68 +1847,70 @@ msgstr "�%s� ei ole sallittu nykyisessä asiayhteydessä; lause ohitetaan"
 msgid "`return' not allowed in current context; statement ignored"
 msgstr "�return� ei ole sallittu nykyisessä asiayhteydessä; lause ohitetaan"
 
-#: debug.c:5590
+#: debug.c:5604
 #, c-format
 msgid "No symbol `%s' in current context"
 msgstr "Symbolia �%s� ei ole nykyisesssä asiayhteydessä"
 
-#: dfa.c:1118 dfa.c:1121 dfa.c:1142 dfa.c:1150 dfa.c:1162 dfa.c:1197
-#: dfa.c:1206 dfa.c:1209 dfa.c:1214 dfa.c:1228 dfa.c:1275
+#: dfa.c:1063 dfa.c:1066 dfa.c:1085 dfa.c:1095 dfa.c:1107 dfa.c:1143
+#: dfa.c:1152 dfa.c:1155 dfa.c:1160 dfa.c:1174 dfa.c:1222
 msgid "unbalanced ["
 msgstr "pariton ["
 
-#: dfa.c:1174
+#: dfa.c:1119
 msgid "invalid character class"
 msgstr "virheellinen merkkiluokka"
 
-#: dfa.c:1316
+#: dfa.c:1265
 msgid "character class syntax is [[:space:]], not [:space:]"
 msgstr "merkkiluokkasyntaksi on [[:space:]], ei [:space:]"
 
-#: dfa.c:1366
+#: dfa.c:1327
 msgid "unfinished \\ escape"
 msgstr "päättymätön \\-koodinvaihtomerkki"
 
-#: dfa.c:1513 regcomp.c:161
-msgid "Invalid content of \\{\\}"
+#: dfa.c:1474
+#, fuzzy
+msgid "invalid content of \\{\\}"
 msgstr "Virheellinen \\{\\}-sisältö"
 
-#: dfa.c:1516 regcomp.c:176
-msgid "Regular expression too big"
+#: dfa.c:1477
+#, fuzzy
+msgid "regular expression too big"
 msgstr "Säännöllinen lauseke on liian iso"
 
-#: dfa.c:1936
+#: dfa.c:1912
 msgid "unbalanced ("
 msgstr "pariton ("
 
-#: dfa.c:2062
+#: dfa.c:2038
 msgid "no syntax specified"
 msgstr "syntaksi ei ole määritelty"
 
-#: dfa.c:2070
+#: dfa.c:2046
 msgid "unbalanced )"
 msgstr "pariton )"
 
-#: eval.c:394
+#: eval.c:396
 #, c-format
 msgid "unknown nodetype %d"
 msgstr "tuntematon solmutyyppi %d"
 
-#: eval.c:405 eval.c:419
+#: eval.c:407 eval.c:421
 #, c-format
 msgid "unknown opcode %d"
 msgstr "tuntematon käskykoodi %d"
 
-#: eval.c:416
+#: eval.c:418
 #, c-format
 msgid "opcode %s not an operator or keyword"
 msgstr "käskykoodi %s ei ole operaattori tai avainsana"
 
-#: eval.c:472
+#: eval.c:474
 msgid "buffer overflow in genflags2str"
 msgstr "puskurin ylivuoto funktiossa genflags2str"
 
-#: eval.c:675
+#: eval.c:676
 #, c-format
 msgid ""
 "\n"
@@ -1889,217 +1921,217 @@ msgstr ""
 "\t# Funktiokutsupino:\n"
 "\n"
 
-#: eval.c:704
+#: eval.c:705
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "�IGNORECASE� on gawk-laajennus"
 
-#: eval.c:736
+#: eval.c:737
 msgid "`BINMODE' is a gawk extension"
 msgstr "�BINMODE� on gawk-laajennus"
 
-#: eval.c:794
+#: eval.c:795
 #, c-format
 msgid "BINMODE value `%s' is invalid, treated as 3"
 msgstr "BINMODE-arvo �%s� on virheellinen, käsiteltiin arvona 3"
 
-#: eval.c:885
+#: eval.c:912
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "väärä �%sFMT�-määritys �%s�"
 
-#: eval.c:969
+#: eval.c:996
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "käännetään pois �--lint�-valitsin �LINT�-sijoituksen vuoksi"
 
-#: eval.c:1147
+#: eval.c:1174
 #, c-format
 msgid "reference to uninitialized argument `%s'"
 msgstr "viite alustamattomaan argumenttiin �%s�"
 
-#: eval.c:1148
+#: eval.c:1175
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "viite alustamattomaan muuttujaan �%s�"
 
-#: eval.c:1166
+#: eval.c:1193
 msgid "attempt to field reference from non-numeric value"
 msgstr "yritettiin kenttäviitettä arvosta, joka ei ole numeerinen"
 
-#: eval.c:1168
+#: eval.c:1195
 msgid "attempt to field reference from null string"
 msgstr "yritettiin kenttäviitettä null-merkkijonosta"
 
-#: eval.c:1176
+#: eval.c:1203
 #, c-format
 msgid "attempt to access field %ld"
 msgstr "yritettiin saantia kenttään %ld"
 
-#: eval.c:1185
+#: eval.c:1212
 #, c-format
 msgid "reference to uninitialized field `$%ld'"
 msgstr "viite alustamattomaan kenttään �$%ld�"
 
-#: eval.c:1272
+#: eval.c:1299
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "funktio �%s� kutsuttiin useammalla argumentilla kuin esiteltiin"
 
-#: eval.c:1473
+#: eval.c:1500
 #, c-format
 msgid "unwind_stack: unexpected type `%s'"
 msgstr "unwind_stack: odottamaton tyyppi �%s�"
 
-#: eval.c:1569
+#: eval.c:1596
 msgid "division by zero attempted in `/='"
 msgstr "jakoa nollalla yritettiin operaatiossa �/=�"
 
-#: eval.c:1576
+#: eval.c:1603
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "jakoa nollalla yritettiin operaatiossa �%%=�"
 
-#: ext.c:89 ext.c:171
+#: ext.c:65 ext.c:147
 msgid "extensions are not allowed in sandbox mode"
 msgstr "laajennuksia ei sallita hiekkalaatikkotilassa"
 
-#: ext.c:92
+#: ext.c:68
 msgid "-l / @load are gawk extensions"
 msgstr "-l / @load ovat gawk-laajennuksia"
 
-#: ext.c:95
+#: ext.c:71
 msgid "load_ext: received NULL lib_name"
 msgstr "load_ext: vastaanotettiin NULL lib_name"
 
-#: ext.c:98
+#: ext.c:74
 #, c-format
 msgid "load_ext: cannot open library `%s' (%s)\n"
 msgstr "load_ext: kirjaston �%s� (%s) avaus epäonnistui\n"
 
-#: ext.c:104
+#: ext.c:80
 #, c-format
 msgid ""
 "load_ext: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
 msgstr ""
 "load_ext: kirjasto �%s�: ei määrittele �plugin_is_GPL_compatible� (%s)\n"
 
-#: ext.c:110
+#: ext.c:86
 #, c-format
 msgid "load_ext: library `%s': cannot call function `%s' (%s)\n"
 msgstr "load_ext: kirjasto �%s�: funktion �%s� (%s) kutsu epäonnistui\n"
 
-#: ext.c:114
+#: ext.c:90
 #, c-format
 msgid "load_ext: library `%s' initialization routine `%s' failed\n"
 msgstr "load_ext: kirjaston �%s� alustusrutiini �%s� epäonnistui\n"
 
-#: ext.c:174
+#: ext.c:150
 msgid "`extension' is a gawk extension"
 msgstr "�extension� on gawk-laajennus"
 
-#: ext.c:177
+#: ext.c:153
 msgid "extension: received NULL lib_name"
 msgstr "extension: vastaanotettiin NULL lib_name"
 
-#: ext.c:180
+#: ext.c:156
 #, c-format
 msgid "extension: cannot open library `%s' (%s)"
 msgstr "extension: kirjaston �%s� (%s) avaus epäonnistui"
 
-#: ext.c:186
+#: ext.c:162
 #, c-format
 msgid ""
 "extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)"
 msgstr ""
 "extension: kirjasto �%s�: ei määrittele �plugin_is_GPL_compatible� (%s)"
 
-#: ext.c:190
+#: ext.c:166
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)"
 msgstr "extension: kirjasto �%s�: funktion �%s� (%s) kutsu epäonnistui"
 
-#: ext.c:221
+#: ext.c:197
 msgid "make_builtin: missing function name"
 msgstr "make_builtin: puuttuva funktionimi"
 
-#: ext.c:236
+#: ext.c:212
 #, c-format
 msgid "make_builtin: can't redefine function `%s'"
 msgstr "make_builtin: funktion �%s� uudelleenmäärittely epäonnistui"
 
-#: ext.c:240
+#: ext.c:216
 #, c-format
 msgid "make_builtin: function `%s' already defined"
 msgstr "make_builtin: funktio �%s� on jo määritelty"
 
-#: ext.c:244
+#: ext.c:220
 #, c-format
 msgid "make_builtin: function name `%s' previously defined"
 msgstr "make_builtin: funktionimi �%s� on määritelty jo aiemmin"
 
-#: ext.c:246
+#: ext.c:222
 #, c-format
 msgid "make_builtin: can't use gawk built-in `%s' as function name"
 msgstr ""
 "make_builtin: gawk-ohjelman sisäisen muuttujanimen �%s� käyttö funktionimenä "
 "epäonnistui"
 
-#: ext.c:249 ext.c:304
+#: ext.c:225 ext.c:280
 #, c-format
 msgid "make_builtin: negative argument count for function `%s'"
 msgstr "make_builtin: negatiivinen argumenttilukumäärä funktiolle �%s�"
 
-#: ext.c:276
+#: ext.c:252
 msgid "extension: missing function name"
 msgstr "extension: puuttuva funktionimi"
 
-#: ext.c:279 ext.c:283
+#: ext.c:255 ext.c:259
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: virheellinen merkki �%c� funktionimessä �%s�"
 
-#: ext.c:291
+#: ext.c:267
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: funktion �%s� uudelleenmäärittely epäonnistui"
 
-#: ext.c:295
+#: ext.c:271
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr "extension: funktio �%s� on jo määritelty"
 
-#: ext.c:299
+#: ext.c:275
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "extension: funktionimi �%s� on määritelty jo aiemmin"
 
-#: ext.c:301
+#: ext.c:277
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 "extension: gawk-ohjelman sisäisen muuttujanimen käyttö �%s� funktionimenä "
 "epäonnistui"
 
-#: ext.c:375
+#: ext.c:351
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "funktio �%s� on määritelty ottamaan enemmän kuin %d argumenttia"
 
-#: ext.c:378
+#: ext.c:354
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "function �%s�: puuttuva argumentti #%d"
 
-#: ext.c:395
+#: ext.c:371
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "funktio �%s�: argumentti #%d: yritettiin käyttää skalaaria taulukkona"
 
-#: ext.c:399
+#: ext.c:375
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr "funktio �%s�: argumentti #%d: yritettiin käyttää taulukkoa skalaarina"
 
-#: ext.c:413
+#: ext.c:389
 msgid "dynamic loading of library not supported"
 msgstr "kirjaston dynaamista latausta ei tueta"
 
@@ -2243,7 +2275,7 @@ msgstr "wait: kutsuttu liian monella argumentilla"
 msgid "inplace_begin: in-place editing already active"
 msgstr "inplace_begin: kohdallaanmuokkaus on jo aktivoitu"
 
-#: extension/inplace.c:133 extension/inplace.c:207
+#: extension/inplace.c:133 extension/inplace.c:210
 #, c-format
 msgid "inplace_begin: expects 2 arguments but called with %d"
 msgstr ""
@@ -2277,57 +2309,57 @@ msgstr "inplace_begin: �%s� ei ole tavallinen tiedosto"
 msgid "inplace_begin: mkstemp(`%s') failed (%s)"
 msgstr "inplace_begin: mkstemp(�%s�) epäonnistui (%s)"
 
-#: extension/inplace.c:178
+#: extension/inplace.c:181
 #, c-format
 msgid "inplace_begin: chmod failed (%s)"
 msgstr "inplace_begin: chmod epäonnistui (%s)"
 
-#: extension/inplace.c:185
+#: extension/inplace.c:188
 #, c-format
 msgid "inplace_begin: dup(stdout) failed (%s)"
 msgstr "inplace_begin: dup(stdout) epäonnistui (%s)"
 
-#: extension/inplace.c:188
+#: extension/inplace.c:191
 #, c-format
 msgid "inplace_begin: dup2(%d, stdout) failed (%s)"
 msgstr "inplace_begin: dup2(%d, stdout) epäonnistui (%s)"
 
-#: extension/inplace.c:191
+#: extension/inplace.c:194
 #, c-format
 msgid "inplace_begin: close(%d) failed (%s)"
 msgstr "inplace_begin: close(%d) epäonnistui (%s)"
 
-#: extension/inplace.c:210
+#: extension/inplace.c:213
 msgid "inplace_end: cannot retrieve 1st argument as a string filename"
 msgstr ""
 "inplace_end: ensimmäisen argumentin noutaminen merkkijonotiedostonimenä "
 "epäonnistui"
 
-#: extension/inplace.c:217
+#: extension/inplace.c:220
 msgid "inplace_end: in-place editing not active"
 msgstr "inplace_end: kohdallaanmuokkaus ei ole aktiivinen"
 
-#: extension/inplace.c:223
+#: extension/inplace.c:226
 #, c-format
 msgid "inplace_end: dup2(%d, stdout) failed (%s)"
 msgstr "inplace_end: dup2(%d, stdout) epäonnistui (%s)"
 
-#: extension/inplace.c:226
+#: extension/inplace.c:229
 #, c-format
 msgid "inplace_end: close(%d) failed (%s)"
 msgstr "inplace_end: close(%d) epäonnistui (%s)"
 
-#: extension/inplace.c:230
+#: extension/inplace.c:233
 #, c-format
 msgid "inplace_end: fsetpos(stdout) failed (%s)"
 msgstr "inplace_end: fsetpos(stdout) epäonnistui (%s)"
 
-#: extension/inplace.c:243
+#: extension/inplace.c:246
 #, c-format
 msgid "inplace_end: link(`%s', `%s') failed (%s)"
 msgstr "inplace_end: link(�%s�, �%s�) epäonnistui (%s)."
 
-#: extension/inplace.c:253
+#: extension/inplace.c:256
 #, c-format
 msgid "inplace_end: rename(`%s', `%s') failed (%s)"
 msgstr "inplace_end: rename(�%s�, �%s�) epäonnistui (%s)"
@@ -2369,50 +2401,54 @@ msgstr "readfile: kutsuttu liian monella argumentilla"
 msgid "readfile: called with no arguments"
 msgstr "readfile: kutsuttu ilman argumentteja"
 
-#: extension/rwarray.c:124
+#: extension/revoutput.c:125
+msgid "revoutput: could not initialize REVOUT variable"
+msgstr ""
+
+#: extension/rwarray.c:124 extension/rwarray0.c:109
 msgid "writea: called with too many arguments"
 msgstr "writea: kutsuttu liian monella argumentilla"
 
-#: extension/rwarray.c:131
+#: extension/rwarray.c:131 extension/rwarray0.c:116
 #, c-format
 msgid "do_writea: argument 0 is not a string\n"
 msgstr "do_writea: argumentti 0 ei ole merkkijono\n"
 
-#: extension/rwarray.c:137
+#: extension/rwarray.c:137 extension/rwarray0.c:122
 #, c-format
 msgid "do_writea: argument 1 is not an array\n"
 msgstr "do_writea: argumentti 1 ei ole taulukko\n"
 
-#: extension/rwarray.c:184
+#: extension/rwarray.c:184 extension/rwarray0.c:169
 #, c-format
 msgid "write_array: could not flatten array\n"
 msgstr "write_array: taulukon litistäminen epäonnistui\n"
 
-#: extension/rwarray.c:198
+#: extension/rwarray.c:198 extension/rwarray0.c:183
 #, c-format
 msgid "write_array: could not release flattened array\n"
 msgstr "write_array: litistettyä taulukon vapauttaminen epäonnistui\n"
 
-#: extension/rwarray.c:280
+#: extension/rwarray.c:280 extension/rwarray0.c:265
 msgid "reada: called with too many arguments"
 msgstr "reada: kutsuttu liian monilla argumenteilla"
 
-#: extension/rwarray.c:287
+#: extension/rwarray.c:287 extension/rwarray0.c:272
 #, c-format
 msgid "do_reada: argument 0 is not a string\n"
 msgstr "do_reada: argumentti 0 ei ole merkkijono\n"
 
-#: extension/rwarray.c:293
+#: extension/rwarray.c:293 extension/rwarray0.c:278
 #, c-format
 msgid "do_reada: argument 1 is not an array\n"
 msgstr "do_reada: argumentti 1 ei ole taulukko\n"
 
-#: extension/rwarray.c:337
+#: extension/rwarray.c:337 extension/rwarray0.c:322
 #, c-format
 msgid "do_reada: clear_array failed\n"
 msgstr "do_reada: clear_array epäonnistui\n"
 
-#: extension/rwarray.c:374
+#: extension/rwarray.c:374 extension/rwarray0.c:358
 #, c-format
 msgid "read_array: set_array_element failed\n"
 msgstr "read_array: set_array_element epäonnistui\n"
@@ -2441,91 +2477,91 @@ msgstr "sleep: argumentti on negatiivinen"
 msgid "sleep: not supported on this platform"
 msgstr "sleep: ei ole tuettu tällä alustalla"
 
-#: field.c:345
+#: field.c:346
 msgid "NF set to negative value"
 msgstr "NF asetettu negatiiviseen arvoon"
 
-#: field.c:971 field.c:978 field.c:982
+#: field.c:958 field.c:965 field.c:969
 msgid "split: fourth argument is a gawk extension"
 msgstr "split: neljäs argumentti on gawk-laajennus"
 
-#: field.c:975
+#: field.c:962
 msgid "split: fourth argument is not an array"
 msgstr "split: neljäs argumentti ei ole taulukko"
 
-#: field.c:989
+#: field.c:976
 msgid "split: second argument is not an array"
 msgstr "split: toinen argumentti ei ole taulukko"
 
-#: field.c:993
+#: field.c:980
 msgid "split: cannot use the same array for second and fourth args"
 msgstr ""
 "split: saman taulukon käyttö toiselle ja neljännelle argumentille epäonnistui"
 
-#: field.c:998
+#: field.c:985
 msgid "split: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "split: toisen argumentin käyttö alitaulukkoa neljännelle argumentille "
 "epäonnistui"
 
-#: field.c:1001
+#: field.c:988
 msgid "split: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "split: neljännen argumentin käyttö alitaulukkoa toiselle argumentille "
 "epäonnistui"
 
-#: field.c:1032
+#: field.c:1019
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: null-merkkijono kolmantena argumenttina on gawk-laajennus"
 
-#: field.c:1072
+#: field.c:1059
 msgid "patsplit: fourth argument is not an array"
 msgstr "patsplit: neljäs argumentti ei ole taulukko"
 
-#: field.c:1077
+#: field.c:1064
 msgid "patsplit: second argument is not an array"
 msgstr "patsplit: toinen argumentti ei ole taulukko"
 
-#: field.c:1083
+#: field.c:1070
 msgid "patsplit: third argument must be non-null"
 msgstr "patsplit: kolmas argumentti ei ole taulukko"
 
-#: field.c:1087
+#: field.c:1074
 msgid "patsplit: cannot use the same array for second and fourth args"
 msgstr ""
 "patsplit: saman taulukon käyttö toiselle ja neljännelle argumentille "
 "epäonnistui"
 
-#: field.c:1092
+#: field.c:1079
 msgid "patsplit: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "patsplit: toisen argumentin käyttö alitaulukkkoa neljännelle argumentille "
 "epäonnistui"
 
-#: field.c:1095
+#: field.c:1082
 msgid "patsplit: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "patsplit: neljännen argumentin käyttö alitaulukkoa toiselle argumentille "
 "epäonnistui"
 
-#: field.c:1133
+#: field.c:1120
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "�FIELDWIDTHS� on gawk-laajennus"
 
-#: field.c:1197
+#: field.c:1184
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "virheellinen FIELDWIDTHS-arvo, lähellä �%s�"
 
-#: field.c:1270
+#: field.c:1257
 msgid "null string for `FS' is a gawk extension"
 msgstr "null-merkkijono �FS�-kenttäerotinmuuttujalle on gawk-laajennus"
 
-#: field.c:1274
+#: field.c:1261
 msgid "old awk does not support regexps as value of `FS'"
 msgstr "vanha awk ei tue regexp-arvoja �FS�-kenttäerotinmuuttujana"
 
-#: field.c:1393
+#: field.c:1380
 msgid "`FPAT' is a gawk extension"
 msgstr "�FPAT� on gawk-laajennus"
 
@@ -2541,20 +2577,20 @@ msgstr "node_to_awk_value: vastaaotti null-solmun"
 msgid "node_to_awk_value: received null val"
 msgstr "node_to_awk_value: vastaanotti null-arvon"
 
-#: gawkapi.c:807
+#: gawkapi.c:809
 msgid "remove_element: received null array"
 msgstr "remove_element: vastaanotettu null-taulukko"
 
-#: gawkapi.c:810
+#: gawkapi.c:812
 msgid "remove_element: received null subscript"
 msgstr "remove_element: vastaanotti null-alaindeksin"
 
-#: gawkapi.c:947
+#: gawkapi.c:949
 #, c-format
 msgid "api_flatten_array: could not convert index %d\n"
 msgstr "api_flatten_array: indeksin %d muuntaminen epäonnistui\n"
 
-#: gawkapi.c:952
+#: gawkapi.c:954
 #, c-format
 msgid "api_flatten_array: could not convert value %d\n"
 msgstr "api_flatten_array: arvon %d muuntaminen epäonnistui\n"
@@ -2614,295 +2650,277 @@ msgstr "%s: valitsin ’-W %s’ ei salli argumenttia\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: valitsin ’-W %s’ vaatii argumentin\n"
 
-#: io.c:392
+#: io.c:423
 #, c-format
 msgid "command line argument `%s' is a directory: skipped"
 msgstr "komentoriviargumentti �%s� on hakemisto: ohitettiin"
 
-#: io.c:395 io.c:513
+#: io.c:426 io.c:544
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "tiedoston �%s� avaaminen lukemista varten (%s) epäonnistui"
 
-#: io.c:640
+#: io.c:671
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "tiedostomäärittelijän %d (�%s�) sulkeminen epäonnistui (%s)"
 
-#: io.c:716
+#: io.c:749
 msgid "redirection not allowed in sandbox mode"
 msgstr "edelleenohjaus ei ole sallittua hiekkalaatikkotilassa"
 
-#: io.c:750
+#: io.c:783
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "lausekkeella �%s�-uudellenohjauksessa on vain numeerinen arvo"
 
-#: io.c:756
+#: io.c:789
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "lausekkeella �%s�-uudelleenohjauksessa on null-merkkijonoarvo"
 
-#: io.c:761
+#: io.c:794
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "tiedostonimi �%s� �%s�-uudelleenohjaukselle saattaa olla loogisen lausekkeen "
 "tulos"
 
-#: io.c:809
+#: io.c:842
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "turha merkkien �>� ja �>>� sekoittaminen tiedostolle �%.*s�"
 
-#: io.c:863
+#: io.c:896
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "putken �%s� avaaminen tulosteelle (%s) epäonnistui"
 
-#: io.c:873
+#: io.c:906
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "putken �%s� avaaminen syötteelle (%s) epäonnistui"
 
-#: io.c:904
+#: io.c:937
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr ""
 "kaksisuuntaisen putken �%s� avaaminen syötteelle/tulosteelle (%s) epäonnistui"
 
-#: io.c:986
+#: io.c:1019
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "uudelleenohjaus putkesta �%s� (%s) epäonnistui"
 
-#: io.c:989
+#: io.c:1022
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "uudelleenohjaus putkeen �%s� (%s) epäonnistui"
 
-#: io.c:1040
+#: io.c:1073
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "saavutettiin avoimien tiedostojen järjestelmäraja: aloitetaan "
 "tiedostomäärittelijöiden lomittaminen"
 
-#: io.c:1056
+#: io.c:1089
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "uudelleenohjauksen �%s� sulkeminen epäonnistui (%s)."
 
-#: io.c:1064
+#: io.c:1097
 msgid "too many pipes or input files open"
 msgstr "avoinna liian monta putkea tai syötetiedostoa"
 
-#: io.c:1086
+#: io.c:1119
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: toisen argumentin on oltava �to� tai �from�"
 
-#: io.c:1103
+#: io.c:1136
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: �%.*s� ei ole avoin tiedosto, putki tai apuprosessi"
 
-#: io.c:1108
+#: io.c:1141
 msgid "close of redirection that was never opened"
 msgstr "suljettiin uudelleenohjaus, jota ei avattu koskaan"
 
-#: io.c:1205
+#: io.c:1238
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: uudelleenohjaus �%s� ei ole avattu operaattoreilla �|&�, toinen "
 "argumentti ohitettu"
 
-#: io.c:1222
+#: io.c:1255
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "virhetila (%d) putken �%s� sulkemisessa (%s)"
 
-#: io.c:1225
+#: io.c:1258
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "virhetila (%d) tiedoston �%s� sulkemisessa (%s)"
 
-#: io.c:1245
+#: io.c:1278
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "pistokkeen �%s� eksplisiittistä sulkemista ei tarjota"
 
-#: io.c:1248
+#: io.c:1281
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "apuprosessin �%s� eksplisiittistä sulkemista ei tarjota"
 
-#: io.c:1251
+#: io.c:1284
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "putken �%s� eksplisiittistä sulkemista ei tarjota"
 
-#: io.c:1254
+#: io.c:1287
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "tiedoston �%s� eksplisiittistä sulkemista ei tarjota"
 
-#: io.c:1284 io.c:1342 main.c:864 main.c:906
+#: io.c:1317 io.c:1375 main.c:628 main.c:670
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "virhe kirjoitettaessa vakiotulosteeseen (%s)"
 
-#: io.c:1289 io.c:1348 main.c:866
+#: io.c:1322 io.c:1381 main.c:630
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "virhe kirjoitettaessa vakiovirheeseen (%s)"
 
-#: io.c:1297
+#: io.c:1330
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "uudelleenohjauksen �%s� putken tyhjennys epäonnistui (%s)."
 
-#: io.c:1300
+#: io.c:1333
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "putken apuprosessityhjennys uudelleenohjaukseen �%s� epäonnistui (%s)."
 
-#: io.c:1303
+#: io.c:1336
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "uudelleenohjauksen �%s� tiedostontyhjennys epäonnistui (%s)."
 
-#: io.c:1420
+#: io.c:1453
 #, c-format
 msgid "local port %s invalid in `/inet'"
 msgstr "paikallinen portti %s virheellinen pistokkeessa �/inet�"
 
-#: io.c:1438
+#: io.c:1471
 #, c-format
 msgid "remote host and port information (%s, %s) invalid"
 msgstr "etäkone- ja porttitiedot (%s, %s) ovat virheellisiä"
 
-#: io.c:1590
-#, c-format
-msgid "no (known) protocol supplied in special filename `%s'"
-msgstr "ei (tunnettua) yhteyskäytäntöä tarjottu erikoistiedostonimessä �%s�"
-
-#: io.c:1604
-#, c-format
-msgid "special file name `%s' is incomplete"
-msgstr "erikoistiedostonimi �%s� on vaillinainen"
-
-#: io.c:1621
-msgid "must supply a remote hostname to `/inet'"
-msgstr "on tarjottava etäkoneen nimi pistokkeeseen �/inet�"
-
-#: io.c:1639
-msgid "must supply a remote port to `/inet'"
-msgstr "on tarjottava etäportti pistokkeeseen �/inet�"
-
-#: io.c:1685
+#: io.c:1673
 msgid "TCP/IP communications are not supported"
 msgstr "TCP/IP-viestintää ei tueta"
 
-#: io.c:1867
+#: io.c:1854
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "laitteen �%s� avaus epäonnistui, tila �%s�"
 
-#: io.c:1917
+#: io.c:1904
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "�master pty�-sulkeminen epäonnistui (%s)"
 
-#: io.c:1919 io.c:2105 io.c:2305
+#: io.c:1906 io.c:2092 io.c:2293
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "vakiotulosteen sulkeminen lapsiprosessissa epäonnistui (%s)"
 
-#: io.c:1922
+#: io.c:1909
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 "�slave pty�:n siirtäminen vakiotulosteeseen lapsiprosessissa epäonnistui "
 "(dup: %s)"
 
-#: io.c:1924 io.c:2110
+#: io.c:1911 io.c:2097
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "vakiosyötteen sulkeminen lapsiprosessissa epäonnistui (%s)"
 
-#: io.c:1927
+#: io.c:1914
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 "�slave pty�:n siirtäminen vakiosyötteeseen lapsiprosessissa epäonnistui "
 "(dup: %s)"
 
-#: io.c:1929 io.c:1951
+#: io.c:1916 io.c:1938
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "�slave pty�:n sulkeminen epäonnistui (%s)"
 
-#: io.c:2040 io.c:2108 io.c:2276 io.c:2308
+#: io.c:2027 io.c:2095 io.c:2264 io.c:2296
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr ""
 "putken siirtäminen vakiotulosteeseen lapsiprosessissa epäonnistui (dup: %s)"
 
-#: io.c:2047 io.c:2113
+#: io.c:2034 io.c:2100
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr ""
 "putken siirtäminen vakiosyötteeseen lapsiprosessissa epäonnistui (dup: %s)"
 
-#: io.c:2073 io.c:2298
+#: io.c:2060 io.c:2286
 msgid "restoring stdout in parent process failed\n"
 msgstr "vakiotulosteen palauttaminen äitiprosessissa epäonnistui\n"
 
-#: io.c:2081
+#: io.c:2068
 msgid "restoring stdin in parent process failed\n"
 msgstr "vakiosyötön palauttaminen äitiprosessissa epäonnistui\n"
 
-#: io.c:2116 io.c:2310 io.c:2324
+#: io.c:2103 io.c:2298 io.c:2313
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "putken sulkeminen epäonnistui (%s)"
 
-#: io.c:2174
+#: io.c:2162
 msgid "`|&' not supported"
 msgstr "�|&� ei tueta"
 
-#: io.c:2261
+#: io.c:2249
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "putken �%s� (%s) avaaminen epäonnistui"
 
-#: io.c:2318
+#: io.c:2307
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "lapsiprosessin luominen komennolle �%s� (fork: %s) epäonnistui"
 
-#: io.c:2790
+#: io.c:2734
 msgid "register_input_parser: received NULL pointer"
 msgstr "register_input_parser: vastaanotettiin NULL-osoitin"
 
-#: io.c:2818
+#: io.c:2762
 #, c-format
 msgid "input parser `%s' conflicts with previously installed input parser `%s'"
 msgstr ""
 "syötejäsennin �%s� on ristiriidassa aiemmin asennetun syötejäsentimen �%s� "
 "kanssa"
 
-#: io.c:2825
+#: io.c:2769
 #, c-format
 msgid "input parser `%s' failed to open `%s'"
 msgstr "syötejäsentäjä �%s� epäonnistui kohteen �%s� avaamisessa"
 
-#: io.c:2845
+#: io.c:2789
 msgid "register_output_wrapper: received NULL pointer"
 msgstr "register_output_wrapper: vastaanotti NULL-osoittimen"
 
-#: io.c:2873
+#: io.c:2817
 #, c-format
 msgid ""
 "output wrapper `%s' conflicts with previously installed output wrapper `%s'"
@@ -2910,16 +2928,16 @@ msgstr ""
 "tulostekäärin �%s� on ristiriidassa aiemmin asennetun tulostekäärimen �%s� "
 "kanssa"
 
-#: io.c:2880
+#: io.c:2824
 #, c-format
 msgid "output wrapper `%s' failed to open `%s'"
 msgstr "tulostekäärin �%s� epäonnistui avaamaan �%s�"
 
-#: io.c:2901
+#: io.c:2845
 msgid "register_output_processor: received NULL pointer"
 msgstr "register_output_processor: vastaanotti NULL-osoittimen"
 
-#: io.c:2930
+#: io.c:2874
 #, c-format
 msgid ""
 "two-way processor `%s' conflicts with previously installed two-way processor "
@@ -2928,216 +2946,203 @@ msgstr ""
 "kaksisuuntainen prosessori �%s� on ristiriidassa aiemmin asennetun "
 "kaksisuuntaisen prosessorin �%s� kanssa"
 
-#: io.c:2939
+#: io.c:2883
 #, c-format
 msgid "two way processor `%s' failed to open `%s'"
 msgstr "kaksisuuntainen prosessori �%s� epäonnistui avaamaan �%s�"
 
-#: io.c:3064
+#: io.c:3008
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "data-tiedosto �%s� on tyhjä"
 
-#: io.c:3106 io.c:3114
+#: io.c:3050 io.c:3058
 msgid "could not allocate more input memory"
 msgstr "lisäsyötemuistin varaus epäonnistui"
 
-#: io.c:3682
+#: io.c:3636
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "�RS�-monimerkkiarvo on gawk-laajennus"
 
-#: io.c:3771
+#: io.c:3783
 msgid "IPv6 communication is not supported"
 msgstr "IPv6-viestintää ei tueta"
 
-#: main.c:405
-msgid "empty argument to `-e/--source' ignored"
-msgstr "tyhjä argumentti valitsimelle �-e/--source� ohitetaan"
-
-#: main.c:495
-#, c-format
-msgid "%s: option `-W %s' unrecognized, ignored\n"
-msgstr "%s: valitsin �-W %s� on tunnistamaton, ohitetaan\n"
-
-#: main.c:541
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: valitsin vaatii argumentin -- %c\n"
-
-#: main.c:562
+#: main.c:321
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
 "ympäristömuuttuja �POSIXLY_CORRECT� asetettu: käännetään päälle valitsin �--"
 "posix�"
 
-#: main.c:568
+#: main.c:327
 msgid "`--posix' overrides `--traditional'"
 msgstr "valitsin �--posix� korvaa valitsimen �--traditional�"
 
-#: main.c:579
+#: main.c:338
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr ""
 "valitsin �--posix� tai �--traditional� korvaa valitsimen �--non-decimal-data�"
 
-#: main.c:583
+#: main.c:342
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "suorittaminen �%s setuid root�-käyttäjänä saattaa olla turvapulma"
 
-#: main.c:588
+#: main.c:346
 msgid "`--posix' overrides `--characters-as-bytes'"
 msgstr "valitsin �--posix� korvaa valitsimen �--characters-as-bytes�"
 
-#: main.c:647
+#: main.c:404
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "binaaritilan asettaminen vakiosyötteessä (%s) epäonnistui"
 
-#: main.c:650
+#: main.c:407
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "binaaritilan asettaminen vakiotulosteessa (%s) epäonnistui"
 
-#: main.c:652
+#: main.c:409
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "binaaritilaa asettaminen vakiovirheessä (%s) epäonnistui"
 
-#: main.c:710
+#: main.c:469
 msgid "no program text at all!"
 msgstr "ei ohjelmatekstiä ollenkaan!"
 
-#: main.c:799
+#: main.c:563
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 "Käyttö: %s [POSIX- tai GNU-tyyliset valitsimet] -f ohjelmatiedosto [--] "
 "tiedosto ...\n"
 
-#: main.c:801
+#: main.c:565
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
 "Käyttö: %s [POSIX- tai GNU-tyyliset valitsimet] [--] %cohjelma%c "
 "tiedosto ...\n"
 
-#: main.c:806
+#: main.c:570
 msgid "POSIX options:\t\tGNU long options: (standard)\n"
 msgstr "POSIX-valitsimet:\t\tGNU-pitkät valitsimet: (vakio)\n"
 
-#: main.c:807
+#: main.c:571
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f ohjelmatiedosto\t\t--file=ohjelmatiedosto\n"
 
-#: main.c:808
+#: main.c:572
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F fs\t\t\t--field-separator=fs\n"
 
-#: main.c:809
+#: main.c:573
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=arvo\t\t--assign=muuttuja=arvo\n"
 
-#: main.c:810
+#: main.c:574
 msgid "Short options:\t\tGNU long options: (extensions)\n"
 msgstr "Lyhyet valitsimet:\t\tGNU-pitkät valitsimet: (laajennukset)\n"
 
-#: main.c:811
+#: main.c:575
 msgid "\t-b\t\t\t--characters-as-bytes\n"
 msgstr "\t-b\t\t\t--characters-as-bytes\n"
 
-#: main.c:812
+#: main.c:576
 msgid "\t-c\t\t\t--traditional\n"
 msgstr "\t-c\t\t\t--traditional\n"
 
-#: main.c:813
+#: main.c:577
 msgid "\t-C\t\t\t--copyright\n"
 msgstr "\t-C\t\t\t--copyright\n"
 
-#: main.c:814
+#: main.c:578
 msgid "\t-d[file]\t\t--dump-variables[=file]\n"
 msgstr "\t-d[tiedosto]\t\t--dump-variables[=tiedosto]\n"
 
-#: main.c:815
+#: main.c:579
 msgid "\t-D[file]\t\t--debug[=file]\n"
 msgstr "\t-D[tiedosto]\t\t--debug[=tiedosto]\n"
 
-#: main.c:816
+#: main.c:580
 msgid "\t-e 'program-text'\t--source='program-text'\n"
 msgstr "\t-e 'program-text'\t--source='program-text'\n"
 
-#: main.c:817
+#: main.c:581
 msgid "\t-E file\t\t\t--exec=file\n"
 msgstr "\t-E file\t\t\t--exec=tiedosto\n"
 
-#: main.c:818
+#: main.c:582
 msgid "\t-g\t\t\t--gen-pot\n"
 msgstr "\t-g\t\t\t--gen-po\n"
 
-#: main.c:819
+#: main.c:583
 msgid "\t-h\t\t\t--help\n"
 msgstr "\t-h\t\t\t--help\n"
 
-#: main.c:820
+#: main.c:584
 msgid "\t-i includefile\t\t--include=includefile\n"
 msgstr "\t-i include-tiedosto\t\t--include=include-tiedosto\n"
 
-#: main.c:821
+#: main.c:585
 msgid "\t-l library\t\t--load=library\n"
 msgstr "\t-l kirjasto\t\t--load=kirjasto\n"
 
-#: main.c:822
-msgid "\t-L [fatal]\t\t--lint[=fatal]\n"
+#: main.c:586
+#, fuzzy
+msgid "\t-L[fatal|invalid]\t--lint[=fatal|invalid]\n"
 msgstr "\t-L [fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:823
-msgid "\t-n\t\t\t--non-decimal-data\n"
-msgstr "\t-n\t\t\t--non-decimal-data\n"
-
-#: main.c:824
+#: main.c:587
 msgid "\t-M\t\t\t--bignum\n"
 msgstr "\t-M\t\t\t--bignum\n"
 
-#: main.c:825
+#: main.c:588
 msgid "\t-N\t\t\t--use-lc-numeric\n"
 msgstr "\t-N\t\t\t--use-lc-numeric\n"
 
-#: main.c:826
+#: main.c:589
+msgid "\t-n\t\t\t--non-decimal-data\n"
+msgstr "\t-n\t\t\t--non-decimal-data\n"
+
+#: main.c:590
 msgid "\t-o[file]\t\t--pretty-print[=file]\n"
 msgstr "\t-o[tiedosto]\t\t--pretty-print[=tiedosto]\n"
 
-#: main.c:827
+#: main.c:591
 msgid "\t-O\t\t\t--optimize\n"
 msgstr "\t-O\t\t\t--optimize\n"
 
-#: main.c:828
+#: main.c:592
 msgid "\t-p[file]\t\t--profile[=file]\n"
 msgstr "\t-p[tiedosto]\t\t--profile[=tiedosto]\n"
 
-#: main.c:829
+#: main.c:593
 msgid "\t-P\t\t\t--posix\n"
 msgstr "\t-P\t\t\t--posix\n"
 
-#: main.c:830
+#: main.c:594
 msgid "\t-r\t\t\t--re-interval\n"
 msgstr "\t-r\t\t\t--re-interval\n"
 
-#: main.c:831
+#: main.c:595
 msgid "\t-S\t\t\t--sandbox\n"
 msgstr "\t-S\t\t\t--sandbox\n"
 
-#: main.c:832
+#: main.c:596
 msgid "\t-t\t\t\t--lint-old\n"
 msgstr "\t-t\t\t\t--lint-old\n"
 
-#: main.c:833
+#: main.c:597
 msgid "\t-V\t\t\t--version\n"
 msgstr "\t-V\t\t\t--version\n"
 
-#: main.c:835
+#: main.c:599
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:838
+#: main.c:602
 msgid "\t-Y\t\t--parsedebug\n"
 msgstr "\t-Y\t\t--parsedebug\n"
 
@@ -3146,7 +3151,7 @@ msgstr "\t-Y\t\t--parsedebug\n"
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: main.c:847
+#: main.c:611
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -3159,7 +3164,7 @@ msgstr ""
 "joka on kappale �Reporting Problems and Bugs� painetussa versiossa.\n"
 "\n"
 
-#: main.c:851
+#: main.c:615
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -3169,7 +3174,7 @@ msgstr ""
 "Oletuksena se lukee vakiosyötettä ja kirjoittaa vakiotulosteeseen.\n"
 "\n"
 
-#: main.c:855
+#: main.c:619
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -3179,7 +3184,7 @@ msgstr ""
 "\tgawk '{ sum += $1 }; END { print sum }' tiedosto\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:880
+#: main.c:644
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
@@ -3198,7 +3203,7 @@ msgstr ""
 "ehtojen mukaisesti.\n"
 "\n"
 
-#: main.c:888
+#: main.c:652
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3212,7 +3217,7 @@ msgstr ""
 "GNU General Public License-ehdoista.\n"
 "\n"
 
-#: main.c:894
+#: main.c:658
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program. If not, see http://www.gnu.org/licenses/.\n"
@@ -3220,16 +3225,16 @@ msgstr ""
 "Sinun pitäisi vastaanottaa kopion GNU General Public Licence-lisenssistä\n"
 "tämän ohjelman mukana. Jos näin ei ole, katso http://www.gnu.org/licenses/.\n"
 
-#: main.c:931
+#: main.c:695
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft ei aseta FS välilehteen POSIX awk:ssa"
 
-#: main.c:1208
+#: main.c:982
 #, c-format
 msgid "unknown value for field spec: %d\n"
 msgstr "tuntematon arvo kenttämääritteelle: %d\n"
 
-#: main.c:1306
+#: main.c:1080
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -3238,100 +3243,118 @@ msgstr ""
 "%s: �%s� argumentti valitsimelle �-v� ei ole �var=arvo�-muodossa\n"
 "\n"
 
-#: main.c:1332
+#: main.c:1106
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "�%s� ei ole laillinen muuttujanimi"
 
-#: main.c:1335
+#: main.c:1109
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "�%s� ei ole muuttujanimi, etsitään tiedostoa �%s=%s�"
 
-#: main.c:1339
+#: main.c:1113
 #, c-format
 msgid "cannot use gawk builtin `%s' as variable name"
 msgstr ""
 "gawk-ohjelman sisäisen �%s�-määrittelyn käyttö muuttujanimenä epäonnistui"
 
-#: main.c:1344
+#: main.c:1118
 #, c-format
 msgid "cannot use function `%s' as variable name"
 msgstr "funktionimen �%s� käyttö muuttujanimenä epäonnistui"
 
-#: main.c:1397
+#: main.c:1171
 msgid "floating point exception"
 msgstr "liukulukupoikkeus"
 
-#: main.c:1404
+#: main.c:1178
 msgid "fatal error: internal error"
 msgstr "tuhoisa virhe: sisäinen virhe"
 
-#: main.c:1419
+#: main.c:1193
 msgid "fatal error: internal error: segfault"
 msgstr "tuhoisa virhe: sisäinen virhe: segmenttivirhe"
 
-#: main.c:1431
+#: main.c:1205
 msgid "fatal error: internal error: stack overflow"
 msgstr "tuhoisa virhe: sisäinen virhe: pinoylivuoto"
 
-#: main.c:1490
+#: main.c:1264
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "ei avattu uudelleen tiedostomäärittelijää %d"
 
-#: main.c:1497
+#: main.c:1271
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr ""
 "laitteen /dev/null avaaminen uudelleen tiedostomäärittelijälle %d epäonnistui"
 
-#: mpfr.c:550
+#: main.c:1485
+msgid "empty argument to `-e/--source' ignored"
+msgstr "tyhjä argumentti valitsimelle �-e/--source� ohitetaan"
+
+#: main.c:1556
+msgid "-M ignored: MPFR/GMP support not compiled in"
+msgstr ""
+
+#: main.c:1577
+#, c-format
+msgid "%s: option `-W %s' unrecognized, ignored\n"
+msgstr "%s: valitsin �-W %s� on tunnistamaton, ohitetaan\n"
+
+#: main.c:1630
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: valitsin vaatii argumentin -- %c\n"
+
+#: mpfr.c:557
 #, c-format
 msgid "PREC value `%.*s' is invalid"
 msgstr "PREC-arvo �%.*s� on virheellinen"
 
-#: mpfr.c:608
+#: mpfr.c:615
 #, c-format
 msgid "RNDMODE value `%.*s' is invalid"
 msgstr "RNDMODE-arvo �%.*s� on virheellinen"
 
-#: mpfr.c:698
+#: mpfr.c:711
 #, c-format
 msgid "%s: received non-numeric argument"
 msgstr "%s: vastaanotettu argumentti ei ole numeerinen"
 
-#: mpfr.c:800
+#: mpfr.c:820
 msgid "compl(%Rg): negative value will give strange results"
 msgstr "compl(%Rg): negatiivinen arvo antaa outoja tuloksia"
 
-#: mpfr.c:804
+#: mpfr.c:824
 msgid "comp(%Rg): fractional value will be truncated"
 msgstr "compl(%Rg): jaosarvo typistetään"
 
-#: mpfr.c:816
+#: mpfr.c:836
 #, c-format
 msgid "cmpl(%Zd): negative values will give strange results"
 msgstr "compl(%Zd): negatiiviset arvot antavat outoja tuloksia"
 
-#: mpfr.c:835
+#: mpfr.c:855
 #, c-format
 msgid "%s: received non-numeric argument #%d"
 msgstr "%s: vastaanotettu argumentti #%d ei ole numeerinen"
 
-#: mpfr.c:845
+#: mpfr.c:865
 msgid "%s: argument #%d has invalid value %Rg, using 0"
 msgstr "%s: argumentilla #%d on virheellinen arvo %Rg, käytetään 0"
 
-#: mpfr.c:857
+#: mpfr.c:877
 msgid "%s: argument #%d negative value %Rg will give strange results"
 msgstr "%s: argumentin #%d negatiivinen arvo %Rg antaa outoja tuloksia"
 
-#: mpfr.c:863
+#: mpfr.c:883
 msgid "%s: argument #%d fractional value %Rg will be truncated"
 msgstr "%s: argumentin #%d jaosarvo %Rg typistetään"
 
-#: mpfr.c:878
+#: mpfr.c:898
 #, c-format
 msgid "%s: argument #%d negative value %Zd will give strange results"
 msgstr "%s: argumentin #%d negatiivinen arvo %Zd antaa outoja tuloksia"
@@ -3341,24 +3364,24 @@ msgstr "%s: argumentin #%d negatiivinen arvo %Zd antaa outoja tuloksia"
 msgid "cmd. line:"
 msgstr "komentorivi:"
 
-#: node.c:421
+#: node.c:409
 msgid "backslash at end of string"
 msgstr "kenoviiva merkkijonon lopussa"
 
-#: node.c:500
+#: node.c:488
 #, c-format
 msgid "old awk does not support the `\\%c' escape sequence"
 msgstr "vanha awk ei tue �\\%c�-koodinvaihtosekvenssiä"
 
-#: node.c:551
+#: node.c:539
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX ei salli �\\x�-koodinvaihtoja"
 
-#: node.c:557
+#: node.c:545
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "ei heksadesimaalilukuja �\\x�-koodinvaihtosekvenssissä"
 
-#: node.c:579
+#: node.c:567
 #, c-format
 msgid ""
 "hex escape \\x%.*s of %d characters probably not interpreted the way you "
@@ -3367,12 +3390,12 @@ msgstr ""
 "heksadesimaalikoodinvaihtomerkkejä \\x%.*s / %d ei ole luultavasti tulkittu "
 "sillä tavalla kuin odotat"
 
-#: node.c:594
+#: node.c:582
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "koodinvaihtosekvenssi �\\%c� käsitelty kuin pelkkä �%c�"
 
-#: node.c:739
+#: node.c:726
 msgid ""
 "Invalid multibyte data detected. There may be a mismatch between your data "
 "and your locale."
@@ -3401,12 +3424,12 @@ msgid "sending profile to standard error"
 msgstr "lähetetään profiili vakiovirheeseen"
 
 #: profile.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t# %s block(s)\n"
+"\t# %s rule(s)\n"
 "\n"
 msgstr ""
-"\t# %s-lohko(t)\n"
+"\t# Säännöt\n"
 "\n"
 
 #: profile.c:198
@@ -3423,11 +3446,11 @@ msgstr ""
 msgid "internal error: %s with null vname"
 msgstr "sisäinen virhe: %s null vname-arvolla"
 
-#: profile.c:537
+#: profile.c:538
 msgid "internal error: builtin with null fname"
 msgstr "sisäinen virhe: builtin null-funktionimellä"
 
-#: profile.c:949
+#: profile.c:958
 #, c-format
 msgid ""
 "\t# Loaded extensions (-l and/or @load)\n"
@@ -3436,12 +3459,12 @@ msgstr ""
 "\t# Ladatut laajennukset (-l ja/tai @load)\n"
 "\n"
 
-#: profile.c:972
+#: profile.c:981
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# gawk-profiili, luotu %s\n"
 
-#: profile.c:1475
+#: profile.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -3450,7 +3473,7 @@ msgstr ""
 "\n"
 "\t# Funktiot, luetteloitu aakkosjärjestyksessä\n"
 
-#: profile.c:1513
+#: profile.c:1559
 #, c-format
 msgid "redir2str: unknown redirection type %d"
 msgstr "redir2str: tuntematon edelleenohjaustyyppi %d"
@@ -3461,80 +3484,116 @@ msgid "regexp component `%.*s' should probably be `[%.*s]'"
 msgstr ""
 "säännöllisen lausekkeen komponentin �%.*s� pitäisi luultavasti olla �[%.*s]�"
 
-#: regcomp.c:131
+#: regcomp.c:139
 msgid "Success"
 msgstr "Onnistui"
 
-#: regcomp.c:134
+#: regcomp.c:142
 msgid "No match"
 msgstr "Ei täsmäystä"
 
-#: regcomp.c:137
+#: regcomp.c:145
 msgid "Invalid regular expression"
 msgstr "Virheellinen säännöllinen lauseke"
 
-#: regcomp.c:140
+#: regcomp.c:148
 msgid "Invalid collation character"
 msgstr "Virheellinen vertailumerkki"
 
-#: regcomp.c:143
+#: regcomp.c:151
 msgid "Invalid character class name"
 msgstr "Virheellinen merkkiluokkanimi"
 
-#: regcomp.c:146
+#: regcomp.c:154
 msgid "Trailing backslash"
 msgstr "Jäljessä oleva kenoviiva"
 
-#: regcomp.c:149
+#: regcomp.c:157
 msgid "Invalid back reference"
 msgstr "Virheellinen paluuviite"
 
-#: regcomp.c:152
-msgid "Unmatched [ or [^"
+#: regcomp.c:160
+#, fuzzy
+msgid "Unmatched [, [^, [:, [., or [="
 msgstr "Pariton [ tai [^"
 
-#: regcomp.c:155
+#: regcomp.c:163
 msgid "Unmatched ( or \\("
 msgstr "Pariton ( tai \\("
 
-#: regcomp.c:158
+#: regcomp.c:166
 msgid "Unmatched \\{"
 msgstr "Pariton \\{"
 
-#: regcomp.c:164
+#: regcomp.c:169
+msgid "Invalid content of \\{\\}"
+msgstr "Virheellinen \\{\\}-sisältö"
+
+#: regcomp.c:172
 msgid "Invalid range end"
 msgstr "Virheellinen lukualueen loppu"
 
-#: regcomp.c:167
+#: regcomp.c:175
 msgid "Memory exhausted"
 msgstr "Muisti loppui"
 
-#: regcomp.c:170
+#: regcomp.c:178
 msgid "Invalid preceding regular expression"
 msgstr "Virheellinen edeltävä säännöllinen lauseke"
 
-#: regcomp.c:173
+#: regcomp.c:181
 msgid "Premature end of regular expression"
 msgstr "Ennenaikainen säännöllisen lausekkeen loppu"
 
-#: regcomp.c:179
+#: regcomp.c:184
+msgid "Regular expression too big"
+msgstr "Säännöllinen lauseke on liian iso"
+
+#: regcomp.c:187
 msgid "Unmatched ) or \\)"
 msgstr "Pariton ) tai \\)"
 
-#: regcomp.c:704
+#: regcomp.c:712
 msgid "No previous regular expression"
 msgstr "Ei edellistä säännöllistä lauseketta"
 
-#: symbol.c:741
+#: symbol.c:677
+#, fuzzy, c-format
+msgid "function `%s': can't use function `%s' as a parameter name"
+msgstr "funktio �%s�: funktionimen käyttö parametrinimenä epäonnistui"
+
+#: symbol.c:809
 msgid "can not pop main context"
 msgstr "pääsisällön pop-toiminto epäonnistui"
 
+#~ msgid "`getline var' invalid inside `%s' rule"
+#~ msgstr "�getline var� virheellinen säännön �%s� sisällä"
+
+#~ msgid "`getline' invalid inside `%s' rule"
+#~ msgstr "�getline� virheellinen säännön �%s� sisällä"
+
+#~ msgid "no (known) protocol supplied in special filename `%s'"
+#~ msgstr "ei (tunnettua) yhteyskäytäntöä tarjottu erikoistiedostonimessä �%s�"
+
+#~ msgid "special file name `%s' is incomplete"
+#~ msgstr "erikoistiedostonimi �%s� on vaillinainen"
+
+#~ msgid "must supply a remote hostname to `/inet'"
+#~ msgstr "on tarjottava etäkoneen nimi pistokkeeseen �/inet�"
+
+#~ msgid "must supply a remote port to `/inet'"
+#~ msgstr "on tarjottava etäportti pistokkeeseen �/inet�"
+
+#~ msgid ""
+#~ "\t# %s block(s)\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\t# %s-lohko(t)\n"
+#~ "\n"
+
 #~ msgid "range of the form `[%c-%c]' is locale dependent"
 #~ msgstr "muodon �[%c-%c]� lukualue on paikallisasetuksesta riippuvainen"
 
-#~ msgid "attempt to use function `%s' as an array"
-#~ msgstr "yritettiin käyttää funktiota �%s� taulukkona"
-
 #~ msgid "reference to uninitialized element `%s[\"%.*s\"]'"
 #~ msgstr "viite alustamattomaan elementtiin �%s[\"%.*s\"]�"
 
@@ -3613,9 +3672,6 @@ msgstr "pääsisällön pop-toiminto epäonnistui"
 #~ msgid "function `%s' not defined"
 #~ msgstr "funktio �%s� ei ole määritelty"
 
-#~ msgid "non-redirected `getline' invalid inside `%s' rule"
-#~ msgstr "edelleenohjaamaton �getline� virheellinen �%s�-säännön sisällä"
-
 #~ msgid "`nextfile' cannot be called from a `%s' rule"
 #~ msgstr "�nextfile� ei voida kutsua �%s�-säännöstä"
 
diff --git a/po/fr.gmo b/po/fr.gmo
index c962ab71..26378b48 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 2a951b29..8cfe5517 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gawk 4.1.0b\n"
-"Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2014-04-08 19:23+0300\n"
+"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
+"POT-Creation-Date: 2015-02-26 20:05+0200\n"
 "PO-Revision-Date: 2014-01-16 00:31+0100\n"
 "Last-Translator: Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir."
 "org>\n"
@@ -39,9 +39,9 @@ msgstr "tentative d'utiliser le paramètre scalaire « %s » comme tableau"
 msgid "attempt to use scalar `%s' as an array"
 msgstr "tentative d'utiliser le scalaire « %s » comme tableau"
 
-#: array.c:409 array.c:576 builtin.c:85 builtin.c:1615 builtin.c:1661
-#: builtin.c:1674 builtin.c:2102 builtin.c:2116 eval.c:1122 eval.c:1126
-#: eval.c:1531
+#: array.c:409 array.c:576 builtin.c:85 builtin.c:1606 builtin.c:1652
+#: builtin.c:1665 builtin.c:2092 builtin.c:2106 eval.c:1149 eval.c:1153
+#: eval.c:1558
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "tentative d'utilisation du tableau « %s » dans un contexte scalaire"
@@ -92,420 +92,425 @@ msgstr "asort : le 1er argument ne doit pas être un sous-tableau du 2e"
 msgid "asorti: cannot use a subarray of second arg for first arg"
 msgstr "asorti : le 1er argument ne doit pas être un sous-tableau du 2e"
 
-#: array.c:1314
+#: array.c:1313
 #, c-format
 msgid "`%s' is invalid as a function name"
 msgstr "« %s » n'est pas un nom de fonction valide"
 
-#: array.c:1318
+#: array.c:1317
 #, c-format
 msgid "sort comparison function `%s' is not defined"
 msgstr "la fonction de comparaison « %s » du tri n'est pas définie"
 
-#: awkgram.y:233
+#: awkgram.y:226
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "les blocs %s doivent avoir une partie action"
 
-#: awkgram.y:236
+#: awkgram.y:229
 msgid "each rule must have a pattern or an action part"
 msgstr "chaque règle doit avoir au moins une partie motif ou action"
 
-#: awkgram.y:325 awkgram.y:336
+#: awkgram.y:320 awkgram.y:331
 msgid "old awk does not support multiple `BEGIN' or `END' rules"
 msgstr "l'ancien awk ne permet pas les « BEGIN » ou « END » multiples"
 
-#: awkgram.y:373
+#: awkgram.y:368
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "« %s » est une fonction interne, elle ne peut être redéfinie"
 
-#: awkgram.y:419
+#: awkgram.y:417
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr "l'expression rationnelle constante « // » n'est pas un commentaire C++"
 
-#: awkgram.y:423
+#: awkgram.y:421
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr "l'expression rationnelle constante « /%s/ » n'est pas un commentaire C"
 
-#: awkgram.y:515
+#: awkgram.y:513
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "le corps du switch comporte des cas répétés : %s"
 
-#: awkgram.y:536
+#: awkgram.y:534
 msgid "duplicate `default' detected in switch body"
 msgstr "plusieurs « default » ont été détectés dans le corps du switch"
 
-#: awkgram.y:796 awkgram.y:3723
+#: awkgram.y:794 awkgram.y:3751
 msgid "`break' is not allowed outside a loop or switch"
 msgstr "« break » est interdit en dehors d'une boucle ou d'un switch"
 
-#: awkgram.y:805 awkgram.y:3715
+#: awkgram.y:803 awkgram.y:3743
 msgid "`continue' is not allowed outside a loop"
 msgstr "« continue » est interdit en dehors d'une boucle ou d'un switch"
 
-#: awkgram.y:815
+#: awkgram.y:813
 #, c-format
 msgid "`next' used in %s action"
 msgstr "« next » est utilisé dans l'action %s"
 
-#: awkgram.y:824
+#: awkgram.y:822
 #, c-format
 msgid "`nextfile' used in %s action"
 msgstr "« nextfile » est utilisé dans l'action %s"
 
-#: awkgram.y:848
+#: awkgram.y:846
 msgid "`return' used outside function context"
 msgstr "« return » est utilisé hors du contexte d'une fonction"
 
-#: awkgram.y:922
+#: awkgram.y:920
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "dans BEGIN ou END, un « print » seul devrait sans doute être un « print "
 "\"\" »"
 
-#: awkgram.y:988 awkgram.y:1037
+#: awkgram.y:986 awkgram.y:1035
 msgid "`delete' is not allowed with SYMTAB"
 msgstr "« delete » est interdit sur SYMTAB"
 
-#: awkgram.y:990 awkgram.y:1039
+#: awkgram.y:988 awkgram.y:1037
 msgid "`delete' is not allowed with FUNCTAB"
 msgstr "« delete » est interdit sur FUNCTAB"
 
-#: awkgram.y:1024 awkgram.y:1028
+#: awkgram.y:1022 awkgram.y:1026
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "« delete(array) » est une extension non portable de tawk"
 
-#: awkgram.y:1149
+#: awkgram.y:1147
 msgid "multistage two-way pipelines don't work"
 msgstr "impossible d'utiliser des tubes bidirectionnels en série"
 
-#: awkgram.y:1264
+#: awkgram.y:1262
 msgid "regular expression on right of assignment"
 msgstr "expression rationnelle à droite d'une affectation"
 
-#: awkgram.y:1275
+#: awkgram.y:1273
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "expression rationnelle à gauche d'un opérateur « ~ » ou « !~ »"
 
-#: awkgram.y:1291 awkgram.y:1442
+#: awkgram.y:1289 awkgram.y:1431
 msgid "old awk does not support the keyword `in' except after `for'"
 msgstr "l'ancien awk n'autorise le mot-clef « in » qu'après « for »"
 
-#: awkgram.y:1301
+#: awkgram.y:1299
 msgid "regular expression on right of comparison"
 msgstr "expression rationnelle à droite d'une comparaison"
 
-#: awkgram.y:1417
-#, c-format
-msgid "`getline var' invalid inside `%s' rule"
-msgstr "« getline var » n'est pas valable dans une règle « %s »"
-
-#: awkgram.y:1420
-#, c-format
-msgid "`getline' invalid inside `%s' rule"
+#: awkgram.y:1411
+#, fuzzy, c-format
+msgid "non-redirected `getline' invalid inside `%s' rule"
 msgstr "« getline » n'est pas valable dans une règle « %s »"
 
-#: awkgram.y:1425
+#: awkgram.y:1414
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "dans une action END, un « getline » non redirigé n'est pas défini"
 
-#: awkgram.y:1444
+#: awkgram.y:1433
 msgid "old awk does not support multidimensional arrays"
 msgstr "l'ancien awk ne dispose pas des tableaux multidimensionnels"
 
-#: awkgram.y:1541
+#: awkgram.y:1530
 msgid "call of `length' without parentheses is not portable"
 msgstr "l'appel de « length » sans parenthèses n'est pas portable"
 
-#: awkgram.y:1607
+#: awkgram.y:1596
 msgid "indirect function calls are a gawk extension"
 msgstr "les appels indirects de fonctions sont une extension gawk"
 
-#: awkgram.y:1620
+#: awkgram.y:1609
 #, c-format
 msgid "can not use special variable `%s' for indirect function call"
 msgstr ""
 "impossible d'utiliser la variable spéciale « %s » pour un appel indirect de "
 "fonction"
 
-#: awkgram.y:1698
+#: awkgram.y:1635
+#, c-format
+msgid "attempt to use non-function `%s' in function call"
+msgstr ""
+
+#: awkgram.y:1699
 msgid "invalid subscript expression"
 msgstr "expression indice incorrecte"
 
-#: awkgram.y:2048 awkgram.y:2068 gawkapi.c:206 gawkapi.c:224 msg.c:126
+#: awkgram.y:2045 awkgram.y:2065 gawkapi.c:206 gawkapi.c:224 msg.c:126
 msgid "warning: "
 msgstr "avertissement : "
 
-#: awkgram.y:2066 gawkapi.c:192 gawkapi.c:221 msg.c:158
+#: awkgram.y:2063 gawkapi.c:192 gawkapi.c:221 msg.c:158
 msgid "fatal: "
 msgstr "fatal : "
 
-#: awkgram.y:2116
+#: awkgram.y:2113
 msgid "unexpected newline or end of string"
 msgstr "fin de chaîne ou passage à la ligne inattendu"
 
-#: awkgram.y:2383 awkgram.y:2459 awkgram.y:2682 debug.c:523 debug.c:539
+#: awkgram.y:2392 awkgram.y:2468 awkgram.y:2691 debug.c:523 debug.c:539
 #: debug.c:2812 debug.c:5055
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "impossible d'ouvrir le fichier source « %s » en lecture (%s)"
 
-#: awkgram.y:2384 awkgram.y:2509
+#: awkgram.y:2393 awkgram.y:2518
 #, c-format
 msgid "can't open shared library `%s' for reading (%s)"
 msgstr "impossible d'ouvrir la bibliothèque partagée « %s » en lecture (%s)"
 
-#: awkgram.y:2386 awkgram.y:2460 awkgram.y:2510 builtin.c:135 debug.c:5206
+#: awkgram.y:2395 awkgram.y:2469 awkgram.y:2519 builtin.c:135 debug.c:5206
 msgid "reason unknown"
 msgstr "raison inconnue"
 
-#: awkgram.y:2395 awkgram.y:2419
+#: awkgram.y:2404 awkgram.y:2428
 #, c-format
 msgid "can't include `%s' and use it as a program file"
 msgstr "impossible d'inclure « %s » et de l'utiliser comme extension"
 
-#: awkgram.y:2408
+#: awkgram.y:2417
 #, c-format
 msgid "already included source file `%s'"
 msgstr "le fichier source « %s » a déjà été intégré"
 
-#: awkgram.y:2409
+#: awkgram.y:2418
 #, c-format
 msgid "already loaded shared library `%s'"
 msgstr "la bibliothèque partagée « %s » est déjà chargée"
 
-#: awkgram.y:2444
+#: awkgram.y:2453
 msgid "@include is a gawk extension"
 msgstr "@include est une extension gawk"
 
-#: awkgram.y:2450
+#: awkgram.y:2459
 msgid "empty filename after @include"
 msgstr "Le nom de fichier après @include est vide"
 
-#: awkgram.y:2494
+#: awkgram.y:2503
 msgid "@load is a gawk extension"
 msgstr "@load est une extension gawk"
 
-#: awkgram.y:2500
+#: awkgram.y:2509
 msgid "empty filename after @load"
 msgstr "Le nom de fichier après @load est vide"
 
-#: awkgram.y:2634
+#: awkgram.y:2643
 msgid "empty program text on command line"
 msgstr "le programme indiqué en ligne de commande est vide"
 
-#: awkgram.y:2749
+#: awkgram.y:2758
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "impossible de lire le fichier source « %s » (%s)"
 
-#: awkgram.y:2760
+#: awkgram.y:2769
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "le fichier source « %s » est vide"
 
-#: awkgram.y:2937
+#: awkgram.y:2828
+#, c-format
+msgid "PEBKAC error: invalid character '\\%03o' in source code"
+msgstr ""
+
+#: awkgram.y:2959
 msgid "source file does not end in newline"
 msgstr "le fichier source ne se termine pas par un passage à la ligne"
 
-#: awkgram.y:3042
+#: awkgram.y:3062
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr ""
 "expression rationnelle non refermée terminée par un « \\ » en fin de fichier"
 
-#: awkgram.y:3066
+#: awkgram.y:3089
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 "%s : %d : le modificateur d'expressions rationnelles « /.../%c » de tawk ne "
 "marche pas dans gawk"
 
-#: awkgram.y:3070
+#: awkgram.y:3093
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 "le modificateur d'expressions rationnelles « /.../%c » de tawk ne marche pas "
 "dans gawk"
 
-#: awkgram.y:3077
+#: awkgram.y:3100
 msgid "unterminated regexp"
 msgstr "expression rationnelle non refermée"
 
-#: awkgram.y:3081
+#: awkgram.y:3104
 msgid "unterminated regexp at end of file"
 msgstr "expression rationnelle non refermée en fin de fichier"
 
-#: awkgram.y:3140
+#: awkgram.y:3162
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr ""
 "l'utilisation de « \\ #... » pour prolonger une ligne n'est pas portable"
 
-#: awkgram.y:3156
+#: awkgram.y:3178
 msgid "backslash not last character on line"
 msgstr "la barre oblique inverse n'est pas le dernier caractère de la ligne"
 
-#: awkgram.y:3217
+#: awkgram.y:3239
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX n'autorise pas l'opérateur « **= »"
 
-#: awkgram.y:3219
+#: awkgram.y:3241
 msgid "old awk does not support operator `**='"
 msgstr "l'ancien awk ne dispose pas de l'opérateur « **= »"
 
-#: awkgram.y:3228
+#: awkgram.y:3250
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX n'autorise pas l'opérateur « ** »"
 
-#: awkgram.y:3230
+#: awkgram.y:3252
 msgid "old awk does not support operator `**'"
 msgstr "l'ancien awk ne dispose pas de l'opérateur « ** »"
 
-#: awkgram.y:3265
+#: awkgram.y:3287
 msgid "operator `^=' is not supported in old awk"
 msgstr "l'ancien awk ne dispose pas de l'opérateur « ^= »"
 
-#: awkgram.y:3273
+#: awkgram.y:3295
 msgid "operator `^' is not supported in old awk"
 msgstr "l'ancien awk ne dispose pas de l'opérateur « ^ »"
 
-#: awkgram.y:3366 awkgram.y:3382 command.y:1178
+#: awkgram.y:3392 awkgram.y:3410 command.y:1180
 msgid "unterminated string"
 msgstr "chaîne non refermée"
 
-#: awkgram.y:3603
+#: awkgram.y:3631
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "caractère incorrect « %c » dans l'expression"
 
-#: awkgram.y:3650
+#: awkgram.y:3678
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "« %s » est une extension gawk"
 
-#: awkgram.y:3655
+#: awkgram.y:3683
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX n'autorise pas « %s »"
 
-#: awkgram.y:3663
+#: awkgram.y:3691
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "l'ancien awk ne dispose pas de « %s »"
 
-#: awkgram.y:3753
+#: awkgram.y:3781
 msgid "`goto' considered harmful!\n"
 msgstr "« goto est jugé dangereux ! » (Edsger W. Dijkstra)\n"
 
-#: awkgram.y:3787
+#: awkgram.y:3815
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d n'est pas un nombre d'arguments valide de %s"
 
-#: awkgram.y:3822
+#: awkgram.y:3850
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 "%s : une chaîne littérale en dernier argument d'une substitution est sans "
 "effet"
 
-#: awkgram.y:3827
+#: awkgram.y:3855
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "le 3e paramètre de %s n'est pas un objet modifiable"
 
-#: awkgram.y:3910 awkgram.y:3913
+#: awkgram.y:3938 awkgram.y:3941
 msgid "match: third argument is a gawk extension"
 msgstr "match : le 3e argument est une extension gawk"
 
-#: awkgram.y:3967 awkgram.y:3970
+#: awkgram.y:3995 awkgram.y:3998
 msgid "close: second argument is a gawk extension"
 msgstr "close : le 2e argument est une extension gawk"
 
-#: awkgram.y:3982
+#: awkgram.y:4010
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "utilisation incorrecte de dcgettext(_\"...\") : enlevez le souligné de tête"
 
-#: awkgram.y:3997
+#: awkgram.y:4025
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "utilisation incorrecte de dcngettext(_\"...\") : enlevez le souligné de tête"
 
-#: awkgram.y:4016
+#: awkgram.y:4044
 msgid "index: regexp constant as second argument is not allowed"
 msgstr ""
 "index : le second argument ne peut être une expression rationnelle constante"
 
-#: awkgram.y:4069
+#: awkgram.y:4097
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "fonction « %s » : le paramètre « %s » masque la variable globale"
 
-#: awkgram.y:4126 debug.c:4041 debug.c:4084 debug.c:5204
+#: awkgram.y:4154 debug.c:4041 debug.c:4084 debug.c:5204
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "impossible d'ouvrir « %s » en écriture (%s)"
 
-#: awkgram.y:4127
+#: awkgram.y:4155
 msgid "sending variable list to standard error"
 msgstr "envoi de la liste des variables vers la sortie d'erreur standard"
 
-#: awkgram.y:4135
+#: awkgram.y:4163
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s : échec de la fermeture (%s)"
 
-#: awkgram.y:4160
+#: awkgram.y:4188
 msgid "shadow_funcs() called twice!"
 msgstr "shadows_funcs() a été appelé deux fois !"
 
-#: awkgram.y:4168
+#: awkgram.y:4196
 msgid "there were shadowed variables."
 msgstr "il y avait des variables masquées."
 
-#: awkgram.y:4239
+#: awkgram.y:4267
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "nom de fonction « %s » déjà défini"
 
-#: awkgram.y:4285
+#: awkgram.y:4313
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr ""
 "fonction « %s » : impossible d'utiliser un nom de fonction comme paramètre"
 
-#: awkgram.y:4288
+#: awkgram.y:4316
 #, c-format
 msgid "function `%s': can't use special variable `%s' as a function parameter"
 msgstr ""
 "fonction « %s » : impossible d'utiliser la variable spéciale « %s » comme "
 "paramètre d'une fonction"
 
-#: awkgram.y:4296
+#: awkgram.y:4324
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr ""
 "fonction « %s » : paramètre #%d, « %s » est un doublon du paramètre #%d"
 
-#: awkgram.y:4383 awkgram.y:4389
+#: awkgram.y:4411 awkgram.y:4417
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "fonction « %s » appelée sans être définie"
 
-#: awkgram.y:4393
+#: awkgram.y:4421
 #, c-format
 msgid "function `%s' defined but never called directly"
 msgstr "fonction « %s » définie mais jamais appelée directement"
 
-#: awkgram.y:4425
+#: awkgram.y:4453
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr "le paramètre #%d, une expr. rationnelle constante, fournit un booléen"
 
-#: awkgram.y:4484
+#: awkgram.y:4468
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -514,24 +519,24 @@ msgstr ""
 "fonction « %s » appelée avec un espace entre son nom\n"
 "et « ( », ou utilisée comme variable ou tableau"
 
-#: awkgram.y:4720
+#: awkgram.y:4674
 msgid "division by zero attempted"
 msgstr "tentative de division par zéro"
 
-#: awkgram.y:4729
+#: awkgram.y:4683
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "tentative de division par zéro dans « %% »"
 
 # gawk 'BEGIN { $1++ = 1 }'
-#: awkgram.y:5049
+#: awkgram.y:5003
 msgid ""
 "cannot assign a value to the result of a field post-increment expression"
 msgstr ""
 "impossible d'assigner une valeur au résultat de la post-incrémentation d'un "
 "champ"
 
-#: awkgram.y:5052
+#: awkgram.y:5006
 #, c-format
 msgid "invalid target of assignment (opcode %s)"
 msgstr "cible de l'assignement incorrecte (opcode %s)"
@@ -574,189 +579,199 @@ msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr ""
 "fflush : « %s » n'est ni un fichier ouvert, ni un tube, ni un co-processus"
 
-#: builtin.c:362
+#: builtin.c:351
 msgid "index: received non-string first argument"
 msgstr "index : le premier argument n'est pas une chaîne"
 
-#: builtin.c:364
+#: builtin.c:353
 msgid "index: received non-string second argument"
 msgstr "index : le second argument n'est pas une chaîne"
 
-#: builtin.c:488 mpfr.c:757
+#: builtin.c:466 mpfr.c:777
 msgid "int: received non-numeric argument"
 msgstr "int : l'argument n'est pas numérique"
 
-#: builtin.c:525
+#: builtin.c:503
 msgid "length: received array argument"
 msgstr "length : l'argument reçu est un tableau"
 
-#: builtin.c:528
+#: builtin.c:506
 msgid "`length(array)' is a gawk extension"
 msgstr "« length(tableau) » est une extension gawk"
 
-#: builtin.c:544
+#: builtin.c:525
 msgid "length: received non-string argument"
 msgstr "length : l'argument n'est pas une chaîne"
 
-#: builtin.c:575
+#: builtin.c:554
 msgid "log: received non-numeric argument"
 msgstr "log : l'argument n'est pas numérique"
 
-#: builtin.c:578
+#: builtin.c:557
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log : l'argument est négatif %g"
 
-#: builtin.c:776 builtin.c:781
+#: builtin.c:755 builtin.c:760 builtin.c:911
 msgid "fatal: must use `count$' on all formats or none"
 msgstr ""
 "fatal : « numéro$ » doit être utilisé pour toutes les formats ou pour aucun"
 
-#: builtin.c:851
+#: builtin.c:830
 #, c-format
 msgid "field width is ignored for `%%' specifier"
 msgstr "taille du champ de la spécification « %% » ignorée"
 
-#: builtin.c:853
+#: builtin.c:832
 #, c-format
 msgid "precision is ignored for `%%' specifier"
 msgstr "précision de la spécification « %% » ignorée"
 
-#: builtin.c:855
+#: builtin.c:834
 #, c-format
 msgid "field width and precision are ignored for `%%' specifier"
 msgstr "taille du champ et précision de la spécification « %% » ignorées"
 
-#: builtin.c:906
+#: builtin.c:885
 msgid "fatal: `$' is not permitted in awk formats"
 msgstr "fatal : « $ » n'est pas autorisé dans les formats awk"
 
-#: builtin.c:915
+#: builtin.c:894
 msgid "fatal: arg count with `$' must be > 0"
 msgstr "fatal : le numéro d'argument de « $ » doit être > 0"
 
-#: builtin.c:919
+#: builtin.c:898
 #, c-format
 msgid "fatal: arg count %ld greater than total number of supplied arguments"
 msgstr ""
 "fatal : le numéro d'argument %ld est > au nombre total d'arguments fournis"
 
-#: builtin.c:923
+#: builtin.c:902
 msgid "fatal: `$' not permitted after period in format"
 msgstr "fatal : dans un format, « $ » ne doit pas suivre un point"
 
-#: builtin.c:939
+#: builtin.c:921
 msgid "fatal: no `$' supplied for positional field width or precision"
 msgstr ""
 "fatal : aucun « $ » fourni pour la taille ou la précision du champ positionné"
 
-#: builtin.c:1009
+#: builtin.c:991
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "« l » n'a aucun sens dans un format awk ; ignoré"
 
-#: builtin.c:1013
+#: builtin.c:995
 msgid "fatal: `l' is not permitted in POSIX awk formats"
 msgstr "fatal : « l » est interdit dans un format awk POSIX"
 
-#: builtin.c:1026
+#: builtin.c:1008
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "« L » n'a aucun sens dans un format awk ; ignoré"
 
-#: builtin.c:1030
+#: builtin.c:1012
 msgid "fatal: `L' is not permitted in POSIX awk formats"
 msgstr "fatal : « L » est interdit dans un format awk POSIX"
 
-#: builtin.c:1043
+#: builtin.c:1025
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "« h » n'a aucun sens dans un format awk ; ignoré"
 
-#: builtin.c:1047
+#: builtin.c:1029
 msgid "fatal: `h' is not permitted in POSIX awk formats"
 msgstr "fatal : « h » est interdit dans un format awk POSIX"
 
-#: builtin.c:1463
+#: builtin.c:1055
+#, fuzzy, c-format
+msgid "[s]printf: value %g is too big for %%c format"
+msgstr "[s]printf : valeur %g hors limite pour le format « %%%c »"
+
+#: builtin.c:1068
+#, fuzzy, c-format
+msgid "[s]printf: value %g is not a valid wide character"
+msgstr "[s]printf : valeur %g hors limite pour le format « %%%c »"
+
+#: builtin.c:1454
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf : valeur %g hors limite pour le format « %%%c »"
 
-#: builtin.c:1561
+#: builtin.c:1552
 #, c-format
 msgid "ignoring unknown format specifier character `%c': no argument converted"
 msgstr "caractère de format inconnu « %c » ignoré : aucun argument converti"
 
-#: builtin.c:1566
+#: builtin.c:1557
 msgid "fatal: not enough arguments to satisfy format string"
 msgstr "fatal : pas assez d'arguments pour satisfaire la chaîne de formatage"
 
-#: builtin.c:1568
+#: builtin.c:1559
 msgid "^ ran out for this one"
 msgstr "^ à court pour celui-ci"
 
-#: builtin.c:1575
+#: builtin.c:1566
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf : spécification de format sans lettre de contrôle"
 
-#: builtin.c:1578
+#: builtin.c:1569
 msgid "too many arguments supplied for format string"
 msgstr "trop d'arguments pour la chaîne de formatage"
 
-#: builtin.c:1634
+#: builtin.c:1625
 msgid "sprintf: no arguments"
 msgstr "sprintf : aucun argument"
 
-#: builtin.c:1657 builtin.c:1668
+#: builtin.c:1648 builtin.c:1659
 msgid "printf: no arguments"
 msgstr "printf : aucun argument"
 
-#: builtin.c:1711
+#: builtin.c:1702
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt : l'argument n'est pas numérique"
 
-#: builtin.c:1715
+#: builtin.c:1706
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt : appelé avec un argument négatif %g"
 
-#: builtin.c:1746
+#: builtin.c:1737
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr : la longueur %g n'est pas >= 1"
 
-#: builtin.c:1748
+#: builtin.c:1739
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr : la longueur %g n'est pas >= 0"
 
-#: builtin.c:1755
+#: builtin.c:1753
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr : la longueur %g n'est pas entière, elle sera tronquée"
 
-#: builtin.c:1760
+#: builtin.c:1758
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr "substr : la longueur %g est trop grande, tronquée à %g"
 
-#: builtin.c:1772
+#: builtin.c:1770
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr : l'index de début %g n'est pas valide, utilisation de 1"
 
-#: builtin.c:1777
+#: builtin.c:1775
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr : l'index de début %g n'est pas un entier, il sera tronqué"
 
-#: builtin.c:1802
+#: builtin.c:1798
 msgid "substr: source string is zero length"
 msgstr "substr : la chaîne source est de longueur nulle"
 
-#: builtin.c:1818
+#: builtin.c:1812
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr : l'index de début %g est au-delà de la fin de la chaîne"
 
-#: builtin.c:1826
+#: builtin.c:1820
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -764,195 +779,201 @@ msgstr ""
 "substr : la longueur %g à partir de %g dépasse la fin du 1er argument (%lu)"
 
 # Exemple : gawk --lint 'BEGIN { PROCINFO["strftime"]=123 ;  print strftime() }'
-#: builtin.c:1900
+#: builtin.c:1890
 msgid "strftime: format value in PROCINFO[\"strftime\"] has numeric type"
 msgstr ""
 "strftime : la valeur de formatage PROCINFO[\"strftime\"] est de type "
 "numérique"
 
-#: builtin.c:1923
+#: builtin.c:1913
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime : le second argument n'est pas numérique"
 
-#: builtin.c:1927
+#: builtin.c:1917
 msgid "strftime: second argument less than 0 or too big for time_t"
 msgstr "strftime: second argument négatif ou trop grand pour time_t"
 
-#: builtin.c:1934
+#: builtin.c:1924
 msgid "strftime: received non-string first argument"
 msgstr "strftim : le premier argument n'est pas une chaîne"
 
-#: builtin.c:1941
+#: builtin.c:1931
 msgid "strftime: received empty format string"
 msgstr "strftime : la chaîne de formatage est vide"
 
-#: builtin.c:2007
+#: builtin.c:1997
 msgid "mktime: received non-string argument"
 msgstr "mktime : l'argument n'est pas une chaîne"
 
-#: builtin.c:2024
+#: builtin.c:2014
 msgid "mktime: at least one of the values is out of the default range"
 msgstr ""
 "mktime : au moins l'une des valeurs est en dehors de la plage par défaut"
 
-#: builtin.c:2059
+#: builtin.c:2049
 msgid "'system' function not allowed in sandbox mode"
 msgstr "La fonction « system » est interdite en isolement (mode sandbox)"
 
-#: builtin.c:2064
+#: builtin.c:2054
 msgid "system: received non-string argument"
 msgstr "system : l'argument n'est pas une chaîne"
 
-#: builtin.c:2184
+#: builtin.c:2174
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "référence à un champ non initialisé « $%d »"
 
-#: builtin.c:2271
+#: builtin.c:2259
 msgid "tolower: received non-string argument"
 msgstr "tolower : l'argument n'est pas une chaîne"
 
-#: builtin.c:2305
+#: builtin.c:2290
 msgid "toupper: received non-string argument"
 msgstr "toupper : l'argument n'est pas une chaîne"
 
-#: builtin.c:2341 mpfr.c:672
+#: builtin.c:2323 mpfr.c:679
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2 : le premier argument n'est pas numérique"
 
-#: builtin.c:2343 mpfr.c:674
+#: builtin.c:2325 mpfr.c:681
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2 : le second argument n'est pas numérique"
 
-#: builtin.c:2362
+#: builtin.c:2344
 msgid "sin: received non-numeric argument"
 msgstr "sin : l'argument n'est pas numérique"
 
-#: builtin.c:2378
+#: builtin.c:2360
 msgid "cos: received non-numeric argument"
 msgstr "cos : l'argument n'est pas numérique"
 
-#: builtin.c:2431 mpfr.c:1156
+#: builtin.c:2413 mpfr.c:1176
 msgid "srand: received non-numeric argument"
 msgstr "srand : l'argument n'est pas numérique"
 
-#: builtin.c:2462
+#: builtin.c:2444
 msgid "match: third argument is not an array"
 msgstr "match : le 3e argument n'est pas un tableau"
 
-#: builtin.c:2734
-msgid "gensub: third argument of 0 treated as 1"
+#: builtin.c:2705
+#, fuzzy, c-format
+msgid "gensub: third argument `%.*s' treated as 1"
 msgstr "gensub : le 3e argument vaut 0, il sera traité comme un 1"
 
-#: builtin.c:3030
+#: builtin.c:2720
+#, fuzzy, c-format
+msgid "gensub: third argument %g treated as 1"
+msgstr "gensub : le 3e argument vaut 0, il sera traité comme un 1"
+
+#: builtin.c:3020
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift : le premier argument n'est pas numérique"
 
-#: builtin.c:3032
+#: builtin.c:3022
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift : le second argument reçu n'est pas numérique"
 
-#: builtin.c:3038
+#: builtin.c:3028
 #, c-format
 msgid "lshift(%f, %f): negative values will give strange results"
 msgstr ""
 "lshift(%f, %f) : les valeurs négatives donnent des résultats inattendus"
 
-#: builtin.c:3040
+#: builtin.c:3030
 #, c-format
 msgid "lshift(%f, %f): fractional values will be truncated"
 msgstr "lshift(%f, %f) : les valeurs non entières seront tronquées"
 
-#: builtin.c:3042
+#: builtin.c:3032
 #, c-format
 msgid "lshift(%f, %f): too large shift value will give strange results"
 msgstr "lshift(%f, %f) : un décalage trop grand donne des résultats inattendus"
 
-#: builtin.c:3067
+#: builtin.c:3057
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift : le premier argument n'est pas numérique"
 
-#: builtin.c:3069
+#: builtin.c:3059
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift : le second argument reçu n'est pas numérique"
 
-#: builtin.c:3075
+#: builtin.c:3065
 #, c-format
 msgid "rshift(%f, %f): negative values will give strange results"
 msgstr ""
 "rshift(%f, %f) : les valeurs négatives donneront des résultats inattendus"
 
-#: builtin.c:3077
+#: builtin.c:3067
 #, c-format
 msgid "rshift(%f, %f): fractional values will be truncated"
 msgstr "rshift(%f, %f) : les valeurs non entières seront tronquées"
 
-#: builtin.c:3079
+#: builtin.c:3069
 #, c-format
 msgid "rshift(%f, %f): too large shift value will give strange results"
 msgstr ""
 "rshift(%f, %f) : un décalage trop grand donnera des résultats inattendus"
 
-#: builtin.c:3104 mpfr.c:968
+#: builtin.c:3094 mpfr.c:988
 msgid "and: called with less than two arguments"
 msgstr "and : appelé avec moins de 2 arguments"
 
-#: builtin.c:3109
+#: builtin.c:3099
 #, c-format
 msgid "and: argument %d is non-numeric"
 msgstr "and : l'argument %d n'est pas numérique"
 
-#: builtin.c:3113
+#: builtin.c:3103
 #, c-format
 msgid "and: argument %d negative value %g will give strange results"
 msgstr ""
 "and : l'argument %d est négatif (%g) ce qui aura des résultats inattendus"
 
-#: builtin.c:3136 mpfr.c:1000
+#: builtin.c:3126 mpfr.c:1020
 msgid "or: called with less than two arguments"
 msgstr "or : appelé avec moins de 2 arguments"
 
-#: builtin.c:3141
+#: builtin.c:3131
 #, c-format
 msgid "or: argument %d is non-numeric"
 msgstr "or : l'argument %d n'est pas numérique"
 
-#: builtin.c:3145
+#: builtin.c:3135
 #, c-format
 msgid "or: argument %d negative value %g will give strange results"
 msgstr ""
 "or : l'argument %d est négatif (%g) ce qui aura des résultats inattendus"
 
-#: builtin.c:3167 mpfr.c:1031
+#: builtin.c:3157 mpfr.c:1051
 msgid "xor: called with less than two arguments"
 msgstr "xor : appelé avec moins de 2 arguments"
 
-#: builtin.c:3173
+#: builtin.c:3163
 #, c-format
 msgid "xor: argument %d is non-numeric"
 msgstr "xor : l'argument %d n'est pas numérique"
 
-#: builtin.c:3177
+#: builtin.c:3167
 #, c-format
 msgid "xor: argument %d negative value %g will give strange results"
 msgstr ""
 "xor : l'argument %d est négatif (%g) ce qui aura des résultats inattendus"
 
-#: builtin.c:3202 mpfr.c:787
+#: builtin.c:3192 mpfr.c:807
 msgid "compl: received non-numeric argument"
 msgstr "compl : l'argument n'est pas numérique"
 
-#: builtin.c:3208
+#: builtin.c:3198
 #, c-format
 msgid "compl(%f): negative value will give strange results"
 msgstr "compl(%f) : les valeurs négatives donneront des résultats inattendus"
 
-#: builtin.c:3210
+#: builtin.c:3200
 #, c-format
 msgid "compl(%f): fractional value will be truncated"
 msgstr "compl(%f) : les valeurs non entières seront tronquées"
 
-#: builtin.c:3379
+#: builtin.c:3369
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext : « %s » n'est pas dans un catégorie valide de la locale"
@@ -1256,40 +1277,49 @@ msgstr "up [N] - remonte de N trames dans la pile."
 msgid "watch var - set a watchpoint for a variable."
 msgstr "watch var - définit un point de surveillance pour une variable."
 
-#: command.y:1011 debug.c:401 msg.c:135
+#: command.y:901
+#, fuzzy
+msgid ""
+"where [N] - (same as backtrace) print trace of all or N innermost (outermost "
+"if N < 0) frames."
+msgstr ""
+"backtrace [N] - affiche la trace de tout ou des N dernières trames (du début "
+"si N < 0)."
+
+#: command.y:1013 debug.c:401 msg.c:135
 #, c-format
 msgid "error: "
 msgstr "erreur : "
 
-#: command.y:1051
+#: command.y:1053
 #, c-format
 msgid "can't read command (%s)\n"
 msgstr "impossible de lire la commande (%s)\n"
 
-#: command.y:1065
+#: command.y:1067
 #, c-format
 msgid "can't read command (%s)"
 msgstr "impossible de lire la commande (%s)"
 
-#: command.y:1116
+#: command.y:1118
 msgid "invalid character in command"
 msgstr "la commande contient un caractère incorrect"
 
-#: command.y:1152
+#: command.y:1154
 #, c-format
 msgid "unknown command - \"%.*s\", try help"
 msgstr "commande inconnue - « %.*s », essayez « help »"
 
-#: command.y:1222
+#: command.y:1224
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.y:1284
+#: command.y:1286
 msgid "invalid character"
 msgstr "Caractère incorrect"
 
-#: command.y:1455
+#: command.y:1457
 #, c-format
 msgid "undefined command: %s\n"
 msgstr "commande inconnue : %s\n"
@@ -1821,68 +1851,70 @@ msgstr "« %s » interdit dans ce contexte ; instruction ignorée"
 msgid "`return' not allowed in current context; statement ignored"
 msgstr "« return » interdit dans ce contexte ; instruction ignorée"
 
-#: debug.c:5590
+#: debug.c:5604
 #, c-format
 msgid "No symbol `%s' in current context"
 msgstr "Pas de symbole « %s » dans le contexte actuel"
 
-#: dfa.c:1118 dfa.c:1121 dfa.c:1142 dfa.c:1150 dfa.c:1162 dfa.c:1197
-#: dfa.c:1206 dfa.c:1209 dfa.c:1214 dfa.c:1228 dfa.c:1275
+#: dfa.c:1063 dfa.c:1066 dfa.c:1085 dfa.c:1095 dfa.c:1107 dfa.c:1143
+#: dfa.c:1152 dfa.c:1155 dfa.c:1160 dfa.c:1174 dfa.c:1222
 msgid "unbalanced ["
 msgstr "[ non apparié"
 
-#: dfa.c:1174
+#: dfa.c:1119
 msgid "invalid character class"
 msgstr "classe de caractères incorrecte"
 
-#: dfa.c:1316
+#: dfa.c:1265
 msgid "character class syntax is [[:space:]], not [:space:]"
 msgstr "la syntaxe des classes de caractères est [[:space:]], et non [:space:]"
 
-#: dfa.c:1366
+#: dfa.c:1327
 msgid "unfinished \\ escape"
 msgstr "échappement \\ non terminé"
 
-#: dfa.c:1513 regcomp.c:161
-msgid "Invalid content of \\{\\}"
+#: dfa.c:1474
+#, fuzzy
+msgid "invalid content of \\{\\}"
 msgstr "Contenu de \\{\\} incorrect"
 
-#: dfa.c:1516 regcomp.c:176
-msgid "Regular expression too big"
+#: dfa.c:1477
+#, fuzzy
+msgid "regular expression too big"
 msgstr "Expression rationnelle trop grande"
 
-#: dfa.c:1936
+#: dfa.c:1912
 msgid "unbalanced ("
 msgstr "( non apparié"
 
-#: dfa.c:2062
+#: dfa.c:2038
 msgid "no syntax specified"
 msgstr "aucune syntaxe indiquée"
 
-#: dfa.c:2070
+#: dfa.c:2046
 msgid "unbalanced )"
 msgstr ") non apparié"
 
-#: eval.c:394
+#: eval.c:396
 #, c-format
 msgid "unknown nodetype %d"
 msgstr "type de nœud %d inconnu"
 
-#: eval.c:405 eval.c:419
+#: eval.c:407 eval.c:421
 #, c-format
 msgid "unknown opcode %d"
 msgstr "code opération %d inconnu"
 
-#: eval.c:416
+#: eval.c:418
 #, c-format
 msgid "opcode %s not an operator or keyword"
 msgstr "le code opération %s n'est pas un opérateur ou un mot-clef"
 
-#: eval.c:472
+#: eval.c:474
 msgid "buffer overflow in genflags2str"
 msgstr "débordement de tampon dans genflag2str"
 
-#: eval.c:675
+#: eval.c:676
 #, c-format
 msgid ""
 "\n"
@@ -1893,93 +1925,93 @@ msgstr ""
 "\t# Pile des appels de fonctions :\n"
 "\n"
 
-#: eval.c:704
+#: eval.c:705
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "« IGNORECASE » est une extension gawk"
 
-#: eval.c:736
+#: eval.c:737
 msgid "`BINMODE' is a gawk extension"
 msgstr "« BINMODE » est une extension gawk"
 
-#: eval.c:794
+#: eval.c:795
 #, c-format
 msgid "BINMODE value `%s' is invalid, treated as 3"
 msgstr "la valeur « %s » de BINMODE n'est pas valide, 3 utilisé à la place"
 
-#: eval.c:885
+#: eval.c:912
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "spécification de « %sFMT » erronée « %s »"
 
-#: eval.c:969
+#: eval.c:996
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "désactivation de « --lint » en raison d'une affectation à « LINT »"
 
-#: eval.c:1147
+#: eval.c:1174
 #, c-format
 msgid "reference to uninitialized argument `%s'"
 msgstr "référence à un argument non initialisé « %s »"
 
-#: eval.c:1148
+#: eval.c:1175
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "référence à une variable non initialisée « %s »"
 
-#: eval.c:1166
+#: eval.c:1193
 msgid "attempt to field reference from non-numeric value"
 msgstr "tentative de référence à un champ via une valeur non numérique"
 
-#: eval.c:1168
+#: eval.c:1195
 msgid "attempt to field reference from null string"
 msgstr "tentative de référence à un champ via une chaîne nulle"
 
-#: eval.c:1176
+#: eval.c:1203
 #, c-format
 msgid "attempt to access field %ld"
 msgstr "tentative d'accès au champ %ld"
 
-#: eval.c:1185
+#: eval.c:1212
 #, c-format
 msgid "reference to uninitialized field `$%ld'"
 msgstr "référence à un champ non initialisé « $%ld »"
 
-#: eval.c:1272
+#: eval.c:1299
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "la fonction « %s » a été appelée avec trop d'arguments"
 
-#: eval.c:1473
+#: eval.c:1500
 #, c-format
 msgid "unwind_stack: unexpected type `%s'"
 msgstr "unwind_stack: type « %s » inattendu"
 
-#: eval.c:1569
+#: eval.c:1596
 msgid "division by zero attempted in `/='"
 msgstr "tentative de division par zéro dans « /= »"
 
-#: eval.c:1576
+#: eval.c:1603
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "tentative de division par zéro dans « %%= »"
 
-#: ext.c:89 ext.c:171
+#: ext.c:65 ext.c:147
 msgid "extensions are not allowed in sandbox mode"
 msgstr "les extensions sont interdites en isolement (mode sandbox)"
 
-#: ext.c:92
+#: ext.c:68
 msgid "-l / @load are gawk extensions"
 msgstr "-l / @load est une extension gawk"
 
-#: ext.c:95
+#: ext.c:71
 msgid "load_ext: received NULL lib_name"
 msgstr "load_ext : lib_name reçu NULL"
 
-#: ext.c:98
+#: ext.c:74
 #, c-format
 msgid "load_ext: cannot open library `%s' (%s)\n"
 msgstr "load_ext : impossible d'ouvrir la bibliothèque « %s » (%s)\n"
 
-#: ext.c:104
+#: ext.c:80
 #, c-format
 msgid ""
 "load_ext: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
@@ -1987,34 +2019,34 @@ msgstr ""
 "load_ext : bibliothèque « %s » : ne définit pas "
 "« plugin_is_GPL_compatible » (%s)\n"
 
-#: ext.c:110
+#: ext.c:86
 #, c-format
 msgid "load_ext: library `%s': cannot call function `%s' (%s)\n"
 msgstr ""
 "load_ext : bibliothèque « %s » : impossible d'appeler la fonction "
 "« %s » (%s)\n"
 
-#: ext.c:114
+#: ext.c:90
 #, c-format
 msgid "load_ext: library `%s' initialization routine `%s' failed\n"
 msgstr ""
 "load_ext : bibliothèque « %s » : échec de la routine d'initialisation « %s "
 "»\n"
 
-#: ext.c:174
+#: ext.c:150
 msgid "`extension' is a gawk extension"
 msgstr "« extension » est une extension gawk"
 
-#: ext.c:177
+#: ext.c:153
 msgid "extension: received NULL lib_name"
 msgstr "extension : lib_name reçu NULL"
 
-#: ext.c:180
+#: ext.c:156
 #, c-format
 msgid "extension: cannot open library `%s' (%s)"
 msgstr "extension : impossible d'ouvrir la bibliothèque « %s » (%s)"
 
-#: ext.c:186
+#: ext.c:162
 #, c-format
 msgid ""
 "extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)"
@@ -2022,100 +2054,100 @@ msgstr ""
 "extension : bibliothèque « %s » : ne définit pas "
 "« plugin_is_GPL_compatible » (%s)"
 
-#: ext.c:190
+#: ext.c:166
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)"
 msgstr ""
 "extension : bibliothèque « %s » : impossible d'appeler la fonction "
 "« %s » (%s)"
 
-#: ext.c:221
+#: ext.c:197
 msgid "make_builtin: missing function name"
 msgstr "make_builtin : nom de fonction manquant"
 
-#: ext.c:236
+#: ext.c:212
 #, c-format
 msgid "make_builtin: can't redefine function `%s'"
 msgstr "make_builtin : impossible de redéfinir la fonction « %s »"
 
-#: ext.c:240
+#: ext.c:216
 #, c-format
 msgid "make_builtin: function `%s' already defined"
 msgstr "make_builtin : fonction « %s » déjà définie"
 
-#: ext.c:244
+#: ext.c:220
 #, c-format
 msgid "make_builtin: function name `%s' previously defined"
 msgstr "make_builtin : nom de la fonction « %s » déjà défini"
 
-#: ext.c:246
+#: ext.c:222
 #, c-format
 msgid "make_builtin: can't use gawk built-in `%s' as function name"
 msgstr ""
 "make_builtin : impossible d'utiliser la fonction gawk « %s » comme nom de "
 "fonction"
 
-#: ext.c:249 ext.c:304
+#: ext.c:225 ext.c:280
 #, c-format
 msgid "make_builtin: negative argument count for function `%s'"
 msgstr "make_builtin : la fonction « %s » a un nombre négatif d'arguments"
 
-#: ext.c:276
+#: ext.c:252
 msgid "extension: missing function name"
 msgstr "extension : nom de fonction manquant"
 
-#: ext.c:279 ext.c:283
+#: ext.c:255 ext.c:259
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension : caractère illégal « %c » dans le nom de la fonction « %s »"
 
-#: ext.c:291
+#: ext.c:267
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension : impossible de redéfinir la fonction « %s »"
 
-#: ext.c:295
+#: ext.c:271
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr "extension : fonction « %s » est déjà définie"
 
-#: ext.c:299
+#: ext.c:275
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "extension : nom de la fonction « %s » déjà défini"
 
-#: ext.c:301
+#: ext.c:277
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 "extension : impossible d'utiliser la fonction interne gawk « %s » comme nom "
 "de fonction"
 
-#: ext.c:375
+#: ext.c:351
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "fonction « %s »  définie comme ayant au maximum« %d » argument(s)"
 
-#: ext.c:378
+#: ext.c:354
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "fonction « %s » : argument #%d manquant"
 
-#: ext.c:395
+#: ext.c:371
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr ""
 "fonction « %s » : argument #%d : tentative d'utilisation d'un scalaire comme "
 "tableau"
 
-#: ext.c:399
+#: ext.c:375
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 "fonction « %s » : argument #%d : tentative d'utiliser un tableau comme "
 "scalaire"
 
-#: ext.c:413
+#: ext.c:389
 msgid "dynamic loading of library not supported"
 msgstr "chargement dynamique des bibliothèques impossible"
 
@@ -2259,7 +2291,7 @@ msgstr "wait : appelé avec trop d'arguments"
 msgid "inplace_begin: in-place editing already active"
 msgstr "inplace_begin : modification sur place déjà active"
 
-#: extension/inplace.c:133 extension/inplace.c:207
+#: extension/inplace.c:133 extension/inplace.c:210
 #, c-format
 msgid "inplace_begin: expects 2 arguments but called with %d"
 msgstr "inplace_begin : 2 arguments attendu, appelé avec %d"
@@ -2291,56 +2323,56 @@ msgstr "inplace_begin : « %s » n'est pas un fichier ordinaire"
 msgid "inplace_begin: mkstemp(`%s') failed (%s)"
 msgstr "inplace_begin : échec de mkstemp('%s') (%s)"
 
-#: extension/inplace.c:178
+#: extension/inplace.c:181
 #, c-format
 msgid "inplace_begin: chmod failed (%s)"
 msgstr "inplace_begin : échec de la chmod (%s)"
 
-#: extension/inplace.c:185
+#: extension/inplace.c:188
 #, c-format
 msgid "inplace_begin: dup(stdout) failed (%s)"
 msgstr "inplace_begin : échec de dup(stdout) (%s)"
 
-#: extension/inplace.c:188
+#: extension/inplace.c:191
 #, c-format
 msgid "inplace_begin: dup2(%d, stdout) failed (%s)"
 msgstr "inplace_begin : échec de dup2(%d, stdout) (%s)"
 
-#: extension/inplace.c:191
+#: extension/inplace.c:194
 #, c-format
 msgid "inplace_begin: close(%d) failed (%s)"
 msgstr "inplace_begin : échec de close(%d) (%s)"
 
-#: extension/inplace.c:210
+#: extension/inplace.c:213
 msgid "inplace_end: cannot retrieve 1st argument as a string filename"
 msgstr ""
 "inplace_end : impossible de récupérer le 1er argument comme nom de fichier"
 
-#: extension/inplace.c:217
+#: extension/inplace.c:220
 msgid "inplace_end: in-place editing not active"
 msgstr "inplace_end : modification sur place non active"
 
-#: extension/inplace.c:223
+#: extension/inplace.c:226
 #, c-format
 msgid "inplace_end: dup2(%d, stdout) failed (%s)"
 msgstr "ipnlace_end : échec de dup2(%d, stdout) (%s)"
 
-#: extension/inplace.c:226
+#: extension/inplace.c:229
 #, c-format
 msgid "inplace_end: close(%d) failed (%s)"
 msgstr "inplace_end : échec de close(%d) (%s)"
 
-#: extension/inplace.c:230
+#: extension/inplace.c:233
 #, c-format
 msgid "inplace_end: fsetpos(stdout) failed (%s)"
 msgstr "inplace_end : échec de fsetpos(stdout) (%s)"
 
-#: extension/inplace.c:243
+#: extension/inplace.c:246
 #, c-format
 msgid "inplace_end: link(`%s', `%s') failed (%s)"
 msgstr "inplace_end : échec de link('%s', '%s') (%s)"
 
-#: extension/inplace.c:253
+#: extension/inplace.c:256
 #, c-format
 msgid "inplace_end: rename(`%s', `%s') failed (%s)"
 msgstr "inplace_end : échec de rename('%s', '%s') (%s)"
@@ -2382,50 +2414,54 @@ msgstr "readfile : appelé avec trop d'arguments"
 msgid "readfile: called with no arguments"
 msgstr "readfile : appelé sans argument"
 
-#: extension/rwarray.c:124
+#: extension/revoutput.c:125
+msgid "revoutput: could not initialize REVOUT variable"
+msgstr ""
+
+#: extension/rwarray.c:124 extension/rwarray0.c:109
 msgid "writea: called with too many arguments"
 msgstr "writea : appelé avec trop d'arguments"
 
-#: extension/rwarray.c:131
+#: extension/rwarray.c:131 extension/rwarray0.c:116
 #, c-format
 msgid "do_writea: argument 0 is not a string\n"
 msgstr "do_writea : l'argument 0 n'est pas une chaîne\n"
 
-#: extension/rwarray.c:137
+#: extension/rwarray.c:137 extension/rwarray0.c:122
 #, c-format
 msgid "do_writea: argument 1 is not an array\n"
 msgstr "do_writea : l'argument 1 n'est pas un tableau\n"
 
-#: extension/rwarray.c:184
+#: extension/rwarray.c:184 extension/rwarray0.c:169
 #, c-format
 msgid "write_array: could not flatten array\n"
 msgstr "write_array : impossible d'aplatir le tableau\n"
 
-#: extension/rwarray.c:198
+#: extension/rwarray.c:198 extension/rwarray0.c:183
 #, c-format
 msgid "write_array: could not release flattened array\n"
 msgstr "write_array : impossible de libérer le tableau aplati\n"
 
-#: extension/rwarray.c:280
+#: extension/rwarray.c:280 extension/rwarray0.c:265
 msgid "reada: called with too many arguments"
 msgstr "reada : appelé avec trop d'arguments"
 
-#: extension/rwarray.c:287
+#: extension/rwarray.c:287 extension/rwarray0.c:272
 #, c-format
 msgid "do_reada: argument 0 is not a string\n"
 msgstr "do_reada : l'argument 0 n'est pas une chaîne\n"
 
-#: extension/rwarray.c:293
+#: extension/rwarray.c:293 extension/rwarray0.c:278
 #, c-format
 msgid "do_reada: argument 1 is not an array\n"
 msgstr "do_reada : l'argument 1 n'est pas un tableau\n"
 
-#: extension/rwarray.c:337
+#: extension/rwarray.c:337 extension/rwarray0.c:322
 #, c-format
 msgid "do_reada: clear_array failed\n"
 msgstr "do_reada : échec de clear_array\n"
 
-#: extension/rwarray.c:374
+#: extension/rwarray.c:374 extension/rwarray0.c:358
 #, c-format
 msgid "read_array: set_array_element failed\n"
 msgstr "read_array : échec de set_array_element\n"
@@ -2454,88 +2490,88 @@ msgstr "sleep : l'argument est négatif"
 msgid "sleep: not supported on this platform"
 msgstr "sleep : n'est pas disponible sur cette plateforme"
 
-#: field.c:345
+#: field.c:346
 msgid "NF set to negative value"
 msgstr "une valeur négative a été assignée à NF"
 
-#: field.c:971 field.c:978 field.c:982
+#: field.c:958 field.c:965 field.c:969
 msgid "split: fourth argument is a gawk extension"
 msgstr "split : le 4e argument est une extension gawk"
 
-#: field.c:975
+#: field.c:962
 msgid "split: fourth argument is not an array"
 msgstr "split : le 4e argument n'est pas un tableau"
 
-#: field.c:989
+#: field.c:976
 msgid "split: second argument is not an array"
 msgstr "split : le 2e argument n'est pas un tableau"
 
-#: field.c:993
+#: field.c:980
 msgid "split: cannot use the same array for second and fourth args"
 msgstr "split : impossible d'utiliser le même tableau comme 2e et 4e argument"
 
-#: field.c:998
+#: field.c:985
 msgid "split: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "split : impossible d'utiliser un sous-tableau du 2e argument en 4e argument"
 
-#: field.c:1001
+#: field.c:988
 msgid "split: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "split : impossible d'utiliser un sous-tableau du 4e argument en 2e argument"
 
-#: field.c:1032
+#: field.c:1019
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split : utiliser une chaîne vide en 3e argument est une extension gawk"
 
-#: field.c:1072
+#: field.c:1059
 msgid "patsplit: fourth argument is not an array"
 msgstr "patsplit : le 4e argument n'est pas un tableau"
 
-#: field.c:1077
+#: field.c:1064
 msgid "patsplit: second argument is not an array"
 msgstr "patsplit : le 2e argument n'est pas un tableau"
 
-#: field.c:1083
+#: field.c:1070
 msgid "patsplit: third argument must be non-null"
 msgstr "patsplit : le 3e argument n'est pas un tableau"
 
-#: field.c:1087
+#: field.c:1074
 msgid "patsplit: cannot use the same array for second and fourth args"
 msgstr ""
 "patsplit : impossible d'utiliser le même tableau comme 2e et 4e argument"
 
-#: field.c:1092
+#: field.c:1079
 msgid "patsplit: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "patsplit : impossible d'utiliser un sous-tableau du 2e argument en 4e "
 "argument"
 
-#: field.c:1095
+#: field.c:1082
 msgid "patsplit: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "patsplit : impossible d'utiliser un sous-tableau du 4e argument en 2e "
 "argument"
 
-#: field.c:1133
+#: field.c:1120
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "« FIELDWIDTHS » est une extension gawk"
 
-#: field.c:1197
+#: field.c:1184
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "valeur de FIELDWIDTHS incorrecte, près de « %s »"
 
-#: field.c:1270
+#: field.c:1257
 msgid "null string for `FS' is a gawk extension"
 msgstr "utiliser une chaîne vide pour « FS » est une extension gawk"
 
-#: field.c:1274
+#: field.c:1261
 msgid "old awk does not support regexps as value of `FS'"
 msgstr ""
 "l'ancien awk n'accepte pas les expr. rationnelles comme valeur de « FS »"
 
-#: field.c:1393
+#: field.c:1380
 msgid "`FPAT' is a gawk extension"
 msgstr "« FPAT » est une extension gawk"
 
@@ -2551,20 +2587,20 @@ msgstr "node_to_awk_value : node nul reçu"
 msgid "node_to_awk_value: received null val"
 msgstr "node_to_awk_value : val nul reçu"
 
-#: gawkapi.c:807
+#: gawkapi.c:809
 msgid "remove_element: received null array"
 msgstr "remove_element : tableau nul reçu"
 
-#: gawkapi.c:810
+#: gawkapi.c:812
 msgid "remove_element: received null subscript"
 msgstr "remove_element : indice nul reçu"
 
-#: gawkapi.c:947
+#: gawkapi.c:949
 #, c-format
 msgid "api_flatten_array: could not convert index %d\n"
 msgstr "api_flatten_array : impossible de convertir l'indice %d\n"
 
-#: gawkapi.c:952
+#: gawkapi.c:954
 #, c-format
 msgid "api_flatten_array: could not convert value %d\n"
 msgstr "api_flatten_array : impossible de convertir la valeur %d\n"
@@ -2624,312 +2660,293 @@ msgstr "%s : l'option « -W %s » n'accepte pas d'argument\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s : l'option « -W %s » nécessite un argument\n"
 
-#: io.c:392
+#: io.c:423
 #, c-format
 msgid "command line argument `%s' is a directory: skipped"
 msgstr "L'argument « %s » de la ligne de commande est un répertoire : ignoré"
 
-#: io.c:395 io.c:513
+#: io.c:426 io.c:544
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "impossible d'ouvrir le fichier « %s » en lecture (%s)"
 
-#: io.c:640
+#: io.c:671
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "échec de la fermeture du fd %d (« %s ») : %s"
 
-#: io.c:716
+#: io.c:749
 msgid "redirection not allowed in sandbox mode"
 msgstr "les redirections sont interdites en isolement (mode sandbox)"
 
-#: io.c:750
+#: io.c:783
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "l'expression dans la redirection « %s » n'a qu'une valeur numérique"
 
-#: io.c:756
+#: io.c:789
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "l'expression dans la redirection « %s » donne une chaîne nulle"
 
-#: io.c:761
+#: io.c:794
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "le fichier « %s » de la redirection « %s » pourrait être le résultat d'une "
 "expression booléenne"
 
-#: io.c:809
+#: io.c:842
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "mélange non nécessaire de « > » et « >> » pour le fichier « %.*s »"
 
-#: io.c:863
+#: io.c:896
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "impossible d'ouvrir le tube « %s » en sortie (%s)"
 
-#: io.c:873
+#: io.c:906
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "impossible d'ouvrir le tube « %s » en entrée (%s)"
 
-#: io.c:904
+#: io.c:937
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr ""
 "impossible d'ouvrir un tube bidirectionnel « %s » en entrées-sorties (%s)"
 
-#: io.c:986
+#: io.c:1019
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "impossible de rediriger depuis « %s » (%s)"
 
-#: io.c:989
+#: io.c:1022
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "impossible de rediriger vers « %s » (%s)"
 
-#: io.c:1040
+#: io.c:1073
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "limite système du nombre de fichiers ouverts atteinte : début du "
 "multiplexage des descripteurs de fichiers"
 
-#: io.c:1056
+#: io.c:1089
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "échec de la fermeture de « %s » (%s)."
 
-#: io.c:1064
+#: io.c:1097
 msgid "too many pipes or input files open"
 msgstr "trop de fichiers d'entrées ou de tubes ouverts"
 
-#: io.c:1086
+#: io.c:1119
 msgid "close: second argument must be `to' or `from'"
 msgstr "close : le second argument doit être « to » ou « from »"
 
-#: io.c:1103
+#: io.c:1136
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr ""
 "close : « %.*s » n'est ni un fichier ouvert, ni un tube ou un co-processus"
 
-#: io.c:1108
+#: io.c:1141
 msgid "close of redirection that was never opened"
 msgstr "fermeture d'une redirection qui n'a jamais été ouverte"
 
-#: io.c:1205
+#: io.c:1238
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close : la redirection « %s » n'a pas été ouverte avec « |& », second "
 "argument ignoré"
 
-#: io.c:1222
+#: io.c:1255
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "résultat d'échec (%d) sur la fermeture du tube « %s » (%s)"
 
-#: io.c:1225
+#: io.c:1258
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "résultat d'échec (%d) sur la fermeture du fichier « %s » (%s)"
 
-#: io.c:1245
+#: io.c:1278
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "aucune fermeture explicite du connecteur « %s » fournie"
 
-#: io.c:1248
+#: io.c:1281
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "aucune fermeture explicite du co-processus « %s » fournie"
 
-#: io.c:1251
+#: io.c:1284
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "aucune fermeture explicite du tube « %s » fournie"
 
-#: io.c:1254
+#: io.c:1287
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "aucune fermeture explicite du fichier « %s » fournie"
 
-#: io.c:1284 io.c:1342 main.c:864 main.c:906
+#: io.c:1317 io.c:1375 main.c:628 main.c:670
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "erreur lors de l'écriture vers la sortie standard (%s)"
 
-#: io.c:1289 io.c:1348 main.c:866
+#: io.c:1322 io.c:1381 main.c:630
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "erreur lors de l'écriture vers l'erreur standard (%s)"
 
-#: io.c:1297
+#: io.c:1330
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "échec du vidage du tube « %s » (%s)."
 
-#: io.c:1300
+#: io.c:1333
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "échec du vidage du tube vers « %s » par le co-processus (%s)."
 
-#: io.c:1303
+#: io.c:1336
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "échec du vidage vers le fichier « %s » (%s)."
 
-#: io.c:1420
+#: io.c:1453
 #, c-format
 msgid "local port %s invalid in `/inet'"
 msgstr "le port local %s n'est pas valide dans « /inet »"
 
-#: io.c:1438
+#: io.c:1471
 #, c-format
 msgid "remote host and port information (%s, %s) invalid"
 msgstr ""
 "les informations sur l'hôte et le port distants (%s, %s) ne sont pas valides"
 
-#: io.c:1590
-#, c-format
-msgid "no (known) protocol supplied in special filename `%s'"
-msgstr ""
-"aucun protocole (connu) n'a été fourni dans le nom de fichier spécial « %s »"
-
-#: io.c:1604
-#, c-format
-msgid "special file name `%s' is incomplete"
-msgstr "nom de fichier spécial « %s » incomplet"
-
-#: io.c:1621
-msgid "must supply a remote hostname to `/inet'"
-msgstr "un nom d'hôte distant doit être fourni à « /inet »"
-
-#: io.c:1639
-msgid "must supply a remote port to `/inet'"
-msgstr "un port distant doit être fourni à « /inet »"
-
-#: io.c:1685
+#: io.c:1673
 msgid "TCP/IP communications are not supported"
 msgstr "les communications TCP/IP ne sont pas disponibles"
 
-#: io.c:1867
+#: io.c:1854
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "impossible d'ouvrir « %s », mode « %s »"
 
-#: io.c:1917
+#: io.c:1904
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "échec de la fermeture du pty maître (%s)"
 
-#: io.c:1919 io.c:2105 io.c:2305
+#: io.c:1906 io.c:2092 io.c:2293
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "échec de la fermeture de stdout du processus fils (%s)"
 
-#: io.c:1922
+#: io.c:1909
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 "échec du déplacement du pty esclave vers le stdout du processus fils (dup : "
 "%s)"
 
-#: io.c:1924 io.c:2110
+#: io.c:1911 io.c:2097
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "échec de fermeture du stdin du processus fils (%s)"
 
-#: io.c:1927
+#: io.c:1914
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 "échec du déplacement du pty esclave vers le stdin du processus fils (dup : "
 "%s)"
 
-#: io.c:1929 io.c:1951
+#: io.c:1916 io.c:1938
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "échec de la fermeture du pty esclave (%s)"
 
-#: io.c:2040 io.c:2108 io.c:2276 io.c:2308
+#: io.c:2027 io.c:2095 io.c:2264 io.c:2296
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr "échec du déplacement du tube vers stdout du processus fils (dup : %s)"
 
-#: io.c:2047 io.c:2113
+#: io.c:2034 io.c:2100
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr "échec de déplacement du tube vers stdin du processus fils (dup : %s)"
 
-#: io.c:2073 io.c:2298
+#: io.c:2060 io.c:2286
 msgid "restoring stdout in parent process failed\n"
 msgstr "échec de la restauration du stdout dans le processus parent\n"
 
-#: io.c:2081
+#: io.c:2068
 msgid "restoring stdin in parent process failed\n"
 msgstr "échec de la restauration du stdin dans le processus parent\n"
 
-#: io.c:2116 io.c:2310 io.c:2324
+#: io.c:2103 io.c:2298 io.c:2313
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "échec de la fermeture du tube (%s)"
 
-#: io.c:2174
+#: io.c:2162
 msgid "`|&' not supported"
 msgstr "« |& » non disponible"
 
-#: io.c:2261
+#: io.c:2249
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "impossible d'ouvrir le tube « %s » (%s)"
 
-#: io.c:2318
+#: io.c:2307
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "impossible de créer le processus fils pour « %s » (fork : %s)"
 
-#: io.c:2790
+#: io.c:2734
 msgid "register_input_parser: received NULL pointer"
 msgstr "register_input_parser : pointeur NULL reçu"
 
-#: io.c:2818
+#: io.c:2762
 #, c-format
 msgid "input parser `%s' conflicts with previously installed input parser `%s'"
 msgstr ""
 "l'analyseur d'entrée « %s » est en conflit avec l'analyseur « %s » déjà "
 "installé"
 
-#: io.c:2825
+#: io.c:2769
 #, c-format
 msgid "input parser `%s' failed to open `%s'"
 msgstr "l'analyseur d'entrée « %s » n'a pu ouvrir « %s »"
 
-#: io.c:2845
+#: io.c:2789
 msgid "register_output_wrapper: received NULL pointer"
 msgstr "register_output_wrapper : pointeur NULL reçu"
 
-#: io.c:2873
+#: io.c:2817
 #, c-format
 msgid ""
 "output wrapper `%s' conflicts with previously installed output wrapper `%s'"
 msgstr ""
 "le filtre de sortie « %s » est en conflit avec le filtre « %s » déjà installé"
 
-#: io.c:2880
+#: io.c:2824
 #, c-format
 msgid "output wrapper `%s' failed to open `%s'"
 msgstr "le filtre de sortie « %s » n'a pu ouvrir « %s »"
 
-#: io.c:2901
+#: io.c:2845
 msgid "register_output_processor: received NULL pointer"
 msgstr "register_output_processor : pointeur NULL reçu"
 
-#: io.c:2930
+#: io.c:2874
 #, c-format
 msgid ""
 "two-way processor `%s' conflicts with previously installed two-way processor "
@@ -2938,216 +2955,203 @@ msgstr ""
 "le gestionnaire bidirectionnel « %s » est en conflit avec le gestionnaire "
 "« %s » déjà installé"
 
-#: io.c:2939
+#: io.c:2883
 #, c-format
 msgid "two way processor `%s' failed to open `%s'"
 msgstr "le gestionnaire bidirectionnel « %s » n'a pu ouvrir « %s »"
 
-#: io.c:3064
+#: io.c:3008
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "le fichier de données « %s » est vide"
 
-#: io.c:3106 io.c:3114
+#: io.c:3050 io.c:3058
 msgid "could not allocate more input memory"
 msgstr "impossible d'allouer plus de mémoire d'entrée"
 
-#: io.c:3682
+#: io.c:3636
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr ""
 "l'utilisation d'un « RS » de plusieurs caractères est une extension gawk"
 
-#: io.c:3771
+#: io.c:3783
 msgid "IPv6 communication is not supported"
 msgstr "les communications IPv6 ne sont pas disponibles"
 
-#: main.c:405
-msgid "empty argument to `-e/--source' ignored"
-msgstr "argument vide de l'option « -e / --source » ignoré"
-
-#: main.c:495
-#, c-format
-msgid "%s: option `-W %s' unrecognized, ignored\n"
-msgstr "%s : option « -W %s » non reconnue, ignorée\n"
-
-#: main.c:541
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s : l'option requiert un argument - %c\n"
-
-#: main.c:562
+#: main.c:321
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
 "variable d'environnement « POSIXLY__CORRECT » définie : activation de « --"
 "posix »"
 
-#: main.c:568
+#: main.c:327
 msgid "`--posix' overrides `--traditional'"
 msgstr "« --posix » prend le pas sur « --traditional »"
 
-#: main.c:579
+#: main.c:338
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr ""
 "« --posix » et « --traditional » prennent le pas sur « --non-decimal-data »"
 
-#: main.c:583
+#: main.c:342
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr ""
 "l'exécution de %s en mode setuid root peut être un problème de sécurité"
 
-#: main.c:588
+#: main.c:346
 msgid "`--posix' overrides `--characters-as-bytes'"
 msgstr "« --posix » prend le pas sur « --characters-as-bytes »"
 
-#: main.c:647
+#: main.c:404
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "impossible d'activer le mode binaire sur stdin (%s)"
 
-#: main.c:650
+#: main.c:407
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "impossible d'activer le mode binaire sur stdout (%s)"
 
-#: main.c:652
+#: main.c:409
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "impossible d'activer le mode binaire sur stderr (%s)"
 
-#: main.c:710
+#: main.c:469
 msgid "no program text at all!"
 msgstr "aucun programme !"
 
-#: main.c:799
+#: main.c:563
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 "Utilisation : %s [options GNU ou POSIX] -f fichier_prog [--] fichier ...\n"
 
-#: main.c:801
+#: main.c:565
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
 "Utilisation : %s [options GNU ou POSIX] [--] %cprogramme%c fichier ...\n"
 
-#: main.c:806
+#: main.c:570
 msgid "POSIX options:\t\tGNU long options: (standard)\n"
 msgstr "Options POSIX :\t\tOptions longues GNU : (standard)\n"
 
-#: main.c:807
+#: main.c:571
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f fichier_prog\t\t--file=fichier_prog\n"
 
-#: main.c:808
+#: main.c:572
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F fs\t\t\t--field-separator=fs\n"
 
-#: main.c:809
+#: main.c:573
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=valeur\t\t--assign=var=valeur\n"
 
-#: main.c:810
+#: main.c:574
 msgid "Short options:\t\tGNU long options: (extensions)\n"
 msgstr "Options POSIX :\t\tOptions longues GNU : (extensions)\n"
 
-#: main.c:811
+#: main.c:575
 msgid "\t-b\t\t\t--characters-as-bytes\n"
 msgstr "\t-b\t\t\t--characters-as-bytes\n"
 
-#: main.c:812
+#: main.c:576
 msgid "\t-c\t\t\t--traditional\n"
 msgstr "\t-c\t\t\t--traditional\n"
 
-#: main.c:813
+#: main.c:577
 msgid "\t-C\t\t\t--copyright\n"
 msgstr "\t-C\t\t\t--copyright\n"
 
-#: main.c:814
+#: main.c:578
 msgid "\t-d[file]\t\t--dump-variables[=file]\n"
 msgstr "\t-d[fichier]\t\t--dump-variables[=fichier]\n"
 
-#: main.c:815
+#: main.c:579
 msgid "\t-D[file]\t\t--debug[=file]\n"
 msgstr "\t-D[fichier]\t\t--debug[=fichier]\n"
 
-#: main.c:816
+#: main.c:580
 msgid "\t-e 'program-text'\t--source='program-text'\n"
 msgstr "\t-e 'programme'\t\t--source='programme'\n"
 
-#: main.c:817
+#: main.c:581
 msgid "\t-E file\t\t\t--exec=file\n"
 msgstr "\t-E fichier\t\t--exec=fichier\n"
 
-#: main.c:818
+#: main.c:582
 msgid "\t-g\t\t\t--gen-pot\n"
 msgstr "\t-g\t\t\t--gen-pot\n"
 
-#: main.c:819
+#: main.c:583
 msgid "\t-h\t\t\t--help\n"
 msgstr "\t-h\t\t\t--help\n"
 
-#: main.c:820
+#: main.c:584
 msgid "\t-i includefile\t\t--include=includefile\n"
 msgstr "\t-i fichier\t\t--include=fichier\n"
 
-#: main.c:821
+#: main.c:585
 msgid "\t-l library\t\t--load=library\n"
 msgstr "\t-l bibliothèque\t\t--load=bibliothèque\n"
 
-#: main.c:822
-msgid "\t-L [fatal]\t\t--lint[=fatal]\n"
+#: main.c:586
+#, fuzzy
+msgid "\t-L[fatal|invalid]\t--lint[=fatal|invalid]\n"
 msgstr "\t-L [fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:823
-msgid "\t-n\t\t\t--non-decimal-data\n"
-msgstr "\t-n\t\t\t--non-decimal-data\n"
-
-#: main.c:824
+#: main.c:587
 msgid "\t-M\t\t\t--bignum\n"
 msgstr "\t-M\t\t\t--bignum\n"
 
-#: main.c:825
+#: main.c:588
 msgid "\t-N\t\t\t--use-lc-numeric\n"
 msgstr "\t-N\t\t\t--use-lc-numeric\n"
 
-#: main.c:826
+#: main.c:589
+msgid "\t-n\t\t\t--non-decimal-data\n"
+msgstr "\t-n\t\t\t--non-decimal-data\n"
+
+#: main.c:590
 msgid "\t-o[file]\t\t--pretty-print[=file]\n"
 msgstr "\t-o[fichier]\t\t--pretty-print[=fichier]\n"
 
-#: main.c:827
+#: main.c:591
 msgid "\t-O\t\t\t--optimize\n"
 msgstr "\t-O\t\t\t--optimize\n"
 
-#: main.c:828
+#: main.c:592
 msgid "\t-p[file]\t\t--profile[=file]\n"
 msgstr "\t-p[fichier]\t\t--profile[=fichier]\n"
 
-#: main.c:829
+#: main.c:593
 msgid "\t-P\t\t\t--posix\n"
 msgstr "\t-P\t\t\t--posix\n"
 
-#: main.c:830
+#: main.c:594
 msgid "\t-r\t\t\t--re-interval\n"
 msgstr "\t-r\t\t\t--re-interval\n"
 
-#: main.c:831
+#: main.c:595
 msgid "\t-S\t\t\t--sandbox\n"
 msgstr "\t-S\t\t\t--sandbox\n"
 
-#: main.c:832
+#: main.c:596
 msgid "\t-t\t\t\t--lint-old\n"
 msgstr "\t-t\t\t\t--lint-old\n"
 
-#: main.c:833
+#: main.c:597
 msgid "\t-V\t\t\t--version\n"
 msgstr "\t-V\t\t\t--version\n"
 
-#: main.c:835
+#: main.c:599
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:838
+#: main.c:602
 msgid "\t-Y\t\t--parsedebug\n"
 msgstr "\t-Y\t\t--parsedebug\n"
 
@@ -3156,7 +3160,7 @@ msgstr "\t-Y\t\t--parsedebug\n"
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: main.c:847
+#: main.c:611
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -3171,7 +3175,7 @@ msgstr ""
 "<traduc CHEZ traduc POINT org>.\n"
 "\n"
 
-#: main.c:851
+#: main.c:615
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -3181,7 +3185,7 @@ msgstr ""
 "Par défaut, il lit l'entrée standard et écrit sur la sortie standard.\n"
 "\n"
 
-#: main.c:855
+#: main.c:619
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -3191,7 +3195,7 @@ msgstr ""
 "\tgawk '{ somme += $1 }; END { print somme }' fichier\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:880
+#: main.c:644
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
@@ -3211,7 +3215,7 @@ msgstr ""
 "version ultérieure de votre choix.\n"
 "\n"
 
-#: main.c:888
+#: main.c:652
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3226,7 +3230,7 @@ msgstr ""
 "General Public License).\n"
 "\n"
 
-#: main.c:894
+#: main.c:658
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program. If not, see http://www.gnu.org/licenses/.\n"
@@ -3235,16 +3239,16 @@ msgstr ""
 "(GNU General Public License) avec ce programme. Sinon, consultez\n"
 "http://www.gnu.org/licenses/.\n"
 
-#: main.c:931
+#: main.c:695
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft ne définit pas le FS comme étant une tabulation en awk POSIX"
 
-#: main.c:1208
+#: main.c:982
 #, c-format
 msgid "unknown value for field spec: %d\n"
 msgstr "valeur inconnue pour la définition de champ : %d\n"
 
-#: main.c:1306
+#: main.c:1080
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -3253,99 +3257,117 @@ msgstr ""
 "%s : « %s » l'argument de « -v » ne respecte pas la forme « var=valeur »\n"
 "\n"
 
-#: main.c:1332
+#: main.c:1106
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "« %s » n'est pas un nom de variable valide"
 
-#: main.c:1335
+#: main.c:1109
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "« %s » n'est pas un nom de variable, recherche du fichier « %s=%s »"
 
-#: main.c:1339
+#: main.c:1113
 #, c-format
 msgid "cannot use gawk builtin `%s' as variable name"
 msgstr "impossible d'utiliser le mot clef gawk « %s » comme variable"
 
-#: main.c:1344
+#: main.c:1118
 #, c-format
 msgid "cannot use function `%s' as variable name"
 msgstr "impossible d'utiliser la fonction « %s » comme variable"
 
-#: main.c:1397
+#: main.c:1171
 msgid "floating point exception"
 msgstr "exception du traitement en virgule flottante"
 
-#: main.c:1404
+#: main.c:1178
 msgid "fatal error: internal error"
 msgstr "fatal : erreur interne"
 
-#: main.c:1419
+#: main.c:1193
 msgid "fatal error: internal error: segfault"
 msgstr "fatal : erreur interne : erreur de segmentation"
 
-#: main.c:1431
+#: main.c:1205
 msgid "fatal error: internal error: stack overflow"
 msgstr "fatal : erreur interne : débordement de la pile"
 
-#: main.c:1490
+#: main.c:1264
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "aucun descripteur fd %d pré-ouvert"
 
-#: main.c:1497
+#: main.c:1271
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "impossible de pré-ouvrir /dev/null pour le descripteur fd %d"
 
-#: mpfr.c:550
+#: main.c:1485
+msgid "empty argument to `-e/--source' ignored"
+msgstr "argument vide de l'option « -e / --source » ignoré"
+
+#: main.c:1556
+msgid "-M ignored: MPFR/GMP support not compiled in"
+msgstr ""
+
+#: main.c:1577
+#, c-format
+msgid "%s: option `-W %s' unrecognized, ignored\n"
+msgstr "%s : option « -W %s » non reconnue, ignorée\n"
+
+#: main.c:1630
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s : l'option requiert un argument - %c\n"
+
+#: mpfr.c:557
 #, c-format
 msgid "PREC value `%.*s' is invalid"
 msgstr "la valeur « %.*s » de PREC est incorrecte"
 
-#: mpfr.c:608
+#: mpfr.c:615
 #, c-format
 msgid "RNDMODE value `%.*s' is invalid"
 msgstr "la valeur « %.*s » de RNDMODE est incorrecte"
 
-#: mpfr.c:698
+#: mpfr.c:711
 #, c-format
 msgid "%s: received non-numeric argument"
 msgstr "%s : argument reçu non numérique"
 
-#: mpfr.c:800
+#: mpfr.c:820
 msgid "compl(%Rg): negative value will give strange results"
 msgstr "compl(%Rg) : les valeurs négatives donneront des résultats inattendus"
 
-#: mpfr.c:804
+#: mpfr.c:824
 msgid "comp(%Rg): fractional value will be truncated"
 msgstr "compl(%Rg) : les valeurs non entières seront tronquées"
 
-#: mpfr.c:816
+#: mpfr.c:836
 #, c-format
 msgid "cmpl(%Zd): negative values will give strange results"
 msgstr "compl(%Zd) : les valeurs négatives donneront des résultats inattendus"
 
-#: mpfr.c:835
+#: mpfr.c:855
 #, c-format
 msgid "%s: received non-numeric argument #%d"
 msgstr "%s : argument reçu non numérique #%d"
 
-#: mpfr.c:845
+#: mpfr.c:865
 msgid "%s: argument #%d has invalid value %Rg, using 0"
 msgstr "%s : l'argument #%d a une valeur incorrecte %Rg, utilisation de 0"
 
-#: mpfr.c:857
+#: mpfr.c:877
 msgid "%s: argument #%d negative value %Rg will give strange results"
 msgstr ""
 "%s : argument #%d : la valeur négative %Rg donnera des résultats inattendus"
 
-#: mpfr.c:863
+#: mpfr.c:883
 msgid "%s: argument #%d fractional value %Rg will be truncated"
 msgstr "%s : argument #%d : la valeur non entière %Rg sera tronquée"
 
-#: mpfr.c:878
+#: mpfr.c:898
 #, c-format
 msgid "%s: argument #%d negative value %Zd will give strange results"
 msgstr ""
@@ -3356,24 +3378,24 @@ msgstr ""
 msgid "cmd. line:"
 msgstr "ligne de commande:"
 
-#: node.c:421
+#: node.c:409
 msgid "backslash at end of string"
 msgstr "barre oblique inverse à la fin de la chaîne"
 
-#: node.c:500
+#: node.c:488
 #, c-format
 msgid "old awk does not support the `\\%c' escape sequence"
 msgstr "l'ancien awk ne dispose pas de la séquence d'échappement « \\%c »"
 
-#: node.c:551
+#: node.c:539
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX n'autorise pas les séquences d'échappement « \\x »"
 
-#: node.c:557
+#: node.c:545
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "aucun chiffre hexadécimal dans la séquence d'échappement « \\x » "
 
-#: node.c:579
+#: node.c:567
 #, c-format
 msgid ""
 "hex escape \\x%.*s of %d characters probably not interpreted the way you "
@@ -3382,12 +3404,12 @@ msgstr ""
 "la séquence d'échappement hexa. \\x%.*s de %d caractères ne sera "
 "probablement pas interprétée comme vous l'imaginez"
 
-#: node.c:594
+#: node.c:582
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "séquence d'échappement « \\%c » traitée comme un simple « %c »"
 
-#: node.c:739
+#: node.c:726
 msgid ""
 "Invalid multibyte data detected. There may be a mismatch between your data "
 "and your locale."
@@ -3417,12 +3439,12 @@ msgid "sending profile to standard error"
 msgstr "envoi du profil vers la sortie d'erreur standard"
 
 #: profile.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t# %s block(s)\n"
+"\t# %s rule(s)\n"
 "\n"
 msgstr ""
-"\t# Bloc(s) %s\n"
+"\t# Règle(s)\n"
 "\n"
 
 #: profile.c:198
@@ -3439,11 +3461,11 @@ msgstr ""
 msgid "internal error: %s with null vname"
 msgstr "erreur interne : %s avec un vname nul"
 
-#: profile.c:537
+#: profile.c:538
 msgid "internal error: builtin with null fname"
 msgstr "erreur interne : fonction interne avec un fname nul"
 
-#: profile.c:949
+#: profile.c:958
 #, c-format
 msgid ""
 "\t# Loaded extensions (-l and/or @load)\n"
@@ -3452,12 +3474,12 @@ msgstr ""
 "\t# Extensions chargées (-l ou @load)\n"
 "\n"
 
-#: profile.c:972
+#: profile.c:981
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# profile gawk, créé %s\n"
 
-#: profile.c:1475
+#: profile.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -3466,7 +3488,7 @@ msgstr ""
 "\n"
 "\t# Fonctions, par ordre alphabétique\n"
 
-#: profile.c:1513
+#: profile.c:1559
 #, c-format
 msgid "redir2str: unknown redirection type %d"
 msgstr "redir2str : type de redirection %d inconnu"
@@ -3478,73 +3500,112 @@ msgstr ""
 "le composant d'expression rationnelle « %.*s » devrait probablement être "
 "« [%.*s] »"
 
-#: regcomp.c:131
+#: regcomp.c:139
 msgid "Success"
 msgstr "Succès"
 
-#: regcomp.c:134
+#: regcomp.c:142
 msgid "No match"
 msgstr "Aucune correspondance"
 
-#: regcomp.c:137
+#: regcomp.c:145
 msgid "Invalid regular expression"
 msgstr "Expression rationnelle incorrecte"
 
-#: regcomp.c:140
+#: regcomp.c:148
 msgid "Invalid collation character"
 msgstr "Caractère d'interclassement incorrect"
 
-#: regcomp.c:143
+#: regcomp.c:151
 msgid "Invalid character class name"
 msgstr "Nom de classe de caractères incorrect"
 
-#: regcomp.c:146
+#: regcomp.c:154
 msgid "Trailing backslash"
 msgstr "Barre oblique inverse finale"
 
-#: regcomp.c:149
+#: regcomp.c:157
 msgid "Invalid back reference"
 msgstr "Référence arrière incorrecte"
 
-#: regcomp.c:152
-msgid "Unmatched [ or [^"
+#: regcomp.c:160
+#, fuzzy
+msgid "Unmatched [, [^, [:, [., or [="
 msgstr "[ ou [^ sans correspondance"
 
-#: regcomp.c:155
+#: regcomp.c:163
 msgid "Unmatched ( or \\("
 msgstr "( ou \\( sans correspondance"
 
-#: regcomp.c:158
+#: regcomp.c:166
 msgid "Unmatched \\{"
 msgstr "\\{ sans correspondance"
 
-#: regcomp.c:164
+#: regcomp.c:169
+msgid "Invalid content of \\{\\}"
+msgstr "Contenu de \\{\\} incorrect"
+
+#: regcomp.c:172
 msgid "Invalid range end"
 msgstr "Borne finale non valable"
 
-#: regcomp.c:167
+#: regcomp.c:175
 msgid "Memory exhausted"
 msgstr "Mémoire épuisée"
 
-#: regcomp.c:170
+#: regcomp.c:178
 msgid "Invalid preceding regular expression"
 msgstr "Expression rationnelle précédente incorrecte"
 
-#: regcomp.c:173
+#: regcomp.c:181
 msgid "Premature end of regular expression"
 msgstr "Fin prématurée de l'expression rationnelle"
 
-#: regcomp.c:179
+#: regcomp.c:184
+msgid "Regular expression too big"
+msgstr "Expression rationnelle trop grande"
+
+#: regcomp.c:187
 msgid "Unmatched ) or \\)"
 msgstr ") ou \\) sans correspondance"
 
-#: regcomp.c:704
+#: regcomp.c:712
 msgid "No previous regular expression"
 msgstr "Aucune expression rationnelle précédente"
 
-#: symbol.c:741
+#: symbol.c:677
+#, fuzzy, c-format
+msgid "function `%s': can't use function `%s' as a parameter name"
+msgstr ""
+"fonction « %s » : impossible d'utiliser un nom de fonction comme paramètre"
+
+#: symbol.c:809
 msgid "can not pop main context"
 msgstr "impossible de rétablir (pop) le contexte principal (main)"
 
+#~ msgid "`getline var' invalid inside `%s' rule"
+#~ msgstr "« getline var » n'est pas valable dans une règle « %s »"
+
+#~ msgid "no (known) protocol supplied in special filename `%s'"
+#~ msgstr ""
+#~ "aucun protocole (connu) n'a été fourni dans le nom de fichier spécial "
+#~ "« %s »"
+
+#~ msgid "special file name `%s' is incomplete"
+#~ msgstr "nom de fichier spécial « %s » incomplet"
+
+#~ msgid "must supply a remote hostname to `/inet'"
+#~ msgstr "un nom d'hôte distant doit être fourni à « /inet »"
+
+#~ msgid "must supply a remote port to `/inet'"
+#~ msgstr "un port distant doit être fourni à « /inet »"
+
+#~ msgid ""
+#~ "\t# %s block(s)\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\t# Bloc(s) %s\n"
+#~ "\n"
+
 #~ msgid "range of the form `[%c-%c]' is locale dependent"
 #~ msgstr "les plages « [%c-%c] » sont dépendantes des paramètres régionaux"
diff --git a/po/gawk.pot b/po/gawk.pot
index bb47fa9e..7f778872 100644
--- a/po/gawk.pot
+++ b/po/gawk.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gawk 4.1.1\n"
-"Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2014-04-08 19:23+0300\n"
+"Project-Id-Version: gawk 4.1.1c\n"
+"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
+"POT-Creation-Date: 2015-02-26 20:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,9 +36,9 @@ msgstr ""
 msgid "attempt to use scalar `%s' as an array"
 msgstr ""
 
-#: array.c:409 array.c:576 builtin.c:85 builtin.c:1615 builtin.c:1661
-#: builtin.c:1674 builtin.c:2102 builtin.c:2116 eval.c:1122 eval.c:1126
-#: eval.c:1531
+#: array.c:409 array.c:576 builtin.c:85 builtin.c:1606 builtin.c:1652
+#: builtin.c:1665 builtin.c:2092 builtin.c:2106 eval.c:1149 eval.c:1153
+#: eval.c:1558
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr ""
@@ -89,422 +89,427 @@ msgstr ""
 msgid "asorti: cannot use a subarray of second arg for first arg"
 msgstr ""
 
-#: array.c:1314
+#: array.c:1313
 #, c-format
 msgid "`%s' is invalid as a function name"
 msgstr ""
 
-#: array.c:1318
+#: array.c:1317
 #, c-format
 msgid "sort comparison function `%s' is not defined"
 msgstr ""
 
-#: awkgram.y:233
+#: awkgram.y:226
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr ""
 
-#: awkgram.y:236
+#: awkgram.y:229
 msgid "each rule must have a pattern or an action part"
 msgstr ""
 
-#: awkgram.y:325 awkgram.y:336
+#: awkgram.y:320 awkgram.y:331
 msgid "old awk does not support multiple `BEGIN' or `END' rules"
 msgstr ""
 
-#: awkgram.y:373
+#: awkgram.y:368
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr ""
 
-#: awkgram.y:419
+#: awkgram.y:417
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr ""
 
-#: awkgram.y:423
+#: awkgram.y:421
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr ""
 
-#: awkgram.y:515
+#: awkgram.y:513
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr ""
 
-#: awkgram.y:536
+#: awkgram.y:534
 msgid "duplicate `default' detected in switch body"
 msgstr ""
 
-#: awkgram.y:796 awkgram.y:3723
+#: awkgram.y:794 awkgram.y:3751
 msgid "`break' is not allowed outside a loop or switch"
 msgstr ""
 
-#: awkgram.y:805 awkgram.y:3715
+#: awkgram.y:803 awkgram.y:3743
 msgid "`continue' is not allowed outside a loop"
 msgstr ""
 
-#: awkgram.y:815
+#: awkgram.y:813
 #, c-format
 msgid "`next' used in %s action"
 msgstr ""
 
-#: awkgram.y:824
+#: awkgram.y:822
 #, c-format
 msgid "`nextfile' used in %s action"
 msgstr ""
 
-#: awkgram.y:848
+#: awkgram.y:846
 msgid "`return' used outside function context"
 msgstr ""
 
-#: awkgram.y:922
+#: awkgram.y:920
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 
-#: awkgram.y:988 awkgram.y:1037
+#: awkgram.y:986 awkgram.y:1035
 msgid "`delete' is not allowed with SYMTAB"
 msgstr ""
 
-#: awkgram.y:990 awkgram.y:1039
+#: awkgram.y:988 awkgram.y:1037
 msgid "`delete' is not allowed with FUNCTAB"
 msgstr ""
 
-#: awkgram.y:1024 awkgram.y:1028
+#: awkgram.y:1022 awkgram.y:1026
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr ""
 
-#: awkgram.y:1149
+#: awkgram.y:1147
 msgid "multistage two-way pipelines don't work"
 msgstr ""
 
-#: awkgram.y:1264
+#: awkgram.y:1262
 msgid "regular expression on right of assignment"
 msgstr ""
 
-#: awkgram.y:1275
+#: awkgram.y:1273
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr ""
 
-#: awkgram.y:1291 awkgram.y:1442
+#: awkgram.y:1289 awkgram.y:1431
 msgid "old awk does not support the keyword `in' except after `for'"
 msgstr ""
 
-#: awkgram.y:1301
+#: awkgram.y:1299
 msgid "regular expression on right of comparison"
 msgstr ""
 
-#: awkgram.y:1417
+#: awkgram.y:1411
 #, c-format
-msgid "`getline var' invalid inside `%s' rule"
+msgid "non-redirected `getline' invalid inside `%s' rule"
 msgstr ""
 
-#: awkgram.y:1420
-#, c-format
-msgid "`getline' invalid inside `%s' rule"
-msgstr ""
-
-#: awkgram.y:1425
+#: awkgram.y:1414
 msgid "non-redirected `getline' undefined inside END action"
 msgstr ""
 
-#: awkgram.y:1444
+#: awkgram.y:1433
 msgid "old awk does not support multidimensional arrays"
 msgstr ""
 
-#: awkgram.y:1541
+#: awkgram.y:1530
 msgid "call of `length' without parentheses is not portable"
 msgstr ""
 
-#: awkgram.y:1607
+#: awkgram.y:1596
 msgid "indirect function calls are a gawk extension"
 msgstr ""
 
-#: awkgram.y:1620
+#: awkgram.y:1609
 #, c-format
 msgid "can not use special variable `%s' for indirect function call"
 msgstr ""
 
-#: awkgram.y:1698
+#: awkgram.y:1635
+#, c-format
+msgid "attempt to use non-function `%s' in function call"
+msgstr ""
+
+#: awkgram.y:1699
 msgid "invalid subscript expression"
 msgstr ""
 
-#: awkgram.y:2048 awkgram.y:2068 gawkapi.c:206 gawkapi.c:224 msg.c:126
+#: awkgram.y:2045 awkgram.y:2065 gawkapi.c:206 gawkapi.c:224 msg.c:126
 msgid "warning: "
 msgstr ""
 
-#: awkgram.y:2066 gawkapi.c:192 gawkapi.c:221 msg.c:158
+#: awkgram.y:2063 gawkapi.c:192 gawkapi.c:221 msg.c:158
 msgid "fatal: "
 msgstr ""
 
-#: awkgram.y:2116
+#: awkgram.y:2113
 msgid "unexpected newline or end of string"
 msgstr ""
 
-#: awkgram.y:2383 awkgram.y:2459 awkgram.y:2682 debug.c:523 debug.c:539
+#: awkgram.y:2392 awkgram.y:2468 awkgram.y:2691 debug.c:523 debug.c:539
 #: debug.c:2812 debug.c:5055
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr ""
 
-#: awkgram.y:2384 awkgram.y:2509
+#: awkgram.y:2393 awkgram.y:2518
 #, c-format
 msgid "can't open shared library `%s' for reading (%s)"
 msgstr ""
 
-#: awkgram.y:2386 awkgram.y:2460 awkgram.y:2510 builtin.c:135 debug.c:5206
+#: awkgram.y:2395 awkgram.y:2469 awkgram.y:2519 builtin.c:135 debug.c:5206
 msgid "reason unknown"
 msgstr ""
 
-#: awkgram.y:2395 awkgram.y:2419
+#: awkgram.y:2404 awkgram.y:2428
 #, c-format
 msgid "can't include `%s' and use it as a program file"
 msgstr ""
 
-#: awkgram.y:2408
+#: awkgram.y:2417
 #, c-format
 msgid "already included source file `%s'"
 msgstr ""
 
-#: awkgram.y:2409
+#: awkgram.y:2418
 #, c-format
 msgid "already loaded shared library `%s'"
 msgstr ""
 
-#: awkgram.y:2444
+#: awkgram.y:2453
 msgid "@include is a gawk extension"
 msgstr ""
 
-#: awkgram.y:2450
+#: awkgram.y:2459
 msgid "empty filename after @include"
 msgstr ""
 
-#: awkgram.y:2494
+#: awkgram.y:2503
 msgid "@load is a gawk extension"
 msgstr ""
 
-#: awkgram.y:2500
+#: awkgram.y:2509
 msgid "empty filename after @load"
 msgstr ""
 
-#: awkgram.y:2634
+#: awkgram.y:2643
 msgid "empty program text on command line"
 msgstr ""
 
-#: awkgram.y:2749
+#: awkgram.y:2758
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr ""
 
-#: awkgram.y:2760
+#: awkgram.y:2769
 #, c-format
 msgid "source file `%s' is empty"
 msgstr ""
 
-#: awkgram.y:2937
+#: awkgram.y:2828
+#, c-format
+msgid "PEBKAC error: invalid character '\\%03o' in source code"
+msgstr ""
+
+#: awkgram.y:2959
 msgid "source file does not end in newline"
 msgstr ""
 
-#: awkgram.y:3042
+#: awkgram.y:3062
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr ""
 
-#: awkgram.y:3066
+#: awkgram.y:3089
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:3070
+#: awkgram.y:3093
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:3077
+#: awkgram.y:3100
 msgid "unterminated regexp"
 msgstr ""
 
-#: awkgram.y:3081
+#: awkgram.y:3104
 msgid "unterminated regexp at end of file"
 msgstr ""
 
-#: awkgram.y:3140
+#: awkgram.y:3162
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr ""
 
-#: awkgram.y:3156
+#: awkgram.y:3178
 msgid "backslash not last character on line"
 msgstr ""
 
-#: awkgram.y:3217
+#: awkgram.y:3239
 msgid "POSIX does not allow operator `**='"
 msgstr ""
 
-#: awkgram.y:3219
+#: awkgram.y:3241
 msgid "old awk does not support operator `**='"
 msgstr ""
 
-#: awkgram.y:3228
+#: awkgram.y:3250
 msgid "POSIX does not allow operator `**'"
 msgstr ""
 
-#: awkgram.y:3230
+#: awkgram.y:3252
 msgid "old awk does not support operator `**'"
 msgstr ""
 
-#: awkgram.y:3265
+#: awkgram.y:3287
 msgid "operator `^=' is not supported in old awk"
 msgstr ""
 
-#: awkgram.y:3273
+#: awkgram.y:3295
 msgid "operator `^' is not supported in old awk"
 msgstr ""
 
-#: awkgram.y:3366 awkgram.y:3382 command.y:1178
+#: awkgram.y:3392 awkgram.y:3410 command.y:1180
 msgid "unterminated string"
 msgstr ""
 
-#: awkgram.y:3603
+#: awkgram.y:3631
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr ""
 
-#: awkgram.y:3650
+#: awkgram.y:3678
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr ""
 
-#: awkgram.y:3655
+#: awkgram.y:3683
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr ""
 
-#: awkgram.y:3663
+#: awkgram.y:3691
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr ""
 
-#: awkgram.y:3753
+#: awkgram.y:3781
 msgid "`goto' considered harmful!\n"
 msgstr ""
 
-#: awkgram.y:3787
+#: awkgram.y:3815
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr ""
 
-#: awkgram.y:3822
+#: awkgram.y:3850
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 
-#: awkgram.y:3827
+#: awkgram.y:3855
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr ""
 
-#: awkgram.y:3910 awkgram.y:3913
+#: awkgram.y:3938 awkgram.y:3941
 msgid "match: third argument is a gawk extension"
 msgstr ""
 
-#: awkgram.y:3967 awkgram.y:3970
+#: awkgram.y:3995 awkgram.y:3998
 msgid "close: second argument is a gawk extension"
 msgstr ""
 
-#: awkgram.y:3982
+#: awkgram.y:4010
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 
-#: awkgram.y:3997
+#: awkgram.y:4025
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 
-#: awkgram.y:4016
+#: awkgram.y:4044
 msgid "index: regexp constant as second argument is not allowed"
 msgstr ""
 
-#: awkgram.y:4069
+#: awkgram.y:4097
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr ""
 
-#: awkgram.y:4126 debug.c:4041 debug.c:4084 debug.c:5204
+#: awkgram.y:4154 debug.c:4041 debug.c:4084 debug.c:5204
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr ""
 
-#: awkgram.y:4127
+#: awkgram.y:4155
 msgid "sending variable list to standard error"
 msgstr ""
 
-#: awkgram.y:4135
+#: awkgram.y:4163
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr ""
 
-#: awkgram.y:4160
+#: awkgram.y:4188
 msgid "shadow_funcs() called twice!"
 msgstr ""
 
-#: awkgram.y:4168
+#: awkgram.y:4196
 msgid "there were shadowed variables."
 msgstr ""
 
-#: awkgram.y:4239
+#: awkgram.y:4267
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr ""
 
-#: awkgram.y:4285
+#: awkgram.y:4313
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr ""
 
-#: awkgram.y:4288
+#: awkgram.y:4316
 #, c-format
 msgid "function `%s': can't use special variable `%s' as a function parameter"
 msgstr ""
 
-#: awkgram.y:4296
+#: awkgram.y:4324
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr ""
 
-#: awkgram.y:4383 awkgram.y:4389
+#: awkgram.y:4411 awkgram.y:4417
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr ""
 
-#: awkgram.y:4393
+#: awkgram.y:4421
 #, c-format
 msgid "function `%s' defined but never called directly"
 msgstr ""
 
-#: awkgram.y:4425
+#: awkgram.y:4453
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr ""
 
-#: awkgram.y:4484
+#: awkgram.y:4468
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
 "or used as a variable or an array"
 msgstr ""
 
-#: awkgram.y:4720
+#: awkgram.y:4674
 msgid "division by zero attempted"
 msgstr ""
 
-#: awkgram.y:4729
+#: awkgram.y:4683
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr ""
 
-#: awkgram.y:5049
+#: awkgram.y:5003
 msgid ""
 "cannot assign a value to the result of a field post-increment expression"
 msgstr ""
 
-#: awkgram.y:5052
+#: awkgram.y:5006
 #, c-format
 msgid "invalid target of assignment (opcode %s)"
 msgstr ""
@@ -542,371 +547,387 @@ msgstr ""
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr ""
 
-#: builtin.c:362
+#: builtin.c:351
 msgid "index: received non-string first argument"
 msgstr ""
 
-#: builtin.c:364
+#: builtin.c:353
 msgid "index: received non-string second argument"
 msgstr ""
 
-#: builtin.c:488 mpfr.c:757
+#: builtin.c:466 mpfr.c:777
 msgid "int: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:525
+#: builtin.c:503
 msgid "length: received array argument"
 msgstr ""
 
-#: builtin.c:528
+#: builtin.c:506
 msgid "`length(array)' is a gawk extension"
 msgstr ""
 
-#: builtin.c:544
+#: builtin.c:525
 msgid "length: received non-string argument"
 msgstr ""
 
-#: builtin.c:575
+#: builtin.c:554
 msgid "log: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:578
+#: builtin.c:557
 #, c-format
 msgid "log: received negative argument %g"
 msgstr ""
 
-#: builtin.c:776 builtin.c:781
+#: builtin.c:755 builtin.c:760 builtin.c:911
 msgid "fatal: must use `count$' on all formats or none"
 msgstr ""
 
-#: builtin.c:851
+#: builtin.c:830
 #, c-format
 msgid "field width is ignored for `%%' specifier"
 msgstr ""
 
-#: builtin.c:853
+#: builtin.c:832
 #, c-format
 msgid "precision is ignored for `%%' specifier"
 msgstr ""
 
-#: builtin.c:855
+#: builtin.c:834
 #, c-format
 msgid "field width and precision are ignored for `%%' specifier"
 msgstr ""
 
-#: builtin.c:906
+#: builtin.c:885
 msgid "fatal: `$' is not permitted in awk formats"
 msgstr ""
 
-#: builtin.c:915
+#: builtin.c:894
 msgid "fatal: arg count with `$' must be > 0"
 msgstr ""
 
-#: builtin.c:919
+#: builtin.c:898
 #, c-format
 msgid "fatal: arg count %ld greater than total number of supplied arguments"
 msgstr ""
 
-#: builtin.c:923
+#: builtin.c:902
 msgid "fatal: `$' not permitted after period in format"
 msgstr ""
 
-#: builtin.c:939
+#: builtin.c:921
 msgid "fatal: no `$' supplied for positional field width or precision"
 msgstr ""
 
-#: builtin.c:1009
+#: builtin.c:991
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr ""
 
-#: builtin.c:1013
+#: builtin.c:995
 msgid "fatal: `l' is not permitted in POSIX awk formats"
 msgstr ""
 
-#: builtin.c:1026
+#: builtin.c:1008
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr ""
 
-#: builtin.c:1030
+#: builtin.c:1012
 msgid "fatal: `L' is not permitted in POSIX awk formats"
 msgstr ""
 
-#: builtin.c:1043
+#: builtin.c:1025
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr ""
 
-#: builtin.c:1047
+#: builtin.c:1029
 msgid "fatal: `h' is not permitted in POSIX awk formats"
 msgstr ""
 
-#: builtin.c:1463
+#: builtin.c:1055
+#, c-format
+msgid "[s]printf: value %g is too big for %%c format"
+msgstr ""
+
+#: builtin.c:1068
+#, c-format
+msgid "[s]printf: value %g is not a valid wide character"
+msgstr ""
+
+#: builtin.c:1454
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr ""
 
-#: builtin.c:1561
+#: builtin.c:1552
 #, c-format
 msgid "ignoring unknown format specifier character `%c': no argument converted"
 msgstr ""
 
-#: builtin.c:1566
+#: builtin.c:1557
 msgid "fatal: not enough arguments to satisfy format string"
 msgstr ""
 
-#: builtin.c:1568
+#: builtin.c:1559
 msgid "^ ran out for this one"
 msgstr ""
 
-#: builtin.c:1575
+#: builtin.c:1566
 msgid "[s]printf: format specifier does not have control letter"
 msgstr ""
 
-#: builtin.c:1578
+#: builtin.c:1569
 msgid "too many arguments supplied for format string"
 msgstr ""
 
-#: builtin.c:1634
+#: builtin.c:1625
 msgid "sprintf: no arguments"
 msgstr ""
 
-#: builtin.c:1657 builtin.c:1668
+#: builtin.c:1648 builtin.c:1659
 msgid "printf: no arguments"
 msgstr ""
 
-#: builtin.c:1711
+#: builtin.c:1702
 msgid "sqrt: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:1715
+#: builtin.c:1706
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr ""
 
-#: builtin.c:1746
+#: builtin.c:1737
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr ""
 
-#: builtin.c:1748
+#: builtin.c:1739
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr ""
 
-#: builtin.c:1755
+#: builtin.c:1753
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr ""
 
-#: builtin.c:1760
+#: builtin.c:1758
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
 
-#: builtin.c:1772
+#: builtin.c:1770
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr ""
 
-#: builtin.c:1777
+#: builtin.c:1775
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr ""
 
-#: builtin.c:1802
+#: builtin.c:1798
 msgid "substr: source string is zero length"
 msgstr ""
 
-#: builtin.c:1818
+#: builtin.c:1812
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr ""
 
-#: builtin.c:1826
+#: builtin.c:1820
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
 msgstr ""
 
-#: builtin.c:1900
+#: builtin.c:1890
 msgid "strftime: format value in PROCINFO[\"strftime\"] has numeric type"
 msgstr ""
 
-#: builtin.c:1923
+#: builtin.c:1913
 msgid "strftime: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:1927
+#: builtin.c:1917
 msgid "strftime: second argument less than 0 or too big for time_t"
 msgstr ""
 
-#: builtin.c:1934
+#: builtin.c:1924
 msgid "strftime: received non-string first argument"
 msgstr ""
 
-#: builtin.c:1941
+#: builtin.c:1931
 msgid "strftime: received empty format string"
 msgstr ""
 
-#: builtin.c:2007
+#: builtin.c:1997
 msgid "mktime: received non-string argument"
 msgstr ""
 
-#: builtin.c:2024
+#: builtin.c:2014
 msgid "mktime: at least one of the values is out of the default range"
 msgstr ""
 
-#: builtin.c:2059
+#: builtin.c:2049
 msgid "'system' function not allowed in sandbox mode"
 msgstr ""
 
-#: builtin.c:2064
+#: builtin.c:2054
 msgid "system: received non-string argument"
 msgstr ""
 
-#: builtin.c:2184
+#: builtin.c:2174
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr ""
 
-#: builtin.c:2271
+#: builtin.c:2259
 msgid "tolower: received non-string argument"
 msgstr ""
 
-#: builtin.c:2305
+#: builtin.c:2290
 msgid "toupper: received non-string argument"
 msgstr ""
 
-#: builtin.c:2341 mpfr.c:672
+#: builtin.c:2323 mpfr.c:679
 msgid "atan2: received non-numeric first argument"
 msgstr ""
 
-#: builtin.c:2343 mpfr.c:674
+#: builtin.c:2325 mpfr.c:681
 msgid "atan2: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:2362
+#: builtin.c:2344
 msgid "sin: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:2378
+#: builtin.c:2360
 msgid "cos: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:2431 mpfr.c:1156
+#: builtin.c:2413 mpfr.c:1176
 msgid "srand: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:2462
+#: builtin.c:2444
 msgid "match: third argument is not an array"
 msgstr ""
 
-#: builtin.c:2734
-msgid "gensub: third argument of 0 treated as 1"
+#: builtin.c:2705
+#, c-format
+msgid "gensub: third argument `%.*s' treated as 1"
 msgstr ""
 
-#: builtin.c:3030
+#: builtin.c:2720
+#, c-format
+msgid "gensub: third argument %g treated as 1"
+msgstr ""
+
+#: builtin.c:3020
 msgid "lshift: received non-numeric first argument"
 msgstr ""
 
-#: builtin.c:3032
+#: builtin.c:3022
 msgid "lshift: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:3038
+#: builtin.c:3028
 #, c-format
 msgid "lshift(%f, %f): negative values will give strange results"
 msgstr ""
 
-#: builtin.c:3040
+#: builtin.c:3030
 #, c-format
 msgid "lshift(%f, %f): fractional values will be truncated"
 msgstr ""
 
-#: builtin.c:3042
+#: builtin.c:3032
 #, c-format
 msgid "lshift(%f, %f): too large shift value will give strange results"
 msgstr ""
 
-#: builtin.c:3067
+#: builtin.c:3057
 msgid "rshift: received non-numeric first argument"
 msgstr ""
 
-#: builtin.c:3069
+#: builtin.c:3059
 msgid "rshift: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:3075
+#: builtin.c:3065
 #, c-format
 msgid "rshift(%f, %f): negative values will give strange results"
 msgstr ""
 
-#: builtin.c:3077
+#: builtin.c:3067
 #, c-format
 msgid "rshift(%f, %f): fractional values will be truncated"
 msgstr ""
 
-#: builtin.c:3079
+#: builtin.c:3069
 #, c-format
 msgid "rshift(%f, %f): too large shift value will give strange results"
 msgstr ""
 
-#: builtin.c:3104 mpfr.c:968
+#: builtin.c:3094 mpfr.c:988
 msgid "and: called with less than two arguments"
 msgstr ""
 
-#: builtin.c:3109
+#: builtin.c:3099
 #, c-format
 msgid "and: argument %d is non-numeric"
 msgstr ""
 
-#: builtin.c:3113
+#: builtin.c:3103
 #, c-format
 msgid "and: argument %d negative value %g will give strange results"
 msgstr ""
 
-#: builtin.c:3136 mpfr.c:1000
+#: builtin.c:3126 mpfr.c:1020
 msgid "or: called with less than two arguments"
 msgstr ""
 
-#: builtin.c:3141
+#: builtin.c:3131
 #, c-format
 msgid "or: argument %d is non-numeric"
 msgstr ""
 
-#: builtin.c:3145
+#: builtin.c:3135
 #, c-format
 msgid "or: argument %d negative value %g will give strange results"
 msgstr ""
 
-#: builtin.c:3167 mpfr.c:1031
+#: builtin.c:3157 mpfr.c:1051
 msgid "xor: called with less than two arguments"
 msgstr ""
 
-#: builtin.c:3173
+#: builtin.c:3163
 #, c-format
 msgid "xor: argument %d is non-numeric"
 msgstr ""
 
-#: builtin.c:3177
+#: builtin.c:3167
 #, c-format
 msgid "xor: argument %d negative value %g will give strange results"
 msgstr ""
 
-#: builtin.c:3202 mpfr.c:787
+#: builtin.c:3192 mpfr.c:807
 msgid "compl: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:3208
+#: builtin.c:3198
 #, c-format
 msgid "compl(%f): negative value will give strange results"
 msgstr ""
 
-#: builtin.c:3210
+#: builtin.c:3200
 #, c-format
 msgid "compl(%f): fractional value will be truncated"
 msgstr ""
 
-#: builtin.c:3379
+#: builtin.c:3369
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr ""
@@ -1186,40 +1207,46 @@ msgstr ""
 msgid "watch var - set a watchpoint for a variable."
 msgstr ""
 
-#: command.y:1011 debug.c:401 msg.c:135
+#: command.y:901
+msgid ""
+"where [N] - (same as backtrace) print trace of all or N innermost (outermost "
+"if N < 0) frames."
+msgstr ""
+
+#: command.y:1013 debug.c:401 msg.c:135
 #, c-format
 msgid "error: "
 msgstr ""
 
-#: command.y:1051
+#: command.y:1053
 #, c-format
 msgid "can't read command (%s)\n"
 msgstr ""
 
-#: command.y:1065
+#: command.y:1067
 #, c-format
 msgid "can't read command (%s)"
 msgstr ""
 
-#: command.y:1116
+#: command.y:1118
 msgid "invalid character in command"
 msgstr ""
 
-#: command.y:1152
+#: command.y:1154
 #, c-format
 msgid "unknown command - \"%.*s\", try help"
 msgstr ""
 
-#: command.y:1222
+#: command.y:1224
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: command.y:1284
+#: command.y:1286
 msgid "invalid character"
 msgstr ""
 
-#: command.y:1455
+#: command.y:1457
 #, c-format
 msgid "undefined command: %s\n"
 msgstr ""
@@ -1731,68 +1758,68 @@ msgstr ""
 msgid "`return' not allowed in current context; statement ignored"
 msgstr ""
 
-#: debug.c:5590
+#: debug.c:5604
 #, c-format
 msgid "No symbol `%s' in current context"
 msgstr ""
 
-#: dfa.c:1118 dfa.c:1121 dfa.c:1142 dfa.c:1150 dfa.c:1162 dfa.c:1197
-#: dfa.c:1206 dfa.c:1209 dfa.c:1214 dfa.c:1228 dfa.c:1275
+#: dfa.c:1063 dfa.c:1066 dfa.c:1085 dfa.c:1095 dfa.c:1107 dfa.c:1143
+#: dfa.c:1152 dfa.c:1155 dfa.c:1160 dfa.c:1174 dfa.c:1222
 msgid "unbalanced ["
 msgstr ""
 
-#: dfa.c:1174
+#: dfa.c:1119
 msgid "invalid character class"
 msgstr ""
 
-#: dfa.c:1316
+#: dfa.c:1265
 msgid "character class syntax is [[:space:]], not [:space:]"
 msgstr ""
 
-#: dfa.c:1366
+#: dfa.c:1327
 msgid "unfinished \\ escape"
 msgstr ""
 
-#: dfa.c:1513 regcomp.c:161
-msgid "Invalid content of \\{\\}"
+#: dfa.c:1474
+msgid "invalid content of \\{\\}"
 msgstr ""
 
-#: dfa.c:1516 regcomp.c:176
-msgid "Regular expression too big"
+#: dfa.c:1477
+msgid "regular expression too big"
 msgstr ""
 
-#: dfa.c:1936
+#: dfa.c:1912
 msgid "unbalanced ("
 msgstr ""
 
-#: dfa.c:2062
+#: dfa.c:2038
 msgid "no syntax specified"
 msgstr ""
 
-#: dfa.c:2070
+#: dfa.c:2046
 msgid "unbalanced )"
 msgstr ""
 
-#: eval.c:394
+#: eval.c:396
 #, c-format
 msgid "unknown nodetype %d"
 msgstr ""
 
-#: eval.c:405 eval.c:419
+#: eval.c:407 eval.c:421
 #, c-format
 msgid "unknown opcode %d"
 msgstr ""
 
-#: eval.c:416
+#: eval.c:418
 #, c-format
 msgid "opcode %s not an operator or keyword"
 msgstr ""
 
-#: eval.c:472
+#: eval.c:474
 msgid "buffer overflow in genflags2str"
 msgstr ""
 
-#: eval.c:675
+#: eval.c:676
 #, c-format
 msgid ""
 "\n"
@@ -1800,211 +1827,211 @@ msgid ""
 "\n"
 msgstr ""
 
-#: eval.c:704
+#: eval.c:705
 msgid "`IGNORECASE' is a gawk extension"
 msgstr ""
 
-#: eval.c:736
+#: eval.c:737
 msgid "`BINMODE' is a gawk extension"
 msgstr ""
 
-#: eval.c:794
+#: eval.c:795
 #, c-format
 msgid "BINMODE value `%s' is invalid, treated as 3"
 msgstr ""
 
-#: eval.c:885
+#: eval.c:912
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr ""
 
-#: eval.c:969
+#: eval.c:996
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr ""
 
-#: eval.c:1147
+#: eval.c:1174
 #, c-format
 msgid "reference to uninitialized argument `%s'"
 msgstr ""
 
-#: eval.c:1148
+#: eval.c:1175
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr ""
 
-#: eval.c:1166
+#: eval.c:1193
 msgid "attempt to field reference from non-numeric value"
 msgstr ""
 
-#: eval.c:1168
+#: eval.c:1195
 msgid "attempt to field reference from null string"
 msgstr ""
 
-#: eval.c:1176
+#: eval.c:1203
 #, c-format
 msgid "attempt to access field %ld"
 msgstr ""
 
-#: eval.c:1185
+#: eval.c:1212
 #, c-format
 msgid "reference to uninitialized field `$%ld'"
 msgstr ""
 
-#: eval.c:1272
+#: eval.c:1299
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr ""
 
-#: eval.c:1473
+#: eval.c:1500
 #, c-format
 msgid "unwind_stack: unexpected type `%s'"
 msgstr ""
 
-#: eval.c:1569
+#: eval.c:1596
 msgid "division by zero attempted in `/='"
 msgstr ""
 
-#: eval.c:1576
+#: eval.c:1603
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr ""
 
-#: ext.c:89 ext.c:171
+#: ext.c:65 ext.c:147
 msgid "extensions are not allowed in sandbox mode"
 msgstr ""
 
-#: ext.c:92
+#: ext.c:68
 msgid "-l / @load are gawk extensions"
 msgstr ""
 
-#: ext.c:95
+#: ext.c:71
 msgid "load_ext: received NULL lib_name"
 msgstr ""
 
-#: ext.c:98
+#: ext.c:74
 #, c-format
 msgid "load_ext: cannot open library `%s' (%s)\n"
 msgstr ""
 
-#: ext.c:104
+#: ext.c:80
 #, c-format
 msgid ""
 "load_ext: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
 msgstr ""
 
-#: ext.c:110
+#: ext.c:86
 #, c-format
 msgid "load_ext: library `%s': cannot call function `%s' (%s)\n"
 msgstr ""
 
-#: ext.c:114
+#: ext.c:90
 #, c-format
 msgid "load_ext: library `%s' initialization routine `%s' failed\n"
 msgstr ""
 
-#: ext.c:174
+#: ext.c:150
 msgid "`extension' is a gawk extension"
 msgstr ""
 
-#: ext.c:177
+#: ext.c:153
 msgid "extension: received NULL lib_name"
 msgstr ""
 
-#: ext.c:180
+#: ext.c:156
 #, c-format
 msgid "extension: cannot open library `%s' (%s)"
 msgstr ""
 
-#: ext.c:186
+#: ext.c:162
 #, c-format
 msgid ""
 "extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)"
 msgstr ""
 
-#: ext.c:190
+#: ext.c:166
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)"
 msgstr ""
 
-#: ext.c:221
+#: ext.c:197
 msgid "make_builtin: missing function name"
 msgstr ""
 
-#: ext.c:236
+#: ext.c:212
 #, c-format
 msgid "make_builtin: can't redefine function `%s'"
 msgstr ""
 
-#: ext.c:240
+#: ext.c:216
 #, c-format
 msgid "make_builtin: function `%s' already defined"
 msgstr ""
 
-#: ext.c:244
+#: ext.c:220
 #, c-format
 msgid "make_builtin: function name `%s' previously defined"
 msgstr ""
 
-#: ext.c:246
+#: ext.c:222
 #, c-format
 msgid "make_builtin: can't use gawk built-in `%s' as function name"
 msgstr ""
 
-#: ext.c:249 ext.c:304
+#: ext.c:225 ext.c:280
 #, c-format
 msgid "make_builtin: negative argument count for function `%s'"
 msgstr ""
 
-#: ext.c:276
+#: ext.c:252
 msgid "extension: missing function name"
 msgstr ""
 
-#: ext.c:279 ext.c:283
+#: ext.c:255 ext.c:259
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr ""
 
-#: ext.c:291
+#: ext.c:267
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr ""
 
-#: ext.c:295
+#: ext.c:271
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr ""
 
-#: ext.c:299
+#: ext.c:275
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr ""
 
-#: ext.c:301
+#: ext.c:277
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 
-#: ext.c:375
+#: ext.c:351
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr ""
 
-#: ext.c:378
+#: ext.c:354
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr ""
 
-#: ext.c:395
+#: ext.c:371
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr ""
 
-#: ext.c:399
+#: ext.c:375
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 
-#: ext.c:413
+#: ext.c:389
 msgid "dynamic loading of library not supported"
 msgstr ""
 
@@ -2148,7 +2175,7 @@ msgstr ""
 msgid "inplace_begin: in-place editing already active"
 msgstr ""
 
-#: extension/inplace.c:133 extension/inplace.c:207
+#: extension/inplace.c:133 extension/inplace.c:210
 #, c-format
 msgid "inplace_begin: expects 2 arguments but called with %d"
 msgstr ""
@@ -2177,55 +2204,55 @@ msgstr ""
 msgid "inplace_begin: mkstemp(`%s') failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:178
+#: extension/inplace.c:181
 #, c-format
 msgid "inplace_begin: chmod failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:185
+#: extension/inplace.c:188
 #, c-format
 msgid "inplace_begin: dup(stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:188
+#: extension/inplace.c:191
 #, c-format
 msgid "inplace_begin: dup2(%d, stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:191
+#: extension/inplace.c:194
 #, c-format
 msgid "inplace_begin: close(%d) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:210
+#: extension/inplace.c:213
 msgid "inplace_end: cannot retrieve 1st argument as a string filename"
 msgstr ""
 
-#: extension/inplace.c:217
+#: extension/inplace.c:220
 msgid "inplace_end: in-place editing not active"
 msgstr ""
 
-#: extension/inplace.c:223
+#: extension/inplace.c:226
 #, c-format
 msgid "inplace_end: dup2(%d, stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:226
+#: extension/inplace.c:229
 #, c-format
 msgid "inplace_end: close(%d) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:230
+#: extension/inplace.c:233
 #, c-format
 msgid "inplace_end: fsetpos(stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:243
+#: extension/inplace.c:246
 #, c-format
 msgid "inplace_end: link(`%s', `%s') failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:253
+#: extension/inplace.c:256
 #, c-format
 msgid "inplace_end: rename(`%s', `%s') failed (%s)"
 msgstr ""
@@ -2267,50 +2294,54 @@ msgstr ""
 msgid "readfile: called with no arguments"
 msgstr ""
 
-#: extension/rwarray.c:124
+#: extension/revoutput.c:125
+msgid "revoutput: could not initialize REVOUT variable"
+msgstr ""
+
+#: extension/rwarray.c:124 extension/rwarray0.c:109
 msgid "writea: called with too many arguments"
 msgstr ""
 
-#: extension/rwarray.c:131
+#: extension/rwarray.c:131 extension/rwarray0.c:116
 #, c-format
 msgid "do_writea: argument 0 is not a string\n"
 msgstr ""
 
-#: extension/rwarray.c:137
+#: extension/rwarray.c:137 extension/rwarray0.c:122
 #, c-format
 msgid "do_writea: argument 1 is not an array\n"
 msgstr ""
 
-#: extension/rwarray.c:184
+#: extension/rwarray.c:184 extension/rwarray0.c:169
 #, c-format
 msgid "write_array: could not flatten array\n"
 msgstr ""
 
-#: extension/rwarray.c:198
+#: extension/rwarray.c:198 extension/rwarray0.c:183
 #, c-format
 msgid "write_array: could not release flattened array\n"
 msgstr ""
 
-#: extension/rwarray.c:280
+#: extension/rwarray.c:280 extension/rwarray0.c:265
 msgid "reada: called with too many arguments"
 msgstr ""
 
-#: extension/rwarray.c:287
+#: extension/rwarray.c:287 extension/rwarray0.c:272
 #, c-format
 msgid "do_reada: argument 0 is not a string\n"
 msgstr ""
 
-#: extension/rwarray.c:293
+#: extension/rwarray.c:293 extension/rwarray0.c:278
 #, c-format
 msgid "do_reada: argument 1 is not an array\n"
 msgstr ""
 
-#: extension/rwarray.c:337
+#: extension/rwarray.c:337 extension/rwarray0.c:322
 #, c-format
 msgid "do_reada: clear_array failed\n"
 msgstr ""
 
-#: extension/rwarray.c:374
+#: extension/rwarray.c:374 extension/rwarray0.c:358
 #, c-format
 msgid "read_array: set_array_element failed\n"
 msgstr ""
@@ -2339,80 +2370,80 @@ msgstr ""
 msgid "sleep: not supported on this platform"
 msgstr ""
 
-#: field.c:345
+#: field.c:346
 msgid "NF set to negative value"
 msgstr ""
 
-#: field.c:971 field.c:978 field.c:982
+#: field.c:958 field.c:965 field.c:969
 msgid "split: fourth argument is a gawk extension"
 msgstr ""
 
-#: field.c:975
+#: field.c:962
 msgid "split: fourth argument is not an array"
 msgstr ""
 
-#: field.c:989
+#: field.c:976
 msgid "split: second argument is not an array"
 msgstr ""
 
-#: field.c:993
+#: field.c:980
 msgid "split: cannot use the same array for second and fourth args"
 msgstr ""
 
-#: field.c:998
+#: field.c:985
 msgid "split: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 
-#: field.c:1001
+#: field.c:988
 msgid "split: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 
-#: field.c:1032
+#: field.c:1019
 msgid "split: null string for third arg is a gawk extension"
 msgstr ""
 
-#: field.c:1072
+#: field.c:1059
 msgid "patsplit: fourth argument is not an array"
 msgstr ""
 
-#: field.c:1077
+#: field.c:1064
 msgid "patsplit: second argument is not an array"
 msgstr ""
 
-#: field.c:1083
+#: field.c:1070
 msgid "patsplit: third argument must be non-null"
 msgstr ""
 
-#: field.c:1087
+#: field.c:1074
 msgid "patsplit: cannot use the same array for second and fourth args"
 msgstr ""
 
-#: field.c:1092
+#: field.c:1079
 msgid "patsplit: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 
-#: field.c:1095
+#: field.c:1082
 msgid "patsplit: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 
-#: field.c:1133
+#: field.c:1120
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr ""
 
-#: field.c:1197
+#: field.c:1184
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr ""
 
-#: field.c:1270
+#: field.c:1257
 msgid "null string for `FS' is a gawk extension"
 msgstr ""
 
-#: field.c:1274
+#: field.c:1261
 msgid "old awk does not support regexps as value of `FS'"
 msgstr ""
 
-#: field.c:1393
+#: field.c:1380
 msgid "`FPAT' is a gawk extension"
 msgstr ""
 
@@ -2428,20 +2459,20 @@ msgstr ""
 msgid "node_to_awk_value: received null val"
 msgstr ""
 
-#: gawkapi.c:807
+#: gawkapi.c:809
 msgid "remove_element: received null array"
 msgstr ""
 
-#: gawkapi.c:810
+#: gawkapi.c:812
 msgid "remove_element: received null subscript"
 msgstr ""
 
-#: gawkapi.c:947
+#: gawkapi.c:949
 #, c-format
 msgid "api_flatten_array: could not convert index %d\n"
 msgstr ""
 
-#: gawkapi.c:952
+#: gawkapi.c:954
 #, c-format
 msgid "api_flatten_array: could not convert value %d\n"
 msgstr ""
@@ -2501,504 +2532,472 @@ msgstr ""
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr ""
 
-#: io.c:392
+#: io.c:423
 #, c-format
 msgid "command line argument `%s' is a directory: skipped"
 msgstr ""
 
-#: io.c:395 io.c:513
+#: io.c:426 io.c:544
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr ""
 
-#: io.c:640
+#: io.c:671
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr ""
 
-#: io.c:716
+#: io.c:749
 msgid "redirection not allowed in sandbox mode"
 msgstr ""
 
-#: io.c:750
+#: io.c:783
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr ""
 
-#: io.c:756
+#: io.c:789
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr ""
 
-#: io.c:761
+#: io.c:794
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 
-#: io.c:809
+#: io.c:842
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr ""
 
-#: io.c:863
+#: io.c:896
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr ""
 
-#: io.c:873
+#: io.c:906
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr ""
 
-#: io.c:904
+#: io.c:937
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr ""
 
-#: io.c:986
+#: io.c:1019
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr ""
 
-#: io.c:989
+#: io.c:1022
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr ""
 
-#: io.c:1040
+#: io.c:1073
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 
-#: io.c:1056
+#: io.c:1089
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr ""
 
-#: io.c:1064
+#: io.c:1097
 msgid "too many pipes or input files open"
 msgstr ""
 
-#: io.c:1086
+#: io.c:1119
 msgid "close: second argument must be `to' or `from'"
 msgstr ""
 
-#: io.c:1103
+#: io.c:1136
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr ""
 
-#: io.c:1108
+#: io.c:1141
 msgid "close of redirection that was never opened"
 msgstr ""
 
-#: io.c:1205
+#: io.c:1238
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 
-#: io.c:1222
+#: io.c:1255
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr ""
 
-#: io.c:1225
+#: io.c:1258
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr ""
 
-#: io.c:1245
+#: io.c:1278
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr ""
 
-#: io.c:1248
+#: io.c:1281
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr ""
 
-#: io.c:1251
+#: io.c:1284
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr ""
 
-#: io.c:1254
+#: io.c:1287
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr ""
 
-#: io.c:1284 io.c:1342 main.c:864 main.c:906
+#: io.c:1317 io.c:1375 main.c:628 main.c:670
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr ""
 
-#: io.c:1289 io.c:1348 main.c:866
+#: io.c:1322 io.c:1381 main.c:630
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr ""
 
-#: io.c:1297
+#: io.c:1330
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr ""
 
-#: io.c:1300
+#: io.c:1333
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr ""
 
-#: io.c:1303
+#: io.c:1336
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr ""
 
-#: io.c:1420
+#: io.c:1453
 #, c-format
 msgid "local port %s invalid in `/inet'"
 msgstr ""
 
-#: io.c:1438
+#: io.c:1471
 #, c-format
 msgid "remote host and port information (%s, %s) invalid"
 msgstr ""
 
-#: io.c:1590
-#, c-format
-msgid "no (known) protocol supplied in special filename `%s'"
-msgstr ""
-
-#: io.c:1604
-#, c-format
-msgid "special file name `%s' is incomplete"
-msgstr ""
-
-#: io.c:1621
-msgid "must supply a remote hostname to `/inet'"
-msgstr ""
-
-#: io.c:1639
-msgid "must supply a remote port to `/inet'"
-msgstr ""
-
-#: io.c:1685
+#: io.c:1673
 msgid "TCP/IP communications are not supported"
 msgstr ""
 
-#: io.c:1867
+#: io.c:1854
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr ""
 
-#: io.c:1917
+#: io.c:1904
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr ""
 
-#: io.c:1919 io.c:2105 io.c:2305
+#: io.c:1906 io.c:2092 io.c:2293
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr ""
 
-#: io.c:1922
+#: io.c:1909
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 
-#: io.c:1924 io.c:2110
+#: io.c:1911 io.c:2097
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr ""
 
-#: io.c:1927
+#: io.c:1914
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 
-#: io.c:1929 io.c:1951
+#: io.c:1916 io.c:1938
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr ""
 
-#: io.c:2040 io.c:2108 io.c:2276 io.c:2308
+#: io.c:2027 io.c:2095 io.c:2264 io.c:2296
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr ""
 
-#: io.c:2047 io.c:2113
+#: io.c:2034 io.c:2100
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr ""
 
-#: io.c:2073 io.c:2298
+#: io.c:2060 io.c:2286
 msgid "restoring stdout in parent process failed\n"
 msgstr ""
 
-#: io.c:2081
+#: io.c:2068
 msgid "restoring stdin in parent process failed\n"
 msgstr ""
 
-#: io.c:2116 io.c:2310 io.c:2324
+#: io.c:2103 io.c:2298 io.c:2313
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr ""
 
-#: io.c:2174
+#: io.c:2162
 msgid "`|&' not supported"
 msgstr ""
 
-#: io.c:2261
+#: io.c:2249
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr ""
 
-#: io.c:2318
+#: io.c:2307
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr ""
 
-#: io.c:2790
+#: io.c:2734
 msgid "register_input_parser: received NULL pointer"
 msgstr ""
 
-#: io.c:2818
+#: io.c:2762
 #, c-format
 msgid "input parser `%s' conflicts with previously installed input parser `%s'"
 msgstr ""
 
-#: io.c:2825
+#: io.c:2769
 #, c-format
 msgid "input parser `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:2845
+#: io.c:2789
 msgid "register_output_wrapper: received NULL pointer"
 msgstr ""
 
-#: io.c:2873
+#: io.c:2817
 #, c-format
 msgid ""
 "output wrapper `%s' conflicts with previously installed output wrapper `%s'"
 msgstr ""
 
-#: io.c:2880
+#: io.c:2824
 #, c-format
 msgid "output wrapper `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:2901
+#: io.c:2845
 msgid "register_output_processor: received NULL pointer"
 msgstr ""
 
-#: io.c:2930
+#: io.c:2874
 #, c-format
 msgid ""
 "two-way processor `%s' conflicts with previously installed two-way processor "
 "`%s'"
 msgstr ""
 
-#: io.c:2939
+#: io.c:2883
 #, c-format
 msgid "two way processor `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:3064
+#: io.c:3008
 #, c-format
 msgid "data file `%s' is empty"
 msgstr ""
 
-#: io.c:3106 io.c:3114
+#: io.c:3050 io.c:3058
 msgid "could not allocate more input memory"
 msgstr ""
 
-#: io.c:3682
+#: io.c:3636
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr ""
 
-#: io.c:3771
+#: io.c:3783
 msgid "IPv6 communication is not supported"
 msgstr ""
 
-#: main.c:405
-msgid "empty argument to `-e/--source' ignored"
-msgstr ""
-
-#: main.c:495
-#, c-format
-msgid "%s: option `-W %s' unrecognized, ignored\n"
-msgstr ""
-
-#: main.c:541
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: main.c:562
+#: main.c:321
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
 
-#: main.c:568
+#: main.c:327
 msgid "`--posix' overrides `--traditional'"
 msgstr ""
 
-#: main.c:579
+#: main.c:338
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr ""
 
-#: main.c:583
+#: main.c:342
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr ""
 
-#: main.c:588
+#: main.c:346
 msgid "`--posix' overrides `--characters-as-bytes'"
 msgstr ""
 
-#: main.c:647
+#: main.c:404
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr ""
 
-#: main.c:650
+#: main.c:407
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr ""
 
-#: main.c:652
+#: main.c:409
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr ""
 
-#: main.c:710
+#: main.c:469
 msgid "no program text at all!"
 msgstr ""
 
-#: main.c:799
+#: main.c:563
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 
-#: main.c:801
+#: main.c:565
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
 
-#: main.c:806
+#: main.c:570
 msgid "POSIX options:\t\tGNU long options: (standard)\n"
 msgstr ""
 
-#: main.c:807
+#: main.c:571
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr ""
 
-#: main.c:808
+#: main.c:572
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr ""
 
-#: main.c:809
+#: main.c:573
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr ""
 
-#: main.c:810
+#: main.c:574
 msgid "Short options:\t\tGNU long options: (extensions)\n"
 msgstr ""
 
-#: main.c:811
+#: main.c:575
 msgid "\t-b\t\t\t--characters-as-bytes\n"
 msgstr ""
 
-#: main.c:812
+#: main.c:576
 msgid "\t-c\t\t\t--traditional\n"
 msgstr ""
 
-#: main.c:813
+#: main.c:577
 msgid "\t-C\t\t\t--copyright\n"
 msgstr ""
 
-#: main.c:814
+#: main.c:578
 msgid "\t-d[file]\t\t--dump-variables[=file]\n"
 msgstr ""
 
-#: main.c:815
+#: main.c:579
 msgid "\t-D[file]\t\t--debug[=file]\n"
 msgstr ""
 
-#: main.c:816
+#: main.c:580
 msgid "\t-e 'program-text'\t--source='program-text'\n"
 msgstr ""
 
-#: main.c:817
+#: main.c:581
 msgid "\t-E file\t\t\t--exec=file\n"
 msgstr ""
 
-#: main.c:818
+#: main.c:582
 msgid "\t-g\t\t\t--gen-pot\n"
 msgstr ""
 
-#: main.c:819
+#: main.c:583
 msgid "\t-h\t\t\t--help\n"
 msgstr ""
 
-#: main.c:820
+#: main.c:584
 msgid "\t-i includefile\t\t--include=includefile\n"
 msgstr ""
 
-#: main.c:821
+#: main.c:585
 msgid "\t-l library\t\t--load=library\n"
 msgstr ""
 
-#: main.c:822
-msgid "\t-L [fatal]\t\t--lint[=fatal]\n"
-msgstr ""
-
-#: main.c:823
-msgid "\t-n\t\t\t--non-decimal-data\n"
+#: main.c:586
+msgid "\t-L[fatal|invalid]\t--lint[=fatal|invalid]\n"
 msgstr ""
 
-#: main.c:824
+#: main.c:587
 msgid "\t-M\t\t\t--bignum\n"
 msgstr ""
 
-#: main.c:825
+#: main.c:588
 msgid "\t-N\t\t\t--use-lc-numeric\n"
 msgstr ""
 
-#: main.c:826
+#: main.c:589
+msgid "\t-n\t\t\t--non-decimal-data\n"
+msgstr ""
+
+#: main.c:590
 msgid "\t-o[file]\t\t--pretty-print[=file]\n"
 msgstr ""
 
-#: main.c:827
+#: main.c:591
 msgid "\t-O\t\t\t--optimize\n"
 msgstr ""
 
-#: main.c:828
+#: main.c:592
 msgid "\t-p[file]\t\t--profile[=file]\n"
 msgstr ""
 
-#: main.c:829
+#: main.c:593
 msgid "\t-P\t\t\t--posix\n"
 msgstr ""
 
-#: main.c:830
+#: main.c:594
 msgid "\t-r\t\t\t--re-interval\n"
 msgstr ""
 
-#: main.c:831
+#: main.c:595
 msgid "\t-S\t\t\t--sandbox\n"
 msgstr ""
 
-#: main.c:832
+#: main.c:596
 msgid "\t-t\t\t\t--lint-old\n"
 msgstr ""
 
-#: main.c:833
+#: main.c:597
 msgid "\t-V\t\t\t--version\n"
 msgstr ""
 
-#: main.c:835
+#: main.c:599
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr ""
 
-#: main.c:838
+#: main.c:602
 msgid "\t-Y\t\t--parsedebug\n"
 msgstr ""
 
@@ -3007,7 +3006,7 @@ msgstr ""
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: main.c:847
+#: main.c:611
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -3015,21 +3014,21 @@ msgid ""
 "\n"
 msgstr ""
 
-#: main.c:851
+#: main.c:615
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
 "\n"
 msgstr ""
 
-#: main.c:855
+#: main.c:619
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 msgstr ""
 
-#: main.c:880
+#: main.c:644
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
@@ -3041,7 +3040,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: main.c:888
+#: main.c:652
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3050,120 +3049,138 @@ msgid ""
 "\n"
 msgstr ""
 
-#: main.c:894
+#: main.c:658
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
 
-#: main.c:931
+#: main.c:695
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr ""
 
-#: main.c:1208
+#: main.c:982
 #, c-format
 msgid "unknown value for field spec: %d\n"
 msgstr ""
 
-#: main.c:1306
+#: main.c:1080
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
 "\n"
 msgstr ""
 
-#: main.c:1332
+#: main.c:1106
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr ""
 
-#: main.c:1335
+#: main.c:1109
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr ""
 
-#: main.c:1339
+#: main.c:1113
 #, c-format
 msgid "cannot use gawk builtin `%s' as variable name"
 msgstr ""
 
-#: main.c:1344
+#: main.c:1118
 #, c-format
 msgid "cannot use function `%s' as variable name"
 msgstr ""
 
-#: main.c:1397
+#: main.c:1171
 msgid "floating point exception"
 msgstr ""
 
-#: main.c:1404
+#: main.c:1178
 msgid "fatal error: internal error"
 msgstr ""
 
-#: main.c:1419
+#: main.c:1193
 msgid "fatal error: internal error: segfault"
 msgstr ""
 
-#: main.c:1431
+#: main.c:1205
 msgid "fatal error: internal error: stack overflow"
 msgstr ""
 
-#: main.c:1490
+#: main.c:1264
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr ""
 
-#: main.c:1497
+#: main.c:1271
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr ""
 
-#: mpfr.c:550
+#: main.c:1485
+msgid "empty argument to `-e/--source' ignored"
+msgstr ""
+
+#: main.c:1556
+msgid "-M ignored: MPFR/GMP support not compiled in"
+msgstr ""
+
+#: main.c:1577
+#, c-format
+msgid "%s: option `-W %s' unrecognized, ignored\n"
+msgstr ""
+
+#: main.c:1630
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr ""
+
+#: mpfr.c:557
 #, c-format
 msgid "PREC value `%.*s' is invalid"
 msgstr ""
 
-#: mpfr.c:608
+#: mpfr.c:615
 #, c-format
 msgid "RNDMODE value `%.*s' is invalid"
 msgstr ""
 
-#: mpfr.c:698
+#: mpfr.c:711
 #, c-format
 msgid "%s: received non-numeric argument"
 msgstr ""
 
-#: mpfr.c:800
+#: mpfr.c:820
 msgid "compl(%Rg): negative value will give strange results"
 msgstr ""
 
-#: mpfr.c:804
+#: mpfr.c:824
 msgid "comp(%Rg): fractional value will be truncated"
 msgstr ""
 
-#: mpfr.c:816
+#: mpfr.c:836
 #, c-format
 msgid "cmpl(%Zd): negative values will give strange results"
 msgstr ""
 
-#: mpfr.c:835
+#: mpfr.c:855
 #, c-format
 msgid "%s: received non-numeric argument #%d"
 msgstr ""
 
-#: mpfr.c:845
+#: mpfr.c:865
 msgid "%s: argument #%d has invalid value %Rg, using 0"
 msgstr ""
 
-#: mpfr.c:857
+#: mpfr.c:877
 msgid "%s: argument #%d negative value %Rg will give strange results"
 msgstr ""
 
-#: mpfr.c:863
+#: mpfr.c:883
 msgid "%s: argument #%d fractional value %Rg will be truncated"
 msgstr ""
 
-#: mpfr.c:878
+#: mpfr.c:898
 #, c-format
 msgid "%s: argument #%d negative value %Zd will give strange results"
 msgstr ""
@@ -3173,36 +3190,36 @@ msgstr ""
 msgid "cmd. line:"
 msgstr ""
 
-#: node.c:421
+#: node.c:409
 msgid "backslash at end of string"
 msgstr ""
 
-#: node.c:500
+#: node.c:488
 #, c-format
 msgid "old awk does not support the `\\%c' escape sequence"
 msgstr ""
 
-#: node.c:551
+#: node.c:539
 msgid "POSIX does not allow `\\x' escapes"
 msgstr ""
 
-#: node.c:557
+#: node.c:545
 msgid "no hex digits in `\\x' escape sequence"
 msgstr ""
 
-#: node.c:579
+#: node.c:567
 #, c-format
 msgid ""
 "hex escape \\x%.*s of %d characters probably not interpreted the way you "
 "expect"
 msgstr ""
 
-#: node.c:594
+#: node.c:582
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr ""
 
-#: node.c:739
+#: node.c:726
 msgid ""
 "Invalid multibyte data detected. There may be a mismatch between your data "
 "and your locale."
@@ -3230,7 +3247,7 @@ msgstr ""
 #: profile.c:193
 #, c-format
 msgid ""
-"\t# %s block(s)\n"
+"\t# %s rule(s)\n"
 "\n"
 msgstr ""
 
@@ -3246,30 +3263,30 @@ msgstr ""
 msgid "internal error: %s with null vname"
 msgstr ""
 
-#: profile.c:537
+#: profile.c:538
 msgid "internal error: builtin with null fname"
 msgstr ""
 
-#: profile.c:949
+#: profile.c:958
 #, c-format
 msgid ""
 "\t# Loaded extensions (-l and/or @load)\n"
 "\n"
 msgstr ""
 
-#: profile.c:972
+#: profile.c:981
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr ""
 
-#: profile.c:1475
+#: profile.c:1521
 #, c-format
 msgid ""
 "\n"
 "\t# Functions, listed alphabetically\n"
 msgstr ""
 
-#: profile.c:1513
+#: profile.c:1559
 #, c-format
 msgid "redir2str: unknown redirection type %d"
 msgstr ""
@@ -3279,70 +3296,83 @@ msgstr ""
 msgid "regexp component `%.*s' should probably be `[%.*s]'"
 msgstr ""
 
-#: regcomp.c:131
+#: regcomp.c:139
 msgid "Success"
 msgstr ""
 
-#: regcomp.c:134
+#: regcomp.c:142
 msgid "No match"
 msgstr ""
 
-#: regcomp.c:137
+#: regcomp.c:145
 msgid "Invalid regular expression"
 msgstr ""
 
-#: regcomp.c:140
+#: regcomp.c:148
 msgid "Invalid collation character"
 msgstr ""
 
-#: regcomp.c:143
+#: regcomp.c:151
 msgid "Invalid character class name"
 msgstr ""
 
-#: regcomp.c:146
+#: regcomp.c:154
 msgid "Trailing backslash"
 msgstr ""
 
-#: regcomp.c:149
+#: regcomp.c:157
 msgid "Invalid back reference"
 msgstr ""
 
-#: regcomp.c:152
-msgid "Unmatched [ or [^"
+#: regcomp.c:160
+msgid "Unmatched [, [^, [:, [., or [="
 msgstr ""
 
-#: regcomp.c:155
+#: regcomp.c:163
 msgid "Unmatched ( or \\("
 msgstr ""
 
-#: regcomp.c:158
+#: regcomp.c:166
 msgid "Unmatched \\{"
 msgstr ""
 
-#: regcomp.c:164
+#: regcomp.c:169
+msgid "Invalid content of \\{\\}"
+msgstr ""
+
+#: regcomp.c:172
 msgid "Invalid range end"
 msgstr ""
 
-#: regcomp.c:167
+#: regcomp.c:175
 msgid "Memory exhausted"
 msgstr ""
 
-#: regcomp.c:170
+#: regcomp.c:178
 msgid "Invalid preceding regular expression"
 msgstr ""
 
-#: regcomp.c:173
+#: regcomp.c:181
 msgid "Premature end of regular expression"
 msgstr ""
 
-#: regcomp.c:179
+#: regcomp.c:184
+msgid "Regular expression too big"
+msgstr ""
+
+#: regcomp.c:187
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: regcomp.c:704
+#: regcomp.c:712
 msgid "No previous regular expression"
 msgstr ""
 
-#: symbol.c:741
+#: symbol.c:677
+#, c-format
+msgid "function `%s': can't use function `%s' as a parameter name"
+msgstr ""
+
+#: symbol.c:809
 msgid "can not pop main context"
 msgstr ""
diff --git a/po/it.gmo b/po/it.gmo
index 73f46395..f7030fd7 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index a5578723..88e537f6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU Awk 4.0.73, API: 0.0\n"
-"Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2014-04-08 19:23+0300\n"
-"PO-Revision-Date: 2014-06-14 17:50+0100\n"
+"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
+"POT-Creation-Date: 2015-02-26 20:05+0200\n"
+"PO-Revision-Date: 2014-12-14 22:10+0100\n"
 "Last-Translator: Antonio Colombo <azc100@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "Language: it\n"
@@ -34,9 +34,9 @@ msgstr "tentativo di usare il parametro scalare `%s' come un vettore"
 msgid "attempt to use scalar `%s' as an array"
 msgstr "tentativo di usare scalare '%s' come vettore"
 
-#: array.c:409 array.c:576 builtin.c:85 builtin.c:1615 builtin.c:1661
-#: builtin.c:1674 builtin.c:2102 builtin.c:2116 eval.c:1122 eval.c:1126
-#: eval.c:1531
+#: array.c:409 array.c:576 builtin.c:85 builtin.c:1606 builtin.c:1652
+#: builtin.c:1665 builtin.c:2092 builtin.c:2106 eval.c:1149 eval.c:1153
+#: eval.c:1558
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "tentativo di usare vettore `%s' in un contesto scalare"
@@ -95,412 +95,417 @@ msgstr ""
 "asorti: non consentito un primo argomento che sia un sottovettore del "
 "secondo argomento"
 
-#: array.c:1314
+#: array.c:1313
 #, c-format
 msgid "`%s' is invalid as a function name"
 msgstr "`%s' non è un nome funzione valido"
 
-#: array.c:1318
+#: array.c:1317
 #, c-format
 msgid "sort comparison function `%s' is not defined"
 msgstr "funzione di confronto del sort `%s' non definita"
 
-#: awkgram.y:233
+#: awkgram.y:226
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "blocchi %s richiedono una `azione'"
 
-#: awkgram.y:236
+#: awkgram.y:229
 msgid "each rule must have a pattern or an action part"
 msgstr "ogni regola deve avere una parte `espressione' o una parte `azione'"
 
-#: awkgram.y:325 awkgram.y:336
+#: awkgram.y:320 awkgram.y:331
 msgid "old awk does not support multiple `BEGIN' or `END' rules"
 msgstr "il vecchio awk non supporta più di una regola `BEGIN' o `END'"
 
-#: awkgram.y:373
+#: awkgram.y:368
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "`%s' è una funzione interna, non si può ridefinire"
 
-#: awkgram.y:419
+#: awkgram.y:417
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr "espressione regolare costante `//' sembra un commento C++, ma non lo è"
 
-#: awkgram.y:423
+#: awkgram.y:421
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr "espressione regolare costante `/%s/' sembra un commento C, ma non lo è"
 
-#: awkgram.y:515
+#: awkgram.y:513
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "valori di `case' doppi all'interno di uno `switch': %s"
 
-#: awkgram.y:536
+#: awkgram.y:534
 msgid "duplicate `default' detected in switch body"
 msgstr "valori di default doppi all'interno di uno `switch'"
 
-#: awkgram.y:796 awkgram.y:3723
+#: awkgram.y:794 awkgram.y:3751
 msgid "`break' is not allowed outside a loop or switch"
 msgstr "`break' non consentito fuori da un ciclo o da uno `switch'"
 
-#: awkgram.y:805 awkgram.y:3715
+#: awkgram.y:803 awkgram.y:3743
 msgid "`continue' is not allowed outside a loop"
 msgstr "`continue' non consentito fuori da un un ciclo"
 
-#: awkgram.y:815
+#: awkgram.y:813
 #, c-format
 msgid "`next' used in %s action"
 msgstr "`next' usato in `azione' %s"
 
-#: awkgram.y:824
+#: awkgram.y:822
 #, c-format
 msgid "`nextfile' used in %s action"
 msgstr "`nextfile' usato in `azione' %s"
 
-#: awkgram.y:848
+#: awkgram.y:846
 msgid "`return' used outside function context"
 msgstr "`return' usato fuori da una funzione"
 
-#: awkgram.y:922
+#: awkgram.y:920
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr "`print' da solo in BEGIN o END dovrebbe forse essere `print \"\"'"
 
-#: awkgram.y:988 awkgram.y:1037
+#: awkgram.y:986 awkgram.y:1035
 msgid "`delete' is not allowed with SYMTAB"
 msgstr "`delete' non consentito in SYMTAB"
 
-#: awkgram.y:990 awkgram.y:1039
+#: awkgram.y:988 awkgram.y:1037
 msgid "`delete' is not allowed with FUNCTAB"
 msgstr "`delete' non consentito in FUNCTAB"
 
-#: awkgram.y:1024 awkgram.y:1028
+#: awkgram.y:1022 awkgram.y:1026
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "`delete(array)' è un'estensione tawk non-portabile"
 
-#: awkgram.y:1149
+#: awkgram.y:1147
 msgid "multistage two-way pipelines don't work"
 msgstr "`pipeline' multistadio bidirezionali non funzionano"
 
-#: awkgram.y:1264
+#: awkgram.y:1262
 msgid "regular expression on right of assignment"
 msgstr "espressione regolare usata per assegnare un valore"
 
-#: awkgram.y:1275
+#: awkgram.y:1273
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "espressione regolare prima di operatore `~' o `!~'"
 
-#: awkgram.y:1291 awkgram.y:1442
+#: awkgram.y:1289 awkgram.y:1431
 msgid "old awk does not support the keyword `in' except after `for'"
 msgstr "il vecchio awk non supporta la parola-chiave `in' se non dopo `for'"
 
-#: awkgram.y:1301
+#: awkgram.y:1299
 msgid "regular expression on right of comparison"
 msgstr "espressione regolare a destra in un confronto"
 
-#: awkgram.y:1417
-#, c-format
-msgid "`getline var' invalid inside `%s' rule"
-msgstr "`getline var' invalida all'interno della regola `%s'"
-
-#: awkgram.y:1420
+#: awkgram.y:1411
 #, c-format
-msgid "`getline' invalid inside `%s' rule"
-msgstr "`getline' invalida all'interno della regola `%s'"
+msgid "non-redirected `getline' invalid inside `%s' rule"
+msgstr "`getline' non ridiretta invalida all'interno della regola `%s'"
 
-#: awkgram.y:1425
+#: awkgram.y:1414
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "`getline' non ri-diretta indefinita dentro `azione' END"
 
-#: awkgram.y:1444
+#: awkgram.y:1433
 msgid "old awk does not support multidimensional arrays"
 msgstr "il vecchio awk non supporta vettori multidimensionali"
 
-#: awkgram.y:1541
+#: awkgram.y:1530
 msgid "call of `length' without parentheses is not portable"
 msgstr "chiamata a `length' senza parentesi non portabile"
 
-#: awkgram.y:1607
+#: awkgram.y:1596
 msgid "indirect function calls are a gawk extension"
 msgstr "chiamate a funzione indirette sono un'estensione gawk"
 
-#: awkgram.y:1620
+#: awkgram.y:1609
 #, c-format
 msgid "can not use special variable `%s' for indirect function call"
 msgstr ""
 "non riesco a usare la variabile speciale `%s' come parametro indiretto di "
 "funzione"
 
-#: awkgram.y:1698
+#: awkgram.y:1635
+#, c-format
+msgid "attempt to use non-function `%s' in function call"
+msgstr ""
+
+#: awkgram.y:1699
 msgid "invalid subscript expression"
 msgstr "espressione indice invalida"
 
-#: awkgram.y:2048 awkgram.y:2068 gawkapi.c:206 gawkapi.c:224 msg.c:126
+#: awkgram.y:2045 awkgram.y:2065 gawkapi.c:206 gawkapi.c:224 msg.c:126
 msgid "warning: "
 msgstr "attenzione: "
 
-#: awkgram.y:2066 gawkapi.c:192 gawkapi.c:221 msg.c:158
+#: awkgram.y:2063 gawkapi.c:192 gawkapi.c:221 msg.c:158
 msgid "fatal: "
 msgstr "fatale: "
 
-#: awkgram.y:2116
+#: awkgram.y:2113
 msgid "unexpected newline or end of string"
 msgstr "carattere 'a capo' o fine stringa non previsti"
 
-#: awkgram.y:2383 awkgram.y:2459 awkgram.y:2682 debug.c:523 debug.c:539
+#: awkgram.y:2392 awkgram.y:2468 awkgram.y:2691 debug.c:523 debug.c:539
 #: debug.c:2812 debug.c:5055
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "non riesco ad aprire file sorgente `%s' in lettura (%s)"
 
-#: awkgram.y:2384 awkgram.y:2509
+#: awkgram.y:2393 awkgram.y:2518
 #, c-format
 msgid "can't open shared library `%s' for reading (%s)"
 msgstr "non riesco ad aprire shared library `%s' in lettura (%s)"
 
-#: awkgram.y:2386 awkgram.y:2460 awkgram.y:2510 builtin.c:135 debug.c:5206
+#: awkgram.y:2395 awkgram.y:2469 awkgram.y:2519 builtin.c:135 debug.c:5206
 msgid "reason unknown"
 msgstr "ragione indeterminata"
 
-#: awkgram.y:2395 awkgram.y:2419
+#: awkgram.y:2404 awkgram.y:2428
 #, c-format
 msgid "can't include `%s' and use it as a program file"
 msgstr "non riesco a includere `%s' per usarlo come file di programma"
 
-#: awkgram.y:2408
+#: awkgram.y:2417
 #, c-format
 msgid "already included source file `%s'"
 msgstr "file sorgente `%s' già incluso"
 
-#: awkgram.y:2409
+#: awkgram.y:2418
 #, c-format
 msgid "already loaded shared library `%s'"
 msgstr "shared library `%s' già inclusa"
 
-#: awkgram.y:2444
+#: awkgram.y:2453
 msgid "@include is a gawk extension"
 msgstr "@include è un'estensione gawk"
 
-#: awkgram.y:2450
+#: awkgram.y:2459
 msgid "empty filename after @include"
 msgstr "nome-file mancante dopo @include"
 
-#: awkgram.y:2494
+#: awkgram.y:2503
 msgid "@load is a gawk extension"
 msgstr "@load è un'estensione gawk"
 
-#: awkgram.y:2500
+#: awkgram.y:2509
 msgid "empty filename after @load"
 msgstr "nome-file mancante dopo @include"
 
-#: awkgram.y:2634
+#: awkgram.y:2643
 msgid "empty program text on command line"
 msgstr "programma nullo sulla riga comandi"
 
-#: awkgram.y:2749
+#: awkgram.y:2758
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "non riesco a leggere file sorgente `%s' (%s)"
 
-#: awkgram.y:2760
+#: awkgram.y:2769
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "file sorgente `%s' vuoto"
 
-#: awkgram.y:2937
+#: awkgram.y:2828
+#, c-format
+msgid "PEBKAC error: invalid character '\\%03o' in source code"
+msgstr "errore PEBKAC: carattere invalido '\\%03o' nel codice sorgente"
+
+#: awkgram.y:2959
 msgid "source file does not end in newline"
 msgstr "file sorgente non termina con carattere 'a capo'"
 
-#: awkgram.y:3042
+#: awkgram.y:3062
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "espressione regolare non completata termina con `\\' a fine file"
 
-#: awkgram.y:3066
+#: awkgram.y:3089
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 "%s: %d: modificatore di espressione regolare tawk `/.../%c' non valido in "
 "gawk"
 
-#: awkgram.y:3070
+#: awkgram.y:3093
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr "modificatore di espressione regolare tawk `/.../%c' non valido in gawk"
 
-#: awkgram.y:3077
+#: awkgram.y:3100
 msgid "unterminated regexp"
 msgstr "espressione regolare non completata"
 
-#: awkgram.y:3081
+#: awkgram.y:3104
 msgid "unterminated regexp at end of file"
 msgstr "espressione regolare non completata a fine file"
 
-#: awkgram.y:3140
+#: awkgram.y:3162
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "uso di `\\ #...' continuazione riga non portabile"
 
-#: awkgram.y:3156
+#: awkgram.y:3178
 msgid "backslash not last character on line"
 msgstr "'\\' non è l'ultimo carattere della riga"
 
-#: awkgram.y:3217
+#: awkgram.y:3239
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX non permette l'operatore `**='"
 
-#: awkgram.y:3219
+#: awkgram.y:3241
 msgid "old awk does not support operator `**='"
 msgstr "il vecchio awk non supporta l'operatore `**='"
 
-#: awkgram.y:3228
+#: awkgram.y:3250
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX non permette l'operatore `**'"
 
-#: awkgram.y:3230
+#: awkgram.y:3252
 msgid "old awk does not support operator `**'"
 msgstr "il vecchio awk non supporta l'operatore `**'"
 
-#: awkgram.y:3265
+#: awkgram.y:3287
 msgid "operator `^=' is not supported in old awk"
 msgstr "l'operatore `^=' non è supportato nel vecchio awk"
 
-#: awkgram.y:3273
+#: awkgram.y:3295
 msgid "operator `^' is not supported in old awk"
 msgstr "l'operatore `^' non è supportato nel vecchio awk"
 
-#: awkgram.y:3366 awkgram.y:3382 command.y:1178
+#: awkgram.y:3392 awkgram.y:3410 command.y:1180
 msgid "unterminated string"
 msgstr "stringa non terminata"
 
-#: awkgram.y:3603
+#: awkgram.y:3631
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "carattere '%c' non valido in un'espressione"
 
-#: awkgram.y:3650
+#: awkgram.y:3678
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "`%s' è un'estensione gawk"
 
-#: awkgram.y:3655
+#: awkgram.y:3683
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX non permette `%s'"
 
-#: awkgram.y:3663
+#: awkgram.y:3691
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "`%s' non è supportato nel vecchio awk"
 
-#: awkgram.y:3753
+#: awkgram.y:3781
 msgid "`goto' considered harmful!\n"
 msgstr "`goto' considerato pericoloso!\n"
 
-#: awkgram.y:3787
+#: awkgram.y:3815
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d non valido come numero di argomenti per %s"
 
-#: awkgram.y:3822
+#: awkgram.y:3850
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr "%s: una stringa come ultimo argomento di `substitute' non ha effetto"
 
-#: awkgram.y:3827
+#: awkgram.y:3855
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "il terzo parametro di '%s'  non è un oggetto modificabile"
 
-#: awkgram.y:3910 awkgram.y:3913
+#: awkgram.y:3938 awkgram.y:3941
 msgid "match: third argument is a gawk extension"
 msgstr "match: il terzo argomento è un'estensione gawk"
 
-#: awkgram.y:3967 awkgram.y:3970
+#: awkgram.y:3995 awkgram.y:3998
 msgid "close: second argument is a gawk extension"
 msgstr "close: il secondo argomento è un'estensione gawk"
 
-#: awkgram.y:3982
+#: awkgram.y:4010
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "uso scorretto di dcgettext(_\"...\"): togliere il carattere '_' iniziale"
 
-#: awkgram.y:3997
+#: awkgram.y:4025
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "uso scorretto di dcngettext(_\"...\"): togliere il carattere '_' iniziale"
 
-#: awkgram.y:4016
+#: awkgram.y:4044
 msgid "index: regexp constant as second argument is not allowed"
 msgstr "index: espressione regolare come secondo argomento non consentita"
 
-#: awkgram.y:4069
+#: awkgram.y:4097
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "funzione `%s': parametro `%s' nasconde variabile globale"
 
-#: awkgram.y:4126 debug.c:4041 debug.c:4084 debug.c:5204
+#: awkgram.y:4154 debug.c:4041 debug.c:4084 debug.c:5204
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "non riesco ad aprire `%s' in scrittura (%s)"
 
-#: awkgram.y:4127
+#: awkgram.y:4155
 msgid "sending variable list to standard error"
 msgstr "mando lista variabili a 'standard error'"
 
-#: awkgram.y:4135
+#: awkgram.y:4163
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: `close' non riuscita (%s)"
 
-#: awkgram.y:4160
+#: awkgram.y:4188
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() chiamata due volte!"
 
-#: awkgram.y:4168
+#: awkgram.y:4196
 msgid "there were shadowed variables."
 msgstr "c'erano variabili nascoste."
 
-#: awkgram.y:4239
+#: awkgram.y:4267
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "funzione di nome `%s' definita in precedenza"
 
-#: awkgram.y:4285
+#: awkgram.y:4313
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr ""
 "funzione `%s': non è possibile usare nome della funzione come nome parametro"
 
-#: awkgram.y:4288
+#: awkgram.y:4316
 #, c-format
 msgid "function `%s': can't use special variable `%s' as a function parameter"
 msgstr ""
 "funzione `%s': non è possibile usare la variabile speciale `%s' come "
 "parametro di funzione"
 
-#: awkgram.y:4296
+#: awkgram.y:4324
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "funzione `%s': parametro #%d, `%s', duplica parametro #%d"
 
-#: awkgram.y:4383 awkgram.y:4389
+#: awkgram.y:4411 awkgram.y:4417
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "funzione `%s' chiamata ma mai definita"
 
-#: awkgram.y:4393
+#: awkgram.y:4421
 #, c-format
 msgid "function `%s' defined but never called directly"
 msgstr "funzione `%s' definita ma mai chiamata direttamente"
 
-#: awkgram.y:4425
+#: awkgram.y:4453
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr ""
 "espressione regolare di valore costante per parametro #%d genera valore "
 "booleano"
 
-#: awkgram.y:4484
+#: awkgram.y:4468
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -509,23 +514,23 @@ msgstr ""
 "funzione `%s' chiamata con spazio tra il nome e `(',\n"
 "o usata come variabile o vettore"
 
-#: awkgram.y:4720
+#: awkgram.y:4674
 msgid "division by zero attempted"
 msgstr "tentativo di dividere per zero"
 
-#: awkgram.y:4729
+#: awkgram.y:4683
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "tentativo di dividere per zero in `%%'"
 
-#: awkgram.y:5049
+#: awkgram.y:5003
 msgid ""
 "cannot assign a value to the result of a field post-increment expression"
 msgstr ""
 "impossibile assegnare un valore al risultato di un'espressione di post-"
 "incremento di un campo"
 
-#: awkgram.y:5052
+#: awkgram.y:5006
 #, c-format
 msgid "invalid target of assignment (opcode %s)"
 msgstr "destinazione di assegnazione non valida (codice operativo %s)"
@@ -541,7 +546,7 @@ msgstr "standard output"
 
 #: builtin.c:148
 msgid "exp: received non-numeric argument"
-msgstr "exp: argomento non-numerico"
+msgstr "exp: l'argomento ricevuto non è numerico"
 
 #: builtin.c:154
 #, c-format
@@ -566,189 +571,198 @@ msgstr ""
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: `%s' non è un file aperto, una `pipe' o un co-processo"
 
-#: builtin.c:362
+#: builtin.c:351
 msgid "index: received non-string first argument"
-msgstr "index: il primo argomento non è una stringa"
+msgstr "index: il primo argomento ricevuto non è una stringa"
 
-#: builtin.c:364
+#: builtin.c:353
 msgid "index: received non-string second argument"
-msgstr "index: il secondo argomento non è una stringa"
+msgstr "index: il secondo argomento ricevuto non è una stringa"
 
-#: builtin.c:488 mpfr.c:757
+#: builtin.c:466 mpfr.c:777
 msgid "int: received non-numeric argument"
-msgstr "int: argomento non-numerico"
+msgstr "int: l'argomento ricevuto non è numerico"
 
-#: builtin.c:525
+#: builtin.c:503
 msgid "length: received array argument"
-msgstr "length: l'argomento fornito è un vettore"
+msgstr "length: l'argomento ricevuto è un vettore"
 
-#: builtin.c:528
+#: builtin.c:506
 msgid "`length(array)' is a gawk extension"
 msgstr "`length(array)' è un'estensione gawk"
 
-#: builtin.c:544
+#: builtin.c:525
 msgid "length: received non-string argument"
-msgstr "length: l'argomento non è una stringa"
+msgstr "length: l'argomento ricevuto non è una stringa"
 
-#: builtin.c:575
+#: builtin.c:554
 msgid "log: received non-numeric argument"
-msgstr "log: argomento non-numerico"
+msgstr "log: l'argomento ricevuto non è numerico"
 
-#: builtin.c:578
+#: builtin.c:557
 #, c-format
 msgid "log: received negative argument %g"
-msgstr "log: argomento negativo %g"
+msgstr "log: argomento ricevuto negativo %g"
 
-#: builtin.c:776 builtin.c:781
+#: builtin.c:755 builtin.c:760 builtin.c:911
 msgid "fatal: must use `count$' on all formats or none"
-msgstr "fatale: `count$' va usato per ogni `format' o per nessuno"
+msgstr "fatale: `count$' va usato per tutti i formati o per nessuno"
 
-#: builtin.c:851
+#: builtin.c:830
 #, c-format
 msgid "field width is ignored for `%%' specifier"
 msgstr "larghezza campo ignorata per la specifica `%%'"
 
-#: builtin.c:853
+#: builtin.c:832
 #, c-format
 msgid "precision is ignored for `%%' specifier"
 msgstr "precisione ignorata per la specifica `%%'"
 
-#: builtin.c:855
+#: builtin.c:834
 #, c-format
 msgid "field width and precision are ignored for `%%' specifier"
 msgstr "larghezza campo e precisone ignorate per la specifica `%%'"
 
-#: builtin.c:906
+#: builtin.c:885
 msgid "fatal: `$' is not permitted in awk formats"
-msgstr "fatale: operatore `$' non consentito nei `format' awk"
+msgstr "fatale: operatore `$' non consentito nei formati awk"
 
-#: builtin.c:915
+#: builtin.c:894
 msgid "fatal: arg count with `$' must be > 0"
 msgstr "fatale: numero argomenti con `$' dev'essere > 0"
 
-#: builtin.c:919
+#: builtin.c:898
 #, c-format
 msgid "fatal: arg count %ld greater than total number of supplied arguments"
 msgstr "fatale: numero argomenti %ld > del numero totale argomenti specificati"
 
-#: builtin.c:923
+#: builtin.c:902
 msgid "fatal: `$' not permitted after period in format"
-msgstr "fatale: `$' non consentito dopo il punto in un `format'"
+msgstr "fatale: `$' non consentito dopo il punto in un formato"
 
-#: builtin.c:939
+#: builtin.c:921
 msgid "fatal: no `$' supplied for positional field width or precision"
 msgstr "fatale: manca `$' per i campi posizionali larghezza o precisione"
 
-#: builtin.c:1009
+#: builtin.c:991
 msgid "`l' is meaningless in awk formats; ignored"
-msgstr "`l' non ha senso nei `format' awk; ignorato"
+msgstr "`l' non ha senso nei formati awk; ignorato"
 
-#: builtin.c:1013
+#: builtin.c:995
 msgid "fatal: `l' is not permitted in POSIX awk formats"
-msgstr "fatale: `l' non consentito nei `format' POSIX awk"
+msgstr "fatale: `l' non consentito nei formati POSIX awk"
 
-#: builtin.c:1026
+#: builtin.c:1008
 msgid "`L' is meaningless in awk formats; ignored"
-msgstr "`L' non ha senso nei `format' awk; ignorato"
+msgstr "`L' non ha senso nei formati awk; ignorato"
 
-#: builtin.c:1030
+#: builtin.c:1012
 msgid "fatal: `L' is not permitted in POSIX awk formats"
-msgstr "`L' non ha senso nei `format' awk; ignorato"
+msgstr "fatale: `L' non consentito nei formati POSIX awk"
 
-#: builtin.c:1043
+#: builtin.c:1025
 msgid "`h' is meaningless in awk formats; ignored"
-msgstr "`h' non ha senso nei `format' awk; ignorato"
+msgstr "`h' non ha senso nei formati awk; ignorato"
 
-#: builtin.c:1047
+#: builtin.c:1029
 msgid "fatal: `h' is not permitted in POSIX awk formats"
-msgstr "fatale: `h' non consentito nei `format' POSIX awk"
+msgstr "fatale: `h' non consentito nei formati POSIX awk"
+
+#: builtin.c:1055
+#, c-format
+msgid "[s]printf: value %g is too big for %%c format"
+msgstr "[s]printf: valore %g troppo elevato per il formato %%c"
 
-#: builtin.c:1463
+#: builtin.c:1068
+#, c-format
+msgid "[s]printf: value %g is not a valid wide character"
+msgstr "[s]printf: valore %g non è un carattere multibyte valido "
+
+#: builtin.c:1454
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
-msgstr "[s]printf: valore %g fuori intervallo per il `format' `%%%c'"
+msgstr "[s]printf: valore %g fuori intervallo per il formato `%%%c'"
 
-#: builtin.c:1561
+#: builtin.c:1552
 #, c-format
 msgid "ignoring unknown format specifier character `%c': no argument converted"
-msgstr ""
-"carattere di `format' sconosciuto `%c' ignorato: nessun argomento convertito"
+msgstr "carattere di formato ignoto `%c' ignorato: nessun argomento convertito"
 
-#: builtin.c:1566
+#: builtin.c:1557
 msgid "fatal: not enough arguments to satisfy format string"
 msgstr ""
 "fatale: argomenti in numero minore di quelli richiesti dalla stringa di "
-"`format'"
+"formato"
 
-#: builtin.c:1568
+#: builtin.c:1559
 msgid "^ ran out for this one"
 msgstr "^ esauriti a questo punto"
 
-#: builtin.c:1575
+#: builtin.c:1566
 msgid "[s]printf: format specifier does not have control letter"
-msgstr "[s]printf: specifica di `format' senza un carattere di controllo"
+msgstr "[s]printf: specifica di formato senza un carattere di controllo"
 
-#: builtin.c:1578
+#: builtin.c:1569
 msgid "too many arguments supplied for format string"
-msgstr "troppi argomenti specificati per questa stringa di `format'"
+msgstr "troppi argomenti specificati per questa stringa di formato"
 
-#: builtin.c:1634
+#: builtin.c:1625
 msgid "sprintf: no arguments"
 msgstr "sprintf: nessun argomento"
 
-#: builtin.c:1657 builtin.c:1668
+#: builtin.c:1648 builtin.c:1659
 msgid "printf: no arguments"
 msgstr "printf: nessun argomento"
 
-#: builtin.c:1711
+#: builtin.c:1702
 msgid "sqrt: received non-numeric argument"
-msgstr "sqrt: argomento non-numerico"
+msgstr "sqrt: l'argomento ricevuto non è numerico"
 
-#: builtin.c:1715
+#: builtin.c:1706
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: chiamata con argomento negativo %g"
 
-#: builtin.c:1746
+#: builtin.c:1737
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: lunghezza %g non >= 1"
 
-#: builtin.c:1748
+#: builtin.c:1739
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: lunghezza %g non >= 0"
 
-#: builtin.c:1755
+#: builtin.c:1753
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: lunghezza non intera %g: sarà troncata"
 
-#: builtin.c:1760
+#: builtin.c:1758
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr "substr: lunghezza %g troppo elevata per indice stringa, tronco a %g"
 
-#: builtin.c:1772
+#: builtin.c:1770
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: indice di partenza %g non valido, uso 1"
 
-#: builtin.c:1777
+#: builtin.c:1775
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: indice di partenza non intero %g: sarà troncato"
 
-#: builtin.c:1802
+#: builtin.c:1798
 msgid "substr: source string is zero length"
 msgstr "substr: stringa di partenza lunga zero"
 
-#: builtin.c:1818
+#: builtin.c:1812
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: indice di partenza %g oltre la fine della stringa"
 
-#: builtin.c:1826
+#: builtin.c:1820
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -756,187 +770,193 @@ msgstr ""
 "substr: lunghezza %g all'indice di partenza %g supera la lunghezza del primo "
 "argomento (%lu)"
 
-#: builtin.c:1900
+#: builtin.c:1890
 msgid "strftime: format value in PROCINFO[\"strftime\"] has numeric type"
 msgstr ""
-"strftime: il valore del `format' in PROCINFO[\"strftime\"] è di tipo numerico"
+"strftime: il valore del formato in PROCINFO[\"strftime\"] è di tipo numerico"
 
-#: builtin.c:1923
+#: builtin.c:1913
 msgid "strftime: received non-numeric second argument"
-msgstr "strftime: secondo argomento non-numerico"
+msgstr "strftime: il secondo argomento ricevuto non è numerico"
 
-#: builtin.c:1927
+#: builtin.c:1917
 msgid "strftime: second argument less than 0 or too big for time_t"
-msgstr "strftime: secondo argomento < 0 o troppo elevato per time_t"
+msgstr "strftime: il secondo argomento è < 0 o troppo elevato per time_t"
 
-#: builtin.c:1934
+#: builtin.c:1924
 msgid "strftime: received non-string first argument"
-msgstr "strftime: il primo argomento non è una stringa"
+msgstr "strftime: il primo argomento ricevuto non è una stringa"
 
-#: builtin.c:1941
+#: builtin.c:1931
 msgid "strftime: received empty format string"
-msgstr "strftime: `format' è una stringa nulla"
+msgstr "strftime: il formato ricevuto è una stringa nulla"
 
-#: builtin.c:2007
+#: builtin.c:1997
 msgid "mktime: received non-string argument"
-msgstr "mktime: l'argomento non è una stringa"
+msgstr "mktime: l'argomento ricevuto non è una stringa"
 
-#: builtin.c:2024
+#: builtin.c:2014
 msgid "mktime: at least one of the values is out of the default range"
 msgstr "mktime: almeno un valore è fuori dall'intervallo di default"
 
-#: builtin.c:2059
+#: builtin.c:2049
 msgid "'system' function not allowed in sandbox mode"
 msgstr "funzione 'system' non consentita in modo `sandbox'"
 
-#: builtin.c:2064
+#: builtin.c:2054
 msgid "system: received non-string argument"
-msgstr "system: l'argomento non è una stringa"
+msgstr "system: l'argomento ricevuto non è una stringa"
 
-#: builtin.c:2184
+#: builtin.c:2174
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "riferimento a variabile non inizializzata `$%d'"
 
-#: builtin.c:2271
+#: builtin.c:2259
 msgid "tolower: received non-string argument"
-msgstr "tolower: l'argomento non è una stringa"
+msgstr "tolower: l'argomento ricevuto non è una stringa"
 
-#: builtin.c:2305
+#: builtin.c:2290
 msgid "toupper: received non-string argument"
-msgstr "toupper: l'argomento non è una stringa"
+msgstr "toupper: l'argomento ricevuto non è una stringa"
 
-#: builtin.c:2341 mpfr.c:672
+#: builtin.c:2323 mpfr.c:679
 msgid "atan2: received non-numeric first argument"
-msgstr "atan2: primo argomento non-numerico"
+msgstr "atan2: il primo argomento ricevuto non è numerico"
 
-#: builtin.c:2343 mpfr.c:674
+#: builtin.c:2325 mpfr.c:681
 msgid "atan2: received non-numeric second argument"
-msgstr "atan2: secondo argomento non-numerico"
+msgstr "atan2: il secondo argomento ricevuto non è numerico"
 
-#: builtin.c:2362
+#: builtin.c:2344
 msgid "sin: received non-numeric argument"
-msgstr "sin: argomento non-numerico"
+msgstr "sin: l'argomento ricevuto non è numerico"
 
-#: builtin.c:2378
+#: builtin.c:2360
 msgid "cos: received non-numeric argument"
-msgstr "cos: argomento non-numerico"
+msgstr "cos: l'argomento ricevuto non è numerico"
 
-#: builtin.c:2431 mpfr.c:1156
+#: builtin.c:2413 mpfr.c:1176
 msgid "srand: received non-numeric argument"
-msgstr "srand: argomento non-numerico"
+msgstr "srand: l'argomento ricevuto non è numerico"
 
-#: builtin.c:2462
+#: builtin.c:2444
 msgid "match: third argument is not an array"
 msgstr "match: terzo argomento non-vettoriale"
 
-#: builtin.c:2734
-msgid "gensub: third argument of 0 treated as 1"
-msgstr "gensub: il terzo argomento è 0, trattato come 1"
+#: builtin.c:2705
+#, c-format
+msgid "gensub: third argument `%.*s' treated as 1"
+msgstr "gensub: il terzo argomento `%.*s' trattato come 1"
 
-#: builtin.c:3030
+#: builtin.c:2720
+#, c-format
+msgid "gensub: third argument %g treated as 1"
+msgstr "gensub: il terzo argomento %g trattato come 1"
+
+#: builtin.c:3020
 msgid "lshift: received non-numeric first argument"
-msgstr "lshift: primo argomento non-numerico"
+msgstr "lshift: il primo argomento ricevuto non è numerico"
 
-#: builtin.c:3032
+#: builtin.c:3022
 msgid "lshift: received non-numeric second argument"
-msgstr "lshift: secondo argomento non-numerico"
+msgstr "lshift: il secondo argomento ricevuto non è numerico"
 
-#: builtin.c:3038
+#: builtin.c:3028
 #, c-format
 msgid "lshift(%f, %f): negative values will give strange results"
 msgstr "lshift(%f, %f): valori negativi daranno risultati strani"
 
-#: builtin.c:3040
+#: builtin.c:3030
 #, c-format
 msgid "lshift(%f, %f): fractional values will be truncated"
 msgstr "lshift(%f, %f): valori decimali saranno troncati"
 
-#: builtin.c:3042
+#: builtin.c:3032
 #, c-format
 msgid "lshift(%f, %f): too large shift value will give strange results"
 msgstr "lshift(%f, %f): valori troppo alti daranno risultati strani"
 
-#: builtin.c:3067
+#: builtin.c:3057
 msgid "rshift: received non-numeric first argument"
-msgstr "rshift: primo argomento ricevuto non-numerico"
+msgstr "rshift: il primo argomento ricevuto non è numerico"
 
-#: builtin.c:3069
+#: builtin.c:3059
 msgid "rshift: received non-numeric second argument"
-msgstr "rshift: secondo argomento non-numerico"
+msgstr "rshift: il secondo argomento ricevuto non è numerico"
 
-#: builtin.c:3075
+#: builtin.c:3065
 #, c-format
 msgid "rshift(%f, %f): negative values will give strange results"
 msgstr "rshift(%f, %f): valori negativi daranno risultati strani"
 
-#: builtin.c:3077
+#: builtin.c:3067
 #, c-format
 msgid "rshift(%f, %f): fractional values will be truncated"
 msgstr "rshift(%f, %f): valori decimali saranno troncati"
 
-#: builtin.c:3079
+#: builtin.c:3069
 #, c-format
 msgid "rshift(%f, %f): too large shift value will give strange results"
 msgstr "rshift(%f, %f): valori troppo alti daranno risultati strani"
 
-#: builtin.c:3104 mpfr.c:968
+#: builtin.c:3094 mpfr.c:988
 msgid "and: called with less than two arguments"
 msgstr "and: chiamata con meno di due argomenti"
 
-#: builtin.c:3109
+#: builtin.c:3099
 #, c-format
 msgid "and: argument %d is non-numeric"
-msgstr "and: argomento %d non-numerico"
+msgstr "and: l'argomento %d non è numerico"
 
-#: builtin.c:3113
+#: builtin.c:3103
 #, c-format
 msgid "and: argument %d negative value %g will give strange results"
 msgstr "and: argomento %d, valore negativo %g darà risultati strani"
 
-#: builtin.c:3136 mpfr.c:1000
+#: builtin.c:3126 mpfr.c:1020
 msgid "or: called with less than two arguments"
 msgstr "or: chiamata con meno di due argomenti"
 
-#: builtin.c:3141
+#: builtin.c:3131
 #, c-format
 msgid "or: argument %d is non-numeric"
-msgstr "or: argomento %d non-numerico"
+msgstr "or: l'argomento %d non è numerico"
 
-#: builtin.c:3145
+#: builtin.c:3135
 #, c-format
 msgid "or: argument %d negative value %g will give strange results"
 msgstr "or: argomento %d, valore negativo %g darà risultati strani"
 
-#: builtin.c:3167 mpfr.c:1031
+#: builtin.c:3157 mpfr.c:1051
 msgid "xor: called with less than two arguments"
 msgstr "xor: chiamata con meno di due argomenti"
 
-#: builtin.c:3173
+#: builtin.c:3163
 #, c-format
 msgid "xor: argument %d is non-numeric"
-msgstr "xor: argomento %d non-numerico"
+msgstr "xor: l'argomento %d non è numerico"
 
-#: builtin.c:3177
+#: builtin.c:3167
 #, c-format
 msgid "xor: argument %d negative value %g will give strange results"
 msgstr "xor: argomento %d, valore negativo %g darà risultati strani"
 
-#: builtin.c:3202 mpfr.c:787
+#: builtin.c:3192 mpfr.c:807
 msgid "compl: received non-numeric argument"
-msgstr "compl: argomento non-numerico"
+msgstr "compl: l'argomento ricevuto non è numerico"
 
-#: builtin.c:3208
+#: builtin.c:3198
 #, c-format
 msgid "compl(%f): negative value will give strange results"
 msgstr "compl(%f): valore negativo, darà risultati strani"
 
-#: builtin.c:3210
+#: builtin.c:3200
 #, c-format
 msgid "compl(%f): fractional value will be truncated"
 msgstr "compl(%f): valori decimali saranno troncati"
 
-#: builtin.c:3379
+#: builtin.c:3369
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: `%s' non è una categoria `locale' valida"
@@ -1167,7 +1187,7 @@ msgstr "print var [var] - stampa valore di variabile/i o vettore/i."
 
 #: command.y:865
 msgid "printf format, [arg], ... - formatted output."
-msgstr "printf format, [arg], ... - output secondo formato specificato."
+msgstr "printf format, [arg], ... - output secondo formato."
 
 #: command.y:867
 msgid "quit - exit debugger."
@@ -1228,8 +1248,8 @@ msgid ""
 "until [[filename:]N|function] - execute until program reaches a different "
 "line or line N within current frame."
 msgstr ""
-"until [[nome-file:]N|funzione] - esegui finché il programma arriva una "
-"riga differente, o alla riga N nell'elemento di stack corrente."
+"until [[nome-file:]N|funzione] - esegui finché il programma arriva una riga "
+"differente, o alla riga N nell'elemento di stack corrente."
 
 #: command.y:895
 msgid "unwatch [N] - remove variable(s) from watch list."
@@ -1243,40 +1263,48 @@ msgstr "up [N] - spostati di N elementi dello stack verso l'alto."
 msgid "watch var - set a watchpoint for a variable."
 msgstr "watch var - imposta un watchpoint per una variabile."
 
-#: command.y:1011 debug.c:401 msg.c:135
+#: command.y:901
+msgid ""
+"where [N] - (same as backtrace) print trace of all or N innermost (outermost "
+"if N < 0) frames."
+msgstr ""
+"dove [N] - (equivalente a backtrace) stampa tracia di tutti gli elementi o "
+"degli N più interni (più esterni se N <0)"
+
+#: command.y:1013 debug.c:401 msg.c:135
 #, c-format
 msgid "error: "
 msgstr "errore: "
 
-#: command.y:1051
+#: command.y:1053
 #, c-format
 msgid "can't read command (%s)\n"
 msgstr "non riesco a leggere comando (%s)\n"
 
-#: command.y:1065
+#: command.y:1067
 #, c-format
 msgid "can't read command (%s)"
 msgstr "non riesco a leggere comando (%s)"
 
-#: command.y:1116
+#: command.y:1118
 msgid "invalid character in command"
 msgstr "carattere non valido nel comando"
 
-#: command.y:1152
+#: command.y:1154
 #, c-format
 msgid "unknown command - \"%.*s\", try help"
 msgstr "comando sconosciuto - \"%.*s\", vedere help"
 
-#: command.y:1222
+#: command.y:1224
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.y:1284
+#: command.y:1286
 msgid "invalid character"
 msgstr "carattere non valido"
 
-#: command.y:1455
+#: command.y:1457
 #, c-format
 msgid "undefined command: %s\n"
 msgstr "comando non definito: %s\n"
@@ -1807,68 +1835,68 @@ msgstr "`%s' non consentito nel contesto corrente; istruzione ignorata"
 msgid "`return' not allowed in current context; statement ignored"
 msgstr "`return' non consentito nel contesto corrente; istruzione ignorata"
 
-#: debug.c:5590
+#: debug.c:5604
 #, c-format
 msgid "No symbol `%s' in current context"
 msgstr "Simbolo `%s' non esiste nel contesto corrente"
 
-#: dfa.c:1118 dfa.c:1121 dfa.c:1142 dfa.c:1150 dfa.c:1162 dfa.c:1197
-#: dfa.c:1206 dfa.c:1209 dfa.c:1214 dfa.c:1228 dfa.c:1275
+#: dfa.c:1063 dfa.c:1066 dfa.c:1085 dfa.c:1095 dfa.c:1107 dfa.c:1143
+#: dfa.c:1152 dfa.c:1155 dfa.c:1160 dfa.c:1174 dfa.c:1222
 msgid "unbalanced ["
 msgstr "[ non chiusa"
 
-#: dfa.c:1174
+#: dfa.c:1119
 msgid "invalid character class"
 msgstr "character class non valida"
 
-#: dfa.c:1316
+#: dfa.c:1265
 msgid "character class syntax is [[:space:]], not [:space:]"
 msgstr "sintassi character class è [[:spazio:]], non [:spazio:]"
 
-#: dfa.c:1366
+#: dfa.c:1327
 msgid "unfinished \\ escape"
 msgstr "sequenza escape \\ non completa"
 
-#: dfa.c:1513 regcomp.c:161
-msgid "Invalid content of \\{\\}"
-msgstr "Contenuto di \\{\\} non valido"
+#: dfa.c:1474
+msgid "invalid content of \\{\\}"
+msgstr "contenuto di \\{\\} non valido"
 
-#: dfa.c:1516 regcomp.c:176
-msgid "Regular expression too big"
-msgstr "Espressione regolare troppo complessa"
+#: dfa.c:1477
+msgid "regular expression too big"
+msgstr "espressione regolare troppo complessa"
 
-#: dfa.c:1936
+#: dfa.c:1912
 msgid "unbalanced ("
 msgstr "( non chiusa"
 
-#: dfa.c:2062
+#: dfa.c:2038
 msgid "no syntax specified"
 msgstr "nessuna sintassi specificata"
 
-#: dfa.c:2070
+#: dfa.c:2046
 msgid "unbalanced )"
 msgstr ") non aperta"
 
-#: eval.c:394
+#: eval.c:396
 #, c-format
 msgid "unknown nodetype %d"
 msgstr "tipo nodo sconosciuto %d"
 
-#: eval.c:405 eval.c:419
+#: eval.c:407 eval.c:421
 #, c-format
 msgid "unknown opcode %d"
 msgstr "codice operativo sconosciuto %d"
 
-#: eval.c:416
+#: eval.c:418
 #, c-format
 msgid "opcode %s not an operator or keyword"
 msgstr "codice operativo %s non è un operatore o una parola chiave"
 
-#: eval.c:472
+#: eval.c:474
 msgid "buffer overflow in genflags2str"
 msgstr "superamento limiti buffer in 'genflags2str'"
 
-#: eval.c:675
+#: eval.c:676
 #, c-format
 msgid ""
 "\n"
@@ -1879,216 +1907,216 @@ msgstr ""
 "\t# `Stack' (Pila) Chiamate Funzione:\n"
 "\n"
 
-#: eval.c:704
+#: eval.c:705
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "`IGNORECASE' è un'estensione gawk"
 
-#: eval.c:736
+#: eval.c:737
 msgid "`BINMODE' is a gawk extension"
 msgstr "`BINMODE' è un'estensione gawk"
 
-#: eval.c:794
+#: eval.c:795
 #, c-format
 msgid "BINMODE value `%s' is invalid, treated as 3"
 msgstr "valore di BINMODE `%s' non valido, considerato come 3"
 
-#: eval.c:885
+#: eval.c:912
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "specificazione invalida `%sFMT' `%s'"
 
-#: eval.c:969
+#: eval.c:996
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "disabilito `--lint' a causa di assegnamento a `LINT'"
 
-#: eval.c:1147
+#: eval.c:1174
 #, c-format
 msgid "reference to uninitialized argument `%s'"
 msgstr "riferimento ad argomento non inizializzato `%s'"
 
-#: eval.c:1148
+#: eval.c:1175
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "riferimento a variabile non inizializzata `%s'"
 
-#: eval.c:1166
+#: eval.c:1193
 msgid "attempt to field reference from non-numeric value"
 msgstr "tentativo di riferimento a un campo da valore non-numerico"
 
-#: eval.c:1168
+#: eval.c:1195
 msgid "attempt to field reference from null string"
 msgstr "tentativo di riferimento a un campo da una stringa nulla"
 
-#: eval.c:1176
+#: eval.c:1203
 #, c-format
 msgid "attempt to access field %ld"
 msgstr "tentativo di accedere al campo %ld"
 
-#: eval.c:1185
+#: eval.c:1212
 #, c-format
 msgid "reference to uninitialized field `$%ld'"
 msgstr "riferimento a campo non inizializzato `$%ld'"
 
-#: eval.c:1272
+#: eval.c:1299
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "funzione `%s' chiamata con più argomenti di quelli previsti"
 
-#: eval.c:1473
+#: eval.c:1500
 #, c-format
 msgid "unwind_stack: unexpected type `%s'"
 msgstr "unwind_stack: tipo non previsto `%s'"
 
-#: eval.c:1569
+#: eval.c:1596
 msgid "division by zero attempted in `/='"
 msgstr "divisione per zero tentata in `/='"
 
-#: eval.c:1576
+#: eval.c:1603
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "divisione per zero tentata in `%%='"
 
-#: ext.c:89 ext.c:171
+#: ext.c:65 ext.c:147
 msgid "extensions are not allowed in sandbox mode"
 msgstr "le estensioni non sono consentite in modo `sandbox'"
 
-#: ext.c:92
+#: ext.c:68
 msgid "-l / @load are gawk extensions"
 msgstr "-l / @load sono estensioni gawk"
 
-#: ext.c:95
+#: ext.c:71
 msgid "load_ext: received NULL lib_name"
-msgstr "load_ext: nome libreria ricevuto è NULL"
+msgstr "load_ext: il nome libreria ricevuto è NULL"
 
-#: ext.c:98
+#: ext.c:74
 #, c-format
 msgid "load_ext: cannot open library `%s' (%s)\n"
 msgstr "load_ext: non riesco ad aprire libreria `%s' (%s)\n"
 
-#: ext.c:104
+#: ext.c:80
 #, c-format
 msgid ""
 "load_ext: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
 msgstr ""
 "load_ext: libreria `%s': non definisce `plugin_is_GPL_compatible' (%s)\n"
 
-#: ext.c:110
+#: ext.c:86
 #, c-format
 msgid "load_ext: library `%s': cannot call function `%s' (%s)\n"
 msgstr "load_ext: libreria `%s': non riesco a chiamare funzione `%s' (%s)\n"
 
-#: ext.c:114
+#: ext.c:90
 #, c-format
 msgid "load_ext: library `%s' initialization routine `%s' failed\n"
 msgstr ""
 "load_ext: libreria `%s' routine di inizializzazione `%s' non riuscita\n"
 
-#: ext.c:174
+#: ext.c:150
 msgid "`extension' is a gawk extension"
 msgstr "`extension' è un'estensione gawk"
 
-#: ext.c:177
+#: ext.c:153
 msgid "extension: received NULL lib_name"
-msgstr "extension: nome libreria ricevuto è NULL"
+msgstr "extension: il nome libreria ricevuto è NULL"
 
-#: ext.c:180
+#: ext.c:156
 #, c-format
 msgid "extension: cannot open library `%s' (%s)"
 msgstr "extension: non riesco ad aprire libreria `%s' (%s)"
 
-#: ext.c:186
+#: ext.c:162
 #, c-format
 msgid ""
 "extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)"
 msgstr ""
 "extension: libreria `%s': non definisce `plugin_is_GPL_compatible' (%s)"
 
-#: ext.c:190
+#: ext.c:166
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)"
 msgstr "extension: libreria `%s': non riesco a chiamare funzione `%s' (%s)"
 
-#: ext.c:221
+#: ext.c:197
 msgid "make_builtin: missing function name"
 msgstr "make_builtin: manca nome di funzione"
 
-#: ext.c:236
+#: ext.c:212
 #, c-format
 msgid "make_builtin: can't redefine function `%s'"
 msgstr "make_builtin: non riesco a ridefinire funzione `%s'"
 
-#: ext.c:240
+#: ext.c:216
 #, c-format
 msgid "make_builtin: function `%s' already defined"
 msgstr "make_builtin: funzione `%s' già definita"
 
-#: ext.c:244
+#: ext.c:220
 #, c-format
 msgid "make_builtin: function name `%s' previously defined"
 msgstr "make_builtin: funzione di nome `%s' definita in precedenza"
 
-#: ext.c:246
+#: ext.c:222
 #, c-format
 msgid "make_builtin: can't use gawk built-in `%s' as function name"
 msgstr ""
 "make_builtin: nome funzione interna gawk `%s' non ammesso come nome funzione"
 
-#: ext.c:249 ext.c:304
+#: ext.c:225 ext.c:280
 #, c-format
 msgid "make_builtin: negative argument count for function `%s'"
 msgstr "make_builtin: contatore argomenti negativo per la funzione `%s'"
 
-#: ext.c:276
+#: ext.c:252
 msgid "extension: missing function name"
 msgstr "extension: manca nome di funzione"
 
-#: ext.c:279 ext.c:283
+#: ext.c:255 ext.c:259
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: carattere non ammesso `%c' nel nome di funzione `%s'"
 
-#: ext.c:291
+#: ext.c:267
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: non riesco a ridefinire funzione `%s'"
 
-#: ext.c:295
+#: ext.c:271
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr "extension: funzione `%s' già definita"
 
-#: ext.c:299
+#: ext.c:275
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "extension: funzione di nome `%s' definita in precedenza"
 
-#: ext.c:301
+#: ext.c:277
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 "extension: nome funzione interna gawk `%s' non ammesso come nome funzione"
 
-#: ext.c:375
+#: ext.c:351
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "funzione `%s' definita per avere al massimo %d argomenti(o)"
 
-#: ext.c:378
+#: ext.c:354
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "funzione `%s': manca argomento #%d"
 
-#: ext.c:395
+#: ext.c:371
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "funzione `%s': argomento #%d: tentativo di usare scalare come vettore"
 
-#: ext.c:399
+#: ext.c:375
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr "funzione `%s': argomento #%d: tentativo di usare vettore come scalare"
 
-#: ext.c:413
+#: ext.c:389
 msgid "dynamic loading of library not supported"
 msgstr "caricamento dinamico di libreria non supportato"
 
@@ -2232,7 +2260,7 @@ msgstr "wait: chiamata con troppi argomenti"
 msgid "inplace_begin: in-place editing already active"
 msgstr "inplace_begin: modifica in-place già attiva"
 
-#: extension/inplace.c:133 extension/inplace.c:207
+#: extension/inplace.c:133 extension/inplace.c:210
 #, c-format
 msgid "inplace_begin: expects 2 arguments but called with %d"
 msgstr "inplace_begin: 2 argumenti richiesti, ma chiamata con %d"
@@ -2263,56 +2291,56 @@ msgstr "inplace_begin: `%s' non è un file regolare"
 msgid "inplace_begin: mkstemp(`%s') failed (%s)"
 msgstr "inplace_begin: mkstemp(`%s') non riuscita (%s)"
 
-#: extension/inplace.c:178
+#: extension/inplace.c:181
 #, c-format
 msgid "inplace_begin: chmod failed (%s)"
 msgstr "inplace_begin: chmod non riuscita (%s)"
 
-#: extension/inplace.c:185
+#: extension/inplace.c:188
 #, c-format
 msgid "inplace_begin: dup(stdout) failed (%s)"
 msgstr "inplace_begin: dup(stdout) non riuscita (%s)"
 
-#: extension/inplace.c:188
+#: extension/inplace.c:191
 #, c-format
 msgid "inplace_begin: dup2(%d, stdout) failed (%s)"
 msgstr "inplace_begin: dup2(%d, stdout) non riuscita (%s)"
 
-#: extension/inplace.c:191
+#: extension/inplace.c:194
 #, c-format
 msgid "inplace_begin: close(%d) failed (%s)"
 msgstr "inplace_begin: close(%d) non riuscita (%s)"
 
-#: extension/inplace.c:210
+#: extension/inplace.c:213
 msgid "inplace_end: cannot retrieve 1st argument as a string filename"
 msgstr ""
 "inplace_end: non riesco a trovare il 1° argomento come stringa nome-file"
 
-#: extension/inplace.c:217
+#: extension/inplace.c:220
 msgid "inplace_end: in-place editing not active"
 msgstr "inplace_end: modifica in-place non attiva"
 
-#: extension/inplace.c:223
+#: extension/inplace.c:226
 #, c-format
 msgid "inplace_end: dup2(%d, stdout) failed (%s)"
 msgstr "inplace_end: dup2(%d, stdout) non riuscita (%s)"
 
-#: extension/inplace.c:226
+#: extension/inplace.c:229
 #, c-format
 msgid "inplace_end: close(%d) failed (%s)"
 msgstr "inplace_end: close(%d) non riuscita (%s)"
 
-#: extension/inplace.c:230
+#: extension/inplace.c:233
 #, c-format
 msgid "inplace_end: fsetpos(stdout) failed (%s)"
 msgstr "inplace_end: fsetpos(stdout) non riuscita (%s)"
 
-#: extension/inplace.c:243
+#: extension/inplace.c:246
 #, c-format
 msgid "inplace_end: link(`%s', `%s') failed (%s)"
 msgstr "inplace_end: link(`%s', `%s') non riuscita (%s)"
 
-#: extension/inplace.c:253
+#: extension/inplace.c:256
 #, c-format
 msgid "inplace_end: rename(`%s', `%s') failed (%s)"
 msgstr "inplace_end: rename(`%s', `%s') non riuscito (%s)"
@@ -2354,50 +2382,54 @@ msgstr "readfile: chiamata con troppi argomenti"
 msgid "readfile: called with no arguments"
 msgstr "readfile: chiamata senza argomenti"
 
-#: extension/rwarray.c:124
+#: extension/revoutput.c:125
+msgid "revoutput: could not initialize REVOUT variable"
+msgstr ""
+
+#: extension/rwarray.c:124 extension/rwarray0.c:109
 msgid "writea: called with too many arguments"
 msgstr "writea: chiamata con troppi argomenti"
 
-#: extension/rwarray.c:131
+#: extension/rwarray.c:131 extension/rwarray0.c:116
 #, c-format
 msgid "do_writea: argument 0 is not a string\n"
 msgstr "do_writea: argomento 0 non è una stringa\n"
 
-#: extension/rwarray.c:137
+#: extension/rwarray.c:137 extension/rwarray0.c:122
 #, c-format
 msgid "do_writea: argument 1 is not an array\n"
 msgstr "do_writea: argomento 1 non-vettoriale\n"
 
-#: extension/rwarray.c:184
+#: extension/rwarray.c:184 extension/rwarray0.c:169
 #, c-format
 msgid "write_array: could not flatten array\n"
 msgstr "write_array: non sono riuscito a appiattire un vettore\n"
 
-#: extension/rwarray.c:198
+#: extension/rwarray.c:198 extension/rwarray0.c:183
 #, c-format
 msgid "write_array: could not release flattened array\n"
 msgstr "write_array: non sono riuscito a rilasciare un vettore appiattito\n"
 
-#: extension/rwarray.c:280
+#: extension/rwarray.c:280 extension/rwarray0.c:265
 msgid "reada: called with too many arguments"
 msgstr "reada: chiamata con troppi argomenti"
 
-#: extension/rwarray.c:287
+#: extension/rwarray.c:287 extension/rwarray0.c:272
 #, c-format
 msgid "do_reada: argument 0 is not a string\n"
 msgstr "do_reada: argomento 0 non è una stringa\n"
 
-#: extension/rwarray.c:293
+#: extension/rwarray.c:293 extension/rwarray0.c:278
 #, c-format
 msgid "do_reada: argument 1 is not an array\n"
 msgstr "do_reada: argomento 1 non-vettoriale\n"
 
-#: extension/rwarray.c:337
+#: extension/rwarray.c:337 extension/rwarray0.c:322
 #, c-format
 msgid "do_reada: clear_array failed\n"
 msgstr "do_reada: clear_array non riuscita\n"
 
-#: extension/rwarray.c:374
+#: extension/rwarray.c:374 extension/rwarray0.c:358
 #, c-format
 msgid "read_array: set_array_element failed\n"
 msgstr "read_array: set_array_element non riuscita\n"
@@ -2426,90 +2458,90 @@ msgstr "sleep: l'argomento è negativo"
 msgid "sleep: not supported on this platform"
 msgstr "sleep: non supportato in questa architettura"
 
-#: field.c:345
+#: field.c:346
 msgid "NF set to negative value"
 msgstr "NF impostato a un valore negativo"
 
-#: field.c:971 field.c:978 field.c:982
+#: field.c:958 field.c:965 field.c:969
 msgid "split: fourth argument is a gawk extension"
 msgstr "split: il quarto argomento è un'estensione gawk"
 
-#: field.c:975
+#: field.c:962
 msgid "split: fourth argument is not an array"
 msgstr "split: quarto argomento non-vettoriale"
 
-#: field.c:989
+#: field.c:976
 msgid "split: second argument is not an array"
 msgstr "split: secondo argomento non-vettoriale"
 
-#: field.c:993
+#: field.c:980
 msgid "split: cannot use the same array for second and fourth args"
 msgstr ""
 "split: non si può usare un unico vettore come secondo e quarto argomento"
 
-#: field.c:998
+#: field.c:985
 msgid "split: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "split: non consentito un quarto argomento che sia un sottovettore del "
 "secondo argomento"
 
-#: field.c:1001
+#: field.c:988
 msgid "split: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "split: non consentito un secondo argomento che sia un sottovettore del "
 "quarto argomento"
 
-#: field.c:1032
+#: field.c:1019
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: la stringa nulla come terzo arg. è un'estensione gawk"
 
-#: field.c:1072
+#: field.c:1059
 msgid "patsplit: fourth argument is not an array"
 msgstr "patsplit: secondo argomento non-vettoriale"
 
-#: field.c:1077
+#: field.c:1064
 msgid "patsplit: second argument is not an array"
 msgstr "patsplit: secondo argomento non-vettoriale"
 
-#: field.c:1083
+#: field.c:1070
 msgid "patsplit: third argument must be non-null"
 msgstr "patsplit: il terzo argomento non può essere nullo"
 
-#: field.c:1087
+#: field.c:1074
 msgid "patsplit: cannot use the same array for second and fourth args"
 msgstr ""
 "patsplit: non si può usare un unico vettore come secondo e quarto argomento"
 
-#: field.c:1092
+#: field.c:1079
 msgid "patsplit: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "patsplit: non consentito un quarto argomento che sia un sottovettore del "
 "secondo argomento"
 
-#: field.c:1095
+#: field.c:1082
 msgid "patsplit: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "patsplit: non consentito un secondo argomento che sia un sottovettore del "
 "quarto argomento"
 
-#: field.c:1133
+#: field.c:1120
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "`FIELDWIDTHS' è un'estensione gawk"
 
-#: field.c:1197
+#: field.c:1184
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "valore di FIELDWIDTHS non valido, vicino a `%s'"
 
-#: field.c:1270
+#: field.c:1257
 msgid "null string for `FS' is a gawk extension"
 msgstr "la stringa nulla usata come `FS' è un'estensione gawk"
 
-#: field.c:1274
+#: field.c:1261
 msgid "old awk does not support regexps as value of `FS'"
 msgstr "il vecchio awk non supporta espressioni come valori di `FS'"
 
-#: field.c:1393
+#: field.c:1380
 msgid "`FPAT' is a gawk extension"
 msgstr "`FPAT' è un'estensione gawk"
 
@@ -2525,20 +2557,20 @@ msgstr "node_to_awk_value: ricevuto nodo nullo"
 msgid "node_to_awk_value: received null val"
 msgstr "node_to_awk_value: ricevuto valore nullo"
 
-#: gawkapi.c:807
+#: gawkapi.c:809
 msgid "remove_element: received null array"
 msgstr "remove_element: ricevuto vettore nullo"
 
-#: gawkapi.c:810
+#: gawkapi.c:812
 msgid "remove_element: received null subscript"
 msgstr "remove_element: ricevuto indice nullo"
 
-#: gawkapi.c:947
+#: gawkapi.c:949
 #, c-format
 msgid "api_flatten_array: could not convert index %d\n"
 msgstr "api_flatten_array: non sono riuscito a convertire l'indice %d\n"
 
-#: gawkapi.c:952
+#: gawkapi.c:954
 #, c-format
 msgid "api_flatten_array: could not convert value %d\n"
 msgstr "api_flatten_array: non sono riuscito a convertire il valore %d\n"
@@ -2598,293 +2630,275 @@ msgstr "%s: l'opzione '-W %s' non ammette un argomento\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: l'opzione '-W %s' richiede un argomento\n"
 
-#: io.c:392
+#: io.c:423
 #, c-format
 msgid "command line argument `%s' is a directory: skipped"
-msgstr "l'argomento in linea comando `%s' è una directory: saltato"
+msgstr "l'argomento in riga comando `%s' è una directory: ignorata"
 
-#: io.c:395 io.c:513
+#: io.c:426 io.c:544
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "non riesco ad aprire file `%s' in lettura (%s)"
 
-#: io.c:640
+#: io.c:671
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "chiusura di fd %d (`%s') non riuscita (%s)"
 
-#: io.c:716
+#: io.c:749
 msgid "redirection not allowed in sandbox mode"
 msgstr "ri-direzione non consentita in modo `sandbox'"
 
-#: io.c:750
+#: io.c:783
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "espressione nella ri-direzione `%s' ha solo un valore numerico"
 
-#: io.c:756
+#: io.c:789
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "espressione nella ri-direzione `%s' ha per valore la stringa nulla"
 
-#: io.c:761
+#: io.c:794
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "nome-file `%s' per la ri-direzione `%s' può essere il risultato di una "
 "espressione logica"
 
-#: io.c:809
+#: io.c:842
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "mistura non necessaria di `>' e `>>' per il file `%.*s'"
 
-#: io.c:863
+#: io.c:896
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "non riesco ad aprire `pipe' `%s' in scrittura (%s)"
 
-#: io.c:873
+#: io.c:906
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "non riesco ad aprire `pipe' `%s' in lettura (%s)"
 
-#: io.c:904
+#: io.c:937
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr ""
 "non riesco ad aprire `pipe' bidirezionale `%s' in lettura/scrittura (%s)"
 
-#: io.c:986
+#: io.c:1019
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "non riesco a ri-dirigere da `%s' (%s)"
 
-#: io.c:989
+#: io.c:1022
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "non riesco a ri-dirigere a `%s' (%s)"
 
-#: io.c:1040
+#: io.c:1073
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "numero massimo consentito di file aperti raggiunto: comincio a riutilizzare "
 "i descrittori di file"
 
-#: io.c:1056
+#: io.c:1089
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "chiusura di `%s' non riuscita (%s)."
 
-#: io.c:1064
+#: io.c:1097
 msgid "too many pipes or input files open"
 msgstr "troppe `pipe' o file di input aperti"
 
-#: io.c:1086
+#: io.c:1119
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: il secondo argomento deve essere `a' o `da'"
 
-#: io.c:1103
+#: io.c:1136
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: `%.*s' non è un file aperto, una `pipe' o un co-processo"
 
-#: io.c:1108
+#: io.c:1141
 msgid "close of redirection that was never opened"
 msgstr "chiusura di una ri-direzione mai aperta"
 
-#: io.c:1205
+#: io.c:1238
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr "close: ri-direzione `%s' non aperta con `|&', ignoro secondo argomento"
 
-#: io.c:1222
+#: io.c:1255
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "errore ritornato (%d) dalla chiusura della `pipe' `%s' (%s)"
 
-#: io.c:1225
+#: io.c:1258
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "errore ritornato (%d) dalla chiusura del file `%s' (%s)"
 
-#: io.c:1245
+#: io.c:1278
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "nessuna chiusura esplicita richiesta per `socket' `%s'"
 
-#: io.c:1248
+#: io.c:1281
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "nessuna chiusura esplicita richiesta per co-processo `%s'"
 
-#: io.c:1251
+#: io.c:1284
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "nessuna chiusura esplicita richiesta per `pipe' `%s'"
 
-#: io.c:1254
+#: io.c:1287
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "nessuna chiusura esplicita richiesta per file `%s'"
 
-#: io.c:1284 io.c:1342 main.c:864 main.c:906
+#: io.c:1317 io.c:1375 main.c:628 main.c:670
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "errore scrivendo 'standard output' (%s)"
 
-#: io.c:1289 io.c:1348 main.c:866
+#: io.c:1322 io.c:1381 main.c:630
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "errore scrivendo 'standard error' (%s)"
 
-#: io.c:1297
+#: io.c:1330
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "scaricamento di `pipe' `%s' non riuscito (%s)."
 
-#: io.c:1300
+#: io.c:1333
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "scaricamento da co-processo di `pipe' a `%s' non riuscito (%s)."
 
-#: io.c:1303
+#: io.c:1336
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "scaricamento di file `%s' non riuscito (%s)."
 
-#: io.c:1420
+#: io.c:1453
 #, c-format
 msgid "local port %s invalid in `/inet'"
 msgstr "porta locale %s invalida in `/inet'"
 
-#: io.c:1438
+#: io.c:1471
 #, c-format
 msgid "remote host and port information (%s, %s) invalid"
 msgstr "host remoto e informazione di porta (%s, %s) invalidi"
 
-#: io.c:1590
-#, c-format
-msgid "no (known) protocol supplied in special filename `%s'"
-msgstr "nessuno protocollo (noto) specificato nel filename speciale `%s'"
-
-#: io.c:1604
-#, c-format
-msgid "special file name `%s' is incomplete"
-msgstr "nome-file speciale `%s' incompleto"
-
-#: io.c:1621
-msgid "must supply a remote hostname to `/inet'"
-msgstr "va fornito nome di `host' remoto a `/inet'"
-
-#: io.c:1639
-msgid "must supply a remote port to `/inet'"
-msgstr "va fornita porta remota a `/inet'"
-
-#: io.c:1685
+#: io.c:1673
 msgid "TCP/IP communications are not supported"
 msgstr "comunicazioni TCP/IP non supportate"
 
-#: io.c:1867
+#: io.c:1854
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "non riesco ad aprire `%s', modo `%s'"
 
-#: io.c:1917
+#: io.c:1904
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "close di `pty' principale non riuscita (%s)"
 
-#: io.c:1919 io.c:2105 io.c:2305
+#: io.c:1906 io.c:2092 io.c:2293
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "close di `stdout' nel processo-figlio non riuscita (%s)"
 
-#: io.c:1922
+#: io.c:1909
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 "trasferimento di `pty' secondaria a `stdout' nel processo-figlio non "
 "riuscita (dup: %s)"
 
-#: io.c:1924 io.c:2110
+#: io.c:1911 io.c:2097
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "close di `stdin' nel processo-figlio non riuscita (%s)"
 
-#: io.c:1927
+#: io.c:1914
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 "trasferimento di 'pty' secondaria a 'stdin' nel processo-figlio non riuscito "
 "(dup: %s)"
 
-#: io.c:1929 io.c:1951
+#: io.c:1916 io.c:1938
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "close di 'pty' secondaria non riuscita (%s)"
 
-#: io.c:2040 io.c:2108 io.c:2276 io.c:2308
+#: io.c:2027 io.c:2095 io.c:2264 io.c:2296
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr ""
 "passaggio di `pipe' a `stdout' nel processo-figlio non riuscito (dup: %s)"
 
-#: io.c:2047 io.c:2113
+#: io.c:2034 io.c:2100
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr ""
 "passaggio di pipe a `stdin' nel processo-figlio  non riuscito (dup: %s)"
 
-#: io.c:2073 io.c:2298
+#: io.c:2060 io.c:2286
 msgid "restoring stdout in parent process failed\n"
 msgstr "ripristino di `stdout' nel processo-padre non riuscito\n"
 
-#: io.c:2081
+#: io.c:2068
 msgid "restoring stdin in parent process failed\n"
 msgstr "ripristino di `stdin' nel processo-padre non riuscito\n"
 
-#: io.c:2116 io.c:2310 io.c:2324
+#: io.c:2103 io.c:2298 io.c:2313
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "close di 'pipe' non riuscita (%s)"
 
-#: io.c:2174
+#: io.c:2162
 msgid "`|&' not supported"
 msgstr "`|&' non supportato"
 
-#: io.c:2261
+#: io.c:2249
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "non riesco ad aprire `pipe' `%s' (%s)"
 
-#: io.c:2318
+#: io.c:2307
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "non riesco a creare processo-figlio per `%s' (fork: %s)"
 
-#: io.c:2790
+#: io.c:2734
 msgid "register_input_parser: received NULL pointer"
 msgstr "register_input_parser: ricevuto puntatore NULL"
 
-#: io.c:2818
+#: io.c:2762
 #, c-format
 msgid "input parser `%s' conflicts with previously installed input parser `%s'"
 msgstr ""
 "input parser `%s' in conflitto con l'input parser `%s' installato in "
 "precedenza"
 
-#: io.c:2825
+#: io.c:2769
 #, c-format
 msgid "input parser `%s' failed to open `%s'"
 msgstr "l'input parser `%s' non è riuscito ad aprire `%s'"
 
-#: io.c:2845
+#: io.c:2789
 msgid "register_output_wrapper: received NULL pointer"
 msgstr "register_output_wrapper: ricevuto puntatore NULL"
 
-#: io.c:2873
+#: io.c:2817
 #, c-format
 msgid ""
 "output wrapper `%s' conflicts with previously installed output wrapper `%s'"
@@ -2892,16 +2906,16 @@ msgstr ""
 "output wrapper `%s' in conflitto con l'output wrapper `%s' installato in "
 "precedenza"
 
-#: io.c:2880
+#: io.c:2824
 #, c-format
 msgid "output wrapper `%s' failed to open `%s'"
 msgstr "l'output wrapper `%s' non è riuscito ad aprire `%s'"
 
-#: io.c:2901
+#: io.c:2845
 msgid "register_output_processor: received NULL pointer"
 msgstr "register_output_processor: ricevuto puntatore NULL"
 
-#: io.c:2930
+#: io.c:2874
 #, c-format
 msgid ""
 "two-way processor `%s' conflicts with previously installed two-way processor "
@@ -2910,209 +2924,195 @@ msgstr ""
 "processore doppio `%s' in conflitto con il processore doppio installato in "
 "precedenza `%s'"
 
-#: io.c:2939
+#: io.c:2883
 #, c-format
 msgid "two way processor `%s' failed to open `%s'"
 msgstr "il processore doppio `%s' non è riuscito ad aprire `%s'"
 
-#: io.c:3064
+#: io.c:3008
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "file dati `%s' vuoto"
 
-#: io.c:3106 io.c:3114
+#: io.c:3050 io.c:3058
 msgid "could not allocate more input memory"
 msgstr "non riesco ad allocare ulteriore memoria per l'input"
 
-#: io.c:3682
+#: io.c:3636
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "valore multicarattere per `RS' è un'estensione gawk"
 
-#: io.c:3771
+#: io.c:3783
 msgid "IPv6 communication is not supported"
 msgstr "comunicazioni IPv6 non supportate"
 
-#: main.c:405
-msgid "empty argument to `-e/--source' ignored"
-msgstr "argomento di `-e/--source' nullo, ignorato"
-
-#: main.c:495
-#, c-format
-msgid "%s: option `-W %s' unrecognized, ignored\n"
-msgstr "%s: opzione `-W %s' non riconosciuta, ignorata\n"
-
-#: main.c:541
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: l'opzione richiede un argomento -- %c\n"
-
-#: main.c:562
+#: main.c:321
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr "variable d'ambiente `POSIXLY_CORRECT' impostata: attivo `--posix'"
 
-#: main.c:568
+#: main.c:327
 msgid "`--posix' overrides `--traditional'"
 msgstr "`--posix' annulla `--traditional'"
 
-#: main.c:579
+#: main.c:338
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "`--posix'/`--traditional' annulla `--non-decimal-data'"
 
-#: main.c:583
+#: main.c:342
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "eseguire %s con `setuid' root può essere un rischio per la sicurezza"
 
-#: main.c:588
+#: main.c:346
 msgid "`--posix' overrides `--characters-as-bytes'"
 msgstr "`--posix' annulla `--characters-as-bytes'"
 
-#: main.c:647
+#: main.c:404
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "non è possibile impostare modalità binaria su `stdin'(%s)"
 
-#: main.c:650
+#: main.c:407
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "non è possibile impostare modalità binaria su `stdout'(%s)"
 
-#: main.c:652
+#: main.c:409
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "non è possibile impostare modalità binaria su `stderr'(%s)"
 
-#: main.c:710
+#: main.c:469
 msgid "no program text at all!"
 msgstr "manca del tutto il testo del programma!"
 
-#: main.c:799
+#: main.c:563
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr "Uso: %s [opzioni in stile POSIX o GNU] -f file-prog. [--] file ...\n"
 
-#: main.c:801
+#: main.c:565
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr "Usage: %s [opzioni in stile POSIX o GNU] [--] %cprogramma%c file ...\n"
 
-#: main.c:806
+#: main.c:570
 msgid "POSIX options:\t\tGNU long options: (standard)\n"
 msgstr "Opzioni POSIX:\t\topzioni lunghe GNU: (standard)\n"
 
-#: main.c:807
+#: main.c:571
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f fileprog\t\t--file=file-prog.\n"
 
-#: main.c:808
+#: main.c:572
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F fs\t\t\t--field-separator=fs\n"
 
-#: main.c:809
+#: main.c:573
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=valore\t\t--assign=var=valore\n"
 
-#: main.c:810
+#: main.c:574
 msgid "Short options:\t\tGNU long options: (extensions)\n"
 msgstr "Opzioni brevi:\t\topzioni lunghe GNU: (estensioni)\n"
 
-#: main.c:811
+#: main.c:575
 msgid "\t-b\t\t\t--characters-as-bytes\n"
 msgstr "\t-b\t\t\t--characters-as-bytes\n"
 
-#: main.c:812
+#: main.c:576
 msgid "\t-c\t\t\t--traditional\n"
 msgstr "\t-c\t\t\t--traditional\n"
 
-#: main.c:813
+#: main.c:577
 msgid "\t-C\t\t\t--copyright\n"
 msgstr "\t-C\t\t\t--copyright\n"
 
-#: main.c:814
+#: main.c:578
 msgid "\t-d[file]\t\t--dump-variables[=file]\n"
 msgstr "\t-d[file]\t\t--dump-variables[=file]\n"
 
-#: main.c:815
+#: main.c:579
 msgid "\t-D[file]\t\t--debug[=file]\n"
 msgstr "\t-D[file]\t\t--debug[=file]\n"
 
-#: main.c:816
+#: main.c:580
 msgid "\t-e 'program-text'\t--source='program-text'\n"
 msgstr "\t-e 'testo-del-programma'\t--source='testo-del-programma'\n"
 
-#: main.c:817
+#: main.c:581
 msgid "\t-E file\t\t\t--exec=file\n"
 msgstr "\t-E file\t\t\t--exec=file\n"
 
-#: main.c:818
+#: main.c:582
 msgid "\t-g\t\t\t--gen-pot\n"
 msgstr "\t-g\t\t\t--gen-pot\n"
 
-#: main.c:819
+#: main.c:583
 msgid "\t-h\t\t\t--help\n"
 msgstr "\t-h\t\t\t--help\n"
 
-#: main.c:820
+#: main.c:584
 msgid "\t-i includefile\t\t--include=includefile\n"
 msgstr "\t-i include_file\t\t--include=include_file\n"
 
-#: main.c:821
+#: main.c:585
 msgid "\t-l library\t\t--load=library\n"
 msgstr "\t-l libreria\t\t--load=libreria\n"
 
-#: main.c:822
-msgid "\t-L [fatal]\t\t--lint[=fatal]\n"
-msgstr "\t-L [fatal]\t\t--lint[=fatal]\n"
+#: main.c:586
+msgid "\t-L[fatal|invalid]\t--lint[=fatal|invalid]\n"
+msgstr "\t-L[fatal|invalid]\t--lint[=fatal|invalid]\n"
 
-#: main.c:823
-msgid "\t-n\t\t\t--non-decimal-data\n"
-msgstr "\t-n\t\t\t--non-decimal-data\n"
-
-#: main.c:824
+#: main.c:587
 msgid "\t-M\t\t\t--bignum\n"
 msgstr "\t-M\t\t\t--bignum\n"
 
-#: main.c:825
+#: main.c:588
 msgid "\t-N\t\t\t--use-lc-numeric\n"
 msgstr "\t-N\t\t\t--use-lc-numeric\n"
 
-#: main.c:826
+#: main.c:589
+msgid "\t-n\t\t\t--non-decimal-data\n"
+msgstr "\t-n\t\t\t--non-decimal-data\n"
+
+#: main.c:590
 msgid "\t-o[file]\t\t--pretty-print[=file]\n"
 msgstr "\t-o[file]\t\t--pretty-print[=file]\n"
 
-#: main.c:827
+#: main.c:591
 msgid "\t-O\t\t\t--optimize\n"
 msgstr "\t-O\t\t\t--optimize\n"
 
-#: main.c:828
+#: main.c:592
 msgid "\t-p[file]\t\t--profile[=file]\n"
 msgstr "\t-p[file]\t\t--profile[=file]\n"
 
-#: main.c:829
+#: main.c:593
 msgid "\t-P\t\t\t--posix\n"
 msgstr "\t-P\t\t\t--posix\n"
 
-#: main.c:830
+#: main.c:594
 msgid "\t-r\t\t\t--re-interval\n"
 msgstr "\t-r\t\t\t--re-interval\n"
 
-#: main.c:831
+#: main.c:595
 msgid "\t-S\t\t\t--sandbox\n"
 msgstr "\t-S\t\t\t--sandbox\n"
 
-#: main.c:832
+#: main.c:596
 msgid "\t-t\t\t\t--lint-old\n"
 msgstr "\t-t\t\t\t--lint-old\n"
 
-#: main.c:833
+#: main.c:597
 msgid "\t-V\t\t\t--version\n"
 msgstr "\t-V\t\t\t--version\n"
 
-#: main.c:835
+#: main.c:599
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:838
+#: main.c:602
 msgid "\t-Y\t\t--parsedebug\n"
 msgstr "\t-Y\t\t--parsedebug\n"
 
@@ -3121,7 +3121,7 @@ msgstr "\t-Y\t\t--parsedebug\n"
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: main.c:847
+#: main.c:611
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -3134,7 +3134,7 @@ msgstr ""
 "Problemi di traduzione, segnalare ad: azc100@gmail.com.\n"
 "\n"
 
-#: main.c:851
+#: main.c:615
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -3144,7 +3144,7 @@ msgstr ""
 "Senza parametri, legge da 'standard input' e scrive su 'standard output'.\n"
 "\n"
 
-#: main.c:855
+#: main.c:619
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -3154,7 +3154,7 @@ msgstr ""
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:880
+#: main.c:644
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
@@ -3173,7 +3173,7 @@ msgstr ""
 "Licenza, o (a tua scelta) a una qualsiasi versione successiva.\n"
 "\n"
 
-#: main.c:888
+#: main.c:652
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3187,7 +3187,7 @@ msgstr ""
 "Vedi la 'GNU General Public License' per ulteriori dettagli.\n"
 "\n"
 
-#: main.c:894
+#: main.c:658
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program. If not, see http://www.gnu.org/licenses/.\n"
@@ -3196,16 +3196,16 @@ msgstr ""
 "assieme a questo programma; se non è così, vedi http://www.gnu.org/"
 "licenses/.\n"
 
-#: main.c:931
+#: main.c:695
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft non imposta FS a `tab' nell'awk POSIX"
 
-#: main.c:1208
+#: main.c:982
 #, c-format
 msgid "unknown value for field spec: %d\n"
 msgstr "valore non noto per specifica campo: %d\n"
 
-#: main.c:1306
+#: main.c:1080
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -3214,98 +3214,116 @@ msgstr ""
 "%s: `%s' argomento di `-v' non in forma `var=valore'\n"
 "\n"
 
-#: main.c:1332
+#: main.c:1106
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "`%s' non è un nome di variabile ammesso"
 
-#: main.c:1335
+#: main.c:1109
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "`%s' non è un nome di variabile, cerco il file `%s=%s'"
 
-#: main.c:1339
+#: main.c:1113
 #, c-format
 msgid "cannot use gawk builtin `%s' as variable name"
 msgstr "nome funzione interna gawk `%s' non ammesso come nome variabile"
 
-#: main.c:1344
+#: main.c:1118
 #, c-format
 msgid "cannot use function `%s' as variable name"
 msgstr "non è possibile usare nome di funzione `%s' come nome di variabile"
 
-#: main.c:1397
+#: main.c:1171
 msgid "floating point exception"
 msgstr "eccezione floating point"
 
-#: main.c:1404
+#: main.c:1178
 msgid "fatal error: internal error"
 msgstr "errore fatale: errore interno"
 
-#: main.c:1419
+#: main.c:1193
 msgid "fatal error: internal error: segfault"
 msgstr "errore fatale: errore interno: segfault"
 
-#: main.c:1431
+#: main.c:1205
 msgid "fatal error: internal error: stack overflow"
 msgstr "errore fatale: errore interno: stack overflow"
 
-#: main.c:1490
+#: main.c:1264
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "manca `fd' pre-aperta %d"
 
-#: main.c:1497
+#: main.c:1271
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "non riesco a pre-aprire /dev/null per `fd' %d"
 
-#: mpfr.c:550
+#: main.c:1485
+msgid "empty argument to `-e/--source' ignored"
+msgstr "argomento di `-e/--source' nullo, ignorato"
+
+#: main.c:1556
+msgid "-M ignored: MPFR/GMP support not compiled in"
+msgstr "-M ignorato: supporto per MPFR/GMP non generato"
+
+#: main.c:1577
+#, c-format
+msgid "%s: option `-W %s' unrecognized, ignored\n"
+msgstr "%s: opzione `-W %s' non riconosciuta, ignorata\n"
+
+#: main.c:1630
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: l'opzione richiede un argomento -- %c\n"
+
+#: mpfr.c:557
 #, c-format
 msgid "PREC value `%.*s' is invalid"
 msgstr "valore PREC `%.*s' non valido"
 
-#: mpfr.c:608
+#: mpfr.c:615
 #, c-format
 msgid "RNDMODE value `%.*s' is invalid"
 msgstr "valore di RNDMODE `%.*s' non valido"
 
-#: mpfr.c:698
+#: mpfr.c:711
 #, c-format
 msgid "%s: received non-numeric argument"
-msgstr "%s: ricevuto argomento non-numerico"
+msgstr "%s: l'argomento ricevuto non è numerico"
 
-#: mpfr.c:800
+#: mpfr.c:820
 msgid "compl(%Rg): negative value will give strange results"
 msgstr "compl(%Rg): valore negativo, darà risultati strani"
 
-#: mpfr.c:804
+#: mpfr.c:824
 msgid "comp(%Rg): fractional value will be truncated"
 msgstr "comp(%Rg): valore decimale sarà troncato"
 
-#: mpfr.c:816
+#: mpfr.c:836
 #, c-format
 msgid "cmpl(%Zd): negative values will give strange results"
 msgstr "cmpl(%Zd): valori negativi, daranno risultati strani"
 
-#: mpfr.c:835
+#: mpfr.c:855
 #, c-format
 msgid "%s: received non-numeric argument #%d"
-msgstr "%s:ricevuto argomento non-numerico #%d"
+msgstr "%s: l'argomento ricevuto non è numerico #%d"
 
-#: mpfr.c:845
+#: mpfr.c:865
 msgid "%s: argument #%d has invalid value %Rg, using 0"
 msgstr "%s: argomento #%d con valore non valido %Rg, uso 0"
 
-#: mpfr.c:857
+#: mpfr.c:877
 msgid "%s: argument #%d negative value %Rg will give strange results"
 msgstr "%s: argomento #%d con valore negativo %Rg, darà risultati strani"
 
-#: mpfr.c:863
+#: mpfr.c:883
 msgid "%s: argument #%d fractional value %Rg will be truncated"
 msgstr "%s: argomento #%d, valore decimale sarà troncato"
 
-#: mpfr.c:878
+#: mpfr.c:898
 #, c-format
 msgid "%s: argument #%d negative value %Zd will give strange results"
 msgstr "%s: argomento #%d con valore negativo %Zd, darà risultati strani"
@@ -3315,24 +3333,24 @@ msgstr "%s: argomento #%d con valore negativo %Zd, darà risultati strani"
 msgid "cmd. line:"
 msgstr "riga com.:"
 
-#: node.c:421
+#: node.c:409
 msgid "backslash at end of string"
 msgstr "'\\' a fine stringa"
 
-#: node.c:500
+#: node.c:488
 #, c-format
 msgid "old awk does not support the `\\%c' escape sequence"
 msgstr "il vecchio awk non supporta la sequenza di escape '\\%c'"
 
-#: node.c:551
+#: node.c:539
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX non permette escape `\\x'"
 
-#: node.c:557
+#: node.c:545
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "niente cifre esadecimali nella sequenza di escape `\\x'"
 
-#: node.c:579
+#: node.c:567
 #, c-format
 msgid ""
 "hex escape \\x%.*s of %d characters probably not interpreted the way you "
@@ -3341,12 +3359,12 @@ msgstr ""
 "sequenza di escape esadec.\\x%.*s di %d caratteri probabilmente non "
 "interpretata nel modo previsto"
 
-#: node.c:594
+#: node.c:582
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "sequenza di escape `\\%c' considerata come semplice `%c'"
 
-#: node.c:739
+#: node.c:726
 msgid ""
 "Invalid multibyte data detected. There may be a mismatch between your data "
 "and your locale."
@@ -3377,10 +3395,10 @@ msgstr "mando profilo a 'standard error'"
 #: profile.c:193
 #, c-format
 msgid ""
-"\t# %s block(s)\n"
+"\t# %s rule(s)\n"
 "\n"
 msgstr ""
-"\t# blocco(hi) %s\n"
+"\t# %s regola(e)\n"
 "\n"
 
 #: profile.c:198
@@ -3397,11 +3415,11 @@ msgstr ""
 msgid "internal error: %s with null vname"
 msgstr "errore interno: %s con `vname' nullo"
 
-#: profile.c:537
+#: profile.c:538
 msgid "internal error: builtin with null fname"
 msgstr "errore interno: funzione interna con `fname' nullo"
 
-#: profile.c:949
+#: profile.c:958
 #, c-format
 msgid ""
 "\t# Loaded extensions (-l and/or @load)\n"
@@ -3410,12 +3428,12 @@ msgstr ""
 "\t# Estensioni caricate (-l e/o @load)\n"
 "\n"
 
-#: profile.c:972
+#: profile.c:981
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# profilo gawk, creato %s\n"
 
-#: profile.c:1475
+#: profile.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -3424,7 +3442,7 @@ msgstr ""
 "\n"
 "\t# Funzioni, in ordine alfabetico\n"
 
-#: profile.c:1513
+#: profile.c:1559
 #, c-format
 msgid "redir2str: unknown redirection type %d"
 msgstr "redir2str: tipo di ri-direzione non noto %d"
@@ -3435,71 +3453,96 @@ msgid "regexp component `%.*s' should probably be `[%.*s]'"
 msgstr ""
 "componente di espressione `%.*s' dovrebbe probabilmente essere `[%.*s]'"
 
-#: regcomp.c:131
+#: regcomp.c:139
 msgid "Success"
 msgstr "Successo"
 
-#: regcomp.c:134
+#: regcomp.c:142
 msgid "No match"
 msgstr "Nessuna corrispondenza"
 
-#: regcomp.c:137
+#: regcomp.c:145
 msgid "Invalid regular expression"
 msgstr "Espressione regolare invalida"
 
-#: regcomp.c:140
+#: regcomp.c:148
 msgid "Invalid collation character"
 msgstr "Carattere di ordinamento non valido"
 
-#: regcomp.c:143
+#: regcomp.c:151
 msgid "Invalid character class name"
 msgstr "Nome di 'classe di caratteri' non valido"
 
-#: regcomp.c:146
+#: regcomp.c:154
 msgid "Trailing backslash"
 msgstr "'\\' finale"
 
-#: regcomp.c:149
+#: regcomp.c:157
 msgid "Invalid back reference"
 msgstr "Riferimento indietro non valido"
 
-#: regcomp.c:152
-msgid "Unmatched [ or [^"
-msgstr "[ o [^ non chiusa"
+#: regcomp.c:160
+msgid "Unmatched [, [^, [:, [., or [="
+msgstr "[, [^, [:, [. o [= non chiusa"
 
-#: regcomp.c:155
+#: regcomp.c:163
 msgid "Unmatched ( or \\("
 msgstr "( o \\( non chiusa"
 
-#: regcomp.c:158
+#: regcomp.c:166
 msgid "Unmatched \\{"
 msgstr "\\{ non chiusa"
 
-#: regcomp.c:164
+#: regcomp.c:169
+msgid "Invalid content of \\{\\}"
+msgstr "Contenuto di \\{\\} non valido"
+
+#: regcomp.c:172
 msgid "Invalid range end"
 msgstr "Fine di intervallo non valido"
 
-#: regcomp.c:167
+#: regcomp.c:175
 msgid "Memory exhausted"
 msgstr "Memoria esaurita"
 
-#: regcomp.c:170
+#: regcomp.c:178
 msgid "Invalid preceding regular expression"
 msgstr "Espressione regolare precedente invalida"
 
-#: regcomp.c:173
+#: regcomp.c:181
 msgid "Premature end of regular expression"
 msgstr "Fine di espressione regolare inaspettata"
 
-#: regcomp.c:179
+#: regcomp.c:184
+msgid "Regular expression too big"
+msgstr "Espressione regolare troppo complessa"
+
+#: regcomp.c:187
 msgid "Unmatched ) or \\)"
 msgstr ") o \\) non aperta"
 
-#: regcomp.c:704
+#: regcomp.c:712
 msgid "No previous regular expression"
 msgstr "Nessuna espressione regolare precedente"
 
-#: symbol.c:741
+#: symbol.c:677
+#, fuzzy, c-format
+msgid "function `%s': can't use function `%s' as a parameter name"
+msgstr ""
+"funzione `%s': non è possibile usare nome della funzione come nome parametro"
+
+#: symbol.c:809
 msgid "can not pop main context"
 msgstr "non posso salire più in alto nello stack"
 
+#~ msgid "div: third argument is not an array"
+#~ msgstr "div: terzo argomento non-vettoriale"
+
+#~ msgid "div: received non-numeric first argument"
+#~ msgstr "div: il primo argomento ricevuto non è numerico"
+
+#~ msgid "div: received non-numeric second argument"
+#~ msgstr "div: il secondo argomento ricevuto non è numerico"
+
+#~ msgid "div: division by zero attempted"
+#~ msgstr "div: tentativo di dividere per zero"
diff --git a/po/ja.gmo b/po/ja.gmo
index d1ef30cc..732821c7 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index ae5b61c8..4a19b5b8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,15 +1,15 @@
 # Japanese messages for gawk.
-# Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gawk package.
 # Makoto Hosoya <mhosoya@ozemail.com.au>, 2003.
-# Yasuaki Taniguchi <yasuakit@gmail.com>, 2011.
+# Yasuaki Taniguchi <yasuakit@gmail.com>, 2011, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gawk 4.0.0\n"
-"Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2014-04-08 19:23+0300\n"
-"PO-Revision-Date: 2011-07-17 08:28+0900\n"
+"Project-Id-Version: gawk 4.1.0b\n"
+"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
+"POT-Creation-Date: 2015-02-26 20:05+0200\n"
+"PO-Revision-Date: 2014-11-07 12:26+0000\n"
 "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
@@ -37,9 +37,9 @@ msgstr "スカラー仮引数 `%s' を�列���使用�る試���"
 msgid "attempt to use scalar `%s' as an array"
 msgstr "スカラー `%s' を�列���使用�る試���"
 
-#: array.c:409 array.c:576 builtin.c:85 builtin.c:1615 builtin.c:1661
-#: builtin.c:1674 builtin.c:2102 builtin.c:2116 eval.c:1122 eval.c:1126
-#: eval.c:1531
+#: array.c:409 array.c:576 builtin.c:85 builtin.c:1606 builtin.c:1652
+#: builtin.c:1665 builtin.c:2092 builtin.c:2106 eval.c:1149 eval.c:1153
+#: eval.c:1558
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "スカラーコンテキスト��列 `%s' を使用�る試���"
@@ -55,9 +55,8 @@ msgid "attempt to use scalar `%s[\"%.*s\"]' as an array"
 msgstr "スカラー `%s[\"%.*s\"]' を�列���使用�る試���"
 
 #: array.c:776
-#, fuzzy
 msgid "adump: first argument not an array"
-msgstr "adump: 引数��列���り��ん"
+msgstr "adump: 第一引数��列���り��ん"
 
 #: array.c:815
 msgid "asort: second argument not an array"
@@ -91,409 +90,412 @@ msgstr "asort: 第二引数ã�®éƒ¨åˆ†é…�列を第一引数用ã�«ä½¿ç”¨ã�™ã‚‹ã�“ã�
 msgid "asorti: cannot use a subarray of second arg for first arg"
 msgstr "asorti: 第二引数�部分�列を第一引数用�使用�る���出���ん"
 
-#: array.c:1314
+#: array.c:1313
 #, c-format
 msgid "`%s' is invalid as a function name"
 msgstr "`%s' �関数�����無効��"
 
-#: array.c:1318
+#: array.c:1317
 #, c-format
 msgid "sort comparison function `%s' is not defined"
 msgstr "ソート比較関数 `%s' �定義�れ����ん"
 
-#: awkgram.y:233
+#: awkgram.y:226
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "%s ブロック��アクション部�必須��"
 
-#: awkgram.y:236
+#: awkgram.y:229
 msgid "each rule must have a pattern or an action part"
 msgstr "�ルール��パターン���アクション部�必須��。"
 
-#: awkgram.y:325 awkgram.y:336
+#: awkgram.y:320 awkgram.y:331
 msgid "old awk does not support multiple `BEGIN' or `END' rules"
 msgstr "�� awk �複数� `BEGIN' ��� `END' ルールをサ�ート���ん"
 
-#: awkgram.y:373
+#: awkgram.y:368
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "`%s' �組込�関数��。�定義����ん"
 
-#: awkgram.y:419
+#: awkgram.y:417
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr "正�表�定数 `//' � C++コメント�似����������。"
 
-#: awkgram.y:423
+#: awkgram.y:421
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr "正�表�定数 `/%s/' � C コメント�似������異�り��"
 
-#: awkgram.y:515
+#: awkgram.y:513
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "switch 文�中��複�� case 値�使用�れ����: %s"
 
-#: awkgram.y:536
+#: awkgram.y:534
 msgid "duplicate `default' detected in switch body"
 msgstr "switch 文�中��複�� `default' �検出�れ���"
 
-#: awkgram.y:796 awkgram.y:3723
+#: awkgram.y:794 awkgram.y:3751
 msgid "`break' is not allowed outside a loop or switch"
 msgstr "`break' �ループ��� switch �外��許��れ����ん"
 
-#: awkgram.y:805 awkgram.y:3715
+#: awkgram.y:803 awkgram.y:3743
 msgid "`continue' is not allowed outside a loop"
 msgstr "`continue' �ループ�外��許��れ����ん"
 
-#: awkgram.y:815
+#: awkgram.y:813
 #, c-format
 msgid "`next' used in %s action"
 msgstr "%s アクション内� `next' �使用�れ���"
 
-#: awkgram.y:824
+#: awkgram.y:822
 #, c-format
 msgid "`nextfile' used in %s action"
 msgstr "`nextfile' � %s アクション内�使用�れ���"
 
-#: awkgram.y:848
+#: awkgram.y:846
 msgid "`return' used outside function context"
 msgstr "`return' �関数定義文�外�使�れ���"
 
-#: awkgram.y:922
+#: awkgram.y:920
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "BEGIN ��� END ルール内�引数�無� `print' � `print \"\"' ����れ��"
 
-#: awkgram.y:988 awkgram.y:1037
+#: awkgram.y:986 awkgram.y:1035
 msgid "`delete' is not allowed with SYMTAB"
 msgstr ""
 
-#: awkgram.y:990 awkgram.y:1039
+#: awkgram.y:988 awkgram.y:1037
 msgid "`delete' is not allowed with FUNCTAB"
 msgstr ""
 
-#: awkgram.y:1024 awkgram.y:1028
+#: awkgram.y:1022 awkgram.y:1026
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "`delete(array)' �移�性�無� tawk 拡張��"
 
-#: awkgram.y:1149
+#: awkgram.y:1147
 msgid "multistage two-way pipelines don't work"
 msgstr "多段階��方�パイプを利用����使用����ん"
 
-#: awkgram.y:1264
+#: awkgram.y:1262
 msgid "regular expression on right of assignment"
 msgstr "正�表��代入���辺�使用�れ����"
 
-#: awkgram.y:1275
+#: awkgram.y:1273
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "`~' や `!~' 演算��左辺�正�表��使用�れ����"
 
-#: awkgram.y:1291 awkgram.y:1442
+#: awkgram.y:1289 awkgram.y:1431
 msgid "old awk does not support the keyword `in' except after `for'"
 msgstr "�� awk �� `in' 予約語� `for' �後を除�サ�ート���ん"
 
-#: awkgram.y:1301
+#: awkgram.y:1299
 msgid "regular expression on right of comparison"
 msgstr "比較���辺�正�表��使用�れ����。"
 
-#: awkgram.y:1417
-#, c-format
-msgid "`getline var' invalid inside `%s' rule"
-msgstr "`%s' ルール�内部�� `getline var' �無効��"
-
-#: awkgram.y:1420
+#: awkgram.y:1411
 #, c-format
-msgid "`getline' invalid inside `%s' rule"
-msgstr "`%s' ルール�内部�� `getline' �無効��"
+msgid "non-redirected `getline' invalid inside `%s' rule"
+msgstr "`%s' ルール�内���リダイレクト�れ���� `getline' �無効��"
 
-#: awkgram.y:1425
+#: awkgram.y:1414
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "リダイレクト�れ���� `getline' � END アクション��未定義��。"
 
-#: awkgram.y:1444
+#: awkgram.y:1433
 msgid "old awk does not support multidimensional arrays"
 msgstr "�� awk �多次元�列をサ�ート���ん"
 
-#: awkgram.y:1541
+#: awkgram.y:1530
 msgid "call of `length' without parentheses is not portable"
 msgstr "�括弧�無� `length' �移�性��り��ん"
 
-#: awkgram.y:1607
+#: awkgram.y:1596
 msgid "indirect function calls are a gawk extension"
 msgstr "間接関数呼�出�� gawk 拡張��"
 
-#: awkgram.y:1620
+#: awkgram.y:1609
 #, c-format
 msgid "can not use special variable `%s' for indirect function call"
 msgstr "特別�変数 `%s' �間接関数呼�出�用��使用出���ん"
 
-#: awkgram.y:1698
+#: awkgram.y:1635
+#, fuzzy, c-format
+msgid "attempt to use non-function `%s' in function call"
+msgstr "関数 `%s' を�列���使用�る試���"
+
+#: awkgram.y:1699
 msgid "invalid subscript expression"
 msgstr "添字���無効��"
 
-#: awkgram.y:2048 awkgram.y:2068 gawkapi.c:206 gawkapi.c:224 msg.c:126
+#: awkgram.y:2045 awkgram.y:2065 gawkapi.c:206 gawkapi.c:224 msg.c:126
 msgid "warning: "
 msgstr "警告: "
 
-#: awkgram.y:2066 gawkapi.c:192 gawkapi.c:221 msg.c:158
+#: awkgram.y:2063 gawkapi.c:192 gawkapi.c:221 msg.c:158
 msgid "fatal: "
 msgstr "致命的: "
 
-#: awkgram.y:2116
+#: awkgram.y:2113
 msgid "unexpected newline or end of string"
 msgstr "予期���改行���文字列終端��"
 
-#: awkgram.y:2383 awkgram.y:2459 awkgram.y:2682 debug.c:523 debug.c:539
+#: awkgram.y:2392 awkgram.y:2468 awkgram.y:2691 debug.c:523 debug.c:539
 #: debug.c:2812 debug.c:5055
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "ソースファイル `%s' を読�込�用�開���ん (%s)"
 
-#: awkgram.y:2384 awkgram.y:2509
-#, fuzzy, c-format
+#: awkgram.y:2393 awkgram.y:2518
+#, c-format
 msgid "can't open shared library `%s' for reading (%s)"
-msgstr "ソースファイル `%s' を読�込�用�開���ん (%s)"
+msgstr "共有ライブラリ `%s' を読�込�用�開���ん (%s)"
 
-#: awkgram.y:2386 awkgram.y:2460 awkgram.y:2510 builtin.c:135 debug.c:5206
+#: awkgram.y:2395 awkgram.y:2469 awkgram.y:2519 builtin.c:135 debug.c:5206
 msgid "reason unknown"
 msgstr "原因�明"
 
-#: awkgram.y:2395 awkgram.y:2419
+#: awkgram.y:2404 awkgram.y:2428
 #, c-format
 msgid "can't include `%s' and use it as a program file"
 msgstr ""
 
-#: awkgram.y:2408
+#: awkgram.y:2417
 #, c-format
 msgid "already included source file `%s'"
 msgstr "ソースファイル `%s' �既�読�込�れ����"
 
-#: awkgram.y:2409
-#, fuzzy, c-format
+#: awkgram.y:2418
+#, c-format
 msgid "already loaded shared library `%s'"
-msgstr "ソースファイル `%s' �既�読�込�れ����"
+msgstr "共有ライブラリ `%s' �既�読�込�れ����"
 
-#: awkgram.y:2444
+#: awkgram.y:2453
 msgid "@include is a gawk extension"
 msgstr "@include � gawk 拡張��"
 
-#: awkgram.y:2450
+#: awkgram.y:2459
 msgid "empty filename after @include"
 msgstr "@include �後�空�ファイル���り��"
 
-#: awkgram.y:2494
-#, fuzzy
+#: awkgram.y:2503
 msgid "@load is a gawk extension"
-msgstr "@include � gawk 拡張��"
+msgstr "@load � gawk 拡張��"
 
-#: awkgram.y:2500
-#, fuzzy
+#: awkgram.y:2509
 msgid "empty filename after @load"
-msgstr "@include �後�空�ファイル���り��"
+msgstr "@load �後�空�ファイル���り��"
 
-#: awkgram.y:2634
+#: awkgram.y:2643
 msgid "empty program text on command line"
 msgstr "コマンド行�プログラム表記�空��"
 
-#: awkgram.y:2749
+#: awkgram.y:2758
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "ソースファイル `%s' を読�込���ん (%s)"
 
-#: awkgram.y:2760
+#: awkgram.y:2769
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "ソースファイル `%s' �空��"
 
-#: awkgram.y:2937
+#: awkgram.y:2828
+#, c-format
+msgid "PEBKAC error: invalid character '\\%03o' in source code"
+msgstr ""
+
+#: awkgram.y:2959
 msgid "source file does not end in newline"
 msgstr "ソースファイル�改行�終�����ん"
 
-#: awkgram.y:3042
+#: awkgram.y:3062
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "終端�れ����正�表��ファイル最後� `\\' �終�����。"
 
-#: awkgram.y:3066
+#: awkgram.y:3089
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr "%s: %d: tawk �正�表�修飾� `/.../%c' � gawk �使用����ん"
 
-#: awkgram.y:3070
+#: awkgram.y:3093
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr "tawk �正�表�修飾� `/.../%c' � gawk �使用����ん"
 
-#: awkgram.y:3077
+#: awkgram.y:3100
 msgid "unterminated regexp"
 msgstr "正�表��終端�れ����ん"
 
-#: awkgram.y:3081
+#: awkgram.y:3104
 msgid "unterminated regexp at end of file"
 msgstr "ファイル�中�正�表��終端�れ����ん"
 
-#: awkgram.y:3140
+#: awkgram.y:3162
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "`\\ #...' 形��行継続�移�性��り��ん"
 
-#: awkgram.y:3156
+#: awkgram.y:3178
 msgid "backslash not last character on line"
 msgstr "�ックスラッシュ�行最後�文字�������ん。"
 
-#: awkgram.y:3217
+#: awkgram.y:3239
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX ��演算� `**=' �許��れ����ん"
 
-#: awkgram.y:3219
+#: awkgram.y:3241
 msgid "old awk does not support operator `**='"
 msgstr "�� awk �演算� `**=' をサ�ート���ん"
 
-#: awkgram.y:3228
+#: awkgram.y:3250
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX ��演算� `**' �許��れ����ん"
 
-#: awkgram.y:3230
+#: awkgram.y:3252
 msgid "old awk does not support operator `**'"
 msgstr "�� awk �演算� `**' をサ�ート���ん"
 
-#: awkgram.y:3265
+#: awkgram.y:3287
 msgid "operator `^=' is not supported in old awk"
 msgstr "�� awk �演算� `^=' をサ�ート���ん"
 
-#: awkgram.y:3273
+#: awkgram.y:3295
 msgid "operator `^' is not supported in old awk"
 msgstr "�� awk �演算� `^' をサ�ート���ん"
 
-#: awkgram.y:3366 awkgram.y:3382 command.y:1178
+#: awkgram.y:3392 awkgram.y:3410 command.y:1180
 msgid "unterminated string"
 msgstr "文字列�終端�れ����ん"
 
-#: awkgram.y:3603
+#: awkgram.y:3631
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "�内�無効�文字 '%c' ��り��"
 
-#: awkgram.y:3650
+#: awkgram.y:3678
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "`%s' � gawk 拡張��"
 
-#: awkgram.y:3655
+#: awkgram.y:3683
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX �� `%s' �許��れ����ん"
 
-#: awkgram.y:3663
+#: awkgram.y:3691
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "�� awk � `%s' をサ�ート���ん"
 
-#: awkgram.y:3753
+#: awkgram.y:3781
 msgid "`goto' considered harmful!\n"
 msgstr "`goto' �有害��見��れ����!\n"
 
-#: awkgram.y:3787
+#: awkgram.y:3815
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d � %s 用�引数�数����無効��"
 
-#: awkgram.y:3822
+#: awkgram.y:3850
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr "%s: 文字列リテラルを置���最後�引数�使用�る�効果��り��ん"
 
-#: awkgram.y:3827
+#: awkgram.y:3855
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "%s 第三仮引数��変オブジェクト���り��ん"
 
-#: awkgram.y:3910 awkgram.y:3913
+#: awkgram.y:3938 awkgram.y:3941
 msgid "match: third argument is a gawk extension"
 msgstr "match: 第三引数� gawk 拡張��"
 
-#: awkgram.y:3967 awkgram.y:3970
+#: awkgram.y:3995 awkgram.y:3998
 msgid "close: second argument is a gawk extension"
 msgstr "close: 第二引数� gawk 拡張��"
 
-#: awkgram.y:3982
+#: awkgram.y:4010
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "dcgettext(_\"...\")�使用法�間������: 先頭�アンダースコア(_)を削除�"
 "�����"
 
-#: awkgram.y:3997
+#: awkgram.y:4025
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "dcngettext(_\"...\")�使用法�間������: 先頭�アンダースコア(_)を削除�"
 "�����"
 
-#: awkgram.y:4016
+#: awkgram.y:4044
 #, fuzzy
 msgid "index: regexp constant as second argument is not allowed"
 msgstr "index: 文字列��無�第二引数を���り���"
 
-#: awkgram.y:4069
+#: awkgram.y:4097
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "関数 `%s': 仮引数 `%s' �大域変数を覆�隠�����"
 
-#: awkgram.y:4126 debug.c:4041 debug.c:4084 debug.c:5204
+#: awkgram.y:4154 debug.c:4041 debug.c:4084 debug.c:5204
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "`%s' を書込�用�開���ん��� (%s)"
 
-#: awkgram.y:4127
+#: awkgram.y:4155
 msgid "sending variable list to standard error"
 msgstr "変数リストを標準エラー�������"
 
-#: awkgram.y:4135
+#: awkgram.y:4163
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: 閉�る��失敗���� (%s)"
 
-#: awkgram.y:4160
+#: awkgram.y:4188
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() を二回呼�出�����!"
 
-#: awkgram.y:4168
+#: awkgram.y:4196
 msgid "there were shadowed variables."
 msgstr "覆�隠�れ�変数��り���"
 
-#: awkgram.y:4239
+#: awkgram.y:4267
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "関数� `%s' ���定義�れ����"
 
-#: awkgram.y:4285
+#: awkgram.y:4313
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "関数 `%s': 関数�を仮引数����使用出���ん"
 
-#: awkgram.y:4288
+#: awkgram.y:4316
 #, c-format
 msgid "function `%s': can't use special variable `%s' as a function parameter"
 msgstr "関数 `%s': 特別�変数 `%s' �関数�仮引数���使用出���ん"
 
-#: awkgram.y:4296
+#: awkgram.y:4324
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "関数 `%s': 仮引数 #%d, `%s' �仮引数 #%d ��複�����"
 
-#: awkgram.y:4383 awkgram.y:4389
+#: awkgram.y:4411 awkgram.y:4417
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "未定義�関数 `%s' を呼�出����"
 
-#: awkgram.y:4393
+#: awkgram.y:4421
 #, c-format
 msgid "function `%s' defined but never called directly"
 msgstr "関数 `%s' �定義�れ������一度も直接呼�出�れ����ん"
 
-#: awkgram.y:4425
+#: awkgram.y:4453
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr "仮引数 #%d 用�正�表�定数�真�値を出力���"
 
-#: awkgram.y:4484
+#: awkgram.y:4468
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -502,21 +504,21 @@ msgstr ""
 "関数�� `(' �間�スペースを入れ�関数 `%s' を呼�出�����。\n"
 "����変数��列���使�れ����。"
 
-#: awkgram.y:4720
+#: awkgram.y:4674
 msgid "division by zero attempted"
 msgstr "ゼロ�よる除算�試�られ���"
 
-#: awkgram.y:4729
+#: awkgram.y:4683
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "`%%' 内�ゼロ�よる除算�試�られ���"
 
-#: awkgram.y:5049
+#: awkgram.y:5003
 msgid ""
 "cannot assign a value to the result of a field post-increment expression"
 msgstr ""
 
-#: awkgram.y:5052
+#: awkgram.y:5006
 #, fuzzy, c-format
 msgid "invalid target of assignment (opcode %s)"
 msgstr "%d � %s 用�引数�数����無効��"
@@ -558,189 +560,198 @@ msgstr ""
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: `%s' �開�れ�ファイル�パイプ�プロセス共有���り��ん"
 
-#: builtin.c:362
+#: builtin.c:351
 msgid "index: received non-string first argument"
 msgstr "index: 文字列��無�第一引数を���り���"
 
-#: builtin.c:364
+#: builtin.c:353
 msgid "index: received non-string second argument"
 msgstr "index: 文字列��無�第二引数を���り���"
 
-#: builtin.c:488 mpfr.c:757
+#: builtin.c:466 mpfr.c:777
 msgid "int: received non-numeric argument"
 msgstr "int: 数値��無�引数を���り���"
 
-#: builtin.c:525
+#: builtin.c:503
 msgid "length: received array argument"
 msgstr "length: �列引数を���り���"
 
-#: builtin.c:528
+#: builtin.c:506
 msgid "`length(array)' is a gawk extension"
 msgstr "`length(array)' � gawk 拡張��"
 
-#: builtin.c:544
+#: builtin.c:525
 msgid "length: received non-string argument"
 msgstr "length: 文字列��無�引数を���り���"
 
-#: builtin.c:575
+#: builtin.c:554
 msgid "log: received non-numeric argument"
 msgstr "log: 数値��無�引数を���り���"
 
-#: builtin.c:578
+#: builtin.c:557
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: 負�引数 %g を���り���"
 
-#: builtin.c:776 builtin.c:781
+#: builtin.c:755 builtin.c:760 builtin.c:911
 msgid "fatal: must use `count$' on all formats or none"
 msgstr ""
 "致命的: `count$’ �全��書�使用�る����全��使用������れ����"
 "れ�����ん"
 
-#: builtin.c:851
+#: builtin.c:830
 #, c-format
 msgid "field width is ignored for `%%' specifier"
 msgstr "`%%' 指定用�フィールド幅�無視�れ��"
 
-#: builtin.c:853
+#: builtin.c:832
 #, c-format
 msgid "precision is ignored for `%%' specifier"
 msgstr "`%%' 指定用�フィールド幅�無視�れ��"
 
-#: builtin.c:855
+#: builtin.c:834
 #, c-format
 msgid "field width and precision are ignored for `%%' specifier"
 msgstr "`%%' 指定用�フィールド幅�よ�精度�無視�れ��"
 
-#: builtin.c:906
+#: builtin.c:885
 msgid "fatal: `$' is not permitted in awk formats"
 msgstr "致命的: `$' � awk 形�内��許��れ����ん"
 
-#: builtin.c:915
+#: builtin.c:894
 msgid "fatal: arg count with `$' must be > 0"
 msgstr "致命的: `$' �指定�る引数�番��正���れ�����ん"
 
-#: builtin.c:919
+#: builtin.c:898
 #, c-format
 msgid "fatal: arg count %ld greater than total number of supplied arguments"
 msgstr "致命的: 引数�番� %ld �引数���与�られ�数より大����"
 
-#: builtin.c:923
+#: builtin.c:902
 msgid "fatal: `$' not permitted after period in format"
 msgstr "致命的: `$' �書�指定内�ピリオド `.' �後�使用����ん"
 
-#: builtin.c:939
+#: builtin.c:921
 msgid "fatal: no `$' supplied for positional field width or precision"
 msgstr "致命的: フィールド幅����精度�指定�� `$' �与�られ����ん"
 
-#: builtin.c:1009
+#: builtin.c:991
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "awk �書�指定�� `l' �無�味��。無視���"
 
-#: builtin.c:1013
+#: builtin.c:995
 msgid "fatal: `l' is not permitted in POSIX awk formats"
 msgstr "致命的: POSIX awk 書�内�� `l' �許��れ����ん"
 
-#: builtin.c:1026
+#: builtin.c:1008
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "awk �書�指定�� `L' �無�味��。無視���。"
 
-#: builtin.c:1030
+#: builtin.c:1012
 msgid "fatal: `L' is not permitted in POSIX awk formats"
 msgstr "致命的: POSIX awk 書�内�� `L' �許��れ����ん"
 
-#: builtin.c:1043
+#: builtin.c:1025
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "awk �書�指定�� `h' �無�味��。無視���。"
 
-#: builtin.c:1047
+#: builtin.c:1029
 msgid "fatal: `h' is not permitted in POSIX awk formats"
 msgstr "致命的: POSIX awk 書�内�� `h' �許��れ����ん"
 
-#: builtin.c:1463
+#: builtin.c:1055
+#, fuzzy, c-format
+msgid "[s]printf: value %g is too big for %%c format"
+msgstr "[s]printf: 値 %g �書� `%%%c' �範囲外��"
+
+#: builtin.c:1068
+#, fuzzy, c-format
+msgid "[s]printf: value %g is not a valid wide character"
+msgstr "[s]printf: 値 %g �書� `%%%c' �範囲外��"
+
+#: builtin.c:1454
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf: 値 %g �書� `%%%c' �範囲外��"
 
-#: builtin.c:1561
+#: builtin.c:1552
 #, c-format
 msgid "ignoring unknown format specifier character `%c': no argument converted"
 msgstr "�明�書�指定文字 `%c' を無視�����: 変��れる引数��り��ん"
 
-#: builtin.c:1566
+#: builtin.c:1557
 msgid "fatal: not enough arguments to satisfy format string"
 msgstr "致命的: 書�文字列を満���分�数�引数��り��ん"
 
-#: builtin.c:1568
+#: builtin.c:1559
 msgid "^ ran out for this one"
 msgstr "^ ���ら足り��ん"
 
-#: builtin.c:1575
+#: builtin.c:1566
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: 書�指定��制御文字��り��ん"
 
-#: builtin.c:1578
+#: builtin.c:1569
 msgid "too many arguments supplied for format string"
 msgstr "書�文字列�与�られ��る引数�多����"
 
-#: builtin.c:1634
-#, fuzzy
+#: builtin.c:1625
 msgid "sprintf: no arguments"
-msgstr "printf: 引数��り��ん"
+msgstr "sprintf: 引数��り��ん"
 
-#: builtin.c:1657 builtin.c:1668
+#: builtin.c:1648 builtin.c:1659
 msgid "printf: no arguments"
 msgstr "printf: 引数��り��ん"
 
-#: builtin.c:1711
+#: builtin.c:1702
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: 数値��無�引数を���り���"
 
-#: builtin.c:1715
+#: builtin.c:1706
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: 負�値 %g を引数�使用��呼�出�れ���"
 
-#: builtin.c:1746
+#: builtin.c:1737
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: 長� %g � 1 以上���り��ん"
 
-#: builtin.c:1748
+#: builtin.c:1739
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: 長� %g � 0 以上���り��ん"
 
-#: builtin.c:1755
+#: builtin.c:1753
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: 文字数 %g ��数点以下�切り����。"
 
-#: builtin.c:1760
+#: builtin.c:1758
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr "substr: 文字数 %g �最大値を超�����。%g を使���。"
 
-#: builtin.c:1772
+#: builtin.c:1770
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: 開始インデックス %g �無効��。1を使用���"
 
-#: builtin.c:1777
+#: builtin.c:1775
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: 開始インデックス %g ��整数����値�切り��られ��"
 
-#: builtin.c:1802
+#: builtin.c:1798
 msgid "substr: source string is zero length"
 msgstr "substr: 文字列�長��ゼロ��。"
 
-#: builtin.c:1818
+#: builtin.c:1812
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: 開始インデックス %g �文字列終端�後��り��"
 
-#: builtin.c:1826
+#: builtin.c:1820
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -748,189 +759,193 @@ msgstr ""
 "substr: 開始インデックス %2$g �ら�長� %1$g �第一引数�長�を超����� "
 "(%3$lu)"
 
-#: builtin.c:1900
+#: builtin.c:1890
 msgid "strftime: format value in PROCINFO[\"strftime\"] has numeric type"
 msgstr "strftime: PROCINFO[\"strftime\"] �書��値�数値型��"
 
-#: builtin.c:1923
+#: builtin.c:1913
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: �数値�第二引数を���り���"
 
-#: builtin.c:1927
+#: builtin.c:1917
 msgid "strftime: second argument less than 0 or too big for time_t"
 msgstr ""
 
-#: builtin.c:1934
+#: builtin.c:1924
 msgid "strftime: received non-string first argument"
 msgstr "strftime: �文字列�第一引数を���り���"
 
-#: builtin.c:1941
+#: builtin.c:1931
 msgid "strftime: received empty format string"
 msgstr "strftime: 空�書�文字列を���り���"
 
-#: builtin.c:2007
+#: builtin.c:1997
 msgid "mktime: received non-string argument"
 msgstr "mktime: �文字列引数を���り���"
 
-#: builtin.c:2024
+#: builtin.c:2014
 msgid "mktime: at least one of the values is out of the default range"
 msgstr "mktime: 一�以上�値�デフォルト�範囲を超�����"
 
-#: builtin.c:2059
+#: builtin.c:2049
 msgid "'system' function not allowed in sandbox mode"
 msgstr "サンドボックスモード�� 'system' 関数�許��れ����ん"
 
-#: builtin.c:2064
+#: builtin.c:2054
 msgid "system: received non-string argument"
 msgstr "system: 文字列��無�引数を���り���"
 
-#: builtin.c:2184
+#: builtin.c:2174
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "�期化�れ����フィールド `$%d' ���照��"
 
-#: builtin.c:2271
+#: builtin.c:2259
 msgid "tolower: received non-string argument"
 msgstr "tolower: �文字列引数を���り���"
 
-#: builtin.c:2305
+#: builtin.c:2290
 msgid "toupper: received non-string argument"
 msgstr "toupper: �文字列引数を���り���"
 
-#: builtin.c:2341 mpfr.c:672
+#: builtin.c:2323 mpfr.c:679
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: �数値�第一引数を���り���"
 
-#: builtin.c:2343 mpfr.c:674
+#: builtin.c:2325 mpfr.c:681
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: �数値�第二引数を���り���"
 
-#: builtin.c:2362
+#: builtin.c:2344
 msgid "sin: received non-numeric argument"
 msgstr "sin: �数値�引数を���り���"
 
-#: builtin.c:2378
+#: builtin.c:2360
 msgid "cos: received non-numeric argument"
 msgstr "cos: �数値�引数を���り���"
 
-#: builtin.c:2431 mpfr.c:1156
+#: builtin.c:2413 mpfr.c:1176
 msgid "srand: received non-numeric argument"
 msgstr "srand: �数値�引数を���り���"
 
-#: builtin.c:2462
+#: builtin.c:2444
 msgid "match: third argument is not an array"
 msgstr "match: 第三引数��列���り��ん"
 
-#: builtin.c:2734
-msgid "gensub: third argument of 0 treated as 1"
+#: builtin.c:2705
+#, fuzzy, c-format
+msgid "gensub: third argument `%.*s' treated as 1"
 msgstr "gensub: 第三引数� 0 ��。1 を代�り�使用���"
 
-#: builtin.c:3030
+#: builtin.c:2720
+#, fuzzy, c-format
+msgid "gensub: third argument %g treated as 1"
+msgstr "gensub: 第三引数� 0 ��。1 を代�り�使用���"
+
+#: builtin.c:3020
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: �数値�第一引数を���り���"
 
-#: builtin.c:3032
+#: builtin.c:3022
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift: �数値�第二引数を���り���"
 
-#: builtin.c:3038
-#, fuzzy, c-format
+#: builtin.c:3028
+#, c-format
 msgid "lshift(%f, %f): negative values will give strange results"
-msgstr "lshift(%lf, %lf): 負�数値を使用�る�異常��果��り��"
+msgstr "lshift(%f, %f): 負�数値を使用�る�異常��果��り��"
 
-#: builtin.c:3040
-#, fuzzy, c-format
+#: builtin.c:3030
+#, c-format
 msgid "lshift(%f, %f): fractional values will be truncated"
-msgstr "lshift(%lf, %lf): �数点以下�切り��られ��"
+msgstr "lshift(%f, %f): �数点以下�切り��られ��"
 
-#: builtin.c:3042
-#, fuzzy, c-format
+#: builtin.c:3032
+#, c-format
 msgid "lshift(%f, %f): too large shift value will give strange results"
-msgstr "lshift(%lf, %lf): シフト値�大���る�異常��果��り��"
+msgstr "lshift(%f, %f): シフト値�大���る�異常��果��り��"
 
-#: builtin.c:3067
+#: builtin.c:3057
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: �数値�第一引数を���り���"
 
-#: builtin.c:3069
+#: builtin.c:3059
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift: �数値�第二引数を���り���"
 
-#: builtin.c:3075
-#, fuzzy, c-format
+#: builtin.c:3065
+#, c-format
 msgid "rshift(%f, %f): negative values will give strange results"
-msgstr "rshift(%lf, %lf): 負�数値を使用�る�異常��果��り��"
+msgstr "rshift(%f, %f): 負�数値を使用�る�異常��果��り��"
 
-#: builtin.c:3077
-#, fuzzy, c-format
+#: builtin.c:3067
+#, c-format
 msgid "rshift(%f, %f): fractional values will be truncated"
-msgstr "rshift(%lf, %lf): �数点以下�切り��られ��"
+msgstr "rshift(%f, %f): �数点以下�切り��られ��"
 
-#: builtin.c:3079
-#, fuzzy, c-format
+#: builtin.c:3069
+#, c-format
 msgid "rshift(%f, %f): too large shift value will give strange results"
-msgstr "rshift(%lf, %lf): シフト値�大���る�異常��果��り��"
+msgstr "rshift(%f, %f): シフト値�大���る�異常��果��り��"
 
-#: builtin.c:3104 mpfr.c:968
-#, fuzzy
+#: builtin.c:3094 mpfr.c:988
 msgid "and: called with less than two arguments"
-msgstr "sqrt: 負�値 %g を引数�使用��呼�出�れ���"
+msgstr "and: 2個未満�引数�呼�出�れ���"
 
-#: builtin.c:3109
-#, fuzzy, c-format
+#: builtin.c:3099
+#, c-format
 msgid "and: argument %d is non-numeric"
-msgstr "exp: 引数 %g �範囲外��"
+msgstr "and: 引数 %d ��数値��"
 
-#: builtin.c:3113
+#: builtin.c:3103
 #, fuzzy, c-format
 msgid "and: argument %d negative value %g will give strange results"
 msgstr "and(%lf, %lf): 負�数値を使用�る�異常��果��り��"
 
-#: builtin.c:3136 mpfr.c:1000
-#, fuzzy
+#: builtin.c:3126 mpfr.c:1020
 msgid "or: called with less than two arguments"
-msgstr "sqrt: 負�値 %g を引数�使用��呼�出�れ���"
+msgstr "or: 2個未満�引数�呼�出�れ���"
 
-#: builtin.c:3141
-#, fuzzy, c-format
+#: builtin.c:3131
+#, c-format
 msgid "or: argument %d is non-numeric"
-msgstr "exp: 引数 %g �範囲外��"
+msgstr "or: 引数 %d ��数値��"
 
-#: builtin.c:3145
+#: builtin.c:3135
 #, fuzzy, c-format
 msgid "or: argument %d negative value %g will give strange results"
 msgstr "compl(%lf): 負�数値を使用�る�異常��果��り��"
 
-#: builtin.c:3167 mpfr.c:1031
+#: builtin.c:3157 mpfr.c:1051
 #, fuzzy
 msgid "xor: called with less than two arguments"
-msgstr "sqrt: 負�値 %g を引数�使用��呼�出�れ���"
+msgstr "xor: 2個未満�引数�呼�出�れ���"
 
-#: builtin.c:3173
-#, fuzzy, c-format
+#: builtin.c:3163
+#, c-format
 msgid "xor: argument %d is non-numeric"
-msgstr "exp: 引数 %g �範囲外��"
+msgstr "xor: 引数 %d ��数値��"
 
-#: builtin.c:3177
+#: builtin.c:3167
 #, fuzzy, c-format
 msgid "xor: argument %d negative value %g will give strange results"
 msgstr "xor(%lf, %lf): 負�数値を使用�る�異常��果��り��"
 
-#: builtin.c:3202 mpfr.c:787
+#: builtin.c:3192 mpfr.c:807
 msgid "compl: received non-numeric argument"
 msgstr "compl: �数値�引数を���り���"
 
-#: builtin.c:3208
-#, fuzzy, c-format
+#: builtin.c:3198
+#, c-format
 msgid "compl(%f): negative value will give strange results"
-msgstr "compl(%lf): 負�数値を使用�る�異常��果��り��"
+msgstr "compl(%f): 負�数値を使用�る�異常��果��り��"
 
-#: builtin.c:3210
-#, fuzzy, c-format
+#: builtin.c:3200
+#, c-format
 msgid "compl(%f): fractional value will be truncated"
-msgstr "compl(%lf): �数点以下�切り��られ��"
+msgstr "compl(%f): �数点以下�切り��られ��"
 
-#: builtin.c:3379
+#: builtin.c:3369
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: `%s' �無効�ロケール区分��"
@@ -941,24 +956,24 @@ msgid "Type (g)awk statement(s). End with the command \"end\"\n"
 msgstr ""
 
 #: command.y:289
-#, fuzzy, c-format
+#, c-format
 msgid "invalid frame number: %d"
-msgstr "無効�範囲終了��"
+msgstr "無効�フレーム番���: %d"
 
 #: command.y:295
 #, fuzzy, c-format
 msgid "info: invalid option - \"%s\""
-msgstr "%s: 無効�オプション -- '%c'\n"
+msgstr "info: 無効�オプション - \"%s\""
 
 #: command.y:321
 #, c-format
 msgid "source \"%s\": already sourced."
-msgstr ""
+msgstr "source \"%s\": 既�読�込�れ�(source)���。"
 
 #: command.y:326
 #, c-format
 msgid "save \"%s\": command not permitted."
-msgstr ""
+msgstr "save \"%s\": コマンド�許��れ����ん。"
 
 #: command.y:339
 msgid "Can't use command `commands' for breakpoint/watchpoint commands"
@@ -966,11 +981,11 @@ msgstr ""
 
 #: command.y:341
 msgid "no breakpoint/watchpoint has been set yet"
-msgstr ""
+msgstr "��一�もブレーク�イント/ウオッ��イント�設定�れ����ん"
 
 #: command.y:343
 msgid "invalid breakpoint/watchpoint number"
-msgstr ""
+msgstr "無効�ブレーク�イント/ウオッ��イント番���"
 
 #: command.y:348
 #, c-format
@@ -991,51 +1006,49 @@ msgid "`silent' valid only in command `commands'"
 msgstr ""
 
 #: command.y:373
-#, fuzzy, c-format
+#, c-format
 msgid "trace: invalid option - \"%s\""
-msgstr "%s: 無効�オプション -- '%c'\n"
+msgstr "trace: 無効�オプション - \"%s\""
 
 #: command.y:387
 msgid "condition: invalid breakpoint/watchpoint number"
 msgstr ""
 
 #: command.y:449
-#, fuzzy
 msgid "argument not a string"
-msgstr "exp: 引数 %g �範囲外��"
+msgstr "引数�文字列���り��ん"
 
 #: command.y:459 command.y:464
 #, c-format
 msgid "option: invalid parameter - \"%s\""
-msgstr ""
+msgstr "option: 無効�パラメーター - \"%s\""
 
 #: command.y:474
 #, c-format
 msgid "no such function - \"%s\""
-msgstr ""
+msgstr "��よ��関数��り��ん - \"%s\""
 
 #: command.y:531
-#, fuzzy, c-format
+#, c-format
 msgid "enable: invalid option - \"%s\""
-msgstr "%s: 無効�オプション -- '%c'\n"
+msgstr "enable: 無効�オプション - \"%s\""
 
 #: command.y:597
-#, fuzzy, c-format
+#, c-format
 msgid "invalid range specification: %d - %d"
-msgstr "無効�範囲終了��"
+msgstr "無効�範囲指定: %d - %d"
 
 #: command.y:659
-#, fuzzy
 msgid "non-numeric value for field number"
-msgstr "フィールド指定��明�値��り��: %d\n"
+msgstr "フィールド番��対���数値�指定�れ����"
 
 #: command.y:680 command.y:687
 msgid "non-numeric value found, numeric expected"
-msgstr ""
+msgstr "�数値�見��り���。数値�予期�れ��。"
 
 #: command.y:712 command.y:718
 msgid "non-zero integer value"
-msgstr ""
+msgstr "�ゼロ整数"
 
 #: command.y:817
 msgid ""
@@ -1212,42 +1225,47 @@ msgstr ""
 msgid "watch var - set a watchpoint for a variable."
 msgstr ""
 
-#: command.y:1011 debug.c:401 msg.c:135
+#: command.y:901
+msgid ""
+"where [N] - (same as backtrace) print trace of all or N innermost (outermost "
+"if N < 0) frames."
+msgstr ""
+
+#: command.y:1013 debug.c:401 msg.c:135
 #, c-format
 msgid "error: "
 msgstr "エラー: "
 
-#: command.y:1051
+#: command.y:1053
 #, fuzzy, c-format
 msgid "can't read command (%s)\n"
 msgstr "`%s' �らリダイレクト����ん (%s)"
 
-#: command.y:1065
+#: command.y:1067
 #, fuzzy, c-format
 msgid "can't read command (%s)"
 msgstr "`%s' �らリダイレクト����ん (%s)"
 
-#: command.y:1116
+#: command.y:1118
 #, fuzzy
 msgid "invalid character in command"
 msgstr "無効�文字クラス���"
 
-#: command.y:1152
+#: command.y:1154
 #, c-format
 msgid "unknown command - \"%.*s\", try help"
 msgstr ""
 
-#: command.y:1222
+#: command.y:1224
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: command.y:1284
-#, fuzzy
+#: command.y:1286
 msgid "invalid character"
-msgstr "無効�照�文字��"
+msgstr "無効�文字��"
 
-#: command.y:1455
+#: command.y:1457
 #, c-format
 msgid "undefined command: %s\n"
 msgstr ""
@@ -1417,9 +1435,9 @@ msgid ""
 msgstr ""
 
 #: debug.c:1029
-#, fuzzy, c-format
+#, c-format
 msgid "no symbol `%s' in current context\n"
-msgstr "`next' � `%s' �ら呼�出����出���ん"
+msgstr ""
 
 #: debug.c:1041 debug.c:1427
 #, fuzzy, c-format
@@ -1709,7 +1727,7 @@ msgstr ""
 #: debug.c:3424
 #, fuzzy, c-format
 msgid "element not in array\n"
-msgstr "delete: �列 `%2$s' 内�インデックス `%1$s' ��り��ん"
+msgstr "adump: 引数��列���り��ん"
 
 #: debug.c:3424
 #, c-format
@@ -1754,78 +1772,79 @@ msgid "invalid number"
 msgstr ""
 
 #: debug.c:5381
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' not allowed in current context; statement ignored"
-msgstr "`next' � `%s' �ら呼�出����出���ん"
+msgstr ""
 
 #: debug.c:5389
-#, fuzzy
 msgid "`return' not allowed in current context; statement ignored"
-msgstr "`next' � `%s' �ら呼�出����出���ん"
+msgstr ""
 
-#: debug.c:5590
+#: debug.c:5604
 #, c-format
 msgid "No symbol `%s' in current context"
 msgstr ""
 
-#: dfa.c:1118 dfa.c:1121 dfa.c:1142 dfa.c:1150 dfa.c:1162 dfa.c:1197
-#: dfa.c:1206 dfa.c:1209 dfa.c:1214 dfa.c:1228 dfa.c:1275
+#: dfa.c:1063 dfa.c:1066 dfa.c:1085 dfa.c:1095 dfa.c:1107 dfa.c:1143
+#: dfa.c:1152 dfa.c:1155 dfa.c:1160 dfa.c:1174 dfa.c:1222
 msgid "unbalanced ["
 msgstr ""
 
-#: dfa.c:1174
+#: dfa.c:1119
 #, fuzzy
 msgid "invalid character class"
 msgstr "無効�文字クラス���"
 
-#: dfa.c:1316
+#: dfa.c:1265
 msgid "character class syntax is [[:space:]], not [:space:]"
 msgstr ""
 
-#: dfa.c:1366
+#: dfa.c:1327
 msgid "unfinished \\ escape"
 msgstr ""
 
-#: dfa.c:1513 regcomp.c:161
-msgid "Invalid content of \\{\\}"
+#: dfa.c:1474
+#, fuzzy
+msgid "invalid content of \\{\\}"
 msgstr "\\{\\} �中身�無効��"
 
-#: dfa.c:1516 regcomp.c:176
-msgid "Regular expression too big"
+#: dfa.c:1477
+#, fuzzy
+msgid "regular expression too big"
 msgstr "正�表��大�����"
 
-#: dfa.c:1936
+#: dfa.c:1912
 msgid "unbalanced ("
 msgstr ""
 
-#: dfa.c:2062
+#: dfa.c:2038
 msgid "no syntax specified"
 msgstr ""
 
-#: dfa.c:2070
+#: dfa.c:2046
 msgid "unbalanced )"
 msgstr ""
 
-#: eval.c:394
+#: eval.c:396
 #, c-format
 msgid "unknown nodetype %d"
 msgstr "�明�ノード型 %d ��"
 
-#: eval.c:405 eval.c:419
+#: eval.c:407 eval.c:421
 #, c-format
 msgid "unknown opcode %d"
 msgstr "�明�オペコード %d ��"
 
-#: eval.c:416
+#: eval.c:418
 #, c-format
 msgid "opcode %s not an operator or keyword"
 msgstr "オペコード %s �演算����予約語���り��ん"
 
-#: eval.c:472
+#: eval.c:474
 msgid "buffer overflow in genflags2str"
 msgstr "genflags2str 内��ッファオー�ーフロー�発生����"
 
-#: eval.c:675
+#: eval.c:676
 #, c-format
 msgid ""
 "\n"
@@ -1836,94 +1855,94 @@ msgstr ""
 "\t# 呼出関数スタック:\n"
 "\n"
 
-#: eval.c:704
+#: eval.c:705
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "`IGNORECASE' � gawk 拡張��"
 
-#: eval.c:736
+#: eval.c:737
 msgid "`BINMODE' is a gawk extension"
 msgstr "`BINMODE' � gawk 拡張��"
 
-#: eval.c:794
+#: eval.c:795
 #, c-format
 msgid "BINMODE value `%s' is invalid, treated as 3"
 msgstr "BINMODE 値 `%s' �無効��。代�り� 3 を使用���"
 
-#: eval.c:885
+#: eval.c:912
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "誤�� `%sFMT' 指定 `%s' ��"
 
-#: eval.c:969
+#: eval.c:996
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "`LINT' ��代入�従� `--lint' を無効����"
 
-#: eval.c:1147
+#: eval.c:1174
 #, c-format
 msgid "reference to uninitialized argument `%s'"
 msgstr "�期化�れ����引数 `%s' ���照��"
 
-#: eval.c:1148
+#: eval.c:1175
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "�期化�れ����変数 `%s' ���照��"
 
-#: eval.c:1166
+#: eval.c:1193
 msgid "attempt to field reference from non-numeric value"
 msgstr "�数値を使用��フイールド�照�試���"
 
-#: eval.c:1168
+#: eval.c:1195
 msgid "attempt to field reference from null string"
 msgstr "NULL 文字列を使用��フィールド��照を試�����"
 
-#: eval.c:1176
+#: eval.c:1203
 #, c-format
 msgid "attempt to access field %ld"
 msgstr "フィールド %ld ��アクセス�試���"
 
-#: eval.c:1185
+#: eval.c:1212
 #, c-format
 msgid "reference to uninitialized field `$%ld'"
 msgstr "�期化�れ����フィールド `$%ld' ���照��"
 
-#: eval.c:1272
+#: eval.c:1299
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "宣言�れ��る数より多�引数を使��関数 `%s' を呼�出����"
 
-#: eval.c:1473
+#: eval.c:1500
 #, c-format
 msgid "unwind_stack: unexpected type `%s'"
 msgstr "unwind_stack: 予期���型 `%s' ��"
 
-#: eval.c:1569
+#: eval.c:1596
 msgid "division by zero attempted in `/='"
 msgstr "`/=' 内�ゼロ�よる除算�行�れ���"
 
-#: eval.c:1576
+#: eval.c:1603
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "`%%=' 内�ゼロ�よる除算�行�れ���"
 
-#: ext.c:89 ext.c:171
+#: ext.c:65 ext.c:147
 msgid "extensions are not allowed in sandbox mode"
 msgstr "サンドボックスモード内��拡張�許��れ����ん"
 
-#: ext.c:92
+#: ext.c:68
 #, fuzzy
 msgid "-l / @load are gawk extensions"
 msgstr "@include � gawk 拡張��"
 
-#: ext.c:95
+#: ext.c:71
 msgid "load_ext: received NULL lib_name"
 msgstr ""
 
-#: ext.c:98
+#: ext.c:74
 #, fuzzy, c-format
 msgid "load_ext: cannot open library `%s' (%s)\n"
 msgstr "致命的: extension: `%s' を開����出���ん (%s)\n"
 
-#: ext.c:104
+#: ext.c:80
 #, fuzzy, c-format
 msgid ""
 "load_ext: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
@@ -1931,32 +1950,32 @@ msgstr ""
 "致命的: extension: ライブラリ `%s': `plugin_is_GPL_compatible' �定義�れ��"
 "��ん (%s)\n"
 
-#: ext.c:110
+#: ext.c:86
 #, fuzzy, c-format
 msgid "load_ext: library `%s': cannot call function `%s' (%s)\n"
 msgstr ""
 "致命的: extension: ライブラリ `%s': 関数 `%s' を呼�出����出���ん "
 "(%s)\n"
 
-#: ext.c:114
+#: ext.c:90
 #, c-format
 msgid "load_ext: library `%s' initialization routine `%s' failed\n"
 msgstr ""
 
-#: ext.c:174
+#: ext.c:150
 msgid "`extension' is a gawk extension"
 msgstr "`extension' � gawk 拡張��"
 
-#: ext.c:177
+#: ext.c:153
 msgid "extension: received NULL lib_name"
 msgstr ""
 
-#: ext.c:180
+#: ext.c:156
 #, fuzzy, c-format
 msgid "extension: cannot open library `%s' (%s)"
 msgstr "致命的: extension: `%s' を開����出���ん (%s)\n"
 
-#: ext.c:186
+#: ext.c:162
 #, fuzzy, c-format
 msgid ""
 "extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)"
@@ -1964,94 +1983,93 @@ msgstr ""
 "致命的: extension: ライブラリ `%s': `plugin_is_GPL_compatible' �定義�れ��"
 "��ん (%s)\n"
 
-#: ext.c:190
+#: ext.c:166
 #, fuzzy, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)"
 msgstr ""
 "致命的: extension: ライブラリ `%s': 関数 `%s' を呼�出����出���ん "
 "(%s)\n"
 
-#: ext.c:221
+#: ext.c:197
 #, fuzzy
 msgid "make_builtin: missing function name"
 msgstr "extension: 関数���り��ん"
 
-#: ext.c:236
+#: ext.c:212
 #, fuzzy, c-format
 msgid "make_builtin: can't redefine function `%s'"
 msgstr "extension: 関数 `%s' を�定義����ん"
 
-#: ext.c:240
+#: ext.c:216
 #, fuzzy, c-format
 msgid "make_builtin: function `%s' already defined"
 msgstr "extension: 関数 `%s' �既�定義�れ����"
 
-#: ext.c:244
+#: ext.c:220
 #, fuzzy, c-format
 msgid "make_builtin: function name `%s' previously defined"
 msgstr "extension: 関数� `%s' ���定義�れ����"
 
-#: ext.c:246
+#: ext.c:222
 #, fuzzy, c-format
 msgid "make_builtin: can't use gawk built-in `%s' as function name"
 msgstr "extension: gawk �組�込�れ��る `%s' �関数����使用出���ん"
 
-#: ext.c:249 ext.c:304
+#: ext.c:225 ext.c:280
 #, c-format
 msgid "make_builtin: negative argument count for function `%s'"
 msgstr "make_builtin: 関数 `%s' �引数�数�負��"
 
-#: ext.c:276
-#, fuzzy
+#: ext.c:252
 msgid "extension: missing function name"
 msgstr "extension: 関数���り��ん"
 
-#: ext.c:279 ext.c:283
-#, fuzzy, c-format
+#: ext.c:255 ext.c:259
+#, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: 関数� `%2$s' �中��正�文字 `%1$c' �使用�れ����"
 
-#: ext.c:291
-#, fuzzy, c-format
+#: ext.c:267
+#, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: 関数 `%s' を�定義����ん"
 
-#: ext.c:295
-#, fuzzy, c-format
+#: ext.c:271
+#, c-format
 msgid "extension: function `%s' already defined"
 msgstr "extension: 関数 `%s' �既�定義�れ����"
 
-#: ext.c:299
-#, fuzzy, c-format
+#: ext.c:275
+#, c-format
 msgid "extension: function name `%s' previously defined"
-msgstr "関数� `%s' ���定義�れ����"
+msgstr "extension: 関数� `%s' ���定義�れ����"
 
-#: ext.c:301
-#, fuzzy, c-format
+#: ext.c:277
+#, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr "extension: gawk �組�込�れ��る `%s' �関数����使用出���ん"
 
-#: ext.c:375
+#: ext.c:351
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "関数 `%s' �使�る引数�数� `%d' 以下�定義�れ����"
 
-#: ext.c:378
+#: ext.c:354
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "関数 `%s': 引数 #%d ��り��ん"
 
-#: ext.c:395
+#: ext.c:371
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "関数 `%s': 引数 #%d: スカラーを�列���使用�る試���"
 
-#: ext.c:399
+#: ext.c:375
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr "関数 `%s': 引数 #%d: �列をスカラー���使用�る試���"
 
-#: ext.c:413
+#: ext.c:389
 msgid "dynamic loading of library not supported"
 msgstr ""
 
@@ -2076,9 +2094,9 @@ msgid "stat: bad parameters"
 msgstr "%s: 仮引数��\n"
 
 #: extension/filefuncs.c:533
-#, fuzzy, c-format
+#, c-format
 msgid "fts init: could not create variable %s"
-msgstr "index: 文字列��無�第二引数を���り���"
+msgstr ""
 
 #: extension/filefuncs.c:554
 #, fuzzy
@@ -2094,9 +2112,8 @@ msgid "fill_stat_element: could not set element"
 msgstr ""
 
 #: extension/filefuncs.c:597
-#, fuzzy
 msgid "fill_path_element: could not set element"
-msgstr "index: 文字列��無�第二引数を���り���"
+msgstr ""
 
 #: extension/filefuncs.c:613
 msgid "fill_error_element: could not set element"
@@ -2108,9 +2125,8 @@ msgstr ""
 
 #: extension/filefuncs.c:670 extension/filefuncs.c:717
 #: extension/filefuncs.c:735
-#, fuzzy
 msgid "fts-process: could not set element"
-msgstr "index: 文字列��無�第二引数を���り���"
+msgstr ""
 
 #: extension/filefuncs.c:784
 #, fuzzy
@@ -2133,9 +2149,8 @@ msgid "fts: bad third parameter"
 msgstr "%s: 仮引数��\n"
 
 #: extension/filefuncs.c:806
-#, fuzzy
 msgid "fts: could not flatten array\n"
-msgstr "`%s' ��正�変数���"
+msgstr ""
 
 #: extension/filefuncs.c:824
 msgid "fts: ignoring sneaky FTS_NOSTAT flag. nyah, nyah, nyah."
@@ -2214,7 +2229,7 @@ msgstr "sqrt: 負�値 %g を引数�使用��呼�出�れ���"
 msgid "inplace_begin: in-place editing already active"
 msgstr ""
 
-#: extension/inplace.c:133 extension/inplace.c:207
+#: extension/inplace.c:133 extension/inplace.c:210
 #, c-format
 msgid "inplace_begin: expects 2 arguments but called with %d"
 msgstr ""
@@ -2234,64 +2249,64 @@ msgid "inplace_begin: Cannot stat `%s' (%s)"
 msgstr "致命的: extension: `%s' を開����出���ん (%s)\n"
 
 #: extension/inplace.c:158
-#, fuzzy, c-format
+#, c-format
 msgid "inplace_begin: `%s' is not a regular file"
-msgstr "`%s' ��正�変数���"
+msgstr ""
 
 #: extension/inplace.c:169
 #, c-format
 msgid "inplace_begin: mkstemp(`%s') failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:178
+#: extension/inplace.c:181
 #, fuzzy, c-format
 msgid "inplace_begin: chmod failed (%s)"
 msgstr "%s: 閉�る��失敗���� (%s)"
 
-#: extension/inplace.c:185
+#: extension/inplace.c:188
 #, c-format
 msgid "inplace_begin: dup(stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:188
+#: extension/inplace.c:191
 #, c-format
 msgid "inplace_begin: dup2(%d, stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:191
+#: extension/inplace.c:194
 #, fuzzy, c-format
 msgid "inplace_begin: close(%d) failed (%s)"
 msgstr "%s: 閉�る��失敗���� (%s)"
 
-#: extension/inplace.c:210
+#: extension/inplace.c:213
 msgid "inplace_end: cannot retrieve 1st argument as a string filename"
 msgstr ""
 
-#: extension/inplace.c:217
+#: extension/inplace.c:220
 msgid "inplace_end: in-place editing not active"
 msgstr ""
 
-#: extension/inplace.c:223
+#: extension/inplace.c:226
 #, c-format
 msgid "inplace_end: dup2(%d, stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:226
+#: extension/inplace.c:229
 #, fuzzy, c-format
 msgid "inplace_end: close(%d) failed (%s)"
 msgstr "%s: 閉�る��失敗���� (%s)"
 
-#: extension/inplace.c:230
+#: extension/inplace.c:233
 #, c-format
 msgid "inplace_end: fsetpos(stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:243
+#: extension/inplace.c:246
 #, fuzzy, c-format
 msgid "inplace_end: link(`%s', `%s') failed (%s)"
 msgstr "パイプ `%s' をフラッシュ����ん (%s)。"
 
-#: extension/inplace.c:253
+#: extension/inplace.c:256
 #, fuzzy, c-format
 msgid "inplace_end: rename(`%s', `%s') failed (%s)"
 msgstr "fd %d (`%s') を閉�る�������ん (%s)"
@@ -2341,52 +2356,56 @@ msgstr "sqrt: 負�値 %g を引数�使用��呼�出�れ���"
 msgid "readfile: called with no arguments"
 msgstr "sqrt: 負�値 %g を引数�使用��呼�出�れ���"
 
-#: extension/rwarray.c:124
+#: extension/revoutput.c:125
+msgid "revoutput: could not initialize REVOUT variable"
+msgstr ""
+
+#: extension/rwarray.c:124 extension/rwarray0.c:109
 #, fuzzy
 msgid "writea: called with too many arguments"
 msgstr "sqrt: 負�値 %g を引数�使用��呼�出�れ���"
 
-#: extension/rwarray.c:131
+#: extension/rwarray.c:131 extension/rwarray0.c:116
 #, fuzzy, c-format
 msgid "do_writea: argument 0 is not a string\n"
 msgstr "exp: 引数 %g �範囲外��"
 
-#: extension/rwarray.c:137
+#: extension/rwarray.c:137 extension/rwarray0.c:122
 #, fuzzy, c-format
 msgid "do_writea: argument 1 is not an array\n"
 msgstr "split: 第四引数��列���り��ん"
 
-#: extension/rwarray.c:184
+#: extension/rwarray.c:184 extension/rwarray0.c:169
 #, c-format
 msgid "write_array: could not flatten array\n"
 msgstr ""
 
-#: extension/rwarray.c:198
+#: extension/rwarray.c:198 extension/rwarray0.c:183
 #, c-format
 msgid "write_array: could not release flattened array\n"
 msgstr ""
 
-#: extension/rwarray.c:280
+#: extension/rwarray.c:280 extension/rwarray0.c:265
 #, fuzzy
 msgid "reada: called with too many arguments"
 msgstr "sqrt: 負�値 %g を引数�使用��呼�出�れ���"
 
-#: extension/rwarray.c:287
+#: extension/rwarray.c:287 extension/rwarray0.c:272
 #, fuzzy, c-format
 msgid "do_reada: argument 0 is not a string\n"
 msgstr "exp: 引数 %g �範囲外��"
 
-#: extension/rwarray.c:293
+#: extension/rwarray.c:293 extension/rwarray0.c:278
 #, fuzzy, c-format
 msgid "do_reada: argument 1 is not an array\n"
-msgstr "match: 第三引数��列���り��ん"
+msgstr "adump: 引数��列���り��ん"
 
-#: extension/rwarray.c:337
+#: extension/rwarray.c:337 extension/rwarray0.c:322
 #, c-format
 msgid "do_reada: clear_array failed\n"
 msgstr ""
 
-#: extension/rwarray.c:374
+#: extension/rwarray.c:374 extension/rwarray0.c:358
 #, c-format
 msgid "read_array: set_array_element failed\n"
 msgstr ""
@@ -2419,80 +2438,80 @@ msgstr "exp: 引数 %g �範囲外��"
 msgid "sleep: not supported on this platform"
 msgstr ""
 
-#: field.c:345
+#: field.c:346
 msgid "NF set to negative value"
 msgstr "NF �負�値�設定�れ����"
 
-#: field.c:971 field.c:978 field.c:982
+#: field.c:958 field.c:965 field.c:969
 msgid "split: fourth argument is a gawk extension"
 msgstr "split: 第四引数� gawk 拡張��"
 
-#: field.c:975
+#: field.c:962
 msgid "split: fourth argument is not an array"
 msgstr "split: 第四引数��列���り��ん"
 
-#: field.c:989
+#: field.c:976
 msgid "split: second argument is not an array"
 msgstr "split: 第二引数��列���り��ん"
 
-#: field.c:993
+#: field.c:980
 msgid "split: cannot use the same array for second and fourth args"
 msgstr "split: 第二引数�第四引数����列を使用�る���出���ん"
 
-#: field.c:998
+#: field.c:985
 msgid "split: cannot use a subarray of second arg for fourth arg"
 msgstr "split: 第四引数�第二引数�部分�列を使用�る���出���ん"
 
-#: field.c:1001
+#: field.c:988
 msgid "split: cannot use a subarray of fourth arg for second arg"
 msgstr "split: 第二引数�第四引数�部分�列を使用�る���出���ん"
 
-#: field.c:1032
+#: field.c:1019
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: 第三引数� NULL 文字列を使用�る��� gawk 拡張��"
 
-#: field.c:1072
+#: field.c:1059
 msgid "patsplit: fourth argument is not an array"
 msgstr "patsplit: 第四引数��列���り��ん"
 
-#: field.c:1077
+#: field.c:1064
 msgid "patsplit: second argument is not an array"
 msgstr "patsplit: 第二引数��列���り��ん"
 
-#: field.c:1083
+#: field.c:1070
 msgid "patsplit: third argument must be non-null"
 msgstr "patsplit: 第三引数�� NULL ���れ�����ん"
 
-#: field.c:1087
+#: field.c:1074
 msgid "patsplit: cannot use the same array for second and fourth args"
 msgstr "patsplit: 第二引数�第四引数����列を使用�る���出���ん"
 
-#: field.c:1092
+#: field.c:1079
 msgid "patsplit: cannot use a subarray of second arg for fourth arg"
 msgstr "patsplit: 第四引数�第二引数�部分�列を使用�る���出���ん"
 
-#: field.c:1095
+#: field.c:1082
 msgid "patsplit: cannot use a subarray of fourth arg for second arg"
 msgstr "patsplit: 第二引数�第四引数�部分�列を使用�る���出���ん"
 
-#: field.c:1133
+#: field.c:1120
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "`FIELDWIDTHS' � gawk 拡張��"
 
-#: field.c:1197
+#: field.c:1184
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "`%s' 付近� FIELDWIDTHS 値�無効��"
 
-#: field.c:1270
+#: field.c:1257
 msgid "null string for `FS' is a gawk extension"
 msgstr "`FS' � NULL 文字列を使用�る�� gawk 拡張��"
 
-#: field.c:1274
+#: field.c:1261
 msgid "old awk does not support regexps as value of `FS'"
 msgstr "�� awk � `FS' �値���正�表�をサ�ート���ん"
 
-#: field.c:1393
+#: field.c:1380
 msgid "`FPAT' is a gawk extension"
 msgstr "`FPAT' � gawk 拡張��"
 
@@ -2508,21 +2527,21 @@ msgstr ""
 msgid "node_to_awk_value: received null val"
 msgstr ""
 
-#: gawkapi.c:807
+#: gawkapi.c:809
 #, fuzzy
 msgid "remove_element: received null array"
 msgstr "length: �列引数を���り���"
 
-#: gawkapi.c:810
+#: gawkapi.c:812
 msgid "remove_element: received null subscript"
 msgstr ""
 
-#: gawkapi.c:947
+#: gawkapi.c:949
 #, c-format
 msgid "api_flatten_array: could not convert index %d\n"
 msgstr ""
 
-#: gawkapi.c:952
+#: gawkapi.c:954
 #, c-format
 msgid "api_flatten_array: could not convert value %d\n"
 msgstr ""
@@ -2582,522 +2601,490 @@ msgstr "%s: オプション '-W %s' �引数を�る�������ん\n
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: オプション '-W %s' ��引数�必���\n"
 
-#: io.c:392
+#: io.c:423
 #, c-format
 msgid "command line argument `%s' is a directory: skipped"
 msgstr "コマンドライン引数 `%s' �ディレクトリ��: スキップ�れ���"
 
-#: io.c:395 io.c:513
+#: io.c:426 io.c:544
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "ファイル `%s' を読�込�用�開���ん (%s)"
 
-#: io.c:640
+#: io.c:671
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "fd %d (`%s') を閉�る�������ん (%s)"
 
-#: io.c:716
+#: io.c:749
 msgid "redirection not allowed in sandbox mode"
 msgstr "サンドボックスモード内��リダイレクト�許��れ����ん"
 
-#: io.c:750
+#: io.c:783
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "`%s' リダイレクト�命令��数値��記述�れ����ん。"
 
-#: io.c:756
+#: io.c:789
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "`%s' リダイレクト�命令��空列��。"
 
-#: io.c:761
+#: io.c:794
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "`%2$s' リダイレクト�論�演算��果���れるファイル� `%1$s' �使�れ���"
 "�。"
 
-#: io.c:809
+#: io.c:842
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "ファイル `%.*s' �必�以上� `>' � `>>' を組������。"
 
-#: io.c:863
+#: io.c:896
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "出力用�パイプ `%s' を開���ん (%s)"
 
-#: io.c:873
+#: io.c:906
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "入力用�パイプ `%s' を開���ん (%s)"
 
-#: io.c:904
+#: io.c:937
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr "入出力用��方�パイプ `%s' �開���ん (%s)"
 
-#: io.c:986
+#: io.c:1019
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "`%s' �らリダイレクト����ん (%s)"
 
-#: io.c:989
+#: io.c:1022
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "`%s' �リダイレクト����ん (%s)"
 
-#: io.c:1040
+#: io.c:1073
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "開���るファイル�数�システム制�������。ファイル記述�を多�化��"
 "�。"
 
-#: io.c:1056
+#: io.c:1089
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "`%s' を閉�る��失敗���� (%s)"
 
-#: io.c:1064
+#: io.c:1097
 msgid "too many pipes or input files open"
 msgstr "開���るパイプ���入力ファイル�数�多����。"
 
-#: io.c:1086
+#: io.c:1119
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: 第二引数� `to' ��� `from' ���れ�����ん"
 
-#: io.c:1103
+#: io.c:1136
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: `%.*s' �開���るファイル�パイプ�プロセス共有���り��ん"
 
-#: io.c:1108
+#: io.c:1141
 msgid "close of redirection that was never opened"
 msgstr "開����リダイレクトを閉�よ�������"
 
-#: io.c:1205
+#: io.c:1238
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: リダイレクト `%s' � `|&' を使用��開�れ����ん。第二引数�無視�"
 "れ���"
 
-#: io.c:1222
+#: io.c:1255
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "パイプ `%2$s' を閉�����状態コード�失敗 (%1$d) ��� (%3$s)。"
 
-#: io.c:1225
+#: io.c:1258
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "ファイル `%2$s' を閉�����状態コード�失敗 (%1$d) ��� (%3$s)。"
 
-#: io.c:1245
+#: io.c:1278
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "ソケット `%s' を明示��閉�����ん。"
 
-#: io.c:1248
+#: io.c:1281
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "並行プロセス `%s' を明示��閉�����ん。"
 
-#: io.c:1251
+#: io.c:1284
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "パイプ `%s' を明示��閉�����ん。"
 
-#: io.c:1254
+#: io.c:1287
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "ファイル `%s' を明示��閉�����ん。"
 
-#: io.c:1284 io.c:1342 main.c:864 main.c:906
+#: io.c:1317 io.c:1375 main.c:628 main.c:670
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "標準出力��書込�エラー (%s)"
 
-#: io.c:1289 io.c:1348 main.c:866
+#: io.c:1322 io.c:1381 main.c:630
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "標準エラー��書込�エラー (%s)"
 
-#: io.c:1297
+#: io.c:1330
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "パイプ `%s' をフラッシュ����ん (%s)。"
 
-#: io.c:1300
+#: io.c:1333
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "`%s' �接続�るパイプを並行プロセス�らフラッシュ����ん (%s)。"
 
-#: io.c:1303
+#: io.c:1336
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "ファイル `%s' をフラッシュ����ん (%s)。"
 
-#: io.c:1420
+#: io.c:1453
 #, c-format
 msgid "local port %s invalid in `/inet'"
 msgstr "`/inet' 内�ローカル�ート %s �無効��"
 
-#: io.c:1438
+#: io.c:1471
 #, c-format
 msgid "remote host and port information (%s, %s) invalid"
 msgstr "リモート�ホスト�よ��ート情報 (%s, %s) �無効��"
 
-#: io.c:1590
-#, c-format
-msgid "no (known) protocol supplied in special filename `%s'"
-msgstr ""
-"スペシャルファイル� `%s' �（�識��る）プロトコル�指定�れ����ん"
-
-#: io.c:1604
-#, c-format
-msgid "special file name `%s' is incomplete"
-msgstr "スペシャルファイル� `%s' ��完全��"
-
-#: io.c:1621
-msgid "must supply a remote hostname to `/inet'"
-msgstr "`/inet' ��リモートホスト�を与���れ�����ん"
-
-#: io.c:1639
-msgid "must supply a remote port to `/inet'"
-msgstr "`/inet' ��リモート�ート番�を与���れ�����ん"
-
-#: io.c:1685
+#: io.c:1673
 msgid "TCP/IP communications are not supported"
 msgstr "TCP/IP 通信�サ�ート�れ����ん"
 
-#: io.c:1867
+#: io.c:1854
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "`%s' をモード `%s' �開���ん"
 
-#: io.c:1917
+#: io.c:1904
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "マスター pty を閉�る��失敗���� (%s)"
 
-#: io.c:1919 io.c:2105 io.c:2305
+#: io.c:1906 io.c:2092 io.c:2293
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "�プロセス�標準出力を閉�る��失敗���� (%s)"
 
-#: io.c:1922
+#: io.c:1909
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr "�プロセス�スレーブ pty を標準出力�移動����ん (dup: %s)。"
 
-#: io.c:1924 io.c:2110
+#: io.c:1911 io.c:2097
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "�プロセス�標準入力を閉�られ��ん (%s)。"
 
-#: io.c:1927
+#: io.c:1914
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr "�プロセス�スレーブ pty を標準入力�移動����ん (dup: %s)。"
 
-#: io.c:1929 io.c:1951
+#: io.c:1916 io.c:1938
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "スレーブ pty を閉�る��失敗���� (%s)"
 
-#: io.c:2040 io.c:2108 io.c:2276 io.c:2308
+#: io.c:2027 io.c:2095 io.c:2264 io.c:2296
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr "�プロセス�パイプを標準出力�移動����ん (dup: %s)。"
 
-#: io.c:2047 io.c:2113
+#: io.c:2034 io.c:2100
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr "�プロセス�パイプを標準入力�移動����ん (dup: %s)。"
 
-#: io.c:2073 io.c:2298
+#: io.c:2060 io.c:2286
 msgid "restoring stdout in parent process failed\n"
 msgstr "親プロセス�標準出力を復旧����ん。\n"
 
-#: io.c:2081
+#: io.c:2068
 msgid "restoring stdin in parent process failed\n"
 msgstr "親プロセス�標準入力を復旧����ん。\n"
 
-#: io.c:2116 io.c:2310 io.c:2324
+#: io.c:2103 io.c:2298 io.c:2313
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "パイプを閉�られ��ん (%s)。"
 
-#: io.c:2174
+#: io.c:2162
 msgid "`|&' not supported"
 msgstr "`|&' �使用����ん。"
 
-#: io.c:2261
+#: io.c:2249
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "パイプ `%s' �開���ん (%s)。"
 
-#: io.c:2318
+#: io.c:2307
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "`%s' 用��プロセスを実行����ん (fork: %s)。"
 
-#: io.c:2790
+#: io.c:2734
 msgid "register_input_parser: received NULL pointer"
 msgstr ""
 
-#: io.c:2818
+#: io.c:2762
 #, c-format
 msgid "input parser `%s' conflicts with previously installed input parser `%s'"
 msgstr ""
 
-#: io.c:2825
+#: io.c:2769
 #, c-format
 msgid "input parser `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:2845
+#: io.c:2789
 msgid "register_output_wrapper: received NULL pointer"
 msgstr ""
 
-#: io.c:2873
+#: io.c:2817
 #, c-format
 msgid ""
 "output wrapper `%s' conflicts with previously installed output wrapper `%s'"
 msgstr ""
 
-#: io.c:2880
+#: io.c:2824
 #, c-format
 msgid "output wrapper `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:2901
+#: io.c:2845
 msgid "register_output_processor: received NULL pointer"
 msgstr ""
 
-#: io.c:2930
+#: io.c:2874
 #, c-format
 msgid ""
 "two-way processor `%s' conflicts with previously installed two-way processor "
 "`%s'"
 msgstr ""
 
-#: io.c:2939
+#: io.c:2883
 #, c-format
 msgid "two way processor `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:3064
+#: io.c:3008
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "データファイル `%s' �空��。"
 
-#: io.c:3106 io.c:3114
+#: io.c:3050 io.c:3058
 msgid "could not allocate more input memory"
 msgstr "入力用メモリーを�れ以上確�����ん。"
 
-#: io.c:3682
+#: io.c:3636
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "複数�文字を `RS' �使用�る�� gawk 特有�拡張��。"
 
-#: io.c:3771
+#: io.c:3783
 msgid "IPv6 communication is not supported"
 msgstr "IPv6 通信�サ�ート�れ����ん"
 
-#: main.c:405
-msgid "empty argument to `-e/--source' ignored"
-msgstr "`-e/--source' ��空�引数�無視�れ���"
-
-#: main.c:495
-#, c-format
-msgid "%s: option `-W %s' unrecognized, ignored\n"
-msgstr "%s: オプション `-W %s' ��識����ん。無視�れ���\n"
-
-#: main.c:541
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: 引数�必��オプション -- %c\n"
-
-#: main.c:562
+#: main.c:321
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
 "環境変数 `POSIXLY_CORRECT' �指定�れ����。オプション `--posix' を有効�"
 "���"
 
-#: main.c:568
+#: main.c:327
 msgid "`--posix' overrides `--traditional'"
 msgstr "オプション `--posix' � `--traditional' を無効����。"
 
-#: main.c:579
+#: main.c:338
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr ""
 "オプション `--posix'/`--traditional' � `--non-decimal-data' を無効����。"
 
-#: main.c:583
+#: main.c:342
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr ""
 "setuid root � %s を実行�る��セキュリティ上��題�発生�る場���り�"
 "�。"
 
-#: main.c:588
+#: main.c:346
 #, fuzzy
 msgid "`--posix' overrides `--characters-as-bytes'"
 msgstr "`--posix' � `--binary' を上書����"
 
-#: main.c:647
+#: main.c:404
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "標準入力を�イナリモード�設定����ん (%s)"
 
-#: main.c:650
+#: main.c:407
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "標準出力を�イナリモード�設定����ん (%s)"
 
-#: main.c:652
+#: main.c:409
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "標準エラーを�イナリモード�設定����ん (%s)"
 
-#: main.c:710
+#: main.c:469
 msgid "no program text at all!"
 msgstr "プログラム文�全��り��ん!"
 
-#: main.c:799
+#: main.c:563
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 "使用法: %s [POSIX ��� GNU 形��オプション] -f progfile [--] file ...\n"
 
-#: main.c:801
+#: main.c:565
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
 "使用法: %s [POSIX ��� GNU 形��オプション] [--] %cprogram%c file ...\n"
 
-#: main.c:806
+#: main.c:570
 msgid "POSIX options:\t\tGNU long options: (standard)\n"
 msgstr "POSIX オプション:\t\tGNU 長�形��オプション: (標準)\n"
 
-#: main.c:807
+#: main.c:571
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f progfile\t\t--file=progfile\n"
 
-#: main.c:808
+#: main.c:572
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F fs\t\t\t--field-separator=fs\n"
 
-#: main.c:809
+#: main.c:573
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=val\t\t--assign=var=val\n"
 
-#: main.c:810
+#: main.c:574
 msgid "Short options:\t\tGNU long options: (extensions)\n"
 msgstr "短�オプション:\t\tGNU 長�形��オプション: (拡張)\n"
 
-#: main.c:811
+#: main.c:575
 msgid "\t-b\t\t\t--characters-as-bytes\n"
 msgstr "\t-b\t\t\t--characters-as-bytes\n"
 
-#: main.c:812
+#: main.c:576
 msgid "\t-c\t\t\t--traditional\n"
 msgstr "\t-c\t\t\t--traditional\n"
 
-#: main.c:813
+#: main.c:577
 msgid "\t-C\t\t\t--copyright\n"
 msgstr "\t-C\t\t\t--copyright\n"
 
-#: main.c:814
+#: main.c:578
 msgid "\t-d[file]\t\t--dump-variables[=file]\n"
 msgstr "\t-d[file]\t\t--dump-variables[=file]\n"
 
-#: main.c:815
+#: main.c:579
 #, fuzzy
 msgid "\t-D[file]\t\t--debug[=file]\n"
 msgstr "\t-p[file]\t\t--profile[=file]\n"
 
-#: main.c:816
+#: main.c:580
 msgid "\t-e 'program-text'\t--source='program-text'\n"
 msgstr "\t-e 'program-text'\t--source='program-text'\n"
 
-#: main.c:817
+#: main.c:581
 msgid "\t-E file\t\t\t--exec=file\n"
 msgstr "\t-E file\t\t\t--exec=file\n"
 
-#: main.c:818
+#: main.c:582
 msgid "\t-g\t\t\t--gen-pot\n"
 msgstr "\t-g\t\t\t--gen-pot\n"
 
-#: main.c:819
+#: main.c:583
 msgid "\t-h\t\t\t--help\n"
 msgstr "\t-h\t\t\t--help\n"
 
-#: main.c:820
+#: main.c:584
 msgid "\t-i includefile\t\t--include=includefile\n"
 msgstr ""
 
-#: main.c:821
+#: main.c:585
 msgid "\t-l library\t\t--load=library\n"
 msgstr ""
 
-#: main.c:822
-msgid "\t-L [fatal]\t\t--lint[=fatal]\n"
+#: main.c:586
+#, fuzzy
+msgid "\t-L[fatal|invalid]\t--lint[=fatal|invalid]\n"
 msgstr "\t-L [fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:823
-msgid "\t-n\t\t\t--non-decimal-data\n"
-msgstr "\t-n\t\t\t--non-decimal-data\n"
-
-#: main.c:824
+#: main.c:587
 #, fuzzy
 msgid "\t-M\t\t\t--bignum\n"
 msgstr "\t-g\t\t\t--gen-pot\n"
 
-#: main.c:825
+#: main.c:588
 msgid "\t-N\t\t\t--use-lc-numeric\n"
 msgstr "\t-N\t\t\t--use-lc-numeric\n"
 
-#: main.c:826
+#: main.c:589
+msgid "\t-n\t\t\t--non-decimal-data\n"
+msgstr "\t-n\t\t\t--non-decimal-data\n"
+
+#: main.c:590
 #, fuzzy
 msgid "\t-o[file]\t\t--pretty-print[=file]\n"
 msgstr "\t-p[file]\t\t--profile[=file]\n"
 
-#: main.c:827
+#: main.c:591
 msgid "\t-O\t\t\t--optimize\n"
 msgstr "\t-O\t\t\t--optimize\n"
 
-#: main.c:828
+#: main.c:592
 msgid "\t-p[file]\t\t--profile[=file]\n"
 msgstr "\t-p[file]\t\t--profile[=file]\n"
 
-#: main.c:829
+#: main.c:593
 msgid "\t-P\t\t\t--posix\n"
 msgstr "\t-P\t\t\t--posix\n"
 
-#: main.c:830
+#: main.c:594
 msgid "\t-r\t\t\t--re-interval\n"
 msgstr "\t-r\t\t\t--re-interval\n"
 
-#: main.c:831
+#: main.c:595
 msgid "\t-S\t\t\t--sandbox\n"
 msgstr "\t-S\t\t\t--sandbox\n"
 
-#: main.c:832
+#: main.c:596
 msgid "\t-t\t\t\t--lint-old\n"
 msgstr "\t-t\t\t\t--lint-old\n"
 
-#: main.c:833
+#: main.c:597
 msgid "\t-V\t\t\t--version\n"
 msgstr "\t-V\t\t\t--version\n"
 
-#: main.c:835
+#: main.c:599
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:838
+#: main.c:602
 msgid "\t-Y\t\t--parsedebug\n"
 msgstr "\t-Y\t\t--parsedebug\n"
 
@@ -3106,7 +3093,7 @@ msgstr "\t-Y\t\t--parsedebug\n"
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: main.c:847
+#: main.c:611
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -3121,7 +3108,7 @@ msgstr ""
 "翻訳�関�る�グ�<translation-team-ja@lists.sourceforge.net>�報告�����"
 "�。\n"
 
-#: main.c:851
+#: main.c:615
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -3131,7 +3118,7 @@ msgstr ""
 "デフォルト設定���標準入力を読�込��標準出力�書�出���。\n"
 "\n"
 
-#: main.c:855
+#: main.c:619
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -3141,7 +3128,7 @@ msgstr ""
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:880
+#: main.c:644
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
@@ -3160,7 +3147,7 @@ msgstr ""
 "(at your option) any later version.\n"
 "\n"
 
-#: main.c:888
+#: main.c:652
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3174,7 +3161,7 @@ msgstr ""
 "GNU General Public License for more details.\n"
 "\n"
 
-#: main.c:894
+#: main.c:658
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program. If not, see http://www.gnu.org/licenses/.\n"
@@ -3182,16 +3169,16 @@ msgstr ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program. If not, see http://www.gnu.org/licenses/.\n"
 
-#: main.c:931
+#: main.c:695
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "POSIX awk �� -Ft � FS をタブ�設定���ん"
 
-#: main.c:1208
+#: main.c:982
 #, c-format
 msgid "unknown value for field spec: %d\n"
 msgstr "フィールド指定��明�値��り��: %d\n"
 
-#: main.c:1306
+#: main.c:1080
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -3200,129 +3187,147 @@ msgstr ""
 "%s: オプション `-v' �引数 `%s' � `変数=代入値' �形��������ん。\n"
 "\n"
 
-#: main.c:1332
+#: main.c:1106
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "`%s' ��正�変数���"
 
-#: main.c:1335
+#: main.c:1109
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "`%s' �変数����り��ん。`%s=%s' �ファイルを探���。"
 
-#: main.c:1339
+#: main.c:1113
 #, c-format
 msgid "cannot use gawk builtin `%s' as variable name"
 msgstr "gawk �組�込�� `%s' �変数����使用出���ん"
 
-#: main.c:1344
+#: main.c:1118
 #, c-format
 msgid "cannot use function `%s' as variable name"
 msgstr "関数 `%s' �変数����使用出���ん"
 
-#: main.c:1397
+#: main.c:1171
 msgid "floating point exception"
 msgstr "浮動�数点例外"
 
-#: main.c:1404
+#: main.c:1178
 msgid "fatal error: internal error"
 msgstr "致命的エラー: 内部エラー"
 
-#: main.c:1419
+#: main.c:1193
 msgid "fatal error: internal error: segfault"
 msgstr "致命的エラー: 内部エラー: セグメンテーション��"
 
-#: main.c:1431
+#: main.c:1205
 msgid "fatal error: internal error: stack overflow"
 msgstr "致命的エラー: 内部エラー: スタックオー�ーフロー"
 
-#: main.c:1490
+#: main.c:1264
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "fd %d �事��開�����ん。"
 
-#: main.c:1497
+#: main.c:1271
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "事�� fd %d 用� /dev/null を開���ん。"
 
-#: mpfr.c:550
+#: main.c:1485
+msgid "empty argument to `-e/--source' ignored"
+msgstr "`-e/--source' ��空�引数�無視�れ���"
+
+#: main.c:1556
+msgid "-M ignored: MPFR/GMP support not compiled in"
+msgstr ""
+
+#: main.c:1577
+#, c-format
+msgid "%s: option `-W %s' unrecognized, ignored\n"
+msgstr "%s: オプション `-W %s' ��識����ん。無視�れ���\n"
+
+#: main.c:1630
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: 引数�必��オプション -- %c\n"
+
+#: mpfr.c:557
 #, fuzzy, c-format
 msgid "PREC value `%.*s' is invalid"
 msgstr "BINMODE 値 `%s' �無効��。代�り� 3 を使用���"
 
-#: mpfr.c:608
+#: mpfr.c:615
 #, fuzzy, c-format
 msgid "RNDMODE value `%.*s' is invalid"
 msgstr "BINMODE 値 `%s' �無効��。代�り� 3 を使用���"
 
-#: mpfr.c:698
+#: mpfr.c:711
 #, fuzzy, c-format
 msgid "%s: received non-numeric argument"
 msgstr "cos: �数値�引数を���り���"
 
-#: mpfr.c:800
+#: mpfr.c:820
 #, fuzzy
 msgid "compl(%Rg): negative value will give strange results"
 msgstr "compl(%lf): 負�数値を使用�る�異常��果��り��"
 
-#: mpfr.c:804
+#: mpfr.c:824
 #, fuzzy
 msgid "comp(%Rg): fractional value will be truncated"
 msgstr "compl(%lf): �数点以下�切り��られ��"
 
-#: mpfr.c:816
+#: mpfr.c:836
 #, fuzzy, c-format
 msgid "cmpl(%Zd): negative values will give strange results"
 msgstr "compl(%lf): 負�数値を使用�る�異常��果��り��"
 
-#: mpfr.c:835
+#: mpfr.c:855
 #, fuzzy, c-format
 msgid "%s: received non-numeric argument #%d"
 msgstr "cos: �数値�引数を���り���"
 
-#: mpfr.c:845
+#: mpfr.c:865
 msgid "%s: argument #%d has invalid value %Rg, using 0"
 msgstr ""
 
-#: mpfr.c:857
+#: mpfr.c:877
 #, fuzzy
 msgid "%s: argument #%d negative value %Rg will give strange results"
-msgstr "compl(%lf): 負�数値を使用�る�異常��果��り��"
+msgstr "and(%lf, %lf): 負�数値を使用�る�異常��果��り��"
 
-#: mpfr.c:863
+#: mpfr.c:883
 #, fuzzy
 msgid "%s: argument #%d fractional value %Rg will be truncated"
-msgstr "or(%lf, %lf): �数点以下�切り��られ��"
+msgstr "and(%lf, %lf): �数点以下�切り��られ��"
 
-#: mpfr.c:878
+#: mpfr.c:898
 #, fuzzy, c-format
 msgid "%s: argument #%d negative value %Zd will give strange results"
-msgstr "compl(%lf): 負�数値を使用�る�異常��果��り��"
+msgstr "and(%lf, %lf): 負�数値を使用�る�異常��果��り��"
 
 #: msg.c:68
 #, c-format
 msgid "cmd. line:"
 msgstr "コマンドライン:"
 
-#: node.c:421
+#: node.c:409
 msgid "backslash at end of string"
 msgstr "文字列�終り��ックスラッシュ�使�れ����。"
 
-#: node.c:500
+#: node.c:488
 #, c-format
 msgid "old awk does not support the `\\%c' escape sequence"
 msgstr "�� awk � `\\%c' エスケープシーケンスをサ�ート���ん"
 
-#: node.c:551
+#: node.c:539
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX �� `\\x' エスケープ�許��れ����ん"
 
-#: node.c:557
+#: node.c:545
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "`\\x' エスケープシーケンス��六進数��り��ん"
 
-#: node.c:579
+#: node.c:567
 #, c-format
 msgid ""
 "hex escape \\x%.*s of %d characters probably not interpreted the way you "
@@ -3331,12 +3336,12 @@ msgstr ""
 "�六進エスケープ \\x%.*s (%d 文字) ���ら�予期��よ���解釈�れ���"
 "�ょ�"
 
-#: node.c:594
+#: node.c:582
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "エスケープシーケンス `\\%c' � `%c' ��等�扱�れ��"
 
-#: node.c:739
+#: node.c:726
 msgid ""
 "Invalid multibyte data detected. There may be a mismatch between your data "
 "and your locale."
@@ -3364,12 +3369,12 @@ msgid "sending profile to standard error"
 msgstr "プロファイルを標準エラー�������"
 
 #: profile.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t# %s block(s)\n"
+"\t# %s rule(s)\n"
 "\n"
 msgstr ""
-"\t# %s ブロック\n"
+"\t# ルール\n"
 "\n"
 
 #: profile.c:198
@@ -3386,24 +3391,24 @@ msgstr ""
 msgid "internal error: %s with null vname"
 msgstr "内部エラー: %s � vname �無効��。"
 
-#: profile.c:537
+#: profile.c:538
 #, fuzzy
 msgid "internal error: builtin with null fname"
 msgstr "内部エラー: %s � vname �無効��。"
 
-#: profile.c:949
+#: profile.c:958
 #, c-format
 msgid ""
 "\t# Loaded extensions (-l and/or @load)\n"
 "\n"
 msgstr ""
 
-#: profile.c:972
+#: profile.c:981
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# gawk プロファイル�作�日時 %s\n"
 
-#: profile.c:1475
+#: profile.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -3412,7 +3417,7 @@ msgstr ""
 "\n"
 "\t# 関数一覧（アルファベット順）\n"
 
-#: profile.c:1513
+#: profile.c:1559
 #, c-format
 msgid "redir2str: unknown redirection type %d"
 msgstr "redir2str: �明�リダイレクト型 %d ��"
@@ -3422,118 +3427,132 @@ msgstr "redir2str: �明�リダイレクト型 %d ��"
 msgid "regexp component `%.*s' should probably be `[%.*s]'"
 msgstr "正�表���素 `%.*s' ���ら� `[%.*s]' ��る����"
 
-#: regcomp.c:131
+#: regcomp.c:139
 msgid "Success"
 msgstr "�功��"
 
-#: regcomp.c:134
+#: regcomp.c:142
 msgid "No match"
 msgstr "一致���ん"
 
-#: regcomp.c:137
+#: regcomp.c:145
 msgid "Invalid regular expression"
 msgstr "無効�正�表���"
 
-#: regcomp.c:140
+#: regcomp.c:148
 msgid "Invalid collation character"
 msgstr "無効�照�文字��"
 
-#: regcomp.c:143
+#: regcomp.c:151
 msgid "Invalid character class name"
 msgstr "無効�文字クラス���"
 
-#: regcomp.c:146
+#: regcomp.c:154
 msgid "Trailing backslash"
 msgstr "終端��ックスラッシュ"
 
-#: regcomp.c:149
+#: regcomp.c:157
 msgid "Invalid back reference"
 msgstr "無効��方�照��"
 
-#: regcomp.c:152
-msgid "Unmatched [ or [^"
+#: regcomp.c:160
+#, fuzzy
+msgid "Unmatched [, [^, [:, [., or [="
 msgstr "[ ��� [^ ��一致��"
 
-#: regcomp.c:155
+#: regcomp.c:163
 msgid "Unmatched ( or \\("
 msgstr "( ��� \\( ��一致��"
 
-#: regcomp.c:158
+#: regcomp.c:166
 msgid "Unmatched \\{"
 msgstr "\\{ ��一致��"
 
-#: regcomp.c:164
+#: regcomp.c:169
+msgid "Invalid content of \\{\\}"
+msgstr "\\{\\} �中身�無効��"
+
+#: regcomp.c:172
 msgid "Invalid range end"
 msgstr "無効�範囲終了��"
 
-#: regcomp.c:167
+#: regcomp.c:175
 msgid "Memory exhausted"
 msgstr "メモリを使�果�����"
 
-#: regcomp.c:170
+#: regcomp.c:178
 msgid "Invalid preceding regular expression"
 msgstr "無効��方正�表���"
 
-#: regcomp.c:173
+#: regcomp.c:181
 msgid "Premature end of regular expression"
 msgstr "正�表��途中�終了����"
 
-#: regcomp.c:179
+#: regcomp.c:184
+msgid "Regular expression too big"
+msgstr "正�表��大�����"
+
+#: regcomp.c:187
 msgid "Unmatched ) or \\)"
 msgstr ") ��� \\) ��一致��"
 
-#: regcomp.c:704
+#: regcomp.c:712
 msgid "No previous regular expression"
 msgstr "以��正�表���り��ん"
 
-#: symbol.c:741
+#: symbol.c:677
+#, fuzzy, c-format
+msgid "function `%s': can't use function `%s' as a parameter name"
+msgstr "関数 `%s': 関数�を仮引数����使用出���ん"
+
+#: symbol.c:809
 msgid "can not pop main context"
 msgstr ""
 
-#, fuzzy
-#~ msgid "range of the form `[%c-%c]' is locale dependent"
-#~ msgstr "`[%c-%c]' 形��範囲�ロケール�存��"
+#~ msgid "`getline var' invalid inside `%s' rule"
+#~ msgstr "`%s' ルール�内部�� `getline var' �無効��"
 
-#, fuzzy
-#~ msgid "[s]printf called with no arguments"
-#~ msgstr "sqrt: 負�値 %g を引数�使用��呼�出�れ���"
+#~ msgid "`getline' invalid inside `%s' rule"
+#~ msgstr "`%s' ルール�内部�� `getline' �無効��"
 
-#~ msgid "`-m[fr]' option irrelevant in gawk"
-#~ msgstr "gawk ��オプション `-m[fr]' �効果��り��ん。"
+#~ msgid "no (known) protocol supplied in special filename `%s'"
+#~ msgstr ""
+#~ "スペシャルファイル� `%s' �（�識��る）プロトコル�指定�れ����ん"
 
-#~ msgid "-m option usage: `-m[fr] nnn'"
-#~ msgstr "-m オプション�使用法: `-m[fr] 数値'"
+#~ msgid "special file name `%s' is incomplete"
+#~ msgstr "スペシャルファイル� `%s' ��完全��"
 
-#, fuzzy
-#~ msgid "%s: received non-numeric first argument"
-#~ msgstr "or: �数値�第一引数を���り���"
+#~ msgid "must supply a remote hostname to `/inet'"
+#~ msgstr "`/inet' ��リモートホスト�を与���れ�����ん"
 
-#, fuzzy
-#~ msgid "%s: received non-numeric second argument"
-#~ msgstr "or: �数値�第二引数を���り���"
+#~ msgid "must supply a remote port to `/inet'"
+#~ msgstr "`/inet' ��リモート�ート番�を与���れ�����ん"
 
-#, fuzzy
-#~ msgid "%s(%Rg, ..): negative values will give strange results"
-#~ msgstr "or(%lf, %lf): 負�数値を使用�る�異常��果��り��"
+#~ msgid ""
+#~ "\t# %s block(s)\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\t# %s ブロック\n"
+#~ "\n"
 
-#, fuzzy
-#~ msgid "%s(%Rg, ..): fractional values will be truncated"
-#~ msgstr "or(%lf, %lf): �数点以下�切り��られ��"
+#~ msgid "reference to uninitialized element `%s[\"%.*s\"]'"
+#~ msgstr "�期化�れ�����素 `%s[\"%.*s\"]' ���照��"
 
-#, fuzzy
-#~ msgid "%s(%Zd, ..): negative values will give strange results"
-#~ msgstr "or(%lf, %lf): 負�数値を使用�る�異常��果��り��"
+#~ msgid "subscript of array `%s' is null string"
+#~ msgstr "�列 `%s' �添字� NULL 文字列��"
 
-#, fuzzy
-#~ msgid "%s(.., %Rg): negative values will give strange results"
-#~ msgstr "or(%lf, %lf): 負�数値を使用�る�異常��果��り��"
+#~ msgid "%s: empty (null)\n"
+#~ msgstr "%s: 空 (null)\n"
 
-#, fuzzy
-#~ msgid "%s(.., %Zd): negative values will give strange results"
-#~ msgstr "or(%lf, %lf): 負�数値を使用�る�異常��果��り��"
+#~ msgid "%s: empty (zero)\n"
+#~ msgstr "%s: 空 (zero)\n"
 
-#~ msgid "`%s' is a Bell Labs extension"
-#~ msgstr "`%s' �ベル研究所�よる拡張��"
+#~ msgid "%s: table_size = %d, array_size = %d\n"
+#~ msgstr ""
+#~ "%s: テーブルサイズ (table_size) = %d, �列サイズ (array_size) = %d\n"
+
+#~ msgid "%s: array_ref to %s\n"
+#~ msgstr "%s: %s ���列�照 (array_ref) ��\n"
 
 #~ msgid "`nextfile' is a gawk extension"
 #~ msgstr "`nextfile' � gawk 拡張��"
@@ -3541,14 +3560,29 @@ msgstr ""
 #~ msgid "`delete array' is a gawk extension"
 #~ msgstr "`delete array' � gawk 拡張��"
 
+#~ msgid "use of non-array as array"
+#~ msgstr "�列���も�を�列���使用�����"
+
+#~ msgid "`%s' is a Bell Labs extension"
+#~ msgstr "`%s' �ベル研究所�よる拡張��"
+
 #~ msgid "and: received non-numeric first argument"
 #~ msgstr "and: �数値�第一引数を���り���"
 
 #~ msgid "and: received non-numeric second argument"
 #~ msgstr "and: �数値�第二引数を���り���"
 
-#~ msgid "and(%lf, %lf): fractional values will be truncated"
-#~ msgstr "and(%lf, %lf): �数点以下�切り��られ��"
+#~ msgid "or: received non-numeric first argument"
+#~ msgstr "or: �数値�第一引数を���り���"
+
+#~ msgid "or: received non-numeric second argument"
+#~ msgstr "or: �数値�第二引数を���り���"
+
+#~ msgid "or(%lf, %lf): negative values will give strange results"
+#~ msgstr "or(%lf, %lf): 負�数値を使用�る�異常��果��り��"
+
+#~ msgid "or(%lf, %lf): fractional values will be truncated"
+#~ msgstr "or(%lf, %lf): �数点以下�切り��られ��"
 
 #~ msgid "xor: received non-numeric first argument"
 #~ msgstr "xor: �数値�第一引数を���り���"
@@ -3559,37 +3593,12 @@ msgstr ""
 #~ msgid "xor(%lf, %lf): fractional values will be truncated"
 #~ msgstr "xor(%lf, %lf): �数点以下�切り��られ��"
 
-#~ msgid "Operation Not Supported"
-#~ msgstr "���作�サ�ート�れ����ん"
-
-#~ msgid "attempt to use function `%s' as an array"
-#~ msgstr "関数 `%s' を�列���使用�る試���"
-
-#~ msgid "reference to uninitialized element `%s[\"%.*s\"]'"
-#~ msgstr "�期化�れ�����素 `%s[\"%.*s\"]' ���照��"
-
-#~ msgid "subscript of array `%s' is null string"
-#~ msgstr "�列 `%s' �添字� NULL 文字列��"
-
-#~ msgid "%s: empty (null)\n"
-#~ msgstr "%s: 空 (null)\n"
-
-#~ msgid "%s: empty (zero)\n"
-#~ msgstr "%s: 空 (zero)\n"
-
-#~ msgid "%s: table_size = %d, array_size = %d\n"
-#~ msgstr ""
-#~ "%s: テーブルサイズ (table_size) = %d, �列サイズ (array_size) = %d\n"
-
-#~ msgid "%s: array_ref to %s\n"
-#~ msgstr "%s: %s ���列�照 (array_ref) ��\n"
-
-#~ msgid "use of non-array as array"
-#~ msgstr "�列���も�を�列���使用�����"
-
 #~ msgid "can't use function name `%s' as variable or array"
 #~ msgstr "関数� `%s' �変数����列���使用出���ん"
 
+#~ msgid "assignment is not allowed to result of builtin function"
+#~ msgstr "組込関数�戻り値��代入�許��れ����ん"
+
 #~ msgid "assignment used in conditional context"
 #~ msgstr "�件コンテキスト内�代入�使用�れ���"
 
@@ -3608,9 +3617,6 @@ msgstr ""
 #~ msgid "function `%s' not defined"
 #~ msgstr "関数 `%s' �定義�れ����ん"
 
-#~ msgid "non-redirected `getline' invalid inside `%s' rule"
-#~ msgstr "`%s' ルール�内���リダイレクト�れ���� `getline' �無効��"
-
 #~ msgid "`nextfile' cannot be called from a `%s' rule"
 #~ msgstr "`nextfile' � `%s' ルール�ら呼�出����出���ん"
 
@@ -3620,11 +3626,20 @@ msgstr ""
 #~ msgid "Sorry, don't know how to interpret `%s'"
 #~ msgstr "申�訳�り��ん� `%s' を��よ��解釈�る�分�り��ん"
 
+#~ msgid "Operation Not Supported"
+#~ msgstr "���作�サ�ート�れ����ん"
+
+#~ msgid "`-m[fr]' option irrelevant in gawk"
+#~ msgstr "gawk ��オプション `-m[fr]' �効果��り��ん。"
+
+#~ msgid "-m option usage: `-m[fr] nnn'"
+#~ msgstr "-m オプション�使用法: `-m[fr] 数値'"
+
 #~ msgid "\t-R file\t\t\t--command=file\n"
 #~ msgstr "\t-R file\t\t\t--command=file\n"
 
 #~ msgid "could not find groups: %s"
 #~ msgstr "グループ�見��り��ん: %s"
 
-#~ msgid "assignment is not allowed to result of builtin function"
-#~ msgstr "組込関数�戻り値��代入�許��れ����ん"
+#~ msgid "range of the form `[%c-%c]' is locale dependant"
+#~ msgstr "`[%c-%c]' 形��範囲�ロケール�存��"
diff --git a/po/ms.gmo b/po/ms.gmo
index 6123c873..12601818 100644
--- a/po/ms.gmo
+++ b/po/ms.gmo
diff --git a/po/ms.po b/po/ms.po
index 09ec6472..cb09870e 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gawk 4.0.75\n"
-"Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2014-04-08 19:23+0300\n"
+"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
+"POT-Creation-Date: 2015-02-26 20:05+0200\n"
 "PO-Revision-Date: 2013-04-19 10:45+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@gmail.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -38,9 +38,9 @@ msgstr "cubaan untuk menggunakan parameter skalar `%s' sebagai tatasusunan"
 msgid "attempt to use scalar `%s' as an array"
 msgstr "cubaan untuk menggunakan skalar `%s' sebagai tatasusunan"
 
-#: array.c:409 array.c:576 builtin.c:85 builtin.c:1615 builtin.c:1661
-#: builtin.c:1674 builtin.c:2102 builtin.c:2116 eval.c:1122 eval.c:1126
-#: eval.c:1531
+#: array.c:409 array.c:576 builtin.c:85 builtin.c:1606 builtin.c:1652
+#: builtin.c:1665 builtin.c:2092 builtin.c:2106 eval.c:1149 eval.c:1153
+#: eval.c:1558
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "cubaan untuk menggunakan tatasusunan `%s' dalam konteks skalar"
@@ -91,422 +91,427 @@ msgstr ""
 msgid "asorti: cannot use a subarray of second arg for first arg"
 msgstr ""
 
-#: array.c:1314
+#: array.c:1313
 #, c-format
 msgid "`%s' is invalid as a function name"
 msgstr ""
 
-#: array.c:1318
+#: array.c:1317
 #, c-format
 msgid "sort comparison function `%s' is not defined"
 msgstr ""
 
-#: awkgram.y:233
+#: awkgram.y:226
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr ""
 
-#: awkgram.y:236
+#: awkgram.y:229
 msgid "each rule must have a pattern or an action part"
 msgstr ""
 
-#: awkgram.y:325 awkgram.y:336
+#: awkgram.y:320 awkgram.y:331
 msgid "old awk does not support multiple `BEGIN' or `END' rules"
 msgstr ""
 
-#: awkgram.y:373
+#: awkgram.y:368
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr ""
 
-#: awkgram.y:419
+#: awkgram.y:417
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr ""
 
-#: awkgram.y:423
+#: awkgram.y:421
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr ""
 
-#: awkgram.y:515
+#: awkgram.y:513
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr ""
 
-#: awkgram.y:536
+#: awkgram.y:534
 msgid "duplicate `default' detected in switch body"
 msgstr ""
 
-#: awkgram.y:796 awkgram.y:3723
+#: awkgram.y:794 awkgram.y:3751
 msgid "`break' is not allowed outside a loop or switch"
 msgstr ""
 
-#: awkgram.y:805 awkgram.y:3715
+#: awkgram.y:803 awkgram.y:3743
 msgid "`continue' is not allowed outside a loop"
 msgstr ""
 
-#: awkgram.y:815
+#: awkgram.y:813
 #, c-format
 msgid "`next' used in %s action"
 msgstr ""
 
-#: awkgram.y:824
+#: awkgram.y:822
 #, c-format
 msgid "`nextfile' used in %s action"
 msgstr ""
 
-#: awkgram.y:848
+#: awkgram.y:846
 msgid "`return' used outside function context"
 msgstr ""
 
-#: awkgram.y:922
+#: awkgram.y:920
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 
-#: awkgram.y:988 awkgram.y:1037
+#: awkgram.y:986 awkgram.y:1035
 msgid "`delete' is not allowed with SYMTAB"
 msgstr ""
 
-#: awkgram.y:990 awkgram.y:1039
+#: awkgram.y:988 awkgram.y:1037
 msgid "`delete' is not allowed with FUNCTAB"
 msgstr ""
 
-#: awkgram.y:1024 awkgram.y:1028
+#: awkgram.y:1022 awkgram.y:1026
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr ""
 
-#: awkgram.y:1149
+#: awkgram.y:1147
 msgid "multistage two-way pipelines don't work"
 msgstr ""
 
-#: awkgram.y:1264
+#: awkgram.y:1262
 msgid "regular expression on right of assignment"
 msgstr ""
 
-#: awkgram.y:1275
+#: awkgram.y:1273
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr ""
 
-#: awkgram.y:1291 awkgram.y:1442
+#: awkgram.y:1289 awkgram.y:1431
 msgid "old awk does not support the keyword `in' except after `for'"
 msgstr ""
 
-#: awkgram.y:1301
+#: awkgram.y:1299
 msgid "regular expression on right of comparison"
 msgstr ""
 
-#: awkgram.y:1417
+#: awkgram.y:1411
 #, c-format
-msgid "`getline var' invalid inside `%s' rule"
+msgid "non-redirected `getline' invalid inside `%s' rule"
 msgstr ""
 
-#: awkgram.y:1420
-#, c-format
-msgid "`getline' invalid inside `%s' rule"
-msgstr ""
-
-#: awkgram.y:1425
+#: awkgram.y:1414
 msgid "non-redirected `getline' undefined inside END action"
 msgstr ""
 
-#: awkgram.y:1444
+#: awkgram.y:1433
 msgid "old awk does not support multidimensional arrays"
 msgstr ""
 
-#: awkgram.y:1541
+#: awkgram.y:1530
 msgid "call of `length' without parentheses is not portable"
 msgstr ""
 
-#: awkgram.y:1607
+#: awkgram.y:1596
 msgid "indirect function calls are a gawk extension"
 msgstr ""
 
-#: awkgram.y:1620
+#: awkgram.y:1609
 #, c-format
 msgid "can not use special variable `%s' for indirect function call"
 msgstr ""
 
-#: awkgram.y:1698
+#: awkgram.y:1635
+#, c-format
+msgid "attempt to use non-function `%s' in function call"
+msgstr ""
+
+#: awkgram.y:1699
 msgid "invalid subscript expression"
 msgstr ""
 
-#: awkgram.y:2048 awkgram.y:2068 gawkapi.c:206 gawkapi.c:224 msg.c:126
+#: awkgram.y:2045 awkgram.y:2065 gawkapi.c:206 gawkapi.c:224 msg.c:126
 msgid "warning: "
 msgstr ""
 
-#: awkgram.y:2066 gawkapi.c:192 gawkapi.c:221 msg.c:158
+#: awkgram.y:2063 gawkapi.c:192 gawkapi.c:221 msg.c:158
 msgid "fatal: "
 msgstr ""
 
-#: awkgram.y:2116
+#: awkgram.y:2113
 msgid "unexpected newline or end of string"
 msgstr ""
 
-#: awkgram.y:2383 awkgram.y:2459 awkgram.y:2682 debug.c:523 debug.c:539
+#: awkgram.y:2392 awkgram.y:2468 awkgram.y:2691 debug.c:523 debug.c:539
 #: debug.c:2812 debug.c:5055
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr ""
 
-#: awkgram.y:2384 awkgram.y:2509
+#: awkgram.y:2393 awkgram.y:2518
 #, c-format
 msgid "can't open shared library `%s' for reading (%s)"
 msgstr ""
 
-#: awkgram.y:2386 awkgram.y:2460 awkgram.y:2510 builtin.c:135 debug.c:5206
+#: awkgram.y:2395 awkgram.y:2469 awkgram.y:2519 builtin.c:135 debug.c:5206
 msgid "reason unknown"
 msgstr ""
 
-#: awkgram.y:2395 awkgram.y:2419
+#: awkgram.y:2404 awkgram.y:2428
 #, c-format
 msgid "can't include `%s' and use it as a program file"
 msgstr ""
 
-#: awkgram.y:2408
+#: awkgram.y:2417
 #, c-format
 msgid "already included source file `%s'"
 msgstr ""
 
-#: awkgram.y:2409
+#: awkgram.y:2418
 #, c-format
 msgid "already loaded shared library `%s'"
 msgstr ""
 
-#: awkgram.y:2444
+#: awkgram.y:2453
 msgid "@include is a gawk extension"
 msgstr ""
 
-#: awkgram.y:2450
+#: awkgram.y:2459
 msgid "empty filename after @include"
 msgstr ""
 
-#: awkgram.y:2494
+#: awkgram.y:2503
 msgid "@load is a gawk extension"
 msgstr ""
 
-#: awkgram.y:2500
+#: awkgram.y:2509
 msgid "empty filename after @load"
 msgstr ""
 
-#: awkgram.y:2634
+#: awkgram.y:2643
 msgid "empty program text on command line"
 msgstr ""
 
-#: awkgram.y:2749
+#: awkgram.y:2758
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr ""
 
-#: awkgram.y:2760
+#: awkgram.y:2769
 #, c-format
 msgid "source file `%s' is empty"
 msgstr ""
 
-#: awkgram.y:2937
+#: awkgram.y:2828
+#, c-format
+msgid "PEBKAC error: invalid character '\\%03o' in source code"
+msgstr ""
+
+#: awkgram.y:2959
 msgid "source file does not end in newline"
 msgstr ""
 
-#: awkgram.y:3042
+#: awkgram.y:3062
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr ""
 
-#: awkgram.y:3066
+#: awkgram.y:3089
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:3070
+#: awkgram.y:3093
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 
-#: awkgram.y:3077
+#: awkgram.y:3100
 msgid "unterminated regexp"
 msgstr ""
 
-#: awkgram.y:3081
+#: awkgram.y:3104
 msgid "unterminated regexp at end of file"
 msgstr ""
 
-#: awkgram.y:3140
+#: awkgram.y:3162
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr ""
 
-#: awkgram.y:3156
+#: awkgram.y:3178
 msgid "backslash not last character on line"
 msgstr ""
 
-#: awkgram.y:3217
+#: awkgram.y:3239
 msgid "POSIX does not allow operator `**='"
 msgstr ""
 
-#: awkgram.y:3219
+#: awkgram.y:3241
 msgid "old awk does not support operator `**='"
 msgstr ""
 
-#: awkgram.y:3228
+#: awkgram.y:3250
 msgid "POSIX does not allow operator `**'"
 msgstr ""
 
-#: awkgram.y:3230
+#: awkgram.y:3252
 msgid "old awk does not support operator `**'"
 msgstr ""
 
-#: awkgram.y:3265
+#: awkgram.y:3287
 msgid "operator `^=' is not supported in old awk"
 msgstr ""
 
-#: awkgram.y:3273
+#: awkgram.y:3295
 msgid "operator `^' is not supported in old awk"
 msgstr ""
 
-#: awkgram.y:3366 awkgram.y:3382 command.y:1178
+#: awkgram.y:3392 awkgram.y:3410 command.y:1180
 msgid "unterminated string"
 msgstr ""
 
-#: awkgram.y:3603
+#: awkgram.y:3631
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr ""
 
-#: awkgram.y:3650
+#: awkgram.y:3678
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr ""
 
-#: awkgram.y:3655
+#: awkgram.y:3683
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr ""
 
-#: awkgram.y:3663
+#: awkgram.y:3691
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr ""
 
-#: awkgram.y:3753
+#: awkgram.y:3781
 msgid "`goto' considered harmful!\n"
 msgstr ""
 
-#: awkgram.y:3787
+#: awkgram.y:3815
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr ""
 
-#: awkgram.y:3822
+#: awkgram.y:3850
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 
-#: awkgram.y:3827
+#: awkgram.y:3855
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr ""
 
-#: awkgram.y:3910 awkgram.y:3913
+#: awkgram.y:3938 awkgram.y:3941
 msgid "match: third argument is a gawk extension"
 msgstr ""
 
-#: awkgram.y:3967 awkgram.y:3970
+#: awkgram.y:3995 awkgram.y:3998
 msgid "close: second argument is a gawk extension"
 msgstr ""
 
-#: awkgram.y:3982
+#: awkgram.y:4010
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 
-#: awkgram.y:3997
+#: awkgram.y:4025
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 
-#: awkgram.y:4016
+#: awkgram.y:4044
 msgid "index: regexp constant as second argument is not allowed"
 msgstr ""
 
-#: awkgram.y:4069
+#: awkgram.y:4097
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr ""
 
-#: awkgram.y:4126 debug.c:4041 debug.c:4084 debug.c:5204
+#: awkgram.y:4154 debug.c:4041 debug.c:4084 debug.c:5204
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr ""
 
-#: awkgram.y:4127
+#: awkgram.y:4155
 msgid "sending variable list to standard error"
 msgstr ""
 
-#: awkgram.y:4135
+#: awkgram.y:4163
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr ""
 
-#: awkgram.y:4160
+#: awkgram.y:4188
 msgid "shadow_funcs() called twice!"
 msgstr ""
 
-#: awkgram.y:4168
+#: awkgram.y:4196
 msgid "there were shadowed variables."
 msgstr ""
 
-#: awkgram.y:4239
+#: awkgram.y:4267
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr ""
 
-#: awkgram.y:4285
+#: awkgram.y:4313
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr ""
 
-#: awkgram.y:4288
+#: awkgram.y:4316
 #, c-format
 msgid "function `%s': can't use special variable `%s' as a function parameter"
 msgstr ""
 
-#: awkgram.y:4296
+#: awkgram.y:4324
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr ""
 
-#: awkgram.y:4383 awkgram.y:4389
+#: awkgram.y:4411 awkgram.y:4417
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr ""
 
-#: awkgram.y:4393
+#: awkgram.y:4421
 #, c-format
 msgid "function `%s' defined but never called directly"
 msgstr ""
 
-#: awkgram.y:4425
+#: awkgram.y:4453
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr ""
 
-#: awkgram.y:4484
+#: awkgram.y:4468
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
 "or used as a variable or an array"
 msgstr ""
 
-#: awkgram.y:4720
+#: awkgram.y:4674
 msgid "division by zero attempted"
 msgstr ""
 
-#: awkgram.y:4729
+#: awkgram.y:4683
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr ""
 
-#: awkgram.y:5049
+#: awkgram.y:5003
 msgid ""
 "cannot assign a value to the result of a field post-increment expression"
 msgstr ""
 
-#: awkgram.y:5052
+#: awkgram.y:5006
 #, c-format
 msgid "invalid target of assignment (opcode %s)"
 msgstr ""
@@ -544,371 +549,387 @@ msgstr ""
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr ""
 
-#: builtin.c:362
+#: builtin.c:351
 msgid "index: received non-string first argument"
 msgstr ""
 
-#: builtin.c:364
+#: builtin.c:353
 msgid "index: received non-string second argument"
 msgstr ""
 
-#: builtin.c:488 mpfr.c:757
+#: builtin.c:466 mpfr.c:777
 msgid "int: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:525
+#: builtin.c:503
 msgid "length: received array argument"
 msgstr ""
 
-#: builtin.c:528
+#: builtin.c:506
 msgid "`length(array)' is a gawk extension"
 msgstr ""
 
-#: builtin.c:544
+#: builtin.c:525
 msgid "length: received non-string argument"
 msgstr ""
 
-#: builtin.c:575
+#: builtin.c:554
 msgid "log: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:578
+#: builtin.c:557
 #, c-format
 msgid "log: received negative argument %g"
 msgstr ""
 
-#: builtin.c:776 builtin.c:781
+#: builtin.c:755 builtin.c:760 builtin.c:911
 msgid "fatal: must use `count$' on all formats or none"
 msgstr ""
 
-#: builtin.c:851
+#: builtin.c:830
 #, c-format
 msgid "field width is ignored for `%%' specifier"
 msgstr ""
 
-#: builtin.c:853
+#: builtin.c:832
 #, c-format
 msgid "precision is ignored for `%%' specifier"
 msgstr ""
 
-#: builtin.c:855
+#: builtin.c:834
 #, c-format
 msgid "field width and precision are ignored for `%%' specifier"
 msgstr ""
 
-#: builtin.c:906
+#: builtin.c:885
 msgid "fatal: `$' is not permitted in awk formats"
 msgstr ""
 
-#: builtin.c:915
+#: builtin.c:894
 msgid "fatal: arg count with `$' must be > 0"
 msgstr ""
 
-#: builtin.c:919
+#: builtin.c:898
 #, c-format
 msgid "fatal: arg count %ld greater than total number of supplied arguments"
 msgstr ""
 
-#: builtin.c:923
+#: builtin.c:902
 msgid "fatal: `$' not permitted after period in format"
 msgstr ""
 
-#: builtin.c:939
+#: builtin.c:921
 msgid "fatal: no `$' supplied for positional field width or precision"
 msgstr ""
 
-#: builtin.c:1009
+#: builtin.c:991
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr ""
 
-#: builtin.c:1013
+#: builtin.c:995
 msgid "fatal: `l' is not permitted in POSIX awk formats"
 msgstr ""
 
-#: builtin.c:1026
+#: builtin.c:1008
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr ""
 
-#: builtin.c:1030
+#: builtin.c:1012
 msgid "fatal: `L' is not permitted in POSIX awk formats"
 msgstr ""
 
-#: builtin.c:1043
+#: builtin.c:1025
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr ""
 
-#: builtin.c:1047
+#: builtin.c:1029
 msgid "fatal: `h' is not permitted in POSIX awk formats"
 msgstr ""
 
-#: builtin.c:1463
+#: builtin.c:1055
+#, c-format
+msgid "[s]printf: value %g is too big for %%c format"
+msgstr ""
+
+#: builtin.c:1068
+#, c-format
+msgid "[s]printf: value %g is not a valid wide character"
+msgstr ""
+
+#: builtin.c:1454
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr ""
 
-#: builtin.c:1561
+#: builtin.c:1552
 #, c-format
 msgid "ignoring unknown format specifier character `%c': no argument converted"
 msgstr ""
 
-#: builtin.c:1566
+#: builtin.c:1557
 msgid "fatal: not enough arguments to satisfy format string"
 msgstr ""
 
-#: builtin.c:1568
+#: builtin.c:1559
 msgid "^ ran out for this one"
 msgstr ""
 
-#: builtin.c:1575
+#: builtin.c:1566
 msgid "[s]printf: format specifier does not have control letter"
 msgstr ""
 
-#: builtin.c:1578
+#: builtin.c:1569
 msgid "too many arguments supplied for format string"
 msgstr ""
 
-#: builtin.c:1634
+#: builtin.c:1625
 msgid "sprintf: no arguments"
 msgstr ""
 
-#: builtin.c:1657 builtin.c:1668
+#: builtin.c:1648 builtin.c:1659
 msgid "printf: no arguments"
 msgstr ""
 
-#: builtin.c:1711
+#: builtin.c:1702
 msgid "sqrt: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:1715
+#: builtin.c:1706
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr ""
 
-#: builtin.c:1746
+#: builtin.c:1737
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr ""
 
-#: builtin.c:1748
+#: builtin.c:1739
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr ""
 
-#: builtin.c:1755
+#: builtin.c:1753
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr ""
 
-#: builtin.c:1760
+#: builtin.c:1758
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
 
-#: builtin.c:1772
+#: builtin.c:1770
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr ""
 
-#: builtin.c:1777
+#: builtin.c:1775
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr ""
 
-#: builtin.c:1802
+#: builtin.c:1798
 msgid "substr: source string is zero length"
 msgstr ""
 
-#: builtin.c:1818
+#: builtin.c:1812
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr ""
 
-#: builtin.c:1826
+#: builtin.c:1820
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
 msgstr ""
 
-#: builtin.c:1900
+#: builtin.c:1890
 msgid "strftime: format value in PROCINFO[\"strftime\"] has numeric type"
 msgstr ""
 
-#: builtin.c:1923
+#: builtin.c:1913
 msgid "strftime: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:1927
+#: builtin.c:1917
 msgid "strftime: second argument less than 0 or too big for time_t"
 msgstr ""
 
-#: builtin.c:1934
+#: builtin.c:1924
 msgid "strftime: received non-string first argument"
 msgstr ""
 
-#: builtin.c:1941
+#: builtin.c:1931
 msgid "strftime: received empty format string"
 msgstr ""
 
-#: builtin.c:2007
+#: builtin.c:1997
 msgid "mktime: received non-string argument"
 msgstr ""
 
-#: builtin.c:2024
+#: builtin.c:2014
 msgid "mktime: at least one of the values is out of the default range"
 msgstr ""
 
-#: builtin.c:2059
+#: builtin.c:2049
 msgid "'system' function not allowed in sandbox mode"
 msgstr ""
 
-#: builtin.c:2064
+#: builtin.c:2054
 msgid "system: received non-string argument"
 msgstr ""
 
-#: builtin.c:2184
+#: builtin.c:2174
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr ""
 
-#: builtin.c:2271
+#: builtin.c:2259
 msgid "tolower: received non-string argument"
 msgstr ""
 
-#: builtin.c:2305
+#: builtin.c:2290
 msgid "toupper: received non-string argument"
 msgstr ""
 
-#: builtin.c:2341 mpfr.c:672
+#: builtin.c:2323 mpfr.c:679
 msgid "atan2: received non-numeric first argument"
 msgstr ""
 
-#: builtin.c:2343 mpfr.c:674
+#: builtin.c:2325 mpfr.c:681
 msgid "atan2: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:2362
+#: builtin.c:2344
 msgid "sin: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:2378
+#: builtin.c:2360
 msgid "cos: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:2431 mpfr.c:1156
+#: builtin.c:2413 mpfr.c:1176
 msgid "srand: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:2462
+#: builtin.c:2444
 msgid "match: third argument is not an array"
 msgstr ""
 
-#: builtin.c:2734
-msgid "gensub: third argument of 0 treated as 1"
+#: builtin.c:2705
+#, c-format
+msgid "gensub: third argument `%.*s' treated as 1"
 msgstr ""
 
-#: builtin.c:3030
+#: builtin.c:2720
+#, c-format
+msgid "gensub: third argument %g treated as 1"
+msgstr ""
+
+#: builtin.c:3020
 msgid "lshift: received non-numeric first argument"
 msgstr ""
 
-#: builtin.c:3032
+#: builtin.c:3022
 msgid "lshift: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:3038
+#: builtin.c:3028
 #, c-format
 msgid "lshift(%f, %f): negative values will give strange results"
 msgstr ""
 
-#: builtin.c:3040
+#: builtin.c:3030
 #, c-format
 msgid "lshift(%f, %f): fractional values will be truncated"
 msgstr ""
 
-#: builtin.c:3042
+#: builtin.c:3032
 #, c-format
 msgid "lshift(%f, %f): too large shift value will give strange results"
 msgstr ""
 
-#: builtin.c:3067
+#: builtin.c:3057
 msgid "rshift: received non-numeric first argument"
 msgstr ""
 
-#: builtin.c:3069
+#: builtin.c:3059
 msgid "rshift: received non-numeric second argument"
 msgstr ""
 
-#: builtin.c:3075
+#: builtin.c:3065
 #, c-format
 msgid "rshift(%f, %f): negative values will give strange results"
 msgstr ""
 
-#: builtin.c:3077
+#: builtin.c:3067
 #, c-format
 msgid "rshift(%f, %f): fractional values will be truncated"
 msgstr ""
 
-#: builtin.c:3079
+#: builtin.c:3069
 #, c-format
 msgid "rshift(%f, %f): too large shift value will give strange results"
 msgstr ""
 
-#: builtin.c:3104 mpfr.c:968
+#: builtin.c:3094 mpfr.c:988
 msgid "and: called with less than two arguments"
 msgstr ""
 
-#: builtin.c:3109
+#: builtin.c:3099
 #, c-format
 msgid "and: argument %d is non-numeric"
 msgstr ""
 
-#: builtin.c:3113
+#: builtin.c:3103
 #, c-format
 msgid "and: argument %d negative value %g will give strange results"
 msgstr ""
 
-#: builtin.c:3136 mpfr.c:1000
+#: builtin.c:3126 mpfr.c:1020
 msgid "or: called with less than two arguments"
 msgstr ""
 
-#: builtin.c:3141
+#: builtin.c:3131
 #, c-format
 msgid "or: argument %d is non-numeric"
 msgstr ""
 
-#: builtin.c:3145
+#: builtin.c:3135
 #, c-format
 msgid "or: argument %d negative value %g will give strange results"
 msgstr ""
 
-#: builtin.c:3167 mpfr.c:1031
+#: builtin.c:3157 mpfr.c:1051
 msgid "xor: called with less than two arguments"
 msgstr ""
 
-#: builtin.c:3173
+#: builtin.c:3163
 #, c-format
 msgid "xor: argument %d is non-numeric"
 msgstr ""
 
-#: builtin.c:3177
+#: builtin.c:3167
 #, c-format
 msgid "xor: argument %d negative value %g will give strange results"
 msgstr ""
 
-#: builtin.c:3202 mpfr.c:787
+#: builtin.c:3192 mpfr.c:807
 msgid "compl: received non-numeric argument"
 msgstr ""
 
-#: builtin.c:3208
+#: builtin.c:3198
 #, c-format
 msgid "compl(%f): negative value will give strange results"
 msgstr ""
 
-#: builtin.c:3210
+#: builtin.c:3200
 #, c-format
 msgid "compl(%f): fractional value will be truncated"
 msgstr ""
 
-#: builtin.c:3379
+#: builtin.c:3369
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr ""
@@ -1188,40 +1209,46 @@ msgstr ""
 msgid "watch var - set a watchpoint for a variable."
 msgstr ""
 
-#: command.y:1011 debug.c:401 msg.c:135
+#: command.y:901
+msgid ""
+"where [N] - (same as backtrace) print trace of all or N innermost (outermost "
+"if N < 0) frames."
+msgstr ""
+
+#: command.y:1013 debug.c:401 msg.c:135
 #, c-format
 msgid "error: "
 msgstr ""
 
-#: command.y:1051
+#: command.y:1053
 #, c-format
 msgid "can't read command (%s)\n"
 msgstr ""
 
-#: command.y:1065
+#: command.y:1067
 #, c-format
 msgid "can't read command (%s)"
 msgstr ""
 
-#: command.y:1116
+#: command.y:1118
 msgid "invalid character in command"
 msgstr ""
 
-#: command.y:1152
+#: command.y:1154
 #, c-format
 msgid "unknown command - \"%.*s\", try help"
 msgstr ""
 
-#: command.y:1222
+#: command.y:1224
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: command.y:1284
+#: command.y:1286
 msgid "invalid character"
 msgstr ""
 
-#: command.y:1455
+#: command.y:1457
 #, c-format
 msgid "undefined command: %s\n"
 msgstr ""
@@ -1733,68 +1760,68 @@ msgstr ""
 msgid "`return' not allowed in current context; statement ignored"
 msgstr ""
 
-#: debug.c:5590
+#: debug.c:5604
 #, c-format
 msgid "No symbol `%s' in current context"
 msgstr ""
 
-#: dfa.c:1118 dfa.c:1121 dfa.c:1142 dfa.c:1150 dfa.c:1162 dfa.c:1197
-#: dfa.c:1206 dfa.c:1209 dfa.c:1214 dfa.c:1228 dfa.c:1275
+#: dfa.c:1063 dfa.c:1066 dfa.c:1085 dfa.c:1095 dfa.c:1107 dfa.c:1143
+#: dfa.c:1152 dfa.c:1155 dfa.c:1160 dfa.c:1174 dfa.c:1222
 msgid "unbalanced ["
 msgstr ""
 
-#: dfa.c:1174
+#: dfa.c:1119
 msgid "invalid character class"
 msgstr ""
 
-#: dfa.c:1316
+#: dfa.c:1265
 msgid "character class syntax is [[:space:]], not [:space:]"
 msgstr ""
 
-#: dfa.c:1366
+#: dfa.c:1327
 msgid "unfinished \\ escape"
 msgstr ""
 
-#: dfa.c:1513 regcomp.c:161
-msgid "Invalid content of \\{\\}"
+#: dfa.c:1474
+msgid "invalid content of \\{\\}"
 msgstr ""
 
-#: dfa.c:1516 regcomp.c:176
-msgid "Regular expression too big"
+#: dfa.c:1477
+msgid "regular expression too big"
 msgstr ""
 
-#: dfa.c:1936
+#: dfa.c:1912
 msgid "unbalanced ("
 msgstr ""
 
-#: dfa.c:2062
+#: dfa.c:2038
 msgid "no syntax specified"
 msgstr ""
 
-#: dfa.c:2070
+#: dfa.c:2046
 msgid "unbalanced )"
 msgstr ""
 
-#: eval.c:394
+#: eval.c:396
 #, c-format
 msgid "unknown nodetype %d"
 msgstr ""
 
-#: eval.c:405 eval.c:419
+#: eval.c:407 eval.c:421
 #, c-format
 msgid "unknown opcode %d"
 msgstr ""
 
-#: eval.c:416
+#: eval.c:418
 #, c-format
 msgid "opcode %s not an operator or keyword"
 msgstr ""
 
-#: eval.c:472
+#: eval.c:474
 msgid "buffer overflow in genflags2str"
 msgstr ""
 
-#: eval.c:675
+#: eval.c:676
 #, c-format
 msgid ""
 "\n"
@@ -1802,211 +1829,211 @@ msgid ""
 "\n"
 msgstr ""
 
-#: eval.c:704
+#: eval.c:705
 msgid "`IGNORECASE' is a gawk extension"
 msgstr ""
 
-#: eval.c:736
+#: eval.c:737
 msgid "`BINMODE' is a gawk extension"
 msgstr ""
 
-#: eval.c:794
+#: eval.c:795
 #, c-format
 msgid "BINMODE value `%s' is invalid, treated as 3"
 msgstr ""
 
-#: eval.c:885
+#: eval.c:912
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr ""
 
-#: eval.c:969
+#: eval.c:996
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr ""
 
-#: eval.c:1147
+#: eval.c:1174
 #, c-format
 msgid "reference to uninitialized argument `%s'"
 msgstr ""
 
-#: eval.c:1148
+#: eval.c:1175
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr ""
 
-#: eval.c:1166
+#: eval.c:1193
 msgid "attempt to field reference from non-numeric value"
 msgstr ""
 
-#: eval.c:1168
+#: eval.c:1195
 msgid "attempt to field reference from null string"
 msgstr ""
 
-#: eval.c:1176
+#: eval.c:1203
 #, c-format
 msgid "attempt to access field %ld"
 msgstr ""
 
-#: eval.c:1185
+#: eval.c:1212
 #, c-format
 msgid "reference to uninitialized field `$%ld'"
 msgstr ""
 
-#: eval.c:1272
+#: eval.c:1299
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr ""
 
-#: eval.c:1473
+#: eval.c:1500
 #, c-format
 msgid "unwind_stack: unexpected type `%s'"
 msgstr ""
 
-#: eval.c:1569
+#: eval.c:1596
 msgid "division by zero attempted in `/='"
 msgstr ""
 
-#: eval.c:1576
+#: eval.c:1603
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr ""
 
-#: ext.c:89 ext.c:171
+#: ext.c:65 ext.c:147
 msgid "extensions are not allowed in sandbox mode"
 msgstr ""
 
-#: ext.c:92
+#: ext.c:68
 msgid "-l / @load are gawk extensions"
 msgstr ""
 
-#: ext.c:95
+#: ext.c:71
 msgid "load_ext: received NULL lib_name"
 msgstr ""
 
-#: ext.c:98
+#: ext.c:74
 #, c-format
 msgid "load_ext: cannot open library `%s' (%s)\n"
 msgstr ""
 
-#: ext.c:104
+#: ext.c:80
 #, c-format
 msgid ""
 "load_ext: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
 msgstr ""
 
-#: ext.c:110
+#: ext.c:86
 #, c-format
 msgid "load_ext: library `%s': cannot call function `%s' (%s)\n"
 msgstr ""
 
-#: ext.c:114
+#: ext.c:90
 #, c-format
 msgid "load_ext: library `%s' initialization routine `%s' failed\n"
 msgstr ""
 
-#: ext.c:174
+#: ext.c:150
 msgid "`extension' is a gawk extension"
 msgstr ""
 
-#: ext.c:177
+#: ext.c:153
 msgid "extension: received NULL lib_name"
 msgstr ""
 
-#: ext.c:180
+#: ext.c:156
 #, c-format
 msgid "extension: cannot open library `%s' (%s)"
 msgstr ""
 
-#: ext.c:186
+#: ext.c:162
 #, c-format
 msgid ""
 "extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)"
 msgstr ""
 
-#: ext.c:190
+#: ext.c:166
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)"
 msgstr ""
 
-#: ext.c:221
+#: ext.c:197
 msgid "make_builtin: missing function name"
 msgstr ""
 
-#: ext.c:236
+#: ext.c:212
 #, c-format
 msgid "make_builtin: can't redefine function `%s'"
 msgstr ""
 
-#: ext.c:240
+#: ext.c:216
 #, c-format
 msgid "make_builtin: function `%s' already defined"
 msgstr ""
 
-#: ext.c:244
+#: ext.c:220
 #, c-format
 msgid "make_builtin: function name `%s' previously defined"
 msgstr ""
 
-#: ext.c:246
+#: ext.c:222
 #, c-format
 msgid "make_builtin: can't use gawk built-in `%s' as function name"
 msgstr ""
 
-#: ext.c:249 ext.c:304
+#: ext.c:225 ext.c:280
 #, c-format
 msgid "make_builtin: negative argument count for function `%s'"
 msgstr ""
 
-#: ext.c:276
+#: ext.c:252
 msgid "extension: missing function name"
 msgstr ""
 
-#: ext.c:279 ext.c:283
+#: ext.c:255 ext.c:259
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr ""
 
-#: ext.c:291
+#: ext.c:267
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr ""
 
-#: ext.c:295
+#: ext.c:271
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr ""
 
-#: ext.c:299
+#: ext.c:275
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr ""
 
-#: ext.c:301
+#: ext.c:277
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 
-#: ext.c:375
+#: ext.c:351
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr ""
 
-#: ext.c:378
+#: ext.c:354
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr ""
 
-#: ext.c:395
+#: ext.c:371
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr ""
 
-#: ext.c:399
+#: ext.c:375
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr ""
 
-#: ext.c:413
+#: ext.c:389
 msgid "dynamic loading of library not supported"
 msgstr ""
 
@@ -2150,7 +2177,7 @@ msgstr ""
 msgid "inplace_begin: in-place editing already active"
 msgstr ""
 
-#: extension/inplace.c:133 extension/inplace.c:207
+#: extension/inplace.c:133 extension/inplace.c:210
 #, c-format
 msgid "inplace_begin: expects 2 arguments but called with %d"
 msgstr ""
@@ -2179,55 +2206,55 @@ msgstr ""
 msgid "inplace_begin: mkstemp(`%s') failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:178
+#: extension/inplace.c:181
 #, c-format
 msgid "inplace_begin: chmod failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:185
+#: extension/inplace.c:188
 #, c-format
 msgid "inplace_begin: dup(stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:188
+#: extension/inplace.c:191
 #, c-format
 msgid "inplace_begin: dup2(%d, stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:191
+#: extension/inplace.c:194
 #, c-format
 msgid "inplace_begin: close(%d) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:210
+#: extension/inplace.c:213
 msgid "inplace_end: cannot retrieve 1st argument as a string filename"
 msgstr ""
 
-#: extension/inplace.c:217
+#: extension/inplace.c:220
 msgid "inplace_end: in-place editing not active"
 msgstr ""
 
-#: extension/inplace.c:223
+#: extension/inplace.c:226
 #, c-format
 msgid "inplace_end: dup2(%d, stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:226
+#: extension/inplace.c:229
 #, c-format
 msgid "inplace_end: close(%d) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:230
+#: extension/inplace.c:233
 #, c-format
 msgid "inplace_end: fsetpos(stdout) failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:243
+#: extension/inplace.c:246
 #, c-format
 msgid "inplace_end: link(`%s', `%s') failed (%s)"
 msgstr ""
 
-#: extension/inplace.c:253
+#: extension/inplace.c:256
 #, c-format
 msgid "inplace_end: rename(`%s', `%s') failed (%s)"
 msgstr ""
@@ -2269,50 +2296,54 @@ msgstr ""
 msgid "readfile: called with no arguments"
 msgstr ""
 
-#: extension/rwarray.c:124
+#: extension/revoutput.c:125
+msgid "revoutput: could not initialize REVOUT variable"
+msgstr ""
+
+#: extension/rwarray.c:124 extension/rwarray0.c:109
 msgid "writea: called with too many arguments"
 msgstr ""
 
-#: extension/rwarray.c:131
+#: extension/rwarray.c:131 extension/rwarray0.c:116
 #, c-format
 msgid "do_writea: argument 0 is not a string\n"
 msgstr ""
 
-#: extension/rwarray.c:137
+#: extension/rwarray.c:137 extension/rwarray0.c:122
 #, c-format
 msgid "do_writea: argument 1 is not an array\n"
 msgstr ""
 
-#: extension/rwarray.c:184
+#: extension/rwarray.c:184 extension/rwarray0.c:169
 #, c-format
 msgid "write_array: could not flatten array\n"
 msgstr ""
 
-#: extension/rwarray.c:198
+#: extension/rwarray.c:198 extension/rwarray0.c:183
 #, c-format
 msgid "write_array: could not release flattened array\n"
 msgstr ""
 
-#: extension/rwarray.c:280
+#: extension/rwarray.c:280 extension/rwarray0.c:265
 msgid "reada: called with too many arguments"
 msgstr ""
 
-#: extension/rwarray.c:287
+#: extension/rwarray.c:287 extension/rwarray0.c:272
 #, c-format
 msgid "do_reada: argument 0 is not a string\n"
 msgstr ""
 
-#: extension/rwarray.c:293
+#: extension/rwarray.c:293 extension/rwarray0.c:278
 #, c-format
 msgid "do_reada: argument 1 is not an array\n"
 msgstr ""
 
-#: extension/rwarray.c:337
+#: extension/rwarray.c:337 extension/rwarray0.c:322
 #, c-format
 msgid "do_reada: clear_array failed\n"
 msgstr ""
 
-#: extension/rwarray.c:374
+#: extension/rwarray.c:374 extension/rwarray0.c:358
 #, c-format
 msgid "read_array: set_array_element failed\n"
 msgstr ""
@@ -2341,80 +2372,80 @@ msgstr ""
 msgid "sleep: not supported on this platform"
 msgstr ""
 
-#: field.c:345
+#: field.c:346
 msgid "NF set to negative value"
 msgstr ""
 
-#: field.c:971 field.c:978 field.c:982
+#: field.c:958 field.c:965 field.c:969
 msgid "split: fourth argument is a gawk extension"
 msgstr ""
 
-#: field.c:975
+#: field.c:962
 msgid "split: fourth argument is not an array"
 msgstr ""
 
-#: field.c:989
+#: field.c:976
 msgid "split: second argument is not an array"
 msgstr ""
 
-#: field.c:993
+#: field.c:980
 msgid "split: cannot use the same array for second and fourth args"
 msgstr ""
 
-#: field.c:998
+#: field.c:985
 msgid "split: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 
-#: field.c:1001
+#: field.c:988
 msgid "split: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 
-#: field.c:1032
+#: field.c:1019
 msgid "split: null string for third arg is a gawk extension"
 msgstr ""
 
-#: field.c:1072
+#: field.c:1059
 msgid "patsplit: fourth argument is not an array"
 msgstr ""
 
-#: field.c:1077
+#: field.c:1064
 msgid "patsplit: second argument is not an array"
 msgstr ""
 
-#: field.c:1083
+#: field.c:1070
 msgid "patsplit: third argument must be non-null"
 msgstr ""
 
-#: field.c:1087
+#: field.c:1074
 msgid "patsplit: cannot use the same array for second and fourth args"
 msgstr ""
 
-#: field.c:1092
+#: field.c:1079
 msgid "patsplit: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 
-#: field.c:1095
+#: field.c:1082
 msgid "patsplit: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 
-#: field.c:1133
+#: field.c:1120
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr ""
 
-#: field.c:1197
+#: field.c:1184
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr ""
 
-#: field.c:1270
+#: field.c:1257
 msgid "null string for `FS' is a gawk extension"
 msgstr ""
 
-#: field.c:1274
+#: field.c:1261
 msgid "old awk does not support regexps as value of `FS'"
 msgstr ""
 
-#: field.c:1393
+#: field.c:1380
 msgid "`FPAT' is a gawk extension"
 msgstr ""
 
@@ -2430,20 +2461,20 @@ msgstr ""
 msgid "node_to_awk_value: received null val"
 msgstr ""
 
-#: gawkapi.c:807
+#: gawkapi.c:809
 msgid "remove_element: received null array"
 msgstr ""
 
-#: gawkapi.c:810
+#: gawkapi.c:812
 msgid "remove_element: received null subscript"
 msgstr ""
 
-#: gawkapi.c:947
+#: gawkapi.c:949
 #, c-format
 msgid "api_flatten_array: could not convert index %d\n"
 msgstr ""
 
-#: gawkapi.c:952
+#: gawkapi.c:954
 #, c-format
 msgid "api_flatten_array: could not convert value %d\n"
 msgstr ""
@@ -2503,504 +2534,472 @@ msgstr ""
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr ""
 
-#: io.c:392
+#: io.c:423
 #, c-format
 msgid "command line argument `%s' is a directory: skipped"
 msgstr ""
 
-#: io.c:395 io.c:513
+#: io.c:426 io.c:544
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr ""
 
-#: io.c:640
+#: io.c:671
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr ""
 
-#: io.c:716
+#: io.c:749
 msgid "redirection not allowed in sandbox mode"
 msgstr ""
 
-#: io.c:750
+#: io.c:783
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr ""
 
-#: io.c:756
+#: io.c:789
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr ""
 
-#: io.c:761
+#: io.c:794
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 
-#: io.c:809
+#: io.c:842
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr ""
 
-#: io.c:863
+#: io.c:896
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr ""
 
-#: io.c:873
+#: io.c:906
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr ""
 
-#: io.c:904
+#: io.c:937
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr ""
 
-#: io.c:986
+#: io.c:1019
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr ""
 
-#: io.c:989
+#: io.c:1022
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr ""
 
-#: io.c:1040
+#: io.c:1073
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 
-#: io.c:1056
+#: io.c:1089
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr ""
 
-#: io.c:1064
+#: io.c:1097
 msgid "too many pipes or input files open"
 msgstr ""
 
-#: io.c:1086
+#: io.c:1119
 msgid "close: second argument must be `to' or `from'"
 msgstr ""
 
-#: io.c:1103
+#: io.c:1136
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr ""
 
-#: io.c:1108
+#: io.c:1141
 msgid "close of redirection that was never opened"
 msgstr ""
 
-#: io.c:1205
+#: io.c:1238
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 
-#: io.c:1222
+#: io.c:1255
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr ""
 
-#: io.c:1225
+#: io.c:1258
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr ""
 
-#: io.c:1245
+#: io.c:1278
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr ""
 
-#: io.c:1248
+#: io.c:1281
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr ""
 
-#: io.c:1251
+#: io.c:1284
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr ""
 
-#: io.c:1254
+#: io.c:1287
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr ""
 
-#: io.c:1284 io.c:1342 main.c:864 main.c:906
+#: io.c:1317 io.c:1375 main.c:628 main.c:670
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr ""
 
-#: io.c:1289 io.c:1348 main.c:866
+#: io.c:1322 io.c:1381 main.c:630
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr ""
 
-#: io.c:1297
+#: io.c:1330
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr ""
 
-#: io.c:1300
+#: io.c:1333
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr ""
 
-#: io.c:1303
+#: io.c:1336
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr ""
 
-#: io.c:1420
+#: io.c:1453
 #, c-format
 msgid "local port %s invalid in `/inet'"
 msgstr ""
 
-#: io.c:1438
+#: io.c:1471
 #, c-format
 msgid "remote host and port information (%s, %s) invalid"
 msgstr ""
 
-#: io.c:1590
-#, c-format
-msgid "no (known) protocol supplied in special filename `%s'"
-msgstr ""
-
-#: io.c:1604
-#, c-format
-msgid "special file name `%s' is incomplete"
-msgstr ""
-
-#: io.c:1621
-msgid "must supply a remote hostname to `/inet'"
-msgstr ""
-
-#: io.c:1639
-msgid "must supply a remote port to `/inet'"
-msgstr ""
-
-#: io.c:1685
+#: io.c:1673
 msgid "TCP/IP communications are not supported"
 msgstr ""
 
-#: io.c:1867
+#: io.c:1854
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr ""
 
-#: io.c:1917
+#: io.c:1904
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr ""
 
-#: io.c:1919 io.c:2105 io.c:2305
+#: io.c:1906 io.c:2092 io.c:2293
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr ""
 
-#: io.c:1922
+#: io.c:1909
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 
-#: io.c:1924 io.c:2110
+#: io.c:1911 io.c:2097
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr ""
 
-#: io.c:1927
+#: io.c:1914
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 
-#: io.c:1929 io.c:1951
+#: io.c:1916 io.c:1938
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr ""
 
-#: io.c:2040 io.c:2108 io.c:2276 io.c:2308
+#: io.c:2027 io.c:2095 io.c:2264 io.c:2296
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr ""
 
-#: io.c:2047 io.c:2113
+#: io.c:2034 io.c:2100
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr ""
 
-#: io.c:2073 io.c:2298
+#: io.c:2060 io.c:2286
 msgid "restoring stdout in parent process failed\n"
 msgstr ""
 
-#: io.c:2081
+#: io.c:2068
 msgid "restoring stdin in parent process failed\n"
 msgstr ""
 
-#: io.c:2116 io.c:2310 io.c:2324
+#: io.c:2103 io.c:2298 io.c:2313
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr ""
 
-#: io.c:2174
+#: io.c:2162
 msgid "`|&' not supported"
 msgstr ""
 
-#: io.c:2261
+#: io.c:2249
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr ""
 
-#: io.c:2318
+#: io.c:2307
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr ""
 
-#: io.c:2790
+#: io.c:2734
 msgid "register_input_parser: received NULL pointer"
 msgstr ""
 
-#: io.c:2818
+#: io.c:2762
 #, c-format
 msgid "input parser `%s' conflicts with previously installed input parser `%s'"
 msgstr ""
 
-#: io.c:2825
+#: io.c:2769
 #, c-format
 msgid "input parser `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:2845
+#: io.c:2789
 msgid "register_output_wrapper: received NULL pointer"
 msgstr ""
 
-#: io.c:2873
+#: io.c:2817
 #, c-format
 msgid ""
 "output wrapper `%s' conflicts with previously installed output wrapper `%s'"
 msgstr ""
 
-#: io.c:2880
+#: io.c:2824
 #, c-format
 msgid "output wrapper `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:2901
+#: io.c:2845
 msgid "register_output_processor: received NULL pointer"
 msgstr ""
 
-#: io.c:2930
+#: io.c:2874
 #, c-format
 msgid ""
 "two-way processor `%s' conflicts with previously installed two-way processor "
 "`%s'"
 msgstr ""
 
-#: io.c:2939
+#: io.c:2883
 #, c-format
 msgid "two way processor `%s' failed to open `%s'"
 msgstr ""
 
-#: io.c:3064
+#: io.c:3008
 #, c-format
 msgid "data file `%s' is empty"
 msgstr ""
 
-#: io.c:3106 io.c:3114
+#: io.c:3050 io.c:3058
 msgid "could not allocate more input memory"
 msgstr ""
 
-#: io.c:3682
+#: io.c:3636
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr ""
 
-#: io.c:3771
+#: io.c:3783
 msgid "IPv6 communication is not supported"
 msgstr ""
 
-#: main.c:405
-msgid "empty argument to `-e/--source' ignored"
-msgstr ""
-
-#: main.c:495
-#, c-format
-msgid "%s: option `-W %s' unrecognized, ignored\n"
-msgstr ""
-
-#: main.c:541
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: main.c:562
+#: main.c:321
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
 
-#: main.c:568
+#: main.c:327
 msgid "`--posix' overrides `--traditional'"
 msgstr ""
 
-#: main.c:579
+#: main.c:338
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr ""
 
-#: main.c:583
+#: main.c:342
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr ""
 
-#: main.c:588
+#: main.c:346
 msgid "`--posix' overrides `--characters-as-bytes'"
 msgstr ""
 
-#: main.c:647
+#: main.c:404
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr ""
 
-#: main.c:650
+#: main.c:407
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr ""
 
-#: main.c:652
+#: main.c:409
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr ""
 
-#: main.c:710
+#: main.c:469
 msgid "no program text at all!"
 msgstr ""
 
-#: main.c:799
+#: main.c:563
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 
-#: main.c:801
+#: main.c:565
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
 
-#: main.c:806
+#: main.c:570
 msgid "POSIX options:\t\tGNU long options: (standard)\n"
 msgstr ""
 
-#: main.c:807
+#: main.c:571
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr ""
 
-#: main.c:808
+#: main.c:572
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr ""
 
-#: main.c:809
+#: main.c:573
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr ""
 
-#: main.c:810
+#: main.c:574
 msgid "Short options:\t\tGNU long options: (extensions)\n"
 msgstr ""
 
-#: main.c:811
+#: main.c:575
 msgid "\t-b\t\t\t--characters-as-bytes\n"
 msgstr ""
 
-#: main.c:812
+#: main.c:576
 msgid "\t-c\t\t\t--traditional\n"
 msgstr ""
 
-#: main.c:813
+#: main.c:577
 msgid "\t-C\t\t\t--copyright\n"
 msgstr ""
 
-#: main.c:814
+#: main.c:578
 msgid "\t-d[file]\t\t--dump-variables[=file]\n"
 msgstr ""
 
-#: main.c:815
+#: main.c:579
 msgid "\t-D[file]\t\t--debug[=file]\n"
 msgstr ""
 
-#: main.c:816
+#: main.c:580
 msgid "\t-e 'program-text'\t--source='program-text'\n"
 msgstr ""
 
-#: main.c:817
+#: main.c:581
 msgid "\t-E file\t\t\t--exec=file\n"
 msgstr ""
 
-#: main.c:818
+#: main.c:582
 msgid "\t-g\t\t\t--gen-pot\n"
 msgstr ""
 
-#: main.c:819
+#: main.c:583
 msgid "\t-h\t\t\t--help\n"
 msgstr ""
 
-#: main.c:820
+#: main.c:584
 msgid "\t-i includefile\t\t--include=includefile\n"
 msgstr ""
 
-#: main.c:821
+#: main.c:585
 msgid "\t-l library\t\t--load=library\n"
 msgstr ""
 
-#: main.c:822
-msgid "\t-L [fatal]\t\t--lint[=fatal]\n"
-msgstr ""
-
-#: main.c:823
-msgid "\t-n\t\t\t--non-decimal-data\n"
+#: main.c:586
+msgid "\t-L[fatal|invalid]\t--lint[=fatal|invalid]\n"
 msgstr ""
 
-#: main.c:824
+#: main.c:587
 msgid "\t-M\t\t\t--bignum\n"
 msgstr ""
 
-#: main.c:825
+#: main.c:588
 msgid "\t-N\t\t\t--use-lc-numeric\n"
 msgstr ""
 
-#: main.c:826
+#: main.c:589
+msgid "\t-n\t\t\t--non-decimal-data\n"
+msgstr ""
+
+#: main.c:590
 msgid "\t-o[file]\t\t--pretty-print[=file]\n"
 msgstr ""
 
-#: main.c:827
+#: main.c:591
 msgid "\t-O\t\t\t--optimize\n"
 msgstr ""
 
-#: main.c:828
+#: main.c:592
 msgid "\t-p[file]\t\t--profile[=file]\n"
 msgstr ""
 
-#: main.c:829
+#: main.c:593
 msgid "\t-P\t\t\t--posix\n"
 msgstr ""
 
-#: main.c:830
+#: main.c:594
 msgid "\t-r\t\t\t--re-interval\n"
 msgstr ""
 
-#: main.c:831
+#: main.c:595
 msgid "\t-S\t\t\t--sandbox\n"
 msgstr ""
 
-#: main.c:832
+#: main.c:596
 msgid "\t-t\t\t\t--lint-old\n"
 msgstr ""
 
-#: main.c:833
+#: main.c:597
 msgid "\t-V\t\t\t--version\n"
 msgstr ""
 
-#: main.c:835
+#: main.c:599
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr ""
 
-#: main.c:838
+#: main.c:602
 msgid "\t-Y\t\t--parsedebug\n"
 msgstr ""
 
@@ -3009,7 +3008,7 @@ msgstr ""
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: main.c:847
+#: main.c:611
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -3017,21 +3016,21 @@ msgid ""
 "\n"
 msgstr ""
 
-#: main.c:851
+#: main.c:615
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
 "\n"
 msgstr ""
 
-#: main.c:855
+#: main.c:619
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 msgstr ""
 
-#: main.c:880
+#: main.c:644
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
@@ -3043,7 +3042,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: main.c:888
+#: main.c:652
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3052,120 +3051,138 @@ msgid ""
 "\n"
 msgstr ""
 
-#: main.c:894
+#: main.c:658
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
 
-#: main.c:931
+#: main.c:695
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr ""
 
-#: main.c:1208
+#: main.c:982
 #, c-format
 msgid "unknown value for field spec: %d\n"
 msgstr ""
 
-#: main.c:1306
+#: main.c:1080
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
 "\n"
 msgstr ""
 
-#: main.c:1332
+#: main.c:1106
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr ""
 
-#: main.c:1335
+#: main.c:1109
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr ""
 
-#: main.c:1339
+#: main.c:1113
 #, c-format
 msgid "cannot use gawk builtin `%s' as variable name"
 msgstr ""
 
-#: main.c:1344
+#: main.c:1118
 #, c-format
 msgid "cannot use function `%s' as variable name"
 msgstr ""
 
-#: main.c:1397
+#: main.c:1171
 msgid "floating point exception"
 msgstr ""
 
-#: main.c:1404
+#: main.c:1178
 msgid "fatal error: internal error"
 msgstr ""
 
-#: main.c:1419
+#: main.c:1193
 msgid "fatal error: internal error: segfault"
 msgstr ""
 
-#: main.c:1431
+#: main.c:1205
 msgid "fatal error: internal error: stack overflow"
 msgstr ""
 
-#: main.c:1490
+#: main.c:1264
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr ""
 
-#: main.c:1497
+#: main.c:1271
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr ""
 
-#: mpfr.c:550
+#: main.c:1485
+msgid "empty argument to `-e/--source' ignored"
+msgstr ""
+
+#: main.c:1556
+msgid "-M ignored: MPFR/GMP support not compiled in"
+msgstr ""
+
+#: main.c:1577
+#, c-format
+msgid "%s: option `-W %s' unrecognized, ignored\n"
+msgstr ""
+
+#: main.c:1630
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr ""
+
+#: mpfr.c:557
 #, c-format
 msgid "PREC value `%.*s' is invalid"
 msgstr ""
 
-#: mpfr.c:608
+#: mpfr.c:615
 #, c-format
 msgid "RNDMODE value `%.*s' is invalid"
 msgstr ""
 
-#: mpfr.c:698
+#: mpfr.c:711
 #, c-format
 msgid "%s: received non-numeric argument"
 msgstr ""
 
-#: mpfr.c:800
+#: mpfr.c:820
 msgid "compl(%Rg): negative value will give strange results"
 msgstr ""
 
-#: mpfr.c:804
+#: mpfr.c:824
 msgid "comp(%Rg): fractional value will be truncated"
 msgstr ""
 
-#: mpfr.c:816
+#: mpfr.c:836
 #, c-format
 msgid "cmpl(%Zd): negative values will give strange results"
 msgstr ""
 
-#: mpfr.c:835
+#: mpfr.c:855
 #, c-format
 msgid "%s: received non-numeric argument #%d"
 msgstr ""
 
-#: mpfr.c:845
+#: mpfr.c:865
 msgid "%s: argument #%d has invalid value %Rg, using 0"
 msgstr ""
 
-#: mpfr.c:857
+#: mpfr.c:877
 msgid "%s: argument #%d negative value %Rg will give strange results"
 msgstr ""
 
-#: mpfr.c:863
+#: mpfr.c:883
 msgid "%s: argument #%d fractional value %Rg will be truncated"
 msgstr ""
 
-#: mpfr.c:878
+#: mpfr.c:898
 #, c-format
 msgid "%s: argument #%d negative value %Zd will give strange results"
 msgstr ""
@@ -3175,36 +3192,36 @@ msgstr ""
 msgid "cmd. line:"
 msgstr ""
 
-#: node.c:421
+#: node.c:409
 msgid "backslash at end of string"
 msgstr ""
 
-#: node.c:500
+#: node.c:488
 #, c-format
 msgid "old awk does not support the `\\%c' escape sequence"
 msgstr ""
 
-#: node.c:551
+#: node.c:539
 msgid "POSIX does not allow `\\x' escapes"
 msgstr ""
 
-#: node.c:557
+#: node.c:545
 msgid "no hex digits in `\\x' escape sequence"
 msgstr ""
 
-#: node.c:579
+#: node.c:567
 #, c-format
 msgid ""
 "hex escape \\x%.*s of %d characters probably not interpreted the way you "
 "expect"
 msgstr ""
 
-#: node.c:594
+#: node.c:582
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr ""
 
-#: node.c:739
+#: node.c:726
 msgid ""
 "Invalid multibyte data detected. There may be a mismatch between your data "
 "and your locale."
@@ -3232,7 +3249,7 @@ msgstr ""
 #: profile.c:193
 #, c-format
 msgid ""
-"\t# %s block(s)\n"
+"\t# %s rule(s)\n"
 "\n"
 msgstr ""
 
@@ -3248,30 +3265,30 @@ msgstr ""
 msgid "internal error: %s with null vname"
 msgstr ""
 
-#: profile.c:537
+#: profile.c:538
 msgid "internal error: builtin with null fname"
 msgstr ""
 
-#: profile.c:949
+#: profile.c:958
 #, c-format
 msgid ""
 "\t# Loaded extensions (-l and/or @load)\n"
 "\n"
 msgstr ""
 
-#: profile.c:972
+#: profile.c:981
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr ""
 
-#: profile.c:1475
+#: profile.c:1521
 #, c-format
 msgid ""
 "\n"
 "\t# Functions, listed alphabetically\n"
 msgstr ""
 
-#: profile.c:1513
+#: profile.c:1559
 #, c-format
 msgid "redir2str: unknown redirection type %d"
 msgstr ""
@@ -3281,70 +3298,83 @@ msgstr ""
 msgid "regexp component `%.*s' should probably be `[%.*s]'"
 msgstr ""
 
-#: regcomp.c:131
+#: regcomp.c:139
 msgid "Success"
 msgstr ""
 
-#: regcomp.c:134
+#: regcomp.c:142
 msgid "No match"
 msgstr ""
 
-#: regcomp.c:137
+#: regcomp.c:145
 msgid "Invalid regular expression"
 msgstr ""
 
-#: regcomp.c:140
+#: regcomp.c:148
 msgid "Invalid collation character"
 msgstr ""
 
-#: regcomp.c:143
+#: regcomp.c:151
 msgid "Invalid character class name"
 msgstr ""
 
-#: regcomp.c:146
+#: regcomp.c:154
 msgid "Trailing backslash"
 msgstr ""
 
-#: regcomp.c:149
+#: regcomp.c:157
 msgid "Invalid back reference"
 msgstr ""
 
-#: regcomp.c:152
-msgid "Unmatched [ or [^"
+#: regcomp.c:160
+msgid "Unmatched [, [^, [:, [., or [="
 msgstr ""
 
-#: regcomp.c:155
+#: regcomp.c:163
 msgid "Unmatched ( or \\("
 msgstr ""
 
-#: regcomp.c:158
+#: regcomp.c:166
 msgid "Unmatched \\{"
 msgstr ""
 
-#: regcomp.c:164
+#: regcomp.c:169
+msgid "Invalid content of \\{\\}"
+msgstr ""
+
+#: regcomp.c:172
 msgid "Invalid range end"
 msgstr ""
 
-#: regcomp.c:167
+#: regcomp.c:175
 msgid "Memory exhausted"
 msgstr ""
 
-#: regcomp.c:170
+#: regcomp.c:178
 msgid "Invalid preceding regular expression"
 msgstr ""
 
-#: regcomp.c:173
+#: regcomp.c:181
 msgid "Premature end of regular expression"
 msgstr ""
 
-#: regcomp.c:179
+#: regcomp.c:184
+msgid "Regular expression too big"
+msgstr ""
+
+#: regcomp.c:187
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: regcomp.c:704
+#: regcomp.c:712
 msgid "No previous regular expression"
 msgstr ""
 
-#: symbol.c:741
+#: symbol.c:677
+#, c-format
+msgid "function `%s': can't use function `%s' as a parameter name"
+msgstr ""
+
+#: symbol.c:809
 msgid "can not pop main context"
 msgstr ""
diff --git a/po/nl.gmo b/po/nl.gmo
index 76c57134..9b707e8e 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index dc037a99..990b072d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gawk 4.1.0b\n"
-"Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2014-04-08 19:23+0300\n"
+"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
+"POT-Creation-Date: 2015-02-26 20:05+0200\n"
 "PO-Revision-Date: 2014-02-04 11:18+0100\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -40,9 +40,9 @@ msgstr "scalaire parameter '%s' wordt gebruikt als array"
 msgid "attempt to use scalar `%s' as an array"
 msgstr "scalair '%s' wordt gebruikt als array"
 
-#: array.c:409 array.c:576 builtin.c:85 builtin.c:1615 builtin.c:1661
-#: builtin.c:1674 builtin.c:2102 builtin.c:2116 eval.c:1122 eval.c:1126
-#: eval.c:1531
+#: array.c:409 array.c:576 builtin.c:85 builtin.c:1606 builtin.c:1652
+#: builtin.c:1665 builtin.c:2092 builtin.c:2106 eval.c:1149 eval.c:1153
+#: eval.c:1558
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "array '%s' wordt gebruikt in een scalaire context"
@@ -101,406 +101,411 @@ msgstr ""
 "asorti: een subarray van het tweede argument kan niet als eerste argument "
 "gebruikt worden"
 
-#: array.c:1314
+#: array.c:1313
 #, c-format
 msgid "`%s' is invalid as a function name"
 msgstr "'%s' is ongeldig als functienaam"
 
-#: array.c:1318
+#: array.c:1317
 #, c-format
 msgid "sort comparison function `%s' is not defined"
 msgstr "sorteervergelijkingsfunctie '%s' is niet gedefinieerd"
 
-#: awkgram.y:233
+#: awkgram.y:226
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "%s-blokken horen een actiedeel te hebben"
 
-#: awkgram.y:236
+#: awkgram.y:229
 msgid "each rule must have a pattern or an action part"
 msgstr "elke regel hoort een patroon of een actiedeel te hebben"
 
-#: awkgram.y:325 awkgram.y:336
+#: awkgram.y:320 awkgram.y:331
 msgid "old awk does not support multiple `BEGIN' or `END' rules"
 msgstr "oude 'awk' staat meerdere 'BEGIN'- en 'END'-regels niet toe"
 
-#: awkgram.y:373
+#: awkgram.y:368
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "'%s' is een ingebouwde functie en is niet te herdefiniëren"
 
-#: awkgram.y:419
+#: awkgram.y:417
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr "regexp-constante '//' lijkt op C-commentaar, maar is het niet"
 
-#: awkgram.y:423
+#: awkgram.y:421
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr "regexp-constante '/%s/' lijkt op C-commentaar, maar is het niet"
 
-#: awkgram.y:515
+#: awkgram.y:513
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "dubbele 'case'-waarde in 'switch'-opdracht: %s"
 
-#: awkgram.y:536
+#: awkgram.y:534
 msgid "duplicate `default' detected in switch body"
 msgstr "dubbele 'default' in 'switch'-opdracht"
 
-#: awkgram.y:796 awkgram.y:3723
+#: awkgram.y:794 awkgram.y:3751
 msgid "`break' is not allowed outside a loop or switch"
 msgstr "'break' buiten een lus of 'switch'-opdracht is niet toegestaan"
 
-#: awkgram.y:805 awkgram.y:3715
+#: awkgram.y:803 awkgram.y:3743
 msgid "`continue' is not allowed outside a loop"
 msgstr "'continue' buiten een lus is niet toegestaan"
 
-#: awkgram.y:815
+#: awkgram.y:813
 #, c-format
 msgid "`next' used in %s action"
 msgstr "'next' wordt gebruikt in %s-actie"
 
-#: awkgram.y:824
+#: awkgram.y:822
 #, c-format
 msgid "`nextfile' used in %s action"
 msgstr "'nextfile' wordt gebruikt in %s-actie"
 
-#: awkgram.y:848
+#: awkgram.y:846
 msgid "`return' used outside function context"
 msgstr "'return' wordt gebruikt buiten functiecontext"
 
-#: awkgram.y:922
+#: awkgram.y:920
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "kale 'print' in BEGIN- of END-regel moet vermoedelijk 'print \"\"' zijn"
 
-#: awkgram.y:988 awkgram.y:1037
+#: awkgram.y:986 awkgram.y:1035
 msgid "`delete' is not allowed with SYMTAB"
 msgstr "'delete' is niet toegestaan met SYMTAB"
 
-#: awkgram.y:990 awkgram.y:1039
+#: awkgram.y:988 awkgram.y:1037
 msgid "`delete' is not allowed with FUNCTAB"
 msgstr "'delete' is niet toegestaan met FUNCTAB"
 
-#: awkgram.y:1024 awkgram.y:1028
+#: awkgram.y:1022 awkgram.y:1026
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "'delete(array)' is een niet-overdraagbare 'tawk'-uitbreiding"
 
-#: awkgram.y:1149
+#: awkgram.y:1147
 msgid "multistage two-way pipelines don't work"
 msgstr "meerfase-tweerichtings-pijplijnen werken niet"
 
-#: awkgram.y:1264
+#: awkgram.y:1262
 msgid "regular expression on right of assignment"
 msgstr "reguliere expressie rechts van toewijzing"
 
-#: awkgram.y:1275
+#: awkgram.y:1273
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "reguliere expressie links van operator '~' of '!~'"
 
-#: awkgram.y:1291 awkgram.y:1442
+#: awkgram.y:1289 awkgram.y:1431
 msgid "old awk does not support the keyword `in' except after `for'"
 msgstr "oude 'awk' kent het sleutelwoord 'in' niet, behalve na 'for'"
 
-#: awkgram.y:1301
+#: awkgram.y:1299
 msgid "regular expression on right of comparison"
 msgstr "reguliere expressie rechts van vergelijking"
 
-#: awkgram.y:1417
-#, c-format
-msgid "`getline var' invalid inside `%s' rule"
-msgstr "'getline var' is ongeldig binnen een '%s'-regel"
-
-#: awkgram.y:1420
+#: awkgram.y:1411
 #, c-format
-msgid "`getline' invalid inside `%s' rule"
-msgstr "'getline' is ongeldig binnen een '%s'-regel"
+msgid "non-redirected `getline' invalid inside `%s' rule"
+msgstr "niet-omgeleide 'getline' is ongeldig binnen een '%s'-regel"
 
-#: awkgram.y:1425
+#: awkgram.y:1414
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "niet-omgeleide 'getline' is ongedefinieerd binnen een END-actie"
 
-#: awkgram.y:1444
+#: awkgram.y:1433
 msgid "old awk does not support multidimensional arrays"
 msgstr "oude 'awk' kent geen meerdimensionale arrays"
 
-#: awkgram.y:1541
+#: awkgram.y:1530
 msgid "call of `length' without parentheses is not portable"
 msgstr "aanroep van 'length' zonder haakjes is niet overdraagbaar"
 
-#: awkgram.y:1607
+#: awkgram.y:1596
 msgid "indirect function calls are a gawk extension"
 msgstr "indirecte functieaanroepen zijn een gawk-uitbreiding"
 
-#: awkgram.y:1620
+#: awkgram.y:1609
 #, c-format
 msgid "can not use special variable `%s' for indirect function call"
 msgstr ""
 "kan speciale variabele '%s' niet voor indirecte functieaanroep gebruiken"
 
-#: awkgram.y:1698
+#: awkgram.y:1635
+#, fuzzy, c-format
+msgid "attempt to use non-function `%s' in function call"
+msgstr "functie '%s' wordt gebruikt als array"
+
+#: awkgram.y:1699
 msgid "invalid subscript expression"
 msgstr "ongeldige index-expressie"
 
-#: awkgram.y:2048 awkgram.y:2068 gawkapi.c:206 gawkapi.c:224 msg.c:126
+#: awkgram.y:2045 awkgram.y:2065 gawkapi.c:206 gawkapi.c:224 msg.c:126
 msgid "warning: "
 msgstr "waarschuwing: "
 
-#: awkgram.y:2066 gawkapi.c:192 gawkapi.c:221 msg.c:158
+#: awkgram.y:2063 gawkapi.c:192 gawkapi.c:221 msg.c:158
 msgid "fatal: "
 msgstr "fataal: "
 
-#: awkgram.y:2116
+#: awkgram.y:2113
 msgid "unexpected newline or end of string"
 msgstr "onverwacht regeleinde of einde van string"
 
-#: awkgram.y:2383 awkgram.y:2459 awkgram.y:2682 debug.c:523 debug.c:539
+#: awkgram.y:2392 awkgram.y:2468 awkgram.y:2691 debug.c:523 debug.c:539
 #: debug.c:2812 debug.c:5055
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "kan bronbestand '%s' niet openen om te lezen (%s)"
 
-#: awkgram.y:2384 awkgram.y:2509
+#: awkgram.y:2393 awkgram.y:2518
 #, c-format
 msgid "can't open shared library `%s' for reading (%s)"
 msgstr "kan gedeelde bibliotheek '%s' niet openen om te lezen (%s)"
 
-#: awkgram.y:2386 awkgram.y:2460 awkgram.y:2510 builtin.c:135 debug.c:5206
+#: awkgram.y:2395 awkgram.y:2469 awkgram.y:2519 builtin.c:135 debug.c:5206
 msgid "reason unknown"
 msgstr "reden onbekend"
 
-#: awkgram.y:2395 awkgram.y:2419
+#: awkgram.y:2404 awkgram.y:2428
 #, c-format
 msgid "can't include `%s' and use it as a program file"
 msgstr "kan '%s' niet invoegen en als programmabestand gebruiken"
 
-#: awkgram.y:2408
+#: awkgram.y:2417
 #, c-format
 msgid "already included source file `%s'"
 msgstr "bronbestand '%s' is reeds ingesloten"
 
-#: awkgram.y:2409
+#: awkgram.y:2418
 #, c-format
 msgid "already loaded shared library `%s'"
 msgstr "gedeelde bibliotheek '%s' is reeds geladen"
 
-#: awkgram.y:2444
+#: awkgram.y:2453
 msgid "@include is a gawk extension"
 msgstr "'@include' is een gawk-uitbreiding"
 
-#: awkgram.y:2450
+#: awkgram.y:2459
 msgid "empty filename after @include"
 msgstr "lege bestandsnaam na '@include'"
 
-#: awkgram.y:2494
+#: awkgram.y:2503
 msgid "@load is a gawk extension"
 msgstr "'@load' is een gawk-uitbreiding"
 
-#: awkgram.y:2500
+#: awkgram.y:2509
 msgid "empty filename after @load"
 msgstr "lege bestandsnaam na '@load'"
 
-#: awkgram.y:2634
+#: awkgram.y:2643
 msgid "empty program text on command line"
 msgstr "lege programmatekst op opdrachtregel"
 
-#: awkgram.y:2749
+#: awkgram.y:2758
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "kan bronbestand '%s' niet lezen (%s)"
 
-#: awkgram.y:2760
+#: awkgram.y:2769
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "bronbestand '%s' is leeg"
 
-#: awkgram.y:2937
+#: awkgram.y:2828
+#, c-format
+msgid "PEBKAC error: invalid character '\\%03o' in source code"
+msgstr ""
+
+#: awkgram.y:2959
 msgid "source file does not end in newline"
 msgstr "bronbestand eindigt niet met een regeleindeteken (LF)"
 
-#: awkgram.y:3042
+#: awkgram.y:3062
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "onafgesloten reguliere expressie eindigt met '\\' aan bestandseinde"
 
-#: awkgram.y:3066
+#: awkgram.y:3089
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr "%s: %d: regexp-optie '/.../%c' van 'tawk' werkt niet in gawk"
 
-#: awkgram.y:3070
+#: awkgram.y:3093
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr "regexp-optie '/.../%c' van 'tawk' werkt niet in gawk"
 
-#: awkgram.y:3077
+#: awkgram.y:3100
 msgid "unterminated regexp"
 msgstr "onafgesloten reguliere expressie"
 
-#: awkgram.y:3081
+#: awkgram.y:3104
 msgid "unterminated regexp at end of file"
 msgstr "onafgesloten reguliere expressie aan bestandseinde"
 
-#: awkgram.y:3140
+#: awkgram.y:3162
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "gebruik van regelvoortzetting '\\ #...' is niet overdraagbaar"
 
-#: awkgram.y:3156
+#: awkgram.y:3178
 msgid "backslash not last character on line"
 msgstr "backslash is niet het laatste teken op de regel"
 
-#: awkgram.y:3217
+#: awkgram.y:3239
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX staat operator '**=' niet toe"
 
-#: awkgram.y:3219
+#: awkgram.y:3241
 msgid "old awk does not support operator `**='"
 msgstr "oude 'awk' kent de operator '**=' niet"
 
-#: awkgram.y:3228
+#: awkgram.y:3250
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX staat operator '**' niet toe"
 
-#: awkgram.y:3230
+#: awkgram.y:3252
 msgid "old awk does not support operator `**'"
 msgstr "oude 'awk' kent de operator '**' niet"
 
-#: awkgram.y:3265
+#: awkgram.y:3287
 msgid "operator `^=' is not supported in old awk"
 msgstr "oude 'awk' kent de operator '^=' niet"
 
-#: awkgram.y:3273
+#: awkgram.y:3295
 msgid "operator `^' is not supported in old awk"
 msgstr "oude 'awk' kent de operator '^' niet"
 
-#: awkgram.y:3366 awkgram.y:3382 command.y:1178
+#: awkgram.y:3392 awkgram.y:3410 command.y:1180
 msgid "unterminated string"
 msgstr "onafgesloten string"
 
-#: awkgram.y:3603
+#: awkgram.y:3631
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "ongeldig teken '%c' in expressie"
 
-#: awkgram.y:3650
+#: awkgram.y:3678
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "'%s' is een gawk-uitbreiding"
 
-#: awkgram.y:3655
+#: awkgram.y:3683
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX staat '%s' niet toe"
 
-#: awkgram.y:3663
+#: awkgram.y:3691
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "oude 'awk' kent '%s' niet"
 
-#: awkgram.y:3753
+#: awkgram.y:3781
 msgid "`goto' considered harmful!\n"
 msgstr "'goto' wordt als schadelijk beschouwd!\n"
 
-#: awkgram.y:3787
+#: awkgram.y:3815
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d is een ongeldig aantal argumenten voor %s"
 
-#: awkgram.y:3822
+#: awkgram.y:3850
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr "%s: een stringwaarde als laatste vervangingsargument heeft geen effect"
 
-#: awkgram.y:3827
+#: awkgram.y:3855
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "%s: derde parameter is geen veranderbaar object"
 
-#: awkgram.y:3910 awkgram.y:3913
+#: awkgram.y:3938 awkgram.y:3941
 msgid "match: third argument is a gawk extension"
 msgstr "match: derde argument is een gawk-uitbreiding"
 
-#: awkgram.y:3967 awkgram.y:3970
+#: awkgram.y:3995 awkgram.y:3998
 msgid "close: second argument is a gawk extension"
 msgstr "close: tweede argument is een gawk-uitbreiding"
 
-#: awkgram.y:3982
+#: awkgram.y:4010
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "dcgettext(_\"...\") is onjuist: verwijder het liggende streepje"
 
-#: awkgram.y:3997
+#: awkgram.y:4025
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "dcngettext(_\"...\") is onjuist: verwijder het liggende streepje"
 
-#: awkgram.y:4016
+#: awkgram.y:4044
 msgid "index: regexp constant as second argument is not allowed"
 msgstr ""
 "index: een reguliere-expressie-constante als tweede argument is niet "
 "toegestaan"
 
-#: awkgram.y:4069
+#: awkgram.y:4097
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "functie '%s': parameter '%s' schaduwt een globale variabele"
 
-#: awkgram.y:4126 debug.c:4041 debug.c:4084 debug.c:5204
+#: awkgram.y:4154 debug.c:4041 debug.c:4084 debug.c:5204
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "kan '%s' niet openen om te schrijven (%s)"
 
-#: awkgram.y:4127
+#: awkgram.y:4155
 msgid "sending variable list to standard error"
 msgstr "variabelenlijst gaat naar standaardfoutuitvoer"
 
-#: awkgram.y:4135
+#: awkgram.y:4163
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: sluiten is mislukt (%s)"
 
-#: awkgram.y:4160
+#: awkgram.y:4188
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() twee keer aangeroepen!"
 
-#: awkgram.y:4168
+#: awkgram.y:4196
 msgid "there were shadowed variables."
 msgstr "er waren geschaduwde variabelen."
 
-#: awkgram.y:4239
+#: awkgram.y:4267
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "functienaam '%s' is al eerder gedefinieerd"
 
-#: awkgram.y:4285
+#: awkgram.y:4313
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "functie '%s': kan functienaam niet als parameternaam gebruiken"
 
-#: awkgram.y:4288
+#: awkgram.y:4316
 #, c-format
 msgid "function `%s': can't use special variable `%s' as a function parameter"
 msgstr ""
 "functie '%s': kan speciale variabele '%s' niet als functieparameter gebruiken"
 
-#: awkgram.y:4296
+#: awkgram.y:4324
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "functie '%s': parameter #%d, '%s', dupliceert parameter #%d"
 
-#: awkgram.y:4383 awkgram.y:4389
+#: awkgram.y:4411 awkgram.y:4417
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "functie '%s' wordt aangeroepen maar is nergens gedefinieerd"
 
-#: awkgram.y:4393
+#: awkgram.y:4421
 #, c-format
 msgid "function `%s' defined but never called directly"
 msgstr "functie '%s' is gedefinieerd maar wordt nergens direct aangeroepen"
 
-#: awkgram.y:4425
+#: awkgram.y:4453
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr "regexp-constante als parameter #%d levert booleanwaarde op"
 
-#: awkgram.y:4484
+#: awkgram.y:4468
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -509,23 +514,23 @@ msgstr ""
 "functie '%s' wordt aangeroepen met een spatie tussen naam en '(',\n"
 "of wordt gebruikt als variabele of array"
 
-#: awkgram.y:4720
+#: awkgram.y:4674
 msgid "division by zero attempted"
 msgstr "deling door nul"
 
-#: awkgram.y:4729
+#: awkgram.y:4683
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "deling door nul in '%%'"
 
-#: awkgram.y:5049
+#: awkgram.y:5003
 msgid ""
 "cannot assign a value to the result of a field post-increment expression"
 msgstr ""
 "kan geen waarde toewijzen aan het resultaat van een post-increment-expressie "
 "van een veld"
 
-#: awkgram.y:5052
+#: awkgram.y:5006
 #, c-format
 msgid "invalid target of assignment (opcode %s)"
 msgstr "ongeldig doel van toewijzing (opcode %s)"
@@ -567,188 +572,198 @@ msgstr ""
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: '%s' is geen open bestand, pijp, of co-proces"
 
-#: builtin.c:362
+#: builtin.c:351
 msgid "index: received non-string first argument"
 msgstr "index: eerste argument is geen string"
 
-#: builtin.c:364
+#: builtin.c:353
 msgid "index: received non-string second argument"
 msgstr "index: tweede argument is geen string"
 
-#: builtin.c:488 mpfr.c:757
+#: builtin.c:466 mpfr.c:777
 msgid "int: received non-numeric argument"
 msgstr "int: argument is geen getal"
 
-#: builtin.c:525
+#: builtin.c:503
 msgid "length: received array argument"
 msgstr "length: argument is een array"
 
-#: builtin.c:528
+#: builtin.c:506
 msgid "`length(array)' is a gawk extension"
 msgstr "'length(array)' is een gawk-uitbreiding"
 
-#: builtin.c:544
+#: builtin.c:525
 msgid "length: received non-string argument"
 msgstr "length: argument is geen string"
 
-#: builtin.c:575
+#: builtin.c:554
 msgid "log: received non-numeric argument"
 msgstr "log: argument is geen getal"
 
-#: builtin.c:578
+#: builtin.c:557
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: argument %g is negatief"
 
-#: builtin.c:776 builtin.c:781
+#: builtin.c:755 builtin.c:760 builtin.c:911
 msgid "fatal: must use `count$' on all formats or none"
 msgstr "fataal: 'count$' hoort in alle opmaken gebruikt te worden, of in geen"
 
-#: builtin.c:851
+#: builtin.c:830
 #, c-format
 msgid "field width is ignored for `%%' specifier"
 msgstr "veldbreedte wordt genegeerd voor opmaakaanduiding '%%'"
 
-#: builtin.c:853
+#: builtin.c:832
 #, c-format
 msgid "precision is ignored for `%%' specifier"
 msgstr "veldprecisie wordt genegeerd voor opmaakaanduiding '%%'"
 
-#: builtin.c:855
+#: builtin.c:834
 #, c-format
 msgid "field width and precision are ignored for `%%' specifier"
 msgstr "veldbreedte en -precisie worden genegeerd voor opmaakaanduiding '%%'"
 
-#: builtin.c:906
+#: builtin.c:885
 msgid "fatal: `$' is not permitted in awk formats"
 msgstr "fataal: '$' is niet toegestaan in awk-opmaak"
 
-#: builtin.c:915
+#: builtin.c:894
 msgid "fatal: arg count with `$' must be > 0"
 msgstr "fataal: het aantal argumenten met '$' moet > 0 zijn"
 
-#: builtin.c:919
+#: builtin.c:898
 #, c-format
 msgid "fatal: arg count %ld greater than total number of supplied arguments"
 msgstr "fataal: argumentental %ld is groter dan het gegeven aantal argumenten"
 
-#: builtin.c:923
+#: builtin.c:902
 msgid "fatal: `$' not permitted after period in format"
 msgstr "fataal: '$' is niet toegestaan na een punt in de opmaak"
 
-#: builtin.c:939
+#: builtin.c:921
 msgid "fatal: no `$' supplied for positional field width or precision"
 msgstr "fataal: geen '$' opgegeven bij positionele veldbreedte of -precisie"
 
-#: builtin.c:1009
+#: builtin.c:991
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "'l' is betekenisloos in awk-opmaak; genegeerd"
 
-#: builtin.c:1013
+#: builtin.c:995
 msgid "fatal: `l' is not permitted in POSIX awk formats"
 msgstr "fataal: 'l' is niet toegestaan in POSIX awk-opmaak"
 
-#: builtin.c:1026
+#: builtin.c:1008
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "'L' is betekenisloos in awk-opmaak; genegeerd"
 
-#: builtin.c:1030
+#: builtin.c:1012
 msgid "fatal: `L' is not permitted in POSIX awk formats"
 msgstr "fataal: 'L' is niet toegestaan in POSIX awk-opmaak"
 
-#: builtin.c:1043
+#: builtin.c:1025
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "'h' is betekenisloos in awk-opmaak; genegeerd"
 
-#: builtin.c:1047
+#: builtin.c:1029
 msgid "fatal: `h' is not permitted in POSIX awk formats"
 msgstr "fataal: 'h' is niet toegestaan in POSIX awk-opmaak"
 
-#: builtin.c:1463
+#: builtin.c:1055
+#, fuzzy, c-format
+msgid "[s]printf: value %g is too big for %%c format"
+msgstr "[s]printf: waarde %g ligt buiten toegestaan bereik voor opmaak '%%%c'"
+
+#: builtin.c:1068
+#, fuzzy, c-format
+msgid "[s]printf: value %g is not a valid wide character"
+msgstr "[s]printf: waarde %g ligt buiten toegestaan bereik voor opmaak '%%%c'"
+
+#: builtin.c:1454
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf: waarde %g ligt buiten toegestaan bereik voor opmaak '%%%c'"
 
-#: builtin.c:1561
+#: builtin.c:1552
 #, c-format
 msgid "ignoring unknown format specifier character `%c': no argument converted"
 msgstr ""
 "onbekend opmaakteken '%c' wordt genegeerd: geen argument is geconverteerd"
 
-#: builtin.c:1566
+#: builtin.c:1557
 msgid "fatal: not enough arguments to satisfy format string"
 msgstr "fataal: niet genoeg argumenten voor opmaakstring"
 
-#: builtin.c:1568
+#: builtin.c:1559
 msgid "^ ran out for this one"
 msgstr "niet genoeg ^ voor deze"
 
-#: builtin.c:1575
+#: builtin.c:1566
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: opmaakaanduiding mist een stuurletter"
 
-#: builtin.c:1578
+#: builtin.c:1569
 msgid "too many arguments supplied for format string"
 msgstr "te veel argumenten voor opmaakstring"
 
-#: builtin.c:1634
+#: builtin.c:1625
 msgid "sprintf: no arguments"
 msgstr "sprintf: geen argumenten"
 
-#: builtin.c:1657 builtin.c:1668
+#: builtin.c:1648 builtin.c:1659
 msgid "printf: no arguments"
 msgstr "printf: geen argumenten"
 
-#: builtin.c:1711
+#: builtin.c:1702
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: argument is geen getal"
 
-#: builtin.c:1715
+#: builtin.c:1706
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: argument %g is negatief"
 
-#: builtin.c:1746
+#: builtin.c:1737
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: lengte %g is niet >= 1"
 
-#: builtin.c:1748
+#: builtin.c:1739
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: lengte %g is niet >= 0"
 
-#: builtin.c:1755
+#: builtin.c:1753
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: lengte %g is geen integer; wordt afgekapt"
 
-#: builtin.c:1760
+#: builtin.c:1758
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
 "substr: lengte %g is te groot voor stringindexering; wordt verkort tot %g"
 
-#: builtin.c:1772
+#: builtin.c:1770
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: startindex %g is ongeldig; 1 wordt gebruikt"
 
-#: builtin.c:1777
+#: builtin.c:1775
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: startindex %g is geen integer; wordt afgekapt"
 
-#: builtin.c:1802
+#: builtin.c:1798
 msgid "substr: source string is zero length"
 msgstr "substr: bronstring heeft lengte nul"
 
-#: builtin.c:1818
+#: builtin.c:1812
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: startindex %g ligt voorbij het einde van de string"
 
-#: builtin.c:1826
+#: builtin.c:1820
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -756,186 +771,192 @@ msgstr ""
 "substr: lengte %g bij startindex %g is groter dan de lengte van het eerste "
 "argument (%lu)"
 
-#: builtin.c:1900
+#: builtin.c:1890
 msgid "strftime: format value in PROCINFO[\"strftime\"] has numeric type"
 msgstr "strftime: opmaakwaarde in PROCINFO[\"strftime\"] is numeriek"
 
-#: builtin.c:1923
+#: builtin.c:1913
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: tweede argument is geen getal"
 
-#: builtin.c:1927
+#: builtin.c:1917
 msgid "strftime: second argument less than 0 or too big for time_t"
 msgstr "strftime: tweede argument is kleiner dan nul of te groot voor 'time_t'"
 
-#: builtin.c:1934
+#: builtin.c:1924
 msgid "strftime: received non-string first argument"
 msgstr "strftime: eerste argument is geen string"
 
-#: builtin.c:1941
+#: builtin.c:1931
 msgid "strftime: received empty format string"
 msgstr "strftime: opmaakstring is leeg"
 
-#: builtin.c:2007
+#: builtin.c:1997
 msgid "mktime: received non-string argument"
 msgstr "mktime: argument is geen string"
 
-#: builtin.c:2024
+#: builtin.c:2014
 msgid "mktime: at least one of the values is out of the default range"
 msgstr "mktime: minstens één van waarden valt buiten het standaardbereik"
 
-#: builtin.c:2059
+#: builtin.c:2049
 msgid "'system' function not allowed in sandbox mode"
 msgstr "'system'-functie is niet toegestaan in sandbox-modus"
 
-#: builtin.c:2064
+#: builtin.c:2054
 msgid "system: received non-string argument"
 msgstr "system: argument is geen string"
 
-#: builtin.c:2184
+#: builtin.c:2174
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "verwijzing naar ongeïnitialiseerd veld '$%d'"
 
-#: builtin.c:2271
+#: builtin.c:2259
 msgid "tolower: received non-string argument"
 msgstr "tolower: argument is geen string"
 
-#: builtin.c:2305
+#: builtin.c:2290
 msgid "toupper: received non-string argument"
 msgstr "toupper: argument is geen string"
 
-#: builtin.c:2341 mpfr.c:672
+#: builtin.c:2323 mpfr.c:679
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: eerste argument is geen getal"
 
-#: builtin.c:2343 mpfr.c:674
+#: builtin.c:2325 mpfr.c:681
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: tweede argument is geen getal"
 
-#: builtin.c:2362
+#: builtin.c:2344
 msgid "sin: received non-numeric argument"
 msgstr "sin: argument is geen getal"
 
-#: builtin.c:2378
+#: builtin.c:2360
 msgid "cos: received non-numeric argument"
 msgstr "cos: argument is geen getal"
 
-#: builtin.c:2431 mpfr.c:1156
+#: builtin.c:2413 mpfr.c:1176
 msgid "srand: received non-numeric argument"
 msgstr "srand: argument is geen getal"
 
-#: builtin.c:2462
+#: builtin.c:2444
 msgid "match: third argument is not an array"
 msgstr "match: derde argument is geen array"
 
-#: builtin.c:2734
-msgid "gensub: third argument of 0 treated as 1"
+#: builtin.c:2705
+#, fuzzy, c-format
+msgid "gensub: third argument `%.*s' treated as 1"
 msgstr "gensub: derde argument is 0; wordt beschouwd als 1"
 
-#: builtin.c:3030
+#: builtin.c:2720
+#, fuzzy, c-format
+msgid "gensub: third argument %g treated as 1"
+msgstr "gensub: derde argument is 0; wordt beschouwd als 1"
+
+#: builtin.c:3020
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: eerste argument is geen getal"
 
-#: builtin.c:3032
+#: builtin.c:3022
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift: tweede argument is geen getal"
 
-#: builtin.c:3038
+#: builtin.c:3028
 #, c-format
 msgid "lshift(%f, %f): negative values will give strange results"
 msgstr "lshift(%f, %f): negatieve waarden geven rare resultaten"
 
-#: builtin.c:3040
+#: builtin.c:3030
 #, c-format
 msgid "lshift(%f, %f): fractional values will be truncated"
 msgstr "lshift(%f, %f): cijfers na de komma worden afgekapt"
 
-#: builtin.c:3042
+#: builtin.c:3032
 #, c-format
 msgid "lshift(%f, %f): too large shift value will give strange results"
 msgstr "lshift(%f, %f): te grote opschuifwaarden geven rare resultaten"
 
-#: builtin.c:3067
+#: builtin.c:3057
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: eerste argument is geen getal"
 
-#: builtin.c:3069
+#: builtin.c:3059
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift: tweede argument is geen getal"
 
-#: builtin.c:3075
+#: builtin.c:3065
 #, c-format
 msgid "rshift(%f, %f): negative values will give strange results"
 msgstr "rshift(%f, %f): negatieve waarden geven rare resultaten"
 
-#: builtin.c:3077
+#: builtin.c:3067
 #, c-format
 msgid "rshift(%f, %f): fractional values will be truncated"
 msgstr "rshift(%f, %f): cijfers na de komma worden afgekapt"
 
-#: builtin.c:3079
+#: builtin.c:3069
 #, c-format
 msgid "rshift(%f, %f): too large shift value will give strange results"
 msgstr "rshift(%f, %f): te grote opschuifwaarden geven rare resultaten"
 
-#: builtin.c:3104 mpfr.c:968
+#: builtin.c:3094 mpfr.c:988
 msgid "and: called with less than two arguments"
 msgstr "and: aangeroepen met minder dan twee argumenten"
 
-#: builtin.c:3109
+#: builtin.c:3099
 #, c-format
 msgid "and: argument %d is non-numeric"
 msgstr "and: argument %d is niet-numeriek"
 
-#: builtin.c:3113
+#: builtin.c:3103
 #, c-format
 msgid "and: argument %d negative value %g will give strange results"
 msgstr "and: negatieve waarde %2$g van argument %1$d geeft rare resultaten"
 
-#: builtin.c:3136 mpfr.c:1000
+#: builtin.c:3126 mpfr.c:1020
 msgid "or: called with less than two arguments"
 msgstr "or: aangeroepen met minder dan twee argumenten"
 
-#: builtin.c:3141
+#: builtin.c:3131
 #, c-format
 msgid "or: argument %d is non-numeric"
 msgstr "or: argument %d is niet-numeriek"
 
-#: builtin.c:3145
+#: builtin.c:3135
 #, c-format
 msgid "or: argument %d negative value %g will give strange results"
 msgstr "or: negatieve waarde %2$g van argument %1$d geeft rare resultaten"
 
-#: builtin.c:3167 mpfr.c:1031
+#: builtin.c:3157 mpfr.c:1051
 msgid "xor: called with less than two arguments"
 msgstr "xor: aangeroepen met minder dan twee argumenten"
 
-#: builtin.c:3173
+#: builtin.c:3163
 #, c-format
 msgid "xor: argument %d is non-numeric"
 msgstr "xor: argument %d is niet-numeriek"
 
-#: builtin.c:3177
+#: builtin.c:3167
 #, c-format
 msgid "xor: argument %d negative value %g will give strange results"
 msgstr "xor: negatieve waarde %2$g van argument %1$d geeft rare resultaten"
 
-#: builtin.c:3202 mpfr.c:787
+#: builtin.c:3192 mpfr.c:807
 msgid "compl: received non-numeric argument"
 msgstr "compl: argument is geen getal"
 
-#: builtin.c:3208
+#: builtin.c:3198
 #, c-format
 msgid "compl(%f): negative value will give strange results"
 msgstr "compl(%f): negatieve waarden geven rare resultaten"
 
-#: builtin.c:3210
+#: builtin.c:3200
 #, c-format
 msgid "compl(%f): fractional value will be truncated"
 msgstr "compl(%f): cijfers na de komma worden afgekapt"
 
-#: builtin.c:3379
+#: builtin.c:3369
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: '%s' is geen geldige taalregio-deelcategorie"
@@ -1249,40 +1270,49 @@ msgstr "up [AANTAL] - dit aantal frames naar boven in de stack gaan"
 msgid "watch var - set a watchpoint for a variable."
 msgstr "watch VAR - een kijkpunt voor een variabele zetten"
 
-#: command.y:1011 debug.c:401 msg.c:135
+#: command.y:901
+#, fuzzy
+msgid ""
+"where [N] - (same as backtrace) print trace of all or N innermost (outermost "
+"if N < 0) frames."
+msgstr ""
+"backtrace [N] - een trace weergeven van alle of N binnenste frames (of "
+"buitenste als N < 0)"
+
+#: command.y:1013 debug.c:401 msg.c:135
 #, c-format
 msgid "error: "
 msgstr "fout: "
 
-#: command.y:1051
+#: command.y:1053
 #, c-format
 msgid "can't read command (%s)\n"
 msgstr "kan commando niet lezen (%s)\n"
 
-#: command.y:1065
+#: command.y:1067
 #, c-format
 msgid "can't read command (%s)"
 msgstr "kan commando niet lezen (%s)"
 
-#: command.y:1116
+#: command.y:1118
 msgid "invalid character in command"
 msgstr "ongeldig teken in commando"
 
-#: command.y:1152
+#: command.y:1154
 #, c-format
 msgid "unknown command - \"%.*s\", try help"
 msgstr "onbekend commando - \"%.*s\", probeer help"
 
-#: command.y:1222
+#: command.y:1224
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.y:1284
+#: command.y:1286
 msgid "invalid character"
 msgstr "ongeldig teken"
 
-#: command.y:1455
+#: command.y:1457
 #, c-format
 msgid "undefined command: %s\n"
 msgstr "ongedefinieerd commando: %s\n"
@@ -1811,68 +1841,70 @@ msgstr "'%s' is niet toegestaan in huidige context; statement is genegeerd"
 msgid "`return' not allowed in current context; statement ignored"
 msgstr "'return' is niet toegestaan in huidige context; statement is genegeerd"
 
-#: debug.c:5590
+#: debug.c:5604
 #, c-format
 msgid "No symbol `%s' in current context"
 msgstr "Geen symbool '%s' in huidige context"
 
-#: dfa.c:1118 dfa.c:1121 dfa.c:1142 dfa.c:1150 dfa.c:1162 dfa.c:1197
-#: dfa.c:1206 dfa.c:1209 dfa.c:1214 dfa.c:1228 dfa.c:1275
+#: dfa.c:1063 dfa.c:1066 dfa.c:1085 dfa.c:1095 dfa.c:1107 dfa.c:1143
+#: dfa.c:1152 dfa.c:1155 dfa.c:1160 dfa.c:1174 dfa.c:1222
 msgid "unbalanced ["
 msgstr "ongepaarde ["
 
-#: dfa.c:1174
+#: dfa.c:1119
 msgid "invalid character class"
 msgstr "ongeldige tekenklasse"
 
-#: dfa.c:1316
+#: dfa.c:1265
 msgid "character class syntax is [[:space:]], not [:space:]"
 msgstr "syntax van tekenklasse is [[:space:]], niet [:space:]"
 
-#: dfa.c:1366
+#: dfa.c:1327
 msgid "unfinished \\ escape"
 msgstr "onafgemaakte \\-stuurcode"
 
-#: dfa.c:1513 regcomp.c:161
-msgid "Invalid content of \\{\\}"
+#: dfa.c:1474
+#, fuzzy
+msgid "invalid content of \\{\\}"
 msgstr "Ongeldige inhoud van \\{\\}"
 
-#: dfa.c:1516 regcomp.c:176
-msgid "Regular expression too big"
+#: dfa.c:1477
+#, fuzzy
+msgid "regular expression too big"
 msgstr "Reguliere expressie is te groot"
 
-#: dfa.c:1936
+#: dfa.c:1912
 msgid "unbalanced ("
 msgstr "ongepaarde ("
 
-#: dfa.c:2062
+#: dfa.c:2038
 msgid "no syntax specified"
 msgstr "geen syntax opgegeven"
 
-#: dfa.c:2070
+#: dfa.c:2046
 msgid "unbalanced )"
 msgstr "ongepaarde )"
 
-#: eval.c:394
+#: eval.c:396
 #, c-format
 msgid "unknown nodetype %d"
 msgstr "onbekend knooptype %d"
 
-#: eval.c:405 eval.c:419
+#: eval.c:407 eval.c:421
 #, c-format
 msgid "unknown opcode %d"
 msgstr "onbekende opcode %d"
 
-#: eval.c:416
+#: eval.c:418
 #, c-format
 msgid "opcode %s not an operator or keyword"
 msgstr "opcode %s is geen operator noch sleutelwoord"
 
-#: eval.c:472
+#: eval.c:474
 msgid "buffer overflow in genflags2str"
 msgstr "bufferoverloop in genflags2str()"
 
-#: eval.c:675
+#: eval.c:676
 #, c-format
 msgid ""
 "\n"
@@ -1883,215 +1915,215 @@ msgstr ""
 "\t# Functieaanroepen-stack:\n"
 "\n"
 
-#: eval.c:704
+#: eval.c:705
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "'IGNORECASE' is een gawk-uitbreiding"
 
-#: eval.c:736
+#: eval.c:737
 msgid "`BINMODE' is a gawk extension"
 msgstr "'BINMODE' is een gawk-uitbreiding"
 
-#: eval.c:794
+#: eval.c:795
 #, c-format
 msgid "BINMODE value `%s' is invalid, treated as 3"
 msgstr "BINMODE-waarde '%s' is ongeldig, wordt behandeld als 3"
 
-#: eval.c:885
+#: eval.c:912
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "onjuiste opgave van '%sFMT': '%s'"
 
-#: eval.c:969
+#: eval.c:996
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "'--lint' wordt uitgeschakeld wegens toewijzing aan 'LINT'"
 
-#: eval.c:1147
+#: eval.c:1174
 #, c-format
 msgid "reference to uninitialized argument `%s'"
 msgstr "verwijzing naar ongeïnitialiseerd argument '%s'"
 
-#: eval.c:1148
+#: eval.c:1175
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "verwijzing naar ongeïnitialiseerde variabele '%s'"
 
-#: eval.c:1166
+#: eval.c:1193
 msgid "attempt to field reference from non-numeric value"
 msgstr "veldverwijzingspoging via een waarde die geen getal is"
 
-#: eval.c:1168
+#: eval.c:1195
 msgid "attempt to field reference from null string"
 msgstr "veldverwijzingspoging via een lege string"
 
-#: eval.c:1176
+#: eval.c:1203
 #, c-format
 msgid "attempt to access field %ld"
 msgstr "toegangspoging tot veld %ld"
 
-#: eval.c:1185
+#: eval.c:1212
 #, c-format
 msgid "reference to uninitialized field `$%ld'"
 msgstr "verwijzing naar ongeïnitialiseerd veld '$%ld'"
 
-#: eval.c:1272
+#: eval.c:1299
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "functie '%s' aangeroepen met meer argumenten dan gedeclareerd"
 
-#: eval.c:1473
+#: eval.c:1500
 #, c-format
 msgid "unwind_stack: unexpected type `%s'"
 msgstr "unwind_stack(): onverwacht type '%s'"
 
-#: eval.c:1569
+#: eval.c:1596
 msgid "division by zero attempted in `/='"
 msgstr "deling door nul in '/='"
 
-#: eval.c:1576
+#: eval.c:1603
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "deling door nul in '%%='"
 
-#: ext.c:89 ext.c:171
+#: ext.c:65 ext.c:147
 msgid "extensions are not allowed in sandbox mode"
 msgstr "uitbreidingen zijn niet toegestaan in sandbox-modus"
 
-#: ext.c:92
+#: ext.c:68
 msgid "-l / @load are gawk extensions"
 msgstr "-l / '@load' zijn gawk-uitbreidingen"
 
-#: ext.c:95
+#: ext.c:71
 msgid "load_ext: received NULL lib_name"
 msgstr "load_ext: lege bibliotheeknaam ontvangen"
 
-#: ext.c:98
+#: ext.c:74
 #, c-format
 msgid "load_ext: cannot open library `%s' (%s)\n"
 msgstr "load_ext: kan bibliotheek '%s' niet openen (%s)\n"
 
-#: ext.c:104
+#: ext.c:80
 #, c-format
 msgid ""
 "load_ext: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
 msgstr ""
 "load_ext: bibliotheek '%s' definieert 'plugin_is_GPL_compatible' niet (%s)\n"
 
-#: ext.c:110
+#: ext.c:86
 #, c-format
 msgid "load_ext: library `%s': cannot call function `%s' (%s)\n"
 msgstr "load_ext: bibliotheek '%s' kan functie '%s' niet aanroepen (%s)\n"
 
-#: ext.c:114
+#: ext.c:90
 #, c-format
 msgid "load_ext: library `%s' initialization routine `%s' failed\n"
 msgstr "load_ext: bibliotheek '%s': initialisatiefunctie '%s' is mislukt\n"
 
-#: ext.c:174
+#: ext.c:150
 msgid "`extension' is a gawk extension"
 msgstr "'extension' is een gawk-uitbreiding"
 
-#: ext.c:177
+#: ext.c:153
 msgid "extension: received NULL lib_name"
 msgstr "uitbreiding: lege bibliotheeknaam ontvangen"
 
-#: ext.c:180
+#: ext.c:156
 #, c-format
 msgid "extension: cannot open library `%s' (%s)"
 msgstr "extension: kan bibliotheek '%s' niet openen (%s)"
 
-#: ext.c:186
+#: ext.c:162
 #, c-format
 msgid ""
 "extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)"
 msgstr ""
 "extension: bibliotheek '%s' definieert 'plugin_is_GPL_compatible' niet (%s)"
 
-#: ext.c:190
+#: ext.c:166
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)"
 msgstr "extension: bibliotheek '%s' kan functie '%s' niet aanroepen (%s)"
 
-#: ext.c:221
+#: ext.c:197
 msgid "make_builtin: missing function name"
 msgstr "make_builtin: ontbrekende functienaam"
 
-#: ext.c:236
+#: ext.c:212
 #, c-format
 msgid "make_builtin: can't redefine function `%s'"
 msgstr "make_builtin: kan functie '%s' niet herdefiniëren"
 
-#: ext.c:240
+#: ext.c:216
 #, c-format
 msgid "make_builtin: function `%s' already defined"
 msgstr "make_builtin: functie '%s' is al gedefinieerd"
 
-#: ext.c:244
+#: ext.c:220
 #, c-format
 msgid "make_builtin: function name `%s' previously defined"
 msgstr "make_builtin: functienaam '%s' is al eerder gedefinieerd"
 
-#: ext.c:246
+#: ext.c:222
 #, c-format
 msgid "make_builtin: can't use gawk built-in `%s' as function name"
 msgstr ""
 "make_builtin: kan in gawk ingebouwde '%s' niet als functienaam gebruiken"
 
-#: ext.c:249 ext.c:304
+#: ext.c:225 ext.c:280
 #, c-format
 msgid "make_builtin: negative argument count for function `%s'"
 msgstr "make_builtin: negatief aantal argumenten voor functie '%s'"
 
-#: ext.c:276
+#: ext.c:252
 msgid "extension: missing function name"
 msgstr "extension: ontbrekende functienaam"
 
-#: ext.c:279 ext.c:283
+#: ext.c:255 ext.c:259
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: ongeldig teken '%c' in functienaam '%s'"
 
-#: ext.c:291
+#: ext.c:267
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: kan functie '%s' niet herdefiniëren"
 
-#: ext.c:295
+#: ext.c:271
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr "extension: functie '%s' is al gedefinieerd"
 
-#: ext.c:299
+#: ext.c:275
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "extension: functienaam '%s' is al eerder gedefinieerd"
 
-#: ext.c:301
+#: ext.c:277
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr "extension: kan in gawk ingebouwde '%s' niet als functienaam gebruiken"
 
-#: ext.c:375
+#: ext.c:351
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr ""
 "functie '%s' is gedefinieerd om niet meer dan %d argument(en) te accepteren"
 
-#: ext.c:378
+#: ext.c:354
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "functie '%s': ontbrekend argument #%d"
 
-#: ext.c:395
+#: ext.c:371
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "functie '%s': argument #%d: een scalair wordt gebruikt als array"
 
-#: ext.c:399
+#: ext.c:375
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr "functie '%s': argument #%d: een array wordt gebruikt als scalair"
 
-#: ext.c:413
+#: ext.c:389
 msgid "dynamic loading of library not supported"
 msgstr "het dynamisch laden van de bibliotheek wordt niet ondersteund"
 
@@ -2237,7 +2269,7 @@ msgstr "wait: aangeroepen met te veel argumenten"
 msgid "inplace_begin: in-place editing already active"
 msgstr "inplace_begin(): in-situ-bewerken is al actief"
 
-#: extension/inplace.c:133 extension/inplace.c:207
+#: extension/inplace.c:133 extension/inplace.c:210
 #, c-format
 msgid "inplace_begin: expects 2 arguments but called with %d"
 msgstr "inplace_begin(): verwachtte twee argumenten maar is aangeroepen met %d"
@@ -2269,56 +2301,56 @@ msgstr "inplace_begin(): '%s' is geen normaal bestand"
 msgid "inplace_begin: mkstemp(`%s') failed (%s)"
 msgstr "inplace_begin(): mkstemp('%s') is mislukt (%s)"
 
-#: extension/inplace.c:178
+#: extension/inplace.c:181
 #, c-format
 msgid "inplace_begin: chmod failed (%s)"
 msgstr "inplace_begin(): chmod is mislukt (%s)"
 
-#: extension/inplace.c:185
+#: extension/inplace.c:188
 #, c-format
 msgid "inplace_begin: dup(stdout) failed (%s)"
 msgstr "inplace_begin(): dup(stdout) is mislukt (%s)"
 
-#: extension/inplace.c:188
+#: extension/inplace.c:191
 #, c-format
 msgid "inplace_begin: dup2(%d, stdout) failed (%s)"
 msgstr "inplace_begin(): dup2(%d, stdout) is mislukt (%s)"
 
-#: extension/inplace.c:191
+#: extension/inplace.c:194
 #, c-format
 msgid "inplace_begin: close(%d) failed (%s)"
 msgstr "inplace_begin(): close(%d) is mislukt (%s)"
 
-#: extension/inplace.c:210
+#: extension/inplace.c:213
 msgid "inplace_end: cannot retrieve 1st argument as a string filename"
 msgstr ""
 "inplace_end(): kan eerste argument niet als bestandsnaamstring oppakken"
 
-#: extension/inplace.c:217
+#: extension/inplace.c:220
 msgid "inplace_end: in-place editing not active"
 msgstr "inplace_end(): in-situ-bewerken is niet actief"
 
-#: extension/inplace.c:223
+#: extension/inplace.c:226
 #, c-format
 msgid "inplace_end: dup2(%d, stdout) failed (%s)"
 msgstr "inplace_end(): dup2(%d, stdout) is mislukt (%s)"
 
-#: extension/inplace.c:226
+#: extension/inplace.c:229
 #, c-format
 msgid "inplace_end: close(%d) failed (%s)"
 msgstr "inplace_end(): close(%d) is mislukt (%s)"
 
-#: extension/inplace.c:230
+#: extension/inplace.c:233
 #, c-format
 msgid "inplace_end: fsetpos(stdout) failed (%s)"
 msgstr "inplace_end(): fsetpos(stdout) is mislukt (%s)"
 
-#: extension/inplace.c:243
+#: extension/inplace.c:246
 #, c-format
 msgid "inplace_end: link(`%s', `%s') failed (%s)"
 msgstr "inplace_end(): link('%s', '%s') is mislukt (%s)"
 
-#: extension/inplace.c:253
+#: extension/inplace.c:256
 #, c-format
 msgid "inplace_end: rename(`%s', `%s') failed (%s)"
 msgstr "inplace_end(): rename('%s', '%s') is mislukt (%s)"
@@ -2360,50 +2392,54 @@ msgstr "readfile: aangeroepen met te veel argumenten"
 msgid "readfile: called with no arguments"
 msgstr "readfile: aangeroepen zonder argumenten"
 
-#: extension/rwarray.c:124
+#: extension/revoutput.c:125
+msgid "revoutput: could not initialize REVOUT variable"
+msgstr ""
+
+#: extension/rwarray.c:124 extension/rwarray0.c:109
 msgid "writea: called with too many arguments"
 msgstr "writea: aangeroepen met te veel argumenten"
 
-#: extension/rwarray.c:131
+#: extension/rwarray.c:131 extension/rwarray0.c:116
 #, c-format
 msgid "do_writea: argument 0 is not a string\n"
 msgstr "do_writea: argument 0 is geen string\n"
 
-#: extension/rwarray.c:137
+#: extension/rwarray.c:137 extension/rwarray0.c:122
 #, c-format
 msgid "do_writea: argument 1 is not an array\n"
 msgstr "do_writea: argument 1 is geen array\n"
 
-#: extension/rwarray.c:184
+#: extension/rwarray.c:184 extension/rwarray0.c:169
 #, c-format
 msgid "write_array: could not flatten array\n"
 msgstr "write_array: kan array niet pletten\n"
 
-#: extension/rwarray.c:198
+#: extension/rwarray.c:198 extension/rwarray0.c:183
 #, c-format
 msgid "write_array: could not release flattened array\n"
 msgstr "write_array: kan geplet array niet vrijgeven\n"
 
-#: extension/rwarray.c:280
+#: extension/rwarray.c:280 extension/rwarray0.c:265
 msgid "reada: called with too many arguments"
 msgstr "reada: aangeroepen met te veel argumenten"
 
-#: extension/rwarray.c:287
+#: extension/rwarray.c:287 extension/rwarray0.c:272
 #, c-format
 msgid "do_reada: argument 0 is not a string\n"
 msgstr "do_reada: argument 0 is geen string\n"
 
-#: extension/rwarray.c:293
+#: extension/rwarray.c:293 extension/rwarray0.c:278
 #, c-format
 msgid "do_reada: argument 1 is not an array\n"
 msgstr "do_reada: argument 1 is geen array\n"
 
-#: extension/rwarray.c:337
+#: extension/rwarray.c:337 extension/rwarray0.c:322
 #, c-format
 msgid "do_reada: clear_array failed\n"
 msgstr "do_reada: clear_array() is mislukt\n"
 
-#: extension/rwarray.c:374
+#: extension/rwarray.c:374 extension/rwarray0.c:358
 #, c-format
 msgid "read_array: set_array_element failed\n"
 msgstr "read_array: set_array_element() is mislukt\n"
@@ -2432,92 +2468,92 @@ msgstr "sleep: argument is negatief"
 msgid "sleep: not supported on this platform"
 msgstr "sleep: wordt op dit platform niet ondersteund"
 
-#: field.c:345
+#: field.c:346
 msgid "NF set to negative value"
 msgstr "NF is op een negatieve waarde gezet"
 
-#: field.c:971 field.c:978 field.c:982
+#: field.c:958 field.c:965 field.c:969
 msgid "split: fourth argument is a gawk extension"
 msgstr "split: vierde argument is een gawk-uitbreiding"
 
-#: field.c:975
+#: field.c:962
 msgid "split: fourth argument is not an array"
 msgstr "split: vierde argument is geen array"
 
-#: field.c:989
+#: field.c:976
 msgid "split: second argument is not an array"
 msgstr "split: tweede argument is geen array"
 
-#: field.c:993
+#: field.c:980
 msgid "split: cannot use the same array for second and fourth args"
 msgstr ""
 "split: hetzelfde array kan niet zowel als tweede als als vierde argument "
 "gebruikt worden"
 
-#: field.c:998
+#: field.c:985
 msgid "split: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "split: een subarray van het tweede argument kan niet als vierde argument "
 "gebruikt worden"
 
-#: field.c:1001
+#: field.c:988
 msgid "split: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "split: een subarray van het vierde argument kan niet als tweede argument "
 "gebruikt worden"
 
-#: field.c:1032
+#: field.c:1019
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: lege string als derde argument is een gawk-uitbreiding"
 
-#: field.c:1072
+#: field.c:1059
 msgid "patsplit: fourth argument is not an array"
 msgstr "patsplit: vierde argument is geen array"
 
-#: field.c:1077
+#: field.c:1064
 msgid "patsplit: second argument is not an array"
 msgstr "patsplit: tweede argument is geen array"
 
-#: field.c:1083
+#: field.c:1070
 msgid "patsplit: third argument must be non-null"
 msgstr "patsplit: derde argument moet niet-nil zijn"
 
-#: field.c:1087
+#: field.c:1074
 msgid "patsplit: cannot use the same array for second and fourth args"
 msgstr ""
 "patsplit: hetzelfde array kan niet zowel als tweede als als vierde argument "
 "gebruikt worden"
 
-#: field.c:1092
+#: field.c:1079
 msgid "patsplit: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "patsplit: een subarray van het tweede argument kan niet als vierde argument "
 "gebruikt worden"
 
-#: field.c:1095
+#: field.c:1082
 msgid "patsplit: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "patsplit: een subarray van het vierde argument kan niet als tweede argument "
 "gebruikt worden"
 
-#: field.c:1133
+#: field.c:1120
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "'FIELDWIDTHS' is een gawk-uitbreiding"
 
-#: field.c:1197
+#: field.c:1184
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "ongeldige waarde voor FIELDWIDTHS, nabij '%s'"
 
-#: field.c:1270
+#: field.c:1257
 msgid "null string for `FS' is a gawk extension"
 msgstr "een lege string als 'FS' is een gawk-uitbreiding"
 
-#: field.c:1274
+#: field.c:1261
 msgid "old awk does not support regexps as value of `FS'"
 msgstr "oude 'awk' staat geen reguliere expressies toe als waarde van 'FS'"
 
-#: field.c:1393
+#: field.c:1380
 msgid "`FPAT' is a gawk extension"
 msgstr "'FPAT' is een gawk-uitbreiding"
 
@@ -2533,20 +2569,20 @@ msgstr "node_to_awk_value(): lege knoop ontvangen"
 msgid "node_to_awk_value: received null val"
 msgstr "node_to_awk_value(): lege waarde ontvangen"
 
-#: gawkapi.c:807
+#: gawkapi.c:809
 msgid "remove_element: received null array"
 msgstr "remove_element(): leeg array ontvangen"
 
-#: gawkapi.c:810
+#: gawkapi.c:812
 msgid "remove_element: received null subscript"
 msgstr "remove_element(): lege index ontvangen"
 
-#: gawkapi.c:947
+#: gawkapi.c:949
 #, c-format
 msgid "api_flatten_array: could not convert index %d\n"
 msgstr "api_flatten_array(): kan index %d niet converteren\n"
 
-#: gawkapi.c:952
+#: gawkapi.c:954
 #, c-format
 msgid "api_flatten_array: could not convert value %d\n"
 msgstr "api_flatten_array(): kan waarde %d niet converteren\n"
@@ -2606,307 +2642,289 @@ msgstr "%s: optie '-W %s' staat geen argument toe\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: optie '-W %s' vereist een argument\n"
 
-#: io.c:392
+#: io.c:423
 #, c-format
 msgid "command line argument `%s' is a directory: skipped"
 msgstr "opdrachtregelargument '%s' is een map -- overgeslagen"
 
-#: io.c:395 io.c:513
+#: io.c:426 io.c:544
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "kan bestand '%s' niet openen om te lezen (%s)"
 
-#: io.c:640
+#: io.c:671
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "sluiten van bestandsdescriptor %d ('%s') is mislukt (%s)"
 
-#: io.c:716
+#: io.c:749
 msgid "redirection not allowed in sandbox mode"
 msgstr "omleiding is niet toegestaan in sandbox-modus"
 
-#: io.c:750
+#: io.c:783
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "expressie in omleiding '%s' heeft alleen een getal als waarde"
 
-#: io.c:756
+#: io.c:789
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "expressie voor omleiding '%s' heeft een lege string als waarde"
 
-#: io.c:761
+#: io.c:794
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "bestandsnaam '%s' voor omleiding '%s' kan het resultaat zijn van een "
 "logische expressie"
 
-#: io.c:809
+#: io.c:842
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "onnodige mix van '>' en '>>' voor bestand '%.*s'"
 
-#: io.c:863
+#: io.c:896
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "kan pijp '%s' niet openen voor uitvoer (%s)"
 
-#: io.c:873
+#: io.c:906
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "kan pijp '%s' niet openen voor invoer (%s)"
 
-#: io.c:904
+#: io.c:937
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr "kan tweerichtings-pijp '%s' niet openen voor in- en uitvoer (%s)"
 
-#: io.c:986
+#: io.c:1019
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "kan niet omleiden van '%s' (%s)"
 
-#: io.c:989
+#: io.c:1022
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "kan niet omleiden naar '%s' (%s)"
 
-#: io.c:1040
+#: io.c:1073
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "systeemgrens voor aantal open bestanden is bereikt: begonnen met multiplexen"
 
-#: io.c:1056
+#: io.c:1089
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "sluiten van '%s' is mislukt (%s)"
 
-#: io.c:1064
+#: io.c:1097
 msgid "too many pipes or input files open"
 msgstr "te veel pijpen of invoerbestanden geopend"
 
-#: io.c:1086
+#: io.c:1119
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: tweede argument moet 'to' of 'from' zijn"
 
-#: io.c:1103
+#: io.c:1136
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: '%.*s' is geen open bestand, pijp, of co-proces"
 
-#: io.c:1108
+#: io.c:1141
 msgid "close of redirection that was never opened"
 msgstr "sluiten van een nooit-geopende omleiding"
 
-#: io.c:1205
+#: io.c:1238
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: omleiding '%s' is niet geopend met '|&'; tweede argument wordt "
 "genegeerd"
 
-#: io.c:1222
+#: io.c:1255
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "afsluitwaarde %d bij mislukte sluiting van pijp '%s' (%s)"
 
-#: io.c:1225
+#: io.c:1258
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "afsluitwaarde %d bij mislukte sluiting van bestand '%s' (%s)"
 
-#: io.c:1245
+#: io.c:1278
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "geen expliciete sluiting van socket '%s' aangegeven"
 
-#: io.c:1248
+#: io.c:1281
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "geen expliciete sluiting van co-proces '%s' aangegeven"
 
-#: io.c:1251
+#: io.c:1284
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "geen expliciete sluiting van pijp '%s' aangegeven"
 
-#: io.c:1254
+#: io.c:1287
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "geen expliciete sluiting van bestand '%s' aangegeven"
 
-#: io.c:1284 io.c:1342 main.c:864 main.c:906
+#: io.c:1317 io.c:1375 main.c:628 main.c:670
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "fout tijdens schrijven van standaarduitvoer (%s)"
 
-#: io.c:1289 io.c:1348 main.c:866
+#: io.c:1322 io.c:1381 main.c:630
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "fout tijdens schrijven van standaardfoutuitvoer (%s)"
 
-#: io.c:1297
+#: io.c:1330
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "leegmaken van pijp '%s' is mislukt (%s)"
 
-#: io.c:1300
+#: io.c:1333
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "leegmaken door co-proces van pijp naar '%s' is mislukt (%s)"
 
-#: io.c:1303
+#: io.c:1336
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "leegmaken van bestand '%s' is mislukt (%s)"
 
-#: io.c:1420
+#: io.c:1453
 #, c-format
 msgid "local port %s invalid in `/inet'"
 msgstr "lokale poort %s is ongeldig in '/inet'"
 
-#: io.c:1438
+#: io.c:1471
 #, c-format
 msgid "remote host and port information (%s, %s) invalid"
 msgstr "host- en poortinformatie (%s, %s) zijn ongeldig"
 
-#: io.c:1590
-#, c-format
-msgid "no (known) protocol supplied in special filename `%s'"
-msgstr "geen (bekend) protocol aangegeven in speciale bestandsnaam '%s'"
-
-#: io.c:1604
-#, c-format
-msgid "special file name `%s' is incomplete"
-msgstr "speciale bestandsnaam '%s' is onvolledig"
-
-#: io.c:1621
-msgid "must supply a remote hostname to `/inet'"
-msgstr "'/inet' heeft een gindse hostnaam nodig"
-
-#: io.c:1639
-msgid "must supply a remote port to `/inet'"
-msgstr "'/inet' heeft een gindse poort nodig"
-
-#: io.c:1685
+#: io.c:1673
 msgid "TCP/IP communications are not supported"
 msgstr "TCP/IP-communicatie wordt niet ondersteund"
 
-#: io.c:1867
+#: io.c:1854
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "kan '%s' niet openen -- modus '%s'"
 
-#: io.c:1917
+#: io.c:1904
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "kan meester-pty van dochterproces niet sluiten (%s)"
 
-#: io.c:1919 io.c:2105 io.c:2305
+#: io.c:1906 io.c:2092 io.c:2293
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "kan standaarduitvoer van dochterproces niet sluiten (%s)"
 
-#: io.c:1922
+#: io.c:1909
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 "kan slaaf-pty niet overzetten naar standaarduitvoer van dochterproces (dup: "
 "%s)"
 
-#: io.c:1924 io.c:2110
+#: io.c:1911 io.c:2097
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "kan standaardinvoer van dochterproces niet sluiten (%s)"
 
-#: io.c:1927
+#: io.c:1914
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 "kan slaaf-pty niet overzetten naar standaardinvoer van dochterproces (dup: "
 "%s)"
 
-#: io.c:1929 io.c:1951
+#: io.c:1916 io.c:1938
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "kan slaaf-pty niet sluiten (%s)"
 
-#: io.c:2040 io.c:2108 io.c:2276 io.c:2308
+#: io.c:2027 io.c:2095 io.c:2264 io.c:2296
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr ""
 "kan pijp niet overzetten naar standaarduitvoer van dochterproces (dup: %s)"
 
-#: io.c:2047 io.c:2113
+#: io.c:2034 io.c:2100
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr ""
 "kan pijp niet overzetten naar standaardinvoer van dochterproces (dup: %s)"
 
-#: io.c:2073 io.c:2298
+#: io.c:2060 io.c:2286
 msgid "restoring stdout in parent process failed\n"
 msgstr "kan standaarduitvoer van ouderproces niet herstellen\n"
 
-#: io.c:2081
+#: io.c:2068
 msgid "restoring stdin in parent process failed\n"
 msgstr "kan standaardinvoer van ouderproces niet herstellen\n"
 
-#: io.c:2116 io.c:2310 io.c:2324
+#: io.c:2103 io.c:2298 io.c:2313
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "kan pijp niet sluiten (%s)"
 
-#: io.c:2174
+#: io.c:2162
 msgid "`|&' not supported"
 msgstr "'|&' wordt niet ondersteund"
 
-#: io.c:2261
+#: io.c:2249
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "kan pijp '%s' niet openen (%s)"
 
-#: io.c:2318
+#: io.c:2307
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "kan voor '%s' geen dochterproces starten (fork: %s)"
 
-#: io.c:2790
+#: io.c:2734
 msgid "register_input_parser: received NULL pointer"
 msgstr "register_input_parser(): NULL-pointer gekregen"
 
-#: io.c:2818
+#: io.c:2762
 #, c-format
 msgid "input parser `%s' conflicts with previously installed input parser `%s'"
 msgstr "invoer-parser '%s' botst met eerder geïnstalleerde invoer-parser '%s'"
 
-#: io.c:2825
+#: io.c:2769
 #, c-format
 msgid "input parser `%s' failed to open `%s'"
 msgstr "invoer-parser '%s' kan '%s' niet openen"
 
-#: io.c:2845
+#: io.c:2789
 msgid "register_output_wrapper: received NULL pointer"
 msgstr "register_output_wrapper(): NULL-pointer gekregen"
 
-#: io.c:2873
+#: io.c:2817
 #, c-format
 msgid ""
 "output wrapper `%s' conflicts with previously installed output wrapper `%s'"
 msgstr ""
 "uitvoer-wrapper '%s' botst met eerder geïnstalleerde uitvoer-wrapper '%s'"
 
-#: io.c:2880
+#: io.c:2824
 #, c-format
 msgid "output wrapper `%s' failed to open `%s'"
 msgstr "uitvoer-wrapper '%s' kan '%s' niet openen"
 
-#: io.c:2901
+#: io.c:2845
 msgid "register_output_processor: received NULL pointer"
 msgstr "register_output_processor(): NULL-pointer gekregen"
 
-#: io.c:2930
+#: io.c:2874
 #, c-format
 msgid ""
 "two-way processor `%s' conflicts with previously installed two-way processor "
@@ -2914,213 +2932,200 @@ msgid ""
 msgstr ""
 "tweeweg-processor '%s' botst met eerder geïnstalleerde tweeweg-processor '%s'"
 
-#: io.c:2939
+#: io.c:2883
 #, c-format
 msgid "two way processor `%s' failed to open `%s'"
 msgstr "tweeweg-processor '%s' kan '%s' niet openen"
 
-#: io.c:3064
+#: io.c:3008
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "databestand '%s' is leeg"
 
-#: io.c:3106 io.c:3114
+#: io.c:3050 io.c:3058
 msgid "could not allocate more input memory"
 msgstr "kan geen extra invoergeheugen meer toewijzen"
 
-#: io.c:3682
+#: io.c:3636
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "een 'RS' van meerdere tekens is een gawk-uitbreiding"
 
-#: io.c:3771
+#: io.c:3783
 msgid "IPv6 communication is not supported"
 msgstr "IPv6-communicatie wordt niet ondersteund"
 
-#: main.c:405
-msgid "empty argument to `-e/--source' ignored"
-msgstr "argument van '-e/--source' is leeg; genegeerd"
-
-#: main.c:495
-#, c-format
-msgid "%s: option `-W %s' unrecognized, ignored\n"
-msgstr "%s: optie '-W %s' is onbekend; genegeerd\n"
-
-#: main.c:541
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: optie vereist een argument -- %c\n"
-
-#: main.c:562
+#: main.c:321
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr "omgevingsvariabele 'POSIXLY_CORRECT' is gezet: '--posix' ingeschakeld"
 
-#: main.c:568
+#: main.c:327
 msgid "`--posix' overrides `--traditional'"
 msgstr "'--posix' overstijgt '--traditional'"
 
-#: main.c:579
+#: main.c:338
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "'--posix'/'--traditional' overstijgen '--non-decimal-data'"
 
-#: main.c:583
+#: main.c:342
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "het uitvoeren van %s als 'setuid root' kan een veiligheidsrisico zijn"
 
-#: main.c:588
+#: main.c:346
 msgid "`--posix' overrides `--characters-as-bytes'"
 msgstr "'--posix' overstijgt '--characters-as-bytes'"
 
-#: main.c:647
+#: main.c:404
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "kan standaardinvoer niet in binaire modus zetten (%s)"
 
-#: main.c:650
+#: main.c:407
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "kan standaarduitvoer niet in binaire modus zetten (%s)"
 
-#: main.c:652
+#: main.c:409
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "kan standaardfoutuitvoer niet in binaire modus zetten (%s)"
 
-#: main.c:710
+#: main.c:469
 msgid "no program text at all!"
 msgstr "helemaal geen programmatekst!"
 
-#: main.c:799
+#: main.c:563
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr "Gebruik:  %s [opties] -f programmabestand [--]  bestand...\n"
 
-#: main.c:801
+#: main.c:565
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
 "     of:  %s [opties] [--] %cprogrammatekst%c  bestand...\n"
 "\n"
 
-#: main.c:806
+#: main.c:570
 msgid "POSIX options:\t\tGNU long options: (standard)\n"
 msgstr "\tPOSIX-opties:\t\tEquivalente GNU-opties: (standaard)\n"
 
-#: main.c:807
+#: main.c:571
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f programmabestand\t--file=programmabestand\n"
 
-#: main.c:808
+#: main.c:572
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F veldscheidingsteken\t--field-separator=veldscheidingsteken\n"
 
-#: main.c:809
+#: main.c:573
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr ""
 "\t-v var=waarde\t\t--assign=var=waarde\n"
 "\n"
 
-#: main.c:810
+#: main.c:574
 msgid "Short options:\t\tGNU long options: (extensions)\n"
 msgstr "\tKorte opties:\t\tEquivalente GNU-opties: (uitbreidingen)\n"
 
-#: main.c:811
+#: main.c:575
 msgid "\t-b\t\t\t--characters-as-bytes\n"
 msgstr "\t-b\t\t\t--characters-as-bytes\n"
 
-#: main.c:812
+#: main.c:576
 msgid "\t-c\t\t\t--traditional\n"
 msgstr "\t-c\t\t\t--traditional\n"
 
-#: main.c:813
+#: main.c:577
 msgid "\t-C\t\t\t--copyright\n"
 msgstr "\t-C\t\t\t--copyright\n"
 
-#: main.c:814
+#: main.c:578
 msgid "\t-d[file]\t\t--dump-variables[=file]\n"
 msgstr "\t-d[bestand]\t\t--dump-variables[=bestand]\n"
 
-#: main.c:815
+#: main.c:579
 msgid "\t-D[file]\t\t--debug[=file]\n"
 msgstr "\t-D[bestand]\t\t--debug[=bestand]\n"
 
-#: main.c:816
+#: main.c:580
 msgid "\t-e 'program-text'\t--source='program-text'\n"
 msgstr "\t-e 'programmatekst'\t--source='programmatekst'\n"
 
-#: main.c:817
+#: main.c:581
 msgid "\t-E file\t\t\t--exec=file\n"
 msgstr "\t-E bestand\t\t--exec=bestand\n"
 
-#: main.c:818
+#: main.c:582
 msgid "\t-g\t\t\t--gen-pot\n"
 msgstr "\t-g\t\t\t--gen-pot\n"
 
-#: main.c:819
+#: main.c:583
 msgid "\t-h\t\t\t--help\n"
 msgstr "\t-h\t\t\t--help\n"
 
-#: main.c:820
+#: main.c:584
 msgid "\t-i includefile\t\t--include=includefile\n"
 msgstr "\t-i include-bestand\t\t--include=include-bestand\n"
 
-#: main.c:821
+#: main.c:585
 msgid "\t-l library\t\t--load=library\n"
 msgstr "\t-l bibliotheek\t\t--load=bibliotheek\n"
 
-#: main.c:822
-msgid "\t-L [fatal]\t\t--lint[=fatal]\n"
+#: main.c:586
+#, fuzzy
+msgid "\t-L[fatal|invalid]\t--lint[=fatal|invalid]\n"
 msgstr "\t-L [fataal]\t\t--lint[=fataal]\n"
 
-#: main.c:823
-msgid "\t-n\t\t\t--non-decimal-data\n"
-msgstr "\t-n\t\t\t--non-decimal-data\n"
-
-#: main.c:824
+#: main.c:587
 msgid "\t-M\t\t\t--bignum\n"
 msgstr "\t-M\t\t\t--bignum\n"
 
-#: main.c:825
+#: main.c:588
 msgid "\t-N\t\t\t--use-lc-numeric\n"
 msgstr "\t-N\t\t\t--use-lc-numeric\n"
 
-#: main.c:826
+#: main.c:589
+msgid "\t-n\t\t\t--non-decimal-data\n"
+msgstr "\t-n\t\t\t--non-decimal-data\n"
+
+#: main.c:590
 msgid "\t-o[file]\t\t--pretty-print[=file]\n"
 msgstr "\t-o[bestand]\t\t--pretty-print[=bestand]\n"
 
-#: main.c:827
+#: main.c:591
 msgid "\t-O\t\t\t--optimize\n"
 msgstr "\t-O\t\t\t--optimize\n"
 
-#: main.c:828
+#: main.c:592
 msgid "\t-p[file]\t\t--profile[=file]\n"
 msgstr "\t-p[bestand]\t\t--profile[=bestand]\n"
 
-#: main.c:829
+#: main.c:593
 msgid "\t-P\t\t\t--posix\n"
 msgstr "\t-P\t\t\t--posix\n"
 
-#: main.c:830
+#: main.c:594
 msgid "\t-r\t\t\t--re-interval\n"
 msgstr "\t-r\t\t\t--re-interval\n"
 
-#: main.c:831
+#: main.c:595
 msgid "\t-S\t\t\t--sandbox\n"
 msgstr "\t-S\t\t\t--sandbox\n"
 
-#: main.c:832
+#: main.c:596
 msgid "\t-t\t\t\t--lint-old\n"
 msgstr "\t-t\t\t\t--lint-old\n"
 
-#: main.c:833
+#: main.c:597
 msgid "\t-V\t\t\t--version\n"
 msgstr "\t-V\t\t\t--version\n"
 
-#: main.c:835
+#: main.c:599
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t\t--nostalgia\n"
 
-#: main.c:838
+#: main.c:602
 msgid "\t-Y\t\t--parsedebug\n"
 msgstr "\t-Y\t\t\t--parsedebug\n"
 
@@ -3129,7 +3134,7 @@ msgstr "\t-Y\t\t\t--parsedebug\n"
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: main.c:847
+#: main.c:611
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -3142,7 +3147,7 @@ msgstr ""
 "Meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n"
 "\n"
 
-#: main.c:851
+#: main.c:615
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -3152,7 +3157,7 @@ msgstr ""
 "Standaard leest het van standaardinvoer en schrijft naar standaarduitvoer.\n"
 "\n"
 
-#: main.c:855
+#: main.c:619
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -3162,7 +3167,7 @@ msgstr ""
 "\tgawk '{ som += $1 }; END { print som }' bestand\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:880
+#: main.c:644
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
@@ -3180,7 +3185,7 @@ msgstr ""
 "uitgegeven door de Free Software Foundation, naar keuze ofwel onder\n"
 "versie 3 of onder een nieuwere versie van die licentie.\n"
 
-#: main.c:888
+#: main.c:652
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3194,7 +3199,7 @@ msgstr ""
 "Zie de GNU General Public License voor meer details.\n"
 "\n"
 
-#: main.c:894
+#: main.c:658
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program. If not, see http://www.gnu.org/licenses/.\n"
@@ -3203,16 +3208,16 @@ msgstr ""
 "ontvangen te hebben; is dit niet het geval, dan kunt u deze licentie\n"
 "ook vinden op http://www.gnu.org/licenses/.\n"
 
-#: main.c:931
+#: main.c:695
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft maakt van FS geen tab in POSIX-awk"
 
-#: main.c:1208
+#: main.c:982
 #, c-format
 msgid "unknown value for field spec: %d\n"
 msgstr "onbekende waarde voor veldspecificatie: %d\n"
 
-#: main.c:1306
+#: main.c:1080
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -3221,99 +3226,117 @@ msgstr ""
 "%s: argument '%s' van '-v' is niet van de vorm 'var=waarde'\n"
 "\n"
 
-#: main.c:1332
+#: main.c:1106
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "'%s' is geen geldige variabelenaam"
 
-#: main.c:1335
+#: main.c:1109
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "'%s' is geen variabelenaam; zoekend naar bestand '%s=%s'"
 
-#: main.c:1339
+#: main.c:1113
 #, c-format
 msgid "cannot use gawk builtin `%s' as variable name"
 msgstr "kan in gawk ingebouwde '%s' niet als variabelenaam gebruiken"
 
-#: main.c:1344
+#: main.c:1118
 #, c-format
 msgid "cannot use function `%s' as variable name"
 msgstr "kan functie '%s' niet als variabelenaam gebruiken"
 
-#: main.c:1397
+#: main.c:1171
 msgid "floating point exception"
 msgstr "drijvendekomma-berekeningsfout"
 
-#: main.c:1404
+#: main.c:1178
 msgid "fatal error: internal error"
 msgstr "fatale fout: **interne fout**"
 
-#: main.c:1419
+#: main.c:1193
 msgid "fatal error: internal error: segfault"
 msgstr "fatale fout: **interne fout**: segmentatiefout"
 
-#: main.c:1431
+#: main.c:1205
 msgid "fatal error: internal error: stack overflow"
 msgstr "fatale fout: **interne fout**: stack is vol"
 
-#: main.c:1490
+#: main.c:1264
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "geen reeds-geopende bestandsdescriptor %d"
 
-#: main.c:1497
+#: main.c:1271
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "kan /dev/null niet openen voor bestandsdescriptor %d"
 
-#: mpfr.c:550
+#: main.c:1485
+msgid "empty argument to `-e/--source' ignored"
+msgstr "argument van '-e/--source' is leeg; genegeerd"
+
+#: main.c:1556
+msgid "-M ignored: MPFR/GMP support not compiled in"
+msgstr ""
+
+#: main.c:1577
+#, c-format
+msgid "%s: option `-W %s' unrecognized, ignored\n"
+msgstr "%s: optie '-W %s' is onbekend; genegeerd\n"
+
+#: main.c:1630
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: optie vereist een argument -- %c\n"
+
+#: mpfr.c:557
 #, c-format
 msgid "PREC value `%.*s' is invalid"
 msgstr "PREC-waarde '%.*s' is ongeldig"
 
-#: mpfr.c:608
+#: mpfr.c:615
 #, c-format
 msgid "RNDMODE value `%.*s' is invalid"
 msgstr "RNDMODE-waarde '%.*s' is ongeldig"
 
-#: mpfr.c:698
+#: mpfr.c:711
 #, c-format
 msgid "%s: received non-numeric argument"
 msgstr "%s: niet-numeriek argument ontvangen"
 
-#: mpfr.c:800
+#: mpfr.c:820
 msgid "compl(%Rg): negative value will give strange results"
 msgstr "compl(%Rg): negatieve waarden geven rare resultaten"
 
-#: mpfr.c:804
+#: mpfr.c:824
 msgid "comp(%Rg): fractional value will be truncated"
 msgstr "compl(%Rg): cijfers na de komma worden afgekapt"
 
-#: mpfr.c:816
+#: mpfr.c:836
 #, c-format
 msgid "cmpl(%Zd): negative values will give strange results"
 msgstr "compl(%Zd): negatieve waarden geven rare resultaten"
 
-#: mpfr.c:835
+#: mpfr.c:855
 #, c-format
 msgid "%s: received non-numeric argument #%d"
 msgstr "%s: niet-numeriek argument #%d ontvangen"
 
-#: mpfr.c:845
+#: mpfr.c:865
 msgid "%s: argument #%d has invalid value %Rg, using 0"
 msgstr "%s: argument #%d heeft ongeldige waarde %Rg;  0 wordt gebruikt"
 
-#: mpfr.c:857
+#: mpfr.c:877
 msgid "%s: argument #%d negative value %Rg will give strange results"
 msgstr "%s: negatieve waarde %2$Rg van argument #%1$d geeft rare resultaten"
 
-#: mpfr.c:863
+#: mpfr.c:883
 msgid "%s: argument #%d fractional value %Rg will be truncated"
 msgstr ""
 "%s: cijfers na de komma van waarde %2$Rg van argument #%1$d worden afgekapt"
 
-#: mpfr.c:878
+#: mpfr.c:898
 #, c-format
 msgid "%s: argument #%d negative value %Zd will give strange results"
 msgstr "%1$s: negatieve waarde %3$Zd van argument #%2$d geeft rare resultaten"
@@ -3323,24 +3346,24 @@ msgstr "%1$s: negatieve waarde %3$Zd van argument #%2$d geeft rare resultaten"
 msgid "cmd. line:"
 msgstr "commandoregel:"
 
-#: node.c:421
+#: node.c:409
 msgid "backslash at end of string"
 msgstr "backslash aan het einde van de string"
 
-#: node.c:500
+#: node.c:488
 #, c-format
 msgid "old awk does not support the `\\%c' escape sequence"
 msgstr "oude 'awk' kent de stuurcodereeks '\\%c' niet"
 
-#: node.c:551
+#: node.c:539
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX staat stuurcode '\\x' niet toe"
 
-#: node.c:557
+#: node.c:545
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "geen hex cijfers in stuurcodereeks '\\x'"
 
-#: node.c:579
+#: node.c:567
 #, c-format
 msgid ""
 "hex escape \\x%.*s of %d characters probably not interpreted the way you "
@@ -3349,12 +3372,12 @@ msgstr ""
 "hexadecimale stuurcode \\x%.*s van %d tekens wordt waarschijnlijk niet "
 "afgehandeld zoals u verwacht"
 
-#: node.c:594
+#: node.c:582
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "stuurcodereeks '\\%c' behandeld als normale '%c'"
 
-#: node.c:739
+#: node.c:726
 msgid ""
 "Invalid multibyte data detected. There may be a mismatch between your data "
 "and your locale."
@@ -3384,12 +3407,12 @@ msgid "sending profile to standard error"
 msgstr "profiel gaat naar standaardfoutuitvoer"
 
 #: profile.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t# %s block(s)\n"
+"\t# %s rule(s)\n"
 "\n"
 msgstr ""
-"\t# %s-blok(ken)\n"
+"\t# Regel(s)\n"
 "\n"
 
 #: profile.c:198
@@ -3406,11 +3429,11 @@ msgstr ""
 msgid "internal error: %s with null vname"
 msgstr "**interne fout**: %s met lege 'vname'"
 
-#: profile.c:537
+#: profile.c:538
 msgid "internal error: builtin with null fname"
 msgstr "**interne fout**: ingebouwde functie met lege 'fname'"
 
-#: profile.c:949
+#: profile.c:958
 #, c-format
 msgid ""
 "\t# Loaded extensions (-l and/or @load)\n"
@@ -3419,12 +3442,12 @@ msgstr ""
 "\t# Geladen uitbreidingen ('-l' en/of '@load')\n"
 "\n"
 
-#: profile.c:972
+#: profile.c:981
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# gawk-profiel, gemaakt op %s\n"
 
-#: profile.c:1475
+#: profile.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -3433,7 +3456,7 @@ msgstr ""
 "\n"
 "\t# Functies, alfabetisch geordend\n"
 
-#: profile.c:1513
+#: profile.c:1559
 #, c-format
 msgid "redir2str: unknown redirection type %d"
 msgstr "redir2str(): onbekend omleidingstype %d"
@@ -3444,82 +3467,118 @@ msgid "regexp component `%.*s' should probably be `[%.*s]'"
 msgstr ""
 "component '%.*s' van reguliere expressie moet vermoedelijk '[%.*s]' zijn"
 
-#: regcomp.c:131
+#: regcomp.c:139
 msgid "Success"
 msgstr "Gelukt"
 
-#: regcomp.c:134
+#: regcomp.c:142
 msgid "No match"
 msgstr "Geen overeenkomsten"
 
-#: regcomp.c:137
+#: regcomp.c:145
 msgid "Invalid regular expression"
 msgstr "Ongeldige reguliere expressie"
 
-#: regcomp.c:140
+#: regcomp.c:148
 msgid "Invalid collation character"
 msgstr "Ongeldig samengesteld teken"
 
-#: regcomp.c:143
+#: regcomp.c:151
 msgid "Invalid character class name"
 msgstr "Ongeldige tekenklassenaam"
 
-#: regcomp.c:146
+#: regcomp.c:154
 msgid "Trailing backslash"
 msgstr "Backslash aan het eind"
 
-#: regcomp.c:149
+#: regcomp.c:157
 msgid "Invalid back reference"
 msgstr "Ongeldige terugverwijzing"
 
-#: regcomp.c:152
-msgid "Unmatched [ or [^"
+#: regcomp.c:160
+#, fuzzy
+msgid "Unmatched [, [^, [:, [., or [="
 msgstr "Ongepaarde [ of [^"
 
-#: regcomp.c:155
+#: regcomp.c:163
 msgid "Unmatched ( or \\("
 msgstr "Ongepaarde ( of \\("
 
-#: regcomp.c:158
+#: regcomp.c:166
 msgid "Unmatched \\{"
 msgstr "Ongepaarde \\{"
 
-#: regcomp.c:164
+#: regcomp.c:169
+msgid "Invalid content of \\{\\}"
+msgstr "Ongeldige inhoud van \\{\\}"
+
+#: regcomp.c:172
 msgid "Invalid range end"
 msgstr "Ongeldig bereikeinde"
 
-#: regcomp.c:167
+#: regcomp.c:175
 msgid "Memory exhausted"
 msgstr "Onvoldoende geheugen beschikbaar"
 
-#: regcomp.c:170
+#: regcomp.c:178
 msgid "Invalid preceding regular expression"
 msgstr "Ongeldige voorafgaande reguliere expressie"
 
-#: regcomp.c:173
+#: regcomp.c:181
 msgid "Premature end of regular expression"
 msgstr "Voortijdig einde van reguliere expressie"
 
-#: regcomp.c:179
+#: regcomp.c:184
+msgid "Regular expression too big"
+msgstr "Reguliere expressie is te groot"
+
+#: regcomp.c:187
 msgid "Unmatched ) or \\)"
 msgstr "Ongepaarde ) of \\)"
 
-#: regcomp.c:704
+#: regcomp.c:712
 msgid "No previous regular expression"
 msgstr "Geen eerdere reguliere expressie"
 
-#: symbol.c:741
+#: symbol.c:677
+#, fuzzy, c-format
+msgid "function `%s': can't use function `%s' as a parameter name"
+msgstr "functie '%s': kan functienaam niet als parameternaam gebruiken"
+
+#: symbol.c:809
 msgid "can not pop main context"
 msgstr "kan hoofdcontext niet poppen"
 
+#~ msgid "`getline var' invalid inside `%s' rule"
+#~ msgstr "'getline var' is ongeldig binnen een '%s'-regel"
+
+#~ msgid "`getline' invalid inside `%s' rule"
+#~ msgstr "'getline' is ongeldig binnen een '%s'-regel"
+
+#~ msgid "no (known) protocol supplied in special filename `%s'"
+#~ msgstr "geen (bekend) protocol aangegeven in speciale bestandsnaam '%s'"
+
+#~ msgid "special file name `%s' is incomplete"
+#~ msgstr "speciale bestandsnaam '%s' is onvolledig"
+
+#~ msgid "must supply a remote hostname to `/inet'"
+#~ msgstr "'/inet' heeft een gindse hostnaam nodig"
+
+#~ msgid "must supply a remote port to `/inet'"
+#~ msgstr "'/inet' heeft een gindse poort nodig"
+
+#~ msgid ""
+#~ "\t# %s block(s)\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\t# %s-blok(ken)\n"
+#~ "\n"
+
 #~ msgid "range of the form `[%c-%c]' is locale dependent"
 #~ msgstr ""
 #~ "de betekenis van een bereik van de vorm '[%c-%c]' is afhankelijk van de "
 #~ "taalregio"
 
-#~ msgid "attempt to use function `%s' as an array"
-#~ msgstr "functie '%s' wordt gebruikt als array"
-
 #~ msgid "reference to uninitialized element `%s[\"%.*s\"]'"
 #~ msgstr "verwijzing naar ongeïnitialiseerd element '%s[\"%.*s\"]'"
 
@@ -3598,9 +3657,6 @@ msgstr "kan hoofdcontext niet poppen"
 #~ msgid "function `%s' not defined"
 #~ msgstr "functie '%s' is niet gedefinieerd"
 
-#~ msgid "non-redirected `getline' invalid inside `%s' rule"
-#~ msgstr "niet-omgeleide 'getline' is ongeldig binnen een '%s'-regel"
-
 #~ msgid "`nextfile' cannot be called from a `%s' rule"
 #~ msgstr "'nextfile' kan niet aangeroepen worden in een '%s'-regel"
 
diff --git a/po/pl.gmo b/po/pl.gmo
index b2c8e5fa..02842916 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 95ddbec2..d7f71e93 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gawk 4.1.0b\n"
-"Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2014-04-08 19:23+0300\n"
+"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
+"POT-Creation-Date: 2015-02-26 20:05+0200\n"
 "PO-Revision-Date: 2014-03-22 17:49+0100\n"
 "Last-Translator: Wojciech Polak <polak@gnu.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -39,9 +39,9 @@ msgstr "próba użycia parametru `%s' skalaru jako tablicy"
 msgid "attempt to use scalar `%s' as an array"
 msgstr "próba użycia skalaru `%s' jako tablicy"
 
-#: array.c:409 array.c:576 builtin.c:85 builtin.c:1615 builtin.c:1661
-#: builtin.c:1674 builtin.c:2102 builtin.c:2116 eval.c:1122 eval.c:1126
-#: eval.c:1531
+#: array.c:409 array.c:576 builtin.c:85 builtin.c:1606 builtin.c:1652
+#: builtin.c:1665 builtin.c:2092 builtin.c:2106 eval.c:1149 eval.c:1153
+#: eval.c:1558
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "próba użycia tablicy `%s' w kontekście skalaru"
@@ -96,417 +96,423 @@ msgid "asorti: cannot use a subarray of second arg for first arg"
 msgstr ""
 "asorti: nie można użyć podtablicy drugiego argumentu dla pierwszego argumentu"
 
-#: array.c:1314
+#: array.c:1313
 #, c-format
 msgid "`%s' is invalid as a function name"
 msgstr "nieprawidłowa nazwa funkcji `%s'"
 
-#: array.c:1318
+#: array.c:1317
 #, c-format
 msgid "sort comparison function `%s' is not defined"
 msgstr "funkcja porównująca w sortowaniu `%s' nie została zdefiniowna"
 
-#: awkgram.y:233
+#: awkgram.y:226
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "%s bloków musi posiadać część dotyczącą akcji"
 
-#: awkgram.y:236
+#: awkgram.y:229
 msgid "each rule must have a pattern or an action part"
 msgstr "każda reguła musi posiadać wzorzec lub część dotyczącą akcji"
 
-#: awkgram.y:325 awkgram.y:336
+#: awkgram.y:320 awkgram.y:331
 msgid "old awk does not support multiple `BEGIN' or `END' rules"
 msgstr "stary awk nie wspiera wielokrotnych reguł `BEGIN' lub `END'"
 
-#: awkgram.y:373
+#: awkgram.y:368
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr ""
 "`%s' jest funkcją wbudowaną, więc nie może zostać ponownie zdefiniowana"
 
-#: awkgram.y:419
+#: awkgram.y:417
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr ""
 "stałe wyrażenie regularne `//' wygląda jak komentarz C++, ale nim nie jest"
 
-#: awkgram.y:423
+#: awkgram.y:421
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr ""
 "stałe wyrażenie regularne `/%s/' wygląda jak komentarz C, ale nim nie jest"
 
-#: awkgram.y:515
+#: awkgram.y:513
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "powielone wartości case w ciele switch: %s"
 
-#: awkgram.y:536
+#: awkgram.y:534
 msgid "duplicate `default' detected in switch body"
 msgstr "wykryto powielony `default' w ciele switch"
 
-#: awkgram.y:796 awkgram.y:3723
+#: awkgram.y:794 awkgram.y:3751
 msgid "`break' is not allowed outside a loop or switch"
 msgstr "instrukcja `break' poza pętlą lub switch'em jest niedozwolona"
 
-#: awkgram.y:805 awkgram.y:3715
+#: awkgram.y:803 awkgram.y:3743
 msgid "`continue' is not allowed outside a loop"
 msgstr "instrukcja `continue' poza pętlą jest niedozwolona"
 
-#: awkgram.y:815
+#: awkgram.y:813
 #, c-format
 msgid "`next' used in %s action"
 msgstr "`next' użyty w akcji %s"
 
-#: awkgram.y:824
+#: awkgram.y:822
 #, c-format
 msgid "`nextfile' used in %s action"
 msgstr "`nextfile' użyty w akcji %s"
 
-#: awkgram.y:848
+#: awkgram.y:846
 msgid "`return' used outside function context"
 msgstr "`return' użyty poza kontekstem funkcji"
 
-#: awkgram.y:922
+#: awkgram.y:920
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "zwykły `print' w regułach BEGIN lub END powinien prawdopodobnie być jako "
 "`print \"\"'"
 
-#: awkgram.y:988 awkgram.y:1037
+#: awkgram.y:986 awkgram.y:1035
 msgid "`delete' is not allowed with SYMTAB"
 msgstr "`delete' nie jest dozwolony z SYMTAB"
 
-#: awkgram.y:990 awkgram.y:1039
+#: awkgram.y:988 awkgram.y:1037
 msgid "`delete' is not allowed with FUNCTAB"
 msgstr "`delete' nie jest dozwolony z FUNCTAB"
 
-#: awkgram.y:1024 awkgram.y:1028
+#: awkgram.y:1022 awkgram.y:1026
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "`delete(tablica)' jest nieprzenośnym rozszerzeniem tawk"
 
-#: awkgram.y:1149
+#: awkgram.y:1147
 msgid "multistage two-way pipelines don't work"
 msgstr "wieloetapowe dwukierunkowe linie potokowe nie działają"
 
-#: awkgram.y:1264
+#: awkgram.y:1262
 msgid "regular expression on right of assignment"
 msgstr "wyrażanie regularne po prawej stronie przypisania"
 
-#: awkgram.y:1275
+#: awkgram.y:1273
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "wyrażenie regularne po lewej stronie operatora `~' lub `!~'"
 
-#: awkgram.y:1291 awkgram.y:1442
+#: awkgram.y:1289 awkgram.y:1431
 msgid "old awk does not support the keyword `in' except after `for'"
 msgstr ""
 "stary awk nie wspiera słowa kluczowego `in', z wyjątkiem po słowie `for'"
 
-#: awkgram.y:1301
+#: awkgram.y:1299
 msgid "regular expression on right of comparison"
 msgstr "wyrażenie regularne po prawej stronie porównania"
 
-#: awkgram.y:1417
-#, c-format
-msgid "`getline var' invalid inside `%s' rule"
-msgstr "nieprawidłowy `getline var' wewnątrz reguły `%s'"
-
-#: awkgram.y:1420
+#: awkgram.y:1411
 #, c-format
-msgid "`getline' invalid inside `%s' rule"
-msgstr "nieprawidłowy `getline' wewnątrz reguły `%s'"
+msgid "non-redirected `getline' invalid inside `%s' rule"
+msgstr ""
+"komenda `getline' bez przekierowania jest nieprawidłowa wewnątrz reguły `%s'"
 
-#: awkgram.y:1425
+#: awkgram.y:1414
 msgid "non-redirected `getline' undefined inside END action"
 msgstr ""
 "komenda `getline' bez przekierowania nie jest zdefiniowana wewnÄ…trz akcji END"
 
-#: awkgram.y:1444
+#: awkgram.y:1433
 msgid "old awk does not support multidimensional arrays"
 msgstr "stary awk nie wspiera wielowymiarowych tablic"
 
-#: awkgram.y:1541
+#: awkgram.y:1530
 msgid "call of `length' without parentheses is not portable"
 msgstr "wywołanie `length' bez nawiasów jest nieprzenośne"
 
-#: awkgram.y:1607
+#: awkgram.y:1596
 msgid "indirect function calls are a gawk extension"
 msgstr "pośrednie wywołania funkcji są rozszerzeniem gawk"
 
-#: awkgram.y:1620
+#: awkgram.y:1609
 #, c-format
 msgid "can not use special variable `%s' for indirect function call"
 msgstr ""
 "nie można użyć specjalnej zmiennej `%s' do pośredniego wywołania funkcji"
 
-#: awkgram.y:1698
+#: awkgram.y:1635
+#, fuzzy, c-format
+msgid "attempt to use non-function `%s' in function call"
+msgstr "próba użycia funkcji `%s' jako tablicy"
+
+#: awkgram.y:1699
 msgid "invalid subscript expression"
 msgstr "nieprawidłowe wyrażenie indeksowe"
 
-#: awkgram.y:2048 awkgram.y:2068 gawkapi.c:206 gawkapi.c:224 msg.c:126
+#: awkgram.y:2045 awkgram.y:2065 gawkapi.c:206 gawkapi.c:224 msg.c:126
 msgid "warning: "
 msgstr "ostrzeżenie: "
 
-#: awkgram.y:2066 gawkapi.c:192 gawkapi.c:221 msg.c:158
+#: awkgram.y:2063 gawkapi.c:192 gawkapi.c:221 msg.c:158
 msgid "fatal: "
 msgstr "fatalny błąd: "
 
-#: awkgram.y:2116
+#: awkgram.y:2113
 msgid "unexpected newline or end of string"
 msgstr "niespodziewany znak nowego wiersza lub końca łańcucha"
 
-#: awkgram.y:2383 awkgram.y:2459 awkgram.y:2682 debug.c:523 debug.c:539
+#: awkgram.y:2392 awkgram.y:2468 awkgram.y:2691 debug.c:523 debug.c:539
 #: debug.c:2812 debug.c:5055
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "nie można otworzyć pliku źródłowego `%s' do czytania (%s)"
 
-#: awkgram.y:2384 awkgram.y:2509
+#: awkgram.y:2393 awkgram.y:2518
 #, c-format
 msgid "can't open shared library `%s' for reading (%s)"
 msgstr "nie można otworzyć współdzielonej biblioteki `%s' do czytania (%s)"
 
-#: awkgram.y:2386 awkgram.y:2460 awkgram.y:2510 builtin.c:135 debug.c:5206
+#: awkgram.y:2395 awkgram.y:2469 awkgram.y:2519 builtin.c:135 debug.c:5206
 msgid "reason unknown"
 msgstr "nieznany powód"
 
-#: awkgram.y:2395 awkgram.y:2419
+#: awkgram.y:2404 awkgram.y:2428
 #, c-format
 msgid "can't include `%s' and use it as a program file"
 msgstr "nie można dołączyć `%s' i używać go jako pliku programu"
 
-#: awkgram.y:2408
+#: awkgram.y:2417
 #, c-format
 msgid "already included source file `%s'"
 msgstr "plik źródłowy `%s' jest już załączony"
 
-#: awkgram.y:2409
+#: awkgram.y:2418
 #, c-format
 msgid "already loaded shared library `%s'"
 msgstr "biblioteka współdzielona jest już załadowana `%s'"
 
-#: awkgram.y:2444
+#: awkgram.y:2453
 msgid "@include is a gawk extension"
 msgstr "@include jest rozszerzeniem gawk"
 
-#: awkgram.y:2450
+#: awkgram.y:2459
 msgid "empty filename after @include"
 msgstr "pusta nazwa pliku po @include"
 
-#: awkgram.y:2494
+#: awkgram.y:2503
 msgid "@load is a gawk extension"
 msgstr "@load jest rozszerzeniem gawk"
 
-#: awkgram.y:2500
+#: awkgram.y:2509
 msgid "empty filename after @load"
 msgstr "pusta nazwa pliku po @load"
 
-#: awkgram.y:2634
+#: awkgram.y:2643
 msgid "empty program text on command line"
 msgstr "pusty tekst programu w linii poleceń"
 
-#: awkgram.y:2749
+#: awkgram.y:2758
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "nie można otworzyć pliku źródłowego `%s' (%s)"
 
-#: awkgram.y:2760
+#: awkgram.y:2769
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "plik źródłowy `%s' jest pusty"
 
-#: awkgram.y:2937
+#: awkgram.y:2828
+#, c-format
+msgid "PEBKAC error: invalid character '\\%03o' in source code"
+msgstr ""
+
+#: awkgram.y:2959
 msgid "source file does not end in newline"
 msgstr "plik źródłowy nie posiada na końcu znaku nowego wiersza"
 
-#: awkgram.y:3042
+#: awkgram.y:3062
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr ""
 "niezakończone prawidłowo wyrażenie regularne kończy się znakiem `\\' na "
 "końcu pliku"
 
-#: awkgram.y:3066
+#: awkgram.y:3089
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 "%s: %d: modyfikator wyrażenia regularnego `/.../%c' tawk nie działa w gawk"
 
-#: awkgram.y:3070
+#: awkgram.y:3093
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr "modyfikator wyrażenia regularnego `/.../%c' tawk nie działa w gawk"
 
-#: awkgram.y:3077
+#: awkgram.y:3100
 msgid "unterminated regexp"
 msgstr "niezakończone wyrażenie regularne"
 
-#: awkgram.y:3081
+#: awkgram.y:3104
 msgid "unterminated regexp at end of file"
 msgstr "niezakończone wyrażenie regularne na końcu pliku"
 
-#: awkgram.y:3140
+#: awkgram.y:3162
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "użycie `\\ #...' kontynuacji linii nie jest przenośne"
 
-#: awkgram.y:3156
+#: awkgram.y:3178
 msgid "backslash not last character on line"
 msgstr "backslash nie jest ostatnim znakiem w wierszu"
 
-#: awkgram.y:3217
+#: awkgram.y:3239
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX nie zezwala na operator `**='"
 
-#: awkgram.y:3219
+#: awkgram.y:3241
 msgid "old awk does not support operator `**='"
 msgstr "stary awk nie wspiera operatora `**='"
 
-#: awkgram.y:3228
+#: awkgram.y:3250
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX nie zezwala na operator `**'"
 
-#: awkgram.y:3230
+#: awkgram.y:3252
 msgid "old awk does not support operator `**'"
 msgstr "stary awk nie wspiera operatora `**'"
 
-#: awkgram.y:3265
+#: awkgram.y:3287
 msgid "operator `^=' is not supported in old awk"
 msgstr "operator `^=' nie jest wspierany w starym awk"
 
-#: awkgram.y:3273
+#: awkgram.y:3295
 msgid "operator `^' is not supported in old awk"
 msgstr "operator `^' nie jest wspierany w starym awk"
 
-#: awkgram.y:3366 awkgram.y:3382 command.y:1178
+#: awkgram.y:3392 awkgram.y:3410 command.y:1180
 msgid "unterminated string"
 msgstr "niezakończony łańcuch"
 
-#: awkgram.y:3603
+#: awkgram.y:3631
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "nieprawidłowy znak '%c' w wyrażeniu"
 
-#: awkgram.y:3650
+#: awkgram.y:3678
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "`%s' jest rozszerzeniem gawk"
 
-#: awkgram.y:3655
+#: awkgram.y:3683
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX nie zezwala na `%s'"
 
-#: awkgram.y:3663
+#: awkgram.y:3691
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "`%s' nie jest wspierany w starym awk"
 
-#: awkgram.y:3753
+#: awkgram.y:3781
 msgid "`goto' considered harmful!\n"
 msgstr "`goto' uważane za szkodliwe!\n"
 
-#: awkgram.y:3787
+#: awkgram.y:3815
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d jest nieprawidłowe jako liczba argumentów dla %s"
 
-#: awkgram.y:3822
+#: awkgram.y:3850
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 "%s: literał łańcuchowy jako ostatni argument podstawienia nie ma żadnego "
 "efektu"
 
-#: awkgram.y:3827
+#: awkgram.y:3855
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "%s trzeci parametr nie jest zmiennym obiektem"
 
-#: awkgram.y:3910 awkgram.y:3913
+#: awkgram.y:3938 awkgram.y:3941
 msgid "match: third argument is a gawk extension"
 msgstr "match: trzeci argument jest rozszerzeniem gawk"
 
-#: awkgram.y:3967 awkgram.y:3970
+#: awkgram.y:3995 awkgram.y:3998
 msgid "close: second argument is a gawk extension"
 msgstr "close: drugi argument jest rozszerzeniem gawk"
 
-#: awkgram.y:3982
+#: awkgram.y:4010
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "nieprawidłowe użycie dcgettext(_\"...\"): usuń znak podkreślenia"
 
-#: awkgram.y:3997
+#: awkgram.y:4025
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "nieprawidłowe użycie dcngettext(_\"...\"): usuń znak podkreślenia"
 
-#: awkgram.y:4016
+#: awkgram.y:4044
 msgid "index: regexp constant as second argument is not allowed"
 msgstr "index: stały regexp jako drugi argument nie jest dozwolony"
 
-#: awkgram.y:4069
+#: awkgram.y:4097
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "funkcja `%s': parametr `%s' zasłania globalną zmienną"
 
-#: awkgram.y:4126 debug.c:4041 debug.c:4084 debug.c:5204
+#: awkgram.y:4154 debug.c:4041 debug.c:4084 debug.c:5204
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "nie można otworzyć `%s' do zapisu (%s)"
 
-#: awkgram.y:4127
+#: awkgram.y:4155
 msgid "sending variable list to standard error"
 msgstr "wysyłanie listy zmiennych na standardowe wyjście diagnostyczne"
 
-#: awkgram.y:4135
+#: awkgram.y:4163
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: zamknięcie nie powiodło się (%s)"
 
-#: awkgram.y:4160
+#: awkgram.y:4188
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() wywołana podwójnie!"
 
-#: awkgram.y:4168
+#: awkgram.y:4196
 msgid "there were shadowed variables."
 msgstr "wystąpiły przykryte zmienne."
 
-#: awkgram.y:4239
+#: awkgram.y:4267
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "nazwa funkcji `%s' została zdefiniowana poprzednio"
 
-#: awkgram.y:4285
+#: awkgram.y:4313
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "funkcja `%s': nie można użyć nazwy funkcji jako nazwy parametru"
 
-#: awkgram.y:4288
+#: awkgram.y:4316
 #, c-format
 msgid "function `%s': can't use special variable `%s' as a function parameter"
 msgstr ""
 "funkcja `%s': nie można użyć specjalnej zmiennej `%s' jako parametru funkcji"
 
-#: awkgram.y:4296
+#: awkgram.y:4324
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "funkcja `%s': parametr #%d, `%s', powiela parametr #%d"
 
-#: awkgram.y:4383 awkgram.y:4389
+#: awkgram.y:4411 awkgram.y:4417
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "funkcja `%s' została wywołana, ale nigdy nie została zdefiniowana"
 
-#: awkgram.y:4393
+#: awkgram.y:4421
 #, c-format
 msgid "function `%s' defined but never called directly"
 msgstr ""
 "funkcja `%s' została zdefiniowana, ale nigdy nie została wywołana "
 "bezpośrednio"
 
-#: awkgram.y:4425
+#: awkgram.y:4453
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr "stałe wyrażenie regularne dla parametru #%d daje wartość logiczną"
 
-#: awkgram.y:4484
+#: awkgram.y:4468
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -516,21 +522,21 @@ msgstr ""
 "`(',\n"
 "lub użyta jako zmienna lub jako tablica"
 
-#: awkgram.y:4720
+#: awkgram.y:4674
 msgid "division by zero attempted"
 msgstr "próba dzielenia przez zero"
 
-#: awkgram.y:4729
+#: awkgram.y:4683
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "próba dzielenia przez zero w `%%'"
 
-#: awkgram.y:5049
+#: awkgram.y:5003
 msgid ""
 "cannot assign a value to the result of a field post-increment expression"
 msgstr "nie można przypisać wartości do wyniku tego wyrażenia"
 
-#: awkgram.y:5052
+#: awkgram.y:5006
 #, c-format
 msgid "invalid target of assignment (opcode %s)"
 msgstr "nieprawidłowy cel przypisania (opcode %s)"
@@ -570,193 +576,203 @@ msgstr ""
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: `%s' nie jest ani otwartym plikiem, ani potokiem, ani procesem"
 
-#: builtin.c:362
+#: builtin.c:351
 msgid "index: received non-string first argument"
 msgstr "index: otrzymano pierwszy argument, który nie jest łańcuchem"
 
-#: builtin.c:364
+#: builtin.c:353
 msgid "index: received non-string second argument"
 msgstr "index: otrzymano drugi argument, który nie jest łańcuchem"
 
-#: builtin.c:488 mpfr.c:757
+#: builtin.c:466 mpfr.c:777
 msgid "int: received non-numeric argument"
 msgstr "int: otrzymano argument, który nie jest liczbą"
 
-#: builtin.c:525
+#: builtin.c:503
 msgid "length: received array argument"
 msgstr "length: otrzymano argument, który jest tablicą"
 
-#: builtin.c:528
+#: builtin.c:506
 msgid "`length(array)' is a gawk extension"
 msgstr "`length(tablica)' jest rozszerzeniem gawk"
 
-#: builtin.c:544
+#: builtin.c:525
 msgid "length: received non-string argument"
 msgstr "length: otrzymano argument, który nie jest łańcuchem"
 
-#: builtin.c:575
+#: builtin.c:554
 msgid "log: received non-numeric argument"
 msgstr "log: otrzymano argument, który nie jest liczbą"
 
-#: builtin.c:578
+#: builtin.c:557
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: otrzymano ujemny argument %g"
 
-#: builtin.c:776 builtin.c:781
+#: builtin.c:755 builtin.c:760 builtin.c:911
 msgid "fatal: must use `count$' on all formats or none"
 msgstr "fatal: należy użyć `count$' we wszystkich formatach lub nic"
 
-#: builtin.c:851
+#: builtin.c:830
 #, c-format
 msgid "field width is ignored for `%%' specifier"
 msgstr "szerokość pola jest ignorowana dla specyfikatora `%%'"
 
-#: builtin.c:853
+#: builtin.c:832
 #, c-format
 msgid "precision is ignored for `%%' specifier"
 msgstr "precyzja jest ignorowana dla specyfikatora `%%'"
 
-#: builtin.c:855
+#: builtin.c:834
 #, c-format
 msgid "field width and precision are ignored for `%%' specifier"
 msgstr "szerokość pola i precyzja są ignorowane dla specyfikatora `%%'"
 
-#: builtin.c:906
+#: builtin.c:885
 msgid "fatal: `$' is not permitted in awk formats"
 msgstr "fatal: `$' jest niedozwolony w formatach awk"
 
-#: builtin.c:915
+#: builtin.c:894
 msgid "fatal: arg count with `$' must be > 0"
 msgstr "fatal: argument count z `$' musi być > 0"
 
-#: builtin.c:919
+#: builtin.c:898
 #, c-format
 msgid "fatal: arg count %ld greater than total number of supplied arguments"
 msgstr ""
 "fatal: argument count %ld większy niż całkowita suma argumentów dostarczonych"
 
-#: builtin.c:923
+#: builtin.c:902
 msgid "fatal: `$' not permitted after period in format"
 msgstr "fatal: `$' jest niedozwolony po kropce w formacie"
 
-#: builtin.c:939
+#: builtin.c:921
 msgid "fatal: no `$' supplied for positional field width or precision"
 msgstr "fatal: brak `$' dla pozycyjnej szerokości pola lub precyzji"
 
-#: builtin.c:1009
+#: builtin.c:991
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "`l' jest bezsensowny w formatach awk; zignorowany"
 
-#: builtin.c:1013
+#: builtin.c:995
 msgid "fatal: `l' is not permitted in POSIX awk formats"
 msgstr "fatal: `l' jest niedozwolony w formatach POSIX awk"
 
-#: builtin.c:1026
+#: builtin.c:1008
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "`L' jest bezsensowny w formatach awk; zignorowany"
 
-#: builtin.c:1030
+#: builtin.c:1012
 msgid "fatal: `L' is not permitted in POSIX awk formats"
 msgstr "fatal: `L' jest niedozwolony w formatach POSIX awk"
 
-#: builtin.c:1043
+#: builtin.c:1025
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "`h' jest bezsensowny w formatach awk; zignorowany"
 
-#: builtin.c:1047
+#: builtin.c:1029
 msgid "fatal: `h' is not permitted in POSIX awk formats"
 msgstr "fatal: `h' jest niedozwolony w formatach POSIX awk"
 
-#: builtin.c:1463
+#: builtin.c:1055
+#, fuzzy, c-format
+msgid "[s]printf: value %g is too big for %%c format"
+msgstr "[s]printf: wartość %g jest poza zasięgiem dla formatu `%%%c'"
+
+#: builtin.c:1068
+#, fuzzy, c-format
+msgid "[s]printf: value %g is not a valid wide character"
+msgstr "[s]printf: wartość %g jest poza zasięgiem dla formatu `%%%c'"
+
+#: builtin.c:1454
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf: wartość %g jest poza zasięgiem dla formatu `%%%c'"
 
-#: builtin.c:1561
+#: builtin.c:1552
 #, c-format
 msgid "ignoring unknown format specifier character `%c': no argument converted"
 msgstr ""
 "pominięcie nieznanego formatu specyfikatora znaku `%c': nie skonwertowano "
 "argumentu"
 
-#: builtin.c:1566
+#: builtin.c:1557
 msgid "fatal: not enough arguments to satisfy format string"
 msgstr ""
 "fatal: brak wystarczającej liczby argumentów, aby zaspokoić łańcuch "
 "formatujÄ…cy"
 
-#: builtin.c:1568
+#: builtin.c:1559
 msgid "^ ran out for this one"
 msgstr "zabrakło ^"
 
-#: builtin.c:1575
+#: builtin.c:1566
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: specyfikator formatu nie posiada kontrolnej litery"
 
-#: builtin.c:1578
+#: builtin.c:1569
 msgid "too many arguments supplied for format string"
 msgstr "zbyt dużo podanych argumentów w łańcuchu formatującym"
 
-#: builtin.c:1634
+#: builtin.c:1625
 msgid "sprintf: no arguments"
 msgstr "sprintf: brak argumentów"
 
-#: builtin.c:1657 builtin.c:1668
+#: builtin.c:1648 builtin.c:1659
 msgid "printf: no arguments"
 msgstr "printf: brak argumentów"
 
-#: builtin.c:1711
+#: builtin.c:1702
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: otrzymano argument, który nie jest liczbą"
 
-#: builtin.c:1715
+#: builtin.c:1706
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: wywołana z ujemnym argumentem %g"
 
-#: builtin.c:1746
+#: builtin.c:1737
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: długość %g nie jest >= 1"
 
-#: builtin.c:1748
+#: builtin.c:1739
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: długość %g nie jest >= 0"
 
-#: builtin.c:1755
+#: builtin.c:1753
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: długość %g, która nie jest liczbą całkowitą, zostanie obcięta"
 
-#: builtin.c:1760
+#: builtin.c:1758
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr "substr: długość %g zbyt duża dla indeksu łańcucha, obcinanie do %g"
 
-#: builtin.c:1772
+#: builtin.c:1770
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: początkowy indeks %g jest nieprawidłowy, nastąpi użycie 1"
 
-#: builtin.c:1777
+#: builtin.c:1775
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr ""
 "substr: początkowy indeks %g, który nie jest liczbą całkowitą, zostanie "
 "obcięty"
 
-#: builtin.c:1802
+#: builtin.c:1798
 msgid "substr: source string is zero length"
 msgstr "substr: łańcuch źródłowy ma zerową długość"
 
-#: builtin.c:1818
+#: builtin.c:1812
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: początkowy indeks %g leży poza końcem łańcucha"
 
-#: builtin.c:1826
+#: builtin.c:1820
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -764,187 +780,193 @@ msgstr ""
 "substr: długość %g zaczynając od %g przekracza długość pierwszego argumentu "
 "(%lu)"
 
-#: builtin.c:1900
+#: builtin.c:1890
 msgid "strftime: format value in PROCINFO[\"strftime\"] has numeric type"
 msgstr ""
 "strftime: wartość formatu w PROCINFO[\"strftime\"] posiada typ numeryczny"
 
-#: builtin.c:1923
+#: builtin.c:1913
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: otrzymano drugi argument, który nie jest liczbą"
 
-#: builtin.c:1927
+#: builtin.c:1917
 msgid "strftime: second argument less than 0 or too big for time_t"
 msgstr "strftime: drugi argument mniejszy od 0 lub zbyt duży dla time_t"
 
-#: builtin.c:1934
+#: builtin.c:1924
 msgid "strftime: received non-string first argument"
 msgstr "strftime: otrzymano pierwszy argument, który nie jest łańcuchem"
 
-#: builtin.c:1941
+#: builtin.c:1931
 msgid "strftime: received empty format string"
 msgstr "strftime: otrzymano pusty łańcuch formatujący"
 
-#: builtin.c:2007
+#: builtin.c:1997
 msgid "mktime: received non-string argument"
 msgstr "mktime: otrzymano argument, który nie jest łańcuchem"
 
-#: builtin.c:2024
+#: builtin.c:2014
 msgid "mktime: at least one of the values is out of the default range"
 msgstr "mktime: przynajmniej jedna z wartości jest poza domyślnym zakresem"
 
-#: builtin.c:2059
+#: builtin.c:2049
 msgid "'system' function not allowed in sandbox mode"
 msgstr "funkcja 'system' nie jest dozwolona w trybie piaskownicy"
 
-#: builtin.c:2064
+#: builtin.c:2054
 msgid "system: received non-string argument"
 msgstr "system: otrzymano argument, który nie jest łańcuchem"
 
-#: builtin.c:2184
+#: builtin.c:2174
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "odwołanie do niezainicjowanego pola `$%d'"
 
-#: builtin.c:2271
+#: builtin.c:2259
 msgid "tolower: received non-string argument"
 msgstr "tolower: otrzymano argument, który nie jest łańcuchem"
 
-#: builtin.c:2305
+#: builtin.c:2290
 msgid "toupper: received non-string argument"
 msgstr "toupper: otrzymano argument, który nie jest łańcuchem"
 
-#: builtin.c:2341 mpfr.c:672
+#: builtin.c:2323 mpfr.c:679
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: otrzymano pierwszy argument, który nie jest liczbą"
 
-#: builtin.c:2343 mpfr.c:674
+#: builtin.c:2325 mpfr.c:681
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: otrzymano drugi argument, który nie jest liczbą"
 
-#: builtin.c:2362
+#: builtin.c:2344
 msgid "sin: received non-numeric argument"
 msgstr "sin: otrzymano argument, który nie jest liczbą"
 
-#: builtin.c:2378
+#: builtin.c:2360
 msgid "cos: received non-numeric argument"
 msgstr "cos: otrzymano argument, który nie jest liczbą"
 
-#: builtin.c:2431 mpfr.c:1156
+#: builtin.c:2413 mpfr.c:1176
 msgid "srand: received non-numeric argument"
 msgstr "srand: otrzymano argument, który nie jest liczbą"
 
-#: builtin.c:2462
+#: builtin.c:2444
 msgid "match: third argument is not an array"
 msgstr "match: otrzymano trzeci argument, który nie jest tablicą"
 
-#: builtin.c:2734
-msgid "gensub: third argument of 0 treated as 1"
+#: builtin.c:2705
+#, fuzzy, c-format
+msgid "gensub: third argument `%.*s' treated as 1"
 msgstr "gensub: trzeci argument 0 potraktowany jako 1"
 
-#: builtin.c:3030
+#: builtin.c:2720
+#, fuzzy, c-format
+msgid "gensub: third argument %g treated as 1"
+msgstr "gensub: trzeci argument 0 potraktowany jako 1"
+
+#: builtin.c:3020
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: otrzymano pierwszy argument, który nie jest liczbą"
 
-#: builtin.c:3032
+#: builtin.c:3022
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift: otrzymano drugi argument, który nie jest liczbą"
 
-#: builtin.c:3038
+#: builtin.c:3028
 #, c-format
 msgid "lshift(%f, %f): negative values will give strange results"
 msgstr "lshift(%f, %f): ujemne wartości spowodują dziwne wyniki"
 
-#: builtin.c:3040
+#: builtin.c:3030
 #, c-format
 msgid "lshift(%f, %f): fractional values will be truncated"
 msgstr "lshift(%f, %f): ułamkowe wartości zostaną obcięte"
 
-#: builtin.c:3042
+#: builtin.c:3032
 #, c-format
 msgid "lshift(%f, %f): too large shift value will give strange results"
 msgstr "lshift(%f, %f): zbyt duża wartość przesunięcia spowoduje dziwne wyniki"
 
-#: builtin.c:3067
+#: builtin.c:3057
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: otrzymano pierwszy argument, który nie jest liczbą"
 
-#: builtin.c:3069
+#: builtin.c:3059
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift: otrzymano drugi argument, który nie jest liczbą"
 
-#: builtin.c:3075
+#: builtin.c:3065
 #, c-format
 msgid "rshift(%f, %f): negative values will give strange results"
 msgstr "rshift(%f, %f): ujemne wartości spowodują dziwne wyniki"
 
-#: builtin.c:3077
+#: builtin.c:3067
 #, c-format
 msgid "rshift(%f, %f): fractional values will be truncated"
 msgstr "rshift(%f, %f): ułamkowe wartości zostaną obcięte"
 
-#: builtin.c:3079
+#: builtin.c:3069
 #, c-format
 msgid "rshift(%f, %f): too large shift value will give strange results"
 msgstr "rshift(%f, %f): zbyt duża wartość przesunięcia spowoduje dziwne wyniki"
 
-#: builtin.c:3104 mpfr.c:968
+#: builtin.c:3094 mpfr.c:988
 msgid "and: called with less than two arguments"
 msgstr "and: wywołano z mniej niż dwoma argumentami"
 
-#: builtin.c:3109
+#: builtin.c:3099
 #, c-format
 msgid "and: argument %d is non-numeric"
 msgstr "and: argument %d nie jest liczbÄ…"
 
-#: builtin.c:3113
+#: builtin.c:3103
 #, c-format
 msgid "and: argument %d negative value %g will give strange results"
 msgstr "and: argument %d ujemna wartość %g spowoduje dziwne wyniki"
 
-#: builtin.c:3136 mpfr.c:1000
+#: builtin.c:3126 mpfr.c:1020
 msgid "or: called with less than two arguments"
 msgstr "or: wywołano z mniej niż dwoma argumentami"
 
-#: builtin.c:3141
+#: builtin.c:3131
 #, c-format
 msgid "or: argument %d is non-numeric"
 msgstr "or: argument %d nie jest liczbÄ…"
 
-#: builtin.c:3145
+#: builtin.c:3135
 #, c-format
 msgid "or: argument %d negative value %g will give strange results"
 msgstr "or: argument %d ujemna wartość %g spowoduje dziwne wyniki"
 
-#: builtin.c:3167 mpfr.c:1031
+#: builtin.c:3157 mpfr.c:1051
 msgid "xor: called with less than two arguments"
 msgstr "xor: wywołano z mniej niż dwoma argumentami"
 
-#: builtin.c:3173
+#: builtin.c:3163
 #, c-format
 msgid "xor: argument %d is non-numeric"
 msgstr "xor: argument %d nie jest liczbÄ…"
 
-#: builtin.c:3177
+#: builtin.c:3167
 #, c-format
 msgid "xor: argument %d negative value %g will give strange results"
 msgstr "xor: argument %d ujemna wartość %g spowoduje dziwne wyniki"
 
-#: builtin.c:3202 mpfr.c:787
+#: builtin.c:3192 mpfr.c:807
 msgid "compl: received non-numeric argument"
 msgstr "compl: otrzymano argument, który nie jest liczbą"
 
-#: builtin.c:3208
+#: builtin.c:3198
 #, c-format
 msgid "compl(%f): negative value will give strange results"
 msgstr "compl(%f): ujemne wartości spowodują dziwne wyniki"
 
-#: builtin.c:3210
+#: builtin.c:3200
 #, c-format
 msgid "compl(%f): fractional value will be truncated"
 msgstr "compl(%f): ułamkowe wartości zostaną obcięte"
 
-#: builtin.c:3379
+#: builtin.c:3369
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: `%s' nie jest prawidłową kategorią lokalizacji"
@@ -1224,40 +1246,46 @@ msgstr ""
 msgid "watch var - set a watchpoint for a variable."
 msgstr ""
 
-#: command.y:1011 debug.c:401 msg.c:135
+#: command.y:901
+msgid ""
+"where [N] - (same as backtrace) print trace of all or N innermost (outermost "
+"if N < 0) frames."
+msgstr ""
+
+#: command.y:1013 debug.c:401 msg.c:135
 #, c-format
 msgid "error: "
 msgstr "błąd: "
 
-#: command.y:1051
+#: command.y:1053
 #, c-format
 msgid "can't read command (%s)\n"
 msgstr "nie można odczytać komendy (%s)\n"
 
-#: command.y:1065
+#: command.y:1067
 #, c-format
 msgid "can't read command (%s)"
 msgstr "nie można odczytać komendy (%s)"
 
-#: command.y:1116
+#: command.y:1118
 msgid "invalid character in command"
 msgstr "nieprawidłowy znak w komendzie"
 
-#: command.y:1152
+#: command.y:1154
 #, c-format
 msgid "unknown command - \"%.*s\", try help"
 msgstr "nieznana komenda - \"%.*s\", spróbuj pomoc"
 
-#: command.y:1222
+#: command.y:1224
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.y:1284
+#: command.y:1286
 msgid "invalid character"
 msgstr "nieprawidłowy znak"
 
-#: command.y:1455
+#: command.y:1457
 #, c-format
 msgid "undefined command: %s\n"
 msgstr "niezdefiniowana komenda: %s\n"
@@ -1778,68 +1806,70 @@ msgid "`return' not allowed in current context; statement ignored"
 msgstr ""
 "instrukcja `return' nie może być wywołana w tym kontekście; zignorowano"
 
-#: debug.c:5590
+#: debug.c:5604
 #, c-format
 msgid "No symbol `%s' in current context"
 msgstr "Brak symbolu `%s' w bieżącym kontekście"
 
-#: dfa.c:1118 dfa.c:1121 dfa.c:1142 dfa.c:1150 dfa.c:1162 dfa.c:1197
-#: dfa.c:1206 dfa.c:1209 dfa.c:1214 dfa.c:1228 dfa.c:1275
+#: dfa.c:1063 dfa.c:1066 dfa.c:1085 dfa.c:1095 dfa.c:1107 dfa.c:1143
+#: dfa.c:1152 dfa.c:1155 dfa.c:1160 dfa.c:1174 dfa.c:1222
 msgid "unbalanced ["
 msgstr "[ nie do pary"
 
-#: dfa.c:1174
+#: dfa.c:1119
 msgid "invalid character class"
 msgstr "nieprawidłowa klasa znaku"
 
-#: dfa.c:1316
+#: dfa.c:1265
 msgid "character class syntax is [[:space:]], not [:space:]"
 msgstr "składnia klasy znaku to [[:space:]], a nie [:space:]"
 
-#: dfa.c:1366
+#: dfa.c:1327
 msgid "unfinished \\ escape"
 msgstr "niedokończona sekwencja ucieczki \\"
 
-#: dfa.c:1513 regcomp.c:161
-msgid "Invalid content of \\{\\}"
+#: dfa.c:1474
+#, fuzzy
+msgid "invalid content of \\{\\}"
 msgstr "Nieprawidłowa zawartość \\{\\}"
 
-#: dfa.c:1516 regcomp.c:176
-msgid "Regular expression too big"
+#: dfa.c:1477
+#, fuzzy
+msgid "regular expression too big"
 msgstr "Wyrażenie regularne jest zbyt duże"
 
-#: dfa.c:1936
+#: dfa.c:1912
 msgid "unbalanced ("
 msgstr "( nie do pary"
 
-#: dfa.c:2062
+#: dfa.c:2038
 msgid "no syntax specified"
 msgstr "nie podano składni"
 
-#: dfa.c:2070
+#: dfa.c:2046
 msgid "unbalanced )"
 msgstr ") nie do pary"
 
-#: eval.c:394
+#: eval.c:396
 #, c-format
 msgid "unknown nodetype %d"
 msgstr "nieznany typ węzła %d"
 
-#: eval.c:405 eval.c:419
+#: eval.c:407 eval.c:421
 #, c-format
 msgid "unknown opcode %d"
 msgstr "nieznany opcode %d"
 
-#: eval.c:416
+#: eval.c:418
 #, c-format
 msgid "opcode %s not an operator or keyword"
 msgstr "opcode %s nie jest operatorem ani słowem kluczowym"
 
-#: eval.c:472
+#: eval.c:474
 msgid "buffer overflow in genflags2str"
 msgstr "przepełnienie bufora w genflags2str"
 
-#: eval.c:675
+#: eval.c:676
 #, c-format
 msgid ""
 "\n"
@@ -1850,216 +1880,216 @@ msgstr ""
 "\t# Stos Wywoławczy Funkcji:\n"
 "\n"
 
-#: eval.c:704
+#: eval.c:705
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "`IGNORECASE' jest rozszerzeniem gawk"
 
-#: eval.c:736
+#: eval.c:737
 msgid "`BINMODE' is a gawk extension"
 msgstr "`BINMODE' jest rozszerzeniem gawk"
 
-#: eval.c:794
+#: eval.c:795
 #, c-format
 msgid "BINMODE value `%s' is invalid, treated as 3"
 msgstr "wartość BINMODE `%s' jest nieprawidłowa, przyjęto ją jako 3"
 
-#: eval.c:885
+#: eval.c:912
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "zła specyfikacja `%sFMT' `%s'"
 
-#: eval.c:969
+#: eval.c:996
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "wyłączenie `--lint' z powodu przypisania do `LINT'"
 
-#: eval.c:1147
+#: eval.c:1174
 #, c-format
 msgid "reference to uninitialized argument `%s'"
 msgstr "odwołanie do niezainicjowanego argumentu `%s'"
 
-#: eval.c:1148
+#: eval.c:1175
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "odwołanie do niezainicjowanej zmiennej `%s'"
 
-#: eval.c:1166
+#: eval.c:1193
 msgid "attempt to field reference from non-numeric value"
 msgstr "próba odwołania do pola poprzez nienumeryczną wartość"
 
-#: eval.c:1168
+#: eval.c:1195
 msgid "attempt to field reference from null string"
 msgstr "próba odwołania z zerowego łańcucha"
 
-#: eval.c:1176
+#: eval.c:1203
 #, c-format
 msgid "attempt to access field %ld"
 msgstr "próba dostępu do pola %ld"
 
-#: eval.c:1185
+#: eval.c:1212
 #, c-format
 msgid "reference to uninitialized field `$%ld'"
 msgstr "odwołanie do niezainicjowanego pola `$%ld'"
 
-#: eval.c:1272
+#: eval.c:1299
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr ""
 "funkcja `%s' została wywołana z większą ilością argumentów niż zostało to "
 "zadeklarowane"
 
-#: eval.c:1473
+#: eval.c:1500
 #, c-format
 msgid "unwind_stack: unexpected type `%s'"
 msgstr "unwind_stack: niespodziewany typ `%s'"
 
-#: eval.c:1569
+#: eval.c:1596
 msgid "division by zero attempted in `/='"
 msgstr "próba dzielenia przez zero w `/='"
 
-#: eval.c:1576
+#: eval.c:1603
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "próba dzielenia przez zero w `%%='"
 
-#: ext.c:89 ext.c:171
+#: ext.c:65 ext.c:147
 msgid "extensions are not allowed in sandbox mode"
 msgstr "rozszerzenia nie sÄ… dozwolone w trybie piaskownicy"
 
-#: ext.c:92
+#: ext.c:68
 msgid "-l / @load are gawk extensions"
 msgstr "-l / @load sÄ… rozszerzeniami gawk"
 
-#: ext.c:95
+#: ext.c:71
 msgid "load_ext: received NULL lib_name"
 msgstr "load_ext: otrzymano NULL lib_name"
 
-#: ext.c:98
+#: ext.c:74
 #, c-format
 msgid "load_ext: cannot open library `%s' (%s)\n"
 msgstr "load_ext: nie można otworzyć biblioteki `%s' (%s)\n"
 
-#: ext.c:104
+#: ext.c:80
 #, c-format
 msgid ""
 "load_ext: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
 msgstr ""
 "load_ext: biblioteka `%s': nie definiuje `plugin_is_GPL_compatible' (%s)\n"
 
-#: ext.c:110
+#: ext.c:86
 #, c-format
 msgid "load_ext: library `%s': cannot call function `%s' (%s)\n"
 msgstr "load_ext: biblioteka `%s': nie można wywołać funkcji `%s' (%s)\n"
 
-#: ext.c:114
+#: ext.c:90
 #, c-format
 msgid "load_ext: library `%s' initialization routine `%s' failed\n"
 msgstr ""
 "load_ext: funkcja inicjalizująca `%s' biblioteki `%s' nie powiodła się\n"
 
-#: ext.c:174
+#: ext.c:150
 msgid "`extension' is a gawk extension"
 msgstr "`extension' jest rozszerzeniem gawk"
 
-#: ext.c:177
+#: ext.c:153
 msgid "extension: received NULL lib_name"
 msgstr "extension: otrzymano NULL lib_name"
 
-#: ext.c:180
+#: ext.c:156
 #, c-format
 msgid "extension: cannot open library `%s' (%s)"
 msgstr "extension: nie można otworzyć biblioteki `%s' (%s)"
 
-#: ext.c:186
+#: ext.c:162
 #, c-format
 msgid ""
 "extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)"
 msgstr ""
 "extension: biblioteka `%s': nie definiuje `plugin_is_GPL_compatible' (%s)"
 
-#: ext.c:190
+#: ext.c:166
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)"
 msgstr "extension: biblioteka `%s': nie można wywołać funkcji `%s' (%s)"
 
-#: ext.c:221
+#: ext.c:197
 msgid "make_builtin: missing function name"
 msgstr "make_builtin: brakujÄ…ca nazwa funkcji"
 
-#: ext.c:236
+#: ext.c:212
 #, c-format
 msgid "make_builtin: can't redefine function `%s'"
 msgstr "make_builtin: nie można zredefiniować funkcji `%s'"
 
-#: ext.c:240
+#: ext.c:216
 #, c-format
 msgid "make_builtin: function `%s' already defined"
 msgstr "make_builtin: funkcja `%s' została już zdefiniowana"
 
-#: ext.c:244
+#: ext.c:220
 #, c-format
 msgid "make_builtin: function name `%s' previously defined"
 msgstr "make_builtin: nazwa funkcji `%s' została zdefiniowana wcześniej"
 
-#: ext.c:246
+#: ext.c:222
 #, c-format
 msgid "make_builtin: can't use gawk built-in `%s' as function name"
 msgstr "make_builtin: nie można użyć wbudowanej w gawk `%s' jako nazwy funkcji"
 
-#: ext.c:249 ext.c:304
+#: ext.c:225 ext.c:280
 #, c-format
 msgid "make_builtin: negative argument count for function `%s'"
 msgstr "make_builtin: ujemny licznik argumentów dla funkcji `%s'"
 
-#: ext.c:276
+#: ext.c:252
 msgid "extension: missing function name"
 msgstr "extension: brakujÄ…ca nazwa funkcji"
 
-#: ext.c:279 ext.c:283
+#: ext.c:255 ext.c:259
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: nieprawidłowy znak `%c' w nazwie funkcji `%s'"
 
-#: ext.c:291
+#: ext.c:267
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: nie można zredefiniować funkcji `%s'"
 
-#: ext.c:295
+#: ext.c:271
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr "extension: funkcja `%s' została już zdefiniowana"
 
-#: ext.c:299
+#: ext.c:275
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "extension: nazwa funkcji `%s' została zdefiniowana wcześniej"
 
-#: ext.c:301
+#: ext.c:277
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr "extension: nie można użyć wbudowanej w gawk `%s' jako nazwy funkcji"
 
-#: ext.c:375
+#: ext.c:351
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "funkcja `%s' zdefiniowana aby pobrać nie więcej niż %d argument(ów)"
 
-#: ext.c:378
+#: ext.c:354
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "funkcja `%s': brakuje #%d argumentu"
 
-#: ext.c:395
+#: ext.c:371
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "funkcja `%s': argument #%d: próba użycia skalaru jako tablicy"
 
-#: ext.c:399
+#: ext.c:375
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr "funkcja `%s': argument #%d: próba użycia tablicy jako skalaru"
 
-#: ext.c:413
+#: ext.c:389
 msgid "dynamic loading of library not supported"
 msgstr "dynamiczne Å‚adowanie biblioteki nie jest wspierane"
 
@@ -2203,7 +2233,7 @@ msgstr "wait: wywołana ze zbyt dużą ilością argumentów"
 msgid "inplace_begin: in-place editing already active"
 msgstr "inplace_begin: edycja w miejscu jest już aktywna"
 
-#: extension/inplace.c:133 extension/inplace.c:207
+#: extension/inplace.c:133 extension/inplace.c:210
 #, c-format
 msgid "inplace_begin: expects 2 arguments but called with %d"
 msgstr "inplace_begin: spodziewano się 2 argumentów, a otrzymano %d"
@@ -2234,55 +2264,55 @@ msgstr "inplace_begin: `%s' nie jest zwykłym plikiem"
 msgid "inplace_begin: mkstemp(`%s') failed (%s)"
 msgstr "inplace_begin: wywołanie mkstemp(`%s') nie powiodło się (%s)"
 
-#: extension/inplace.c:178
+#: extension/inplace.c:181
 #, c-format
 msgid "inplace_begin: chmod failed (%s)"
 msgstr "inplace_begin: funkcja chmod nie powiodła się (%s)"
 
-#: extension/inplace.c:185
+#: extension/inplace.c:188
 #, c-format
 msgid "inplace_begin: dup(stdout) failed (%s)"
 msgstr "inplace_begin: wywołanie dup(stdout) nie powiodło się (%s)"
 
-#: extension/inplace.c:188
+#: extension/inplace.c:191
 #, c-format
 msgid "inplace_begin: dup2(%d, stdout) failed (%s)"
 msgstr "inplace_begin: wywołanie dup2(%d, stdout) nie powiodło się (%s)"
 
-#: extension/inplace.c:191
+#: extension/inplace.c:194
 #, c-format
 msgid "inplace_begin: close(%d) failed (%s)"
 msgstr "inplace_begin: wywołanie close(%d) nie powiodło się (%s)"
 
-#: extension/inplace.c:210
+#: extension/inplace.c:213
 msgid "inplace_end: cannot retrieve 1st argument as a string filename"
 msgstr "inplace_end: nie można pobrać pierwszego argumentu jako nazwy pliku"
 
-#: extension/inplace.c:217
+#: extension/inplace.c:220
 msgid "inplace_end: in-place editing not active"
 msgstr "inplace_end: edycja w miejscu nie jest aktywna"
 
-#: extension/inplace.c:223
+#: extension/inplace.c:226
 #, c-format
 msgid "inplace_end: dup2(%d, stdout) failed (%s)"
 msgstr "inplace_end: wywołanie dup2(%d, stdout) nie powiodło się (%s)"
 
-#: extension/inplace.c:226
+#: extension/inplace.c:229
 #, c-format
 msgid "inplace_end: close(%d) failed (%s)"
 msgstr "inplace_end: wywołanie close(%d) nie powiodło się (%s)"
 
-#: extension/inplace.c:230
+#: extension/inplace.c:233
 #, c-format
 msgid "inplace_end: fsetpos(stdout) failed (%s)"
 msgstr "inplace_end: wywołanie fsetpos(stdout) nie powiodło się (%s)"
 
-#: extension/inplace.c:243
+#: extension/inplace.c:246
 #, c-format
 msgid "inplace_end: link(`%s', `%s') failed (%s)"
 msgstr "inplace_end: wywołanie link(`%s', `%s') nie powiodło się (%s)"
 
-#: extension/inplace.c:253
+#: extension/inplace.c:256
 #, c-format
 msgid "inplace_end: rename(`%s', `%s') failed (%s)"
 msgstr "inplace_end: wywołanie rename(`%s', `%s') nie powiodło się (%s)"
@@ -2324,50 +2354,54 @@ msgstr "readfile: wywołana ze zbyt dużą ilością argumentów"
 msgid "readfile: called with no arguments"
 msgstr "readfile: wywołano bez argumentów"
 
-#: extension/rwarray.c:124
+#: extension/revoutput.c:125
+msgid "revoutput: could not initialize REVOUT variable"
+msgstr ""
+
+#: extension/rwarray.c:124 extension/rwarray0.c:109
 msgid "writea: called with too many arguments"
 msgstr "writea: wywołana ze zbyt dużą ilością argumentów"
 
-#: extension/rwarray.c:131
+#: extension/rwarray.c:131 extension/rwarray0.c:116
 #, c-format
 msgid "do_writea: argument 0 is not a string\n"
 msgstr "do_writea: argument 0 nie jest tekstem\n"
 
-#: extension/rwarray.c:137
+#: extension/rwarray.c:137 extension/rwarray0.c:122
 #, c-format
 msgid "do_writea: argument 1 is not an array\n"
 msgstr "do_writea: argument 1 nie jest tablicÄ…\n"
 
-#: extension/rwarray.c:184
+#: extension/rwarray.c:184 extension/rwarray0.c:169
 #, c-format
 msgid "write_array: could not flatten array\n"
 msgstr "write_array: nie można spłaszczyć tablicy\n"
 
-#: extension/rwarray.c:198
+#: extension/rwarray.c:198 extension/rwarray0.c:183
 #, c-format
 msgid "write_array: could not release flattened array\n"
 msgstr "write_array: nie można było zwolnić spłaszczonej tablicy\n"
 
-#: extension/rwarray.c:280
+#: extension/rwarray.c:280 extension/rwarray0.c:265
 msgid "reada: called with too many arguments"
 msgstr "reada: wywołana ze zbyt dużą ilością argumentów"
 
-#: extension/rwarray.c:287
+#: extension/rwarray.c:287 extension/rwarray0.c:272
 #, c-format
 msgid "do_reada: argument 0 is not a string\n"
 msgstr "do_reada: argument 0 nie jest tekstem\n"
 
-#: extension/rwarray.c:293
+#: extension/rwarray.c:293 extension/rwarray0.c:278
 #, c-format
 msgid "do_reada: argument 1 is not an array\n"
 msgstr "do_reada: argument 1 nie jest tablicÄ…\n"
 
-#: extension/rwarray.c:337
+#: extension/rwarray.c:337 extension/rwarray0.c:322
 #, c-format
 msgid "do_reada: clear_array failed\n"
 msgstr "do_reada: clear_array nie powiodła się\n"
 
-#: extension/rwarray.c:374
+#: extension/rwarray.c:374 extension/rwarray0.c:358
 #, c-format
 msgid "read_array: set_array_element failed\n"
 msgstr "read_array: set_array_element nie powiodła się\n"
@@ -2396,88 +2430,88 @@ msgstr "sleep: argument jest ujemny"
 msgid "sleep: not supported on this platform"
 msgstr "sleep: funkcja nie jest wspierana na tej platformie"
 
-#: field.c:345
+#: field.c:346
 msgid "NF set to negative value"
 msgstr "NF ustawiony na wartość ujemną"
 
-#: field.c:971 field.c:978 field.c:982
+#: field.c:958 field.c:965 field.c:969
 msgid "split: fourth argument is a gawk extension"
 msgstr "split: czwarty argument jest rozszerzeniem gawk"
 
-#: field.c:975
+#: field.c:962
 msgid "split: fourth argument is not an array"
 msgstr "split: czwarty argument nie jest tablicÄ…"
 
-#: field.c:989
+#: field.c:976
 msgid "split: second argument is not an array"
 msgstr "split: drugi argument nie jest tablicÄ…"
 
-#: field.c:993
+#: field.c:980
 msgid "split: cannot use the same array for second and fourth args"
 msgstr ""
 "split: nie można użyć tej samej tablicy dla drugiego i czwartego argumentu"
 
-#: field.c:998
+#: field.c:985
 msgid "split: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "split: nie można użyć podtablicy drugiego argumentu dla czwartego argumentu"
 
-#: field.c:1001
+#: field.c:988
 msgid "split: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "split: nie można użyć podtablicy czwartego argumentu dla drugiego argumentu"
 
-#: field.c:1032
+#: field.c:1019
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: zerowy łańcuch dla trzeciego argumentu jest rozszerzeniem gawk"
 
-#: field.c:1072
+#: field.c:1059
 msgid "patsplit: fourth argument is not an array"
 msgstr "patsplit: czwarty argument nie jest tablicÄ…"
 
-#: field.c:1077
+#: field.c:1064
 msgid "patsplit: second argument is not an array"
 msgstr "patsplit: drugi argument nie jest tablicÄ…"
 
-#: field.c:1083
+#: field.c:1070
 msgid "patsplit: third argument must be non-null"
 msgstr "patsplit: trzeci argument nie może być pusty"
 
-#: field.c:1087
+#: field.c:1074
 msgid "patsplit: cannot use the same array for second and fourth args"
 msgstr ""
 "patsplit: nie można użyć tej samej tablicy dla drugiego i czwartego argumentu"
 
-#: field.c:1092
+#: field.c:1079
 msgid "patsplit: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "patsplit: nie można użyć podtablicy drugiego argumentu dla czwartego "
 "argumentu"
 
-#: field.c:1095
+#: field.c:1082
 msgid "patsplit: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "patsplit: nie można użyć podtablicy czwartego argumentu dla drugiego "
 "argumentu"
 
-#: field.c:1133
+#: field.c:1120
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "`FIELDWIDTHS' jest rozszerzeniem gawk"
 
-#: field.c:1197
+#: field.c:1184
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "nieprawidłowa wartość FIELDWIDTHS, w pobliżu `%s'"
 
-#: field.c:1270
+#: field.c:1257
 msgid "null string for `FS' is a gawk extension"
 msgstr "zerowy łańcuch dla `FS' jest rozszerzeniem gawk"
 
-#: field.c:1274
+#: field.c:1261
 msgid "old awk does not support regexps as value of `FS'"
 msgstr "stary awk nie wspiera wyrażeń regularnych jako wartości `FS'"
 
-#: field.c:1393
+#: field.c:1380
 msgid "`FPAT' is a gawk extension"
 msgstr "`FPAT' jest rozszerzeniem gawk"
 
@@ -2493,20 +2527,20 @@ msgstr "node_to_awk_value: otrzymano null node"
 msgid "node_to_awk_value: received null val"
 msgstr "node_to_awk_value: otrzymano null val"
 
-#: gawkapi.c:807
+#: gawkapi.c:809
 msgid "remove_element: received null array"
 msgstr "remove_element: otrzymano tablicÄ™ null"
 
-#: gawkapi.c:810
+#: gawkapi.c:812
 msgid "remove_element: received null subscript"
 msgstr "remove_element: otrzymano null subscript"
 
-#: gawkapi.c:947
+#: gawkapi.c:949
 #, c-format
 msgid "api_flatten_array: could not convert index %d\n"
 msgstr "api_flatten_array: nie można było skonwertować indeksu %d\n"
 
-#: gawkapi.c:952
+#: gawkapi.c:954
 #, c-format
 msgid "api_flatten_array: could not convert value %d\n"
 msgstr "api_flatten_array: nie można było skonwertować wartości %d\n"
@@ -2566,318 +2600,300 @@ msgstr "%s: opcja '-W %s' nie może mieć argumentów\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: opcja '-W %s' wymaga argumentu\n"
 
-#: io.c:392
+#: io.c:423
 #, c-format
 msgid "command line argument `%s' is a directory: skipped"
 msgstr "argument linii poleceń `%s' jest katalogiem: pominięto"
 
-#: io.c:395 io.c:513
+#: io.c:426 io.c:544
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "nie można otworzyć pliku `%s' do czytania (%s)"
 
-#: io.c:640
+#: io.c:671
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "zamknięcie fd %d (`%s') nie powiodło się (%s)"
 
-#: io.c:716
+#: io.c:749
 msgid "redirection not allowed in sandbox mode"
 msgstr "przekierowanie nie jest dozwolone w trybie piaskownicy"
 
-#: io.c:750
+#: io.c:783
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "wyrażenie w przekierowaniu `%s' ma tylko wartość numeryczną"
 
-#: io.c:756
+#: io.c:789
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "wyrażenie dla przekierowania `%s' ma zerową wartość łańcucha"
 
-#: io.c:761
+#: io.c:794
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "nazwa pliku `%s' dla przekierowania `%s' może być rezultatem logicznego "
 "wyrażenia"
 
-#: io.c:809
+#: io.c:842
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "niepotrzebne mieszanie `>' i `>>' dla pliku `%.*s'"
 
-#: io.c:863
+#: io.c:896
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "nie można otworzyć potoku `%s' jako wyjścia (%s)"
 
-#: io.c:873
+#: io.c:906
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "nie można otworzyć potoku `%s' jako wejścia (%s)"
 
-#: io.c:904
+#: io.c:937
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr ""
 "nie można otworzyć dwukierunkowego potoku `%s' jako wejścia/wyjścia (%s)"
 
-#: io.c:986
+#: io.c:1019
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "nie można przekierować z `%s' (%s)"
 
-#: io.c:989
+#: io.c:1022
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "nie można przekierować do `%s' (%s)"
 
-#: io.c:1040
+#: io.c:1073
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "osiągnięto systemowy limit otwartych plików: rozpoczęcie multipleksowania "
 "deskryptorów plików"
 
-#: io.c:1056
+#: io.c:1089
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "zamknięcie `%s' nie powiodło się (%s)."
 
-#: io.c:1064
+#: io.c:1097
 msgid "too many pipes or input files open"
 msgstr "zbyt dużo otwartych potoków lub plików wejściowych"
 
-#: io.c:1086
+#: io.c:1119
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: drugim argumentem musi być `to' lub `from'"
 
-#: io.c:1103
+#: io.c:1136
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr ""
 "close: `%.*s' nie jest ani otwartym plikiem, ani potokiem, ani procesem"
 
-#: io.c:1108
+#: io.c:1141
 msgid "close of redirection that was never opened"
 msgstr "zamknięcie przekierowania, które nigdy nie zostało otwarte"
 
-#: io.c:1205
+#: io.c:1238
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: przekierowanie `%s' nie zostało otwarte z `|&', drugi argument "
 "zignorowany"
 
-#: io.c:1222
+#: io.c:1255
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "status awarii (%d) podczas zamykania potoku `%s' (%s)"
 
-#: io.c:1225
+#: io.c:1258
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "status awarii (%d) podczas zamykania pliku `%s' (%s)"
 
-#: io.c:1245
+#: io.c:1278
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "brak jawnego zamknięcia gniazdka `%s'"
 
-#: io.c:1248
+#: io.c:1281
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "brak jawnego zamknięcia procesu pomocniczego `%s'"
 
-#: io.c:1251
+#: io.c:1284
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "brak jawnego zamknięcia potoku `%s'"
 
-#: io.c:1254
+#: io.c:1287
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "brak jawnego zamknięcia pliku `%s'"
 
-#: io.c:1284 io.c:1342 main.c:864 main.c:906
+#: io.c:1317 io.c:1375 main.c:628 main.c:670
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "błąd podczas zapisu na standardowe wyjście (%s)"
 
-#: io.c:1289 io.c:1348 main.c:866
+#: io.c:1322 io.c:1381 main.c:630
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "błąd podczas zapisu na standardowe wyjście diagnostyczne (%s)"
 
-#: io.c:1297
+#: io.c:1330
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "opróżnienie potoku `%s' nie powiodło się (%s)."
 
-#: io.c:1300
+#: io.c:1333
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr ""
 "opróżnienie potoku do `%s' przez proces pomocniczy nie powiodło się (%s)."
 
-#: io.c:1303
+#: io.c:1336
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "opróżnienie pliku `%s' nie powiodło się (%s)."
 
-#: io.c:1420
+#: io.c:1453
 #, c-format
 msgid "local port %s invalid in `/inet'"
 msgstr "nieprawidłowy lokalny port %s w `/inet'"
 
-#: io.c:1438
+#: io.c:1471
 #, c-format
 msgid "remote host and port information (%s, %s) invalid"
 msgstr "informacje o zdalnym hoście i porcie są nieprawidłowe (%s, %s)"
 
-#: io.c:1590
-#, c-format
-msgid "no (known) protocol supplied in special filename `%s'"
-msgstr "nie dostarczono (znanego) protokołu w specjalnym pliku `%s'"
-
-#: io.c:1604
-#, c-format
-msgid "special file name `%s' is incomplete"
-msgstr "specjalna nazwa pliku `%s' jest niekompletna"
-
-#: io.c:1621
-msgid "must supply a remote hostname to `/inet'"
-msgstr "należy dostarczyć nazwę zdalnego hosta do `/inet'"
-
-#: io.c:1639
-msgid "must supply a remote port to `/inet'"
-msgstr "należy dostarczyć numer zdalnego portu do `/inet'"
-
-#: io.c:1685
+#: io.c:1673
 msgid "TCP/IP communications are not supported"
 msgstr "Komunikacja TCP/IP nie jest wspierana"
 
-#: io.c:1867
+#: io.c:1854
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "nie można otworzyć `%s', tryb `%s'"
 
-#: io.c:1917
+#: io.c:1904
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "zamknięcie nadrzędnego pty nie powiodło się (%s)"
 
-#: io.c:1919 io.c:2105 io.c:2305
+#: io.c:1906 io.c:2092 io.c:2293
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr ""
 "zamknięcie standardowego wyjścia w procesie potomnym nie powiodło się (%s)"
 
-#: io.c:1922
+#: io.c:1909
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 "przesunięcie podległego pty na standardowe wyjście w procesie potomnym nie "
 "powiodło się (dup: %s)"
 
-#: io.c:1924 io.c:2110
+#: io.c:1911 io.c:2097
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr ""
 "zamknięcie standardowego wejścia w procesie potomnym nie powiodło się (%s)"
 
-#: io.c:1927
+#: io.c:1914
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 "przesunięcie podległego pty na standardowe wejście w procesie potomnym nie "
 "powiodło się (dup: %s)"
 
-#: io.c:1929 io.c:1951
+#: io.c:1916 io.c:1938
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "zamknięcie podległego pty nie powiodło się (%s)"
 
-#: io.c:2040 io.c:2108 io.c:2276 io.c:2308
+#: io.c:2027 io.c:2095 io.c:2264 io.c:2296
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr ""
 "przesunięcie potoku na standardowe wyjście w procesie potomnym nie powiodło "
 "siÄ™ (dup: %s)"
 
-#: io.c:2047 io.c:2113
+#: io.c:2034 io.c:2100
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr ""
 "przesunięcie potoku na standardowe wejście w procesie potomnym nie powiodło "
 "siÄ™ (dup: %s)"
 
-#: io.c:2073 io.c:2298
+#: io.c:2060 io.c:2286
 msgid "restoring stdout in parent process failed\n"
 msgstr ""
 "odzyskanie standardowego wyjścia w procesie potomnym nie powiodło się\n"
 
-#: io.c:2081
+#: io.c:2068
 msgid "restoring stdin in parent process failed\n"
 msgstr ""
 "odzyskanie standardowego wejścia w procesie potomnym nie powiodło się\n"
 
-#: io.c:2116 io.c:2310 io.c:2324
+#: io.c:2103 io.c:2298 io.c:2313
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "zamknięcie potoku nie powiodło się (%s)"
 
-#: io.c:2174
+#: io.c:2162
 msgid "`|&' not supported"
 msgstr "`|&' nie jest wspierany"
 
-#: io.c:2261
+#: io.c:2249
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "nie można otworzyć potoku `%s' (%s)"
 
-#: io.c:2318
+#: io.c:2307
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "nie można utworzyć procesu potomnego dla `%s' (fork: %s)"
 
-#: io.c:2790
+#: io.c:2734
 msgid "register_input_parser: received NULL pointer"
 msgstr "register_input_parser: otrzymano wskaźnik NULL"
 
-#: io.c:2818
+#: io.c:2762
 #, c-format
 msgid "input parser `%s' conflicts with previously installed input parser `%s'"
 msgstr ""
 "parser wejścia `%s' konfliktuje z poprzednio zainstalowanym parserem `%s'"
 
-#: io.c:2825
+#: io.c:2769
 #, c-format
 msgid "input parser `%s' failed to open `%s'"
 msgstr "parser wejścia `%s': nie powiodło się otwarcie `%s'"
 
-#: io.c:2845
+#: io.c:2789
 msgid "register_output_wrapper: received NULL pointer"
 msgstr "register_output_wrapper: otrzymano wskaźnik NULL"
 
-#: io.c:2873
+#: io.c:2817
 #, c-format
 msgid ""
 "output wrapper `%s' conflicts with previously installed output wrapper `%s'"
 msgstr ""
 "otoczka wyjścia `%s' konfliktuje z poprzednio zainstalowaną otoczką `%s'"
 
-#: io.c:2880
+#: io.c:2824
 #, c-format
 msgid "output wrapper `%s' failed to open `%s'"
 msgstr "otoczka wyjścia `%s': nie powiodło się otwarcie `%s'"
 
-#: io.c:2901
+#: io.c:2845
 msgid "register_output_processor: received NULL pointer"
 msgstr "register_output_processor: otrzymano wskaźnik NULL"
 
-#: io.c:2930
+#: io.c:2874
 #, c-format
 msgid ""
 "two-way processor `%s' conflicts with previously installed two-way processor "
@@ -2886,212 +2902,199 @@ msgstr ""
 "dwukierunkowy procesor `%s' konfliktuje z poprzednio zainstalowanym "
 "procesorem `%s'"
 
-#: io.c:2939
+#: io.c:2883
 #, c-format
 msgid "two way processor `%s' failed to open `%s'"
 msgstr "dwukierunkowy procesor `%s' zawiódł w otwarciu `%s'"
 
-#: io.c:3064
+#: io.c:3008
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "plik danych `%s' jest pusty"
 
-#: io.c:3106 io.c:3114
+#: io.c:3050 io.c:3058
 msgid "could not allocate more input memory"
 msgstr "nie można zarezerwować więcej pamięci wejściowej"
 
-#: io.c:3682
+#: io.c:3636
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "wieloznakowa wartość `RS' jest rozszerzeniem gawk"
 
-#: io.c:3771
+#: io.c:3783
 msgid "IPv6 communication is not supported"
 msgstr "Komunikacja IPv6 nie jest wspierana"
 
-#: main.c:405
-msgid "empty argument to `-e/--source' ignored"
-msgstr "pusty argument dla opcji `-e/--source' został zignorowany"
-
-#: main.c:495
-#, c-format
-msgid "%s: option `-W %s' unrecognized, ignored\n"
-msgstr "%s: opcja `-W %s' nierozpoznana i zignorowana\n"
-
-#: main.c:541
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: opcja musi mieć argument -- %c\n"
-
-#: main.c:562
+#: main.c:321
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
 "zmienna środowiskowa `POSIXLY_CORRECT' ustawiona: `--posix' został włączony"
 
-#: main.c:568
+#: main.c:327
 msgid "`--posix' overrides `--traditional'"
 msgstr "opcja `--posix' zostanie użyta nad `--traditional'"
 
-#: main.c:579
+#: main.c:338
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "`--posix'/`--traditional' użyte nad opcją `--non-decimal-data'"
 
-#: main.c:583
+#: main.c:342
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr ""
 "uruchamianie %s setuid root może być problemem pod względem bezpieczeństwa"
 
-#: main.c:588
+#: main.c:346
 msgid "`--posix' overrides `--characters-as-bytes'"
 msgstr "opcja `--posix' zostanie użyta nad `--characters-as-bytes'"
 
-#: main.c:647
+#: main.c:404
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "nie można ustawić trybu binarnego na standardowym wejściu (%s)"
 
-#: main.c:650
+#: main.c:407
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "nie można ustawić trybu binarnego na standardowym wyjściu (%s)"
 
-#: main.c:652
+#: main.c:409
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "nie można ustawić trybu binarnego na wyjściu diagnostycznym (%s)"
 
-#: main.c:710
+#: main.c:469
 msgid "no program text at all!"
 msgstr "brak tekstu programu!"
 
-#: main.c:799
+#: main.c:563
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 "Użycie: %s [styl opcji POSIX lub GNU] -f plik_z_programem [--] plik ...\n"
 
-#: main.c:801
+#: main.c:565
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr "Użycie: %s [styl opcji POSIX lub GNU] [--] %cprogram%c plik ...\n"
 
-#: main.c:806
+#: main.c:570
 msgid "POSIX options:\t\tGNU long options: (standard)\n"
 msgstr "Opcje POSIX:\t\tDÅ‚ugie opcje GNU (standard):\n"
 
-#: main.c:807
+#: main.c:571
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f program\t\t--file=program\n"
 
-#: main.c:808
+#: main.c:572
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F fs\t\t\t--field-separator=fs\n"
 
-#: main.c:809
+#: main.c:573
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v zmienna=wartość\t--assign=zmienna=wartość\n"
 
-#: main.c:810
+#: main.c:574
 msgid "Short options:\t\tGNU long options: (extensions)\n"
 msgstr "Krótkie opcje:\t\tDługie opcje GNU: (rozszerzenia)\n"
 
-#: main.c:811
+#: main.c:575
 msgid "\t-b\t\t\t--characters-as-bytes\n"
 msgstr "\t-b\t\t\t--characters-as-bytes\n"
 
-#: main.c:812
+#: main.c:576
 msgid "\t-c\t\t\t--traditional\n"
 msgstr "\t-c\t\t\t--traditional\n"
 
-#: main.c:813
+#: main.c:577
 msgid "\t-C\t\t\t--copyright\n"
 msgstr "\t-C\t\t\t--copyright\n"
 
-#: main.c:814
+#: main.c:578
 msgid "\t-d[file]\t\t--dump-variables[=file]\n"
 msgstr "\t-d[plik]\t\t--dump-variables[=plik]\n"
 
-#: main.c:815
+#: main.c:579
 msgid "\t-D[file]\t\t--debug[=file]\n"
 msgstr "\t-D[plik]\t\t--debug[=plik]\n"
 
-#: main.c:816
+#: main.c:580
 msgid "\t-e 'program-text'\t--source='program-text'\n"
 msgstr "\t-e 'tekst-programu'\t--source='tekst-programu'\n"
 
-#: main.c:817
+#: main.c:581
 msgid "\t-E file\t\t\t--exec=file\n"
 msgstr "\t-E plik\t\t\t--exec=plik\n"
 
-#: main.c:818
+#: main.c:582
 msgid "\t-g\t\t\t--gen-pot\n"
 msgstr "\t-g\t\t\t--gen-pot\n"
 
-#: main.c:819
+#: main.c:583
 msgid "\t-h\t\t\t--help\n"
 msgstr "\t-h\t\t\t--help\n"
 
-#: main.c:820
+#: main.c:584
 msgid "\t-i includefile\t\t--include=includefile\n"
 msgstr "\t-i plikinclude\t\t--include=plikinclude\n"
 
-#: main.c:821
+#: main.c:585
 msgid "\t-l library\t\t--load=library\n"
 msgstr "\t-l biblioteka\t\t--load=biblioteka\n"
 
-#: main.c:822
-msgid "\t-L [fatal]\t\t--lint[=fatal]\n"
+#: main.c:586
+#, fuzzy
+msgid "\t-L[fatal|invalid]\t--lint[=fatal|invalid]\n"
 msgstr "\t-L [fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:823
-msgid "\t-n\t\t\t--non-decimal-data\n"
-msgstr "\t-n\t\t\t--non-decimal-data\n"
-
-#: main.c:824
+#: main.c:587
 msgid "\t-M\t\t\t--bignum\n"
 msgstr "\t-M\t\t\t--bignum\n"
 
-#: main.c:825
+#: main.c:588
 msgid "\t-N\t\t\t--use-lc-numeric\n"
 msgstr "\t-N\t\t\t--use-lc-numeric\n"
 
-#: main.c:826
+#: main.c:589
+msgid "\t-n\t\t\t--non-decimal-data\n"
+msgstr "\t-n\t\t\t--non-decimal-data\n"
+
+#: main.c:590
 msgid "\t-o[file]\t\t--pretty-print[=file]\n"
 msgstr "\t-o[plik]\t\t--pretty-print[=plik]\n"
 
-#: main.c:827
+#: main.c:591
 msgid "\t-O\t\t\t--optimize\n"
 msgstr "\t-O\t\t\t--optimize\n"
 
-#: main.c:828
+#: main.c:592
 msgid "\t-p[file]\t\t--profile[=file]\n"
 msgstr "\t-p[plik]\t\t--profile[=plik]\n"
 
-#: main.c:829
+#: main.c:593
 msgid "\t-P\t\t\t--posix\n"
 msgstr "\t-P\t\t\t--posix\n"
 
-#: main.c:830
+#: main.c:594
 msgid "\t-r\t\t\t--re-interval\n"
 msgstr "\t-r\t\t\t--re-interval\n"
 
-#: main.c:831
+#: main.c:595
 msgid "\t-S\t\t\t--sandbox\n"
 msgstr "\t-S\t\t\t--sandbox\n"
 
-#: main.c:832
+#: main.c:596
 msgid "\t-t\t\t\t--lint-old\n"
 msgstr "\t-t\t\t\t--lint-old\n"
 
-#: main.c:833
+#: main.c:597
 msgid "\t-V\t\t\t--version\n"
 msgstr "\t-V\t\t\t--version\n"
 
-#: main.c:835
+#: main.c:599
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:838
+#: main.c:602
 msgid "\t-Y\t\t--parsedebug\n"
 msgstr "\t-Y\t\t--parsedebug\n"
 
@@ -3100,7 +3103,7 @@ msgstr "\t-Y\t\t--parsedebug\n"
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: main.c:847
+#: main.c:611
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -3113,7 +3116,7 @@ msgstr ""
 "dokumentacji.\n"
 "\n"
 
-#: main.c:851
+#: main.c:615
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -3123,7 +3126,7 @@ msgstr ""
 "Program domyślnie czyta standardowe wejście i zapisuje standardowe wyjście.\n"
 "\n"
 
-#: main.c:855
+#: main.c:619
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -3133,7 +3136,7 @@ msgstr ""
 "\tgawk '{ suma += $1 }; END { print suma }' plik\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:880
+#: main.c:644
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
@@ -3152,7 +3155,7 @@ msgstr ""
 "tej Licencji lub którejś z późniejszych wersji.\n"
 "\n"
 
-#: main.c:888
+#: main.c:652
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3167,7 +3170,7 @@ msgstr ""
 "PowszechnÄ… LicencjÄ™ PublicznÄ… GNU.\n"
 "\n"
 
-#: main.c:894
+#: main.c:658
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program. If not, see http://www.gnu.org/licenses/.\n"
@@ -3176,16 +3179,16 @@ msgstr ""
 "Powszechnej Licencji Publicznej GNU (GNU General Public License);\n"
 "jeśli zaś nie - odwiedź stronę http://www.gnu.org/licenses/.\n"
 
-#: main.c:931
+#: main.c:695
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft nie ustawia FS na znak tabulatora w POSIX awk"
 
-#: main.c:1208
+#: main.c:982
 #, c-format
 msgid "unknown value for field spec: %d\n"
 msgstr "nieznana wartość dla specyfikacji pola: %d\n"
 
-#: main.c:1306
+#: main.c:1080
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -3194,98 +3197,116 @@ msgstr ""
 "%s: argument `%s' dla `-v' nie jest zgodny ze składnią `zmienna=wartość'\n"
 "\n"
 
-#: main.c:1332
+#: main.c:1106
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "`%s' nie jest dozwolonÄ… nazwÄ… zmiennej"
 
-#: main.c:1335
+#: main.c:1109
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "`%s' nie jest nazwÄ… zmiennej, szukanie pliku `%s=%s'"
 
-#: main.c:1339
+#: main.c:1113
 #, c-format
 msgid "cannot use gawk builtin `%s' as variable name"
 msgstr "nie można użyć wbudowanej w gawk `%s' jako nazwy zmiennej"
 
-#: main.c:1344
+#: main.c:1118
 #, c-format
 msgid "cannot use function `%s' as variable name"
 msgstr "nie można użyć funkcji `%s' jako nazwy zmiennej"
 
-#: main.c:1397
+#: main.c:1171
 msgid "floating point exception"
 msgstr "wyjÄ…tek zmiennopozycyjny"
 
-#: main.c:1404
+#: main.c:1178
 msgid "fatal error: internal error"
 msgstr "fatalny błąd: wewnętrzny błąd"
 
-#: main.c:1419
+#: main.c:1193
 msgid "fatal error: internal error: segfault"
 msgstr "fatalny błąd: wewnętrzny błąd: błąd segmentacji"
 
-#: main.c:1431
+#: main.c:1205
 msgid "fatal error: internal error: stack overflow"
 msgstr "fatalny błąd: wewnętrzny błąd: przepełnienie stosu"
 
-#: main.c:1490
+#: main.c:1264
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "brak już otwartego fd %d"
 
-#: main.c:1497
+#: main.c:1271
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "nie można otworzyć zawczasu /dev/null dla fd %d"
 
-#: mpfr.c:550
+#: main.c:1485
+msgid "empty argument to `-e/--source' ignored"
+msgstr "pusty argument dla opcji `-e/--source' został zignorowany"
+
+#: main.c:1556
+msgid "-M ignored: MPFR/GMP support not compiled in"
+msgstr ""
+
+#: main.c:1577
+#, c-format
+msgid "%s: option `-W %s' unrecognized, ignored\n"
+msgstr "%s: opcja `-W %s' nierozpoznana i zignorowana\n"
+
+#: main.c:1630
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opcja musi mieć argument -- %c\n"
+
+#: mpfr.c:557
 #, c-format
 msgid "PREC value `%.*s' is invalid"
 msgstr "wartość PREC `%.*s' jest nieprawidłowa"
 
-#: mpfr.c:608
+#: mpfr.c:615
 #, c-format
 msgid "RNDMODE value `%.*s' is invalid"
 msgstr "wartość RNDMODE `%.*s' jest nieprawidłowa"
 
-#: mpfr.c:698
+#: mpfr.c:711
 #, c-format
 msgid "%s: received non-numeric argument"
 msgstr "%s: otrzymano argument, który nie jest liczbą"
 
-#: mpfr.c:800
+#: mpfr.c:820
 msgid "compl(%Rg): negative value will give strange results"
 msgstr "compl(%Rg): ujemne wartości spowodują dziwne wyniki"
 
-#: mpfr.c:804
+#: mpfr.c:824
 msgid "comp(%Rg): fractional value will be truncated"
 msgstr "compl(%Rg): ułamkowe wartości zostaną obcięte"
 
-#: mpfr.c:816
+#: mpfr.c:836
 #, c-format
 msgid "cmpl(%Zd): negative values will give strange results"
 msgstr "cmpl(%Zd): ujemne wartości spowodują dziwne wyniki"
 
-#: mpfr.c:835
+#: mpfr.c:855
 #, c-format
 msgid "%s: received non-numeric argument #%d"
 msgstr "%s: otrzymano argument #%d, który nie jest liczbą"
 
-#: mpfr.c:845
+#: mpfr.c:865
 msgid "%s: argument #%d has invalid value %Rg, using 0"
 msgstr "%s: argument #%d ma nieprawidłową wartość %Rg, użyto 0"
 
-#: mpfr.c:857
+#: mpfr.c:877
 msgid "%s: argument #%d negative value %Rg will give strange results"
 msgstr "%s: argument #%d ujemna wartość %Rg spowoduje dziwne wyniki"
 
-#: mpfr.c:863
+#: mpfr.c:883
 msgid "%s: argument #%d fractional value %Rg will be truncated"
 msgstr "%s: argument #%d ułamkowa wartość %Rg zostanie obcięta"
 
-#: mpfr.c:878
+#: mpfr.c:898
 #, c-format
 msgid "%s: argument #%d negative value %Zd will give strange results"
 msgstr "%s: argument #%d ujemna wartość %Zd spowoduje dziwne wyniki"
@@ -3295,24 +3316,24 @@ msgstr "%s: argument #%d ujemna wartość %Zd spowoduje dziwne wyniki"
 msgid "cmd. line:"
 msgstr "linia poleceń:"
 
-#: node.c:421
+#: node.c:409
 msgid "backslash at end of string"
 msgstr "backslash na końcu łańcucha"
 
-#: node.c:500
+#: node.c:488
 #, c-format
 msgid "old awk does not support the `\\%c' escape sequence"
 msgstr "stary awk nie wspiera sekwencji ucieczki `\\%c'"
 
-#: node.c:551
+#: node.c:539
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX nie zezwala na sekwencjÄ™ ucieczki `\\x'"
 
-#: node.c:557
+#: node.c:545
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "brak liczb szesnastkowych w sekwencji ucieczki `\\x'"
 
-#: node.c:579
+#: node.c:567
 #, c-format
 msgid ""
 "hex escape \\x%.*s of %d characters probably not interpreted the way you "
@@ -3321,12 +3342,12 @@ msgstr ""
 "szesnastkowa sekwencja ucieczki \\x%.*s %d znaków prawdopodobnie nie została "
 "zinterpretowana jak tego oczekujesz"
 
-#: node.c:594
+#: node.c:582
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "sekwencja ucieczki `\\%c' potraktowana jako zwykłe `%c'"
 
-#: node.c:739
+#: node.c:726
 msgid ""
 "Invalid multibyte data detected. There may be a mismatch between your data "
 "and your locale."
@@ -3354,12 +3375,12 @@ msgid "sending profile to standard error"
 msgstr "wysyłanie profilu na standardowe wyjście diagnostyczne"
 
 #: profile.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t# %s block(s)\n"
+"\t# %s rule(s)\n"
 "\n"
 msgstr ""
-"\t# %s blok(i)\n"
+"\t# Reguła(i)\n"
 "\n"
 
 #: profile.c:198
@@ -3376,11 +3397,11 @@ msgstr ""
 msgid "internal error: %s with null vname"
 msgstr "wewnętrzny błąd: %s z zerowym vname"
 
-#: profile.c:537
+#: profile.c:538
 msgid "internal error: builtin with null fname"
 msgstr "wewnętrzny błąd: builtin z fname null"
 
-#: profile.c:949
+#: profile.c:958
 #, c-format
 msgid ""
 "\t# Loaded extensions (-l and/or @load)\n"
@@ -3389,12 +3410,12 @@ msgstr ""
 "\t# Załadowane rozszerzenia (-l i/lub @load)\n"
 "\n"
 
-#: profile.c:972
+#: profile.c:981
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# profil programu gawk, utworzony %s\n"
 
-#: profile.c:1475
+#: profile.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -3403,7 +3424,7 @@ msgstr ""
 "\n"
 "\t# Funkcje, spis alfabetyczny\n"
 
-#: profile.c:1513
+#: profile.c:1559
 #, c-format
 msgid "redir2str: unknown redirection type %d"
 msgstr "redir2str: nieznany typ przekierowania %d"
@@ -3413,80 +3434,116 @@ msgstr "redir2str: nieznany typ przekierowania %d"
 msgid "regexp component `%.*s' should probably be `[%.*s]'"
 msgstr "komponent regexp `%.*s' powinien być prawdopodobnie `[%.*s]'"
 
-#: regcomp.c:131
+#: regcomp.c:139
 msgid "Success"
 msgstr "Sukces"
 
-#: regcomp.c:134
+#: regcomp.c:142
 msgid "No match"
 msgstr "Brak dopasowania"
 
-#: regcomp.c:137
+#: regcomp.c:145
 msgid "Invalid regular expression"
 msgstr "Nieprawidłowe wyrażenie regularne"
 
-#: regcomp.c:140
+#: regcomp.c:148
 msgid "Invalid collation character"
 msgstr "Nieprawidłowy znak porównania"
 
-#: regcomp.c:143
+#: regcomp.c:151
 msgid "Invalid character class name"
 msgstr "Nieprawidłowa nazwa klasy znaku"
 
-#: regcomp.c:146
+#: regcomp.c:154
 msgid "Trailing backslash"
 msgstr "Końcowy znak backslash"
 
-#: regcomp.c:149
+#: regcomp.c:157
 msgid "Invalid back reference"
 msgstr "Nieprawidłowe odwołanie wsteczne"
 
-#: regcomp.c:152
-msgid "Unmatched [ or [^"
+#: regcomp.c:160
+#, fuzzy
+msgid "Unmatched [, [^, [:, [., or [="
 msgstr "Niedopasowany znak [ lub [^"
 
-#: regcomp.c:155
+#: regcomp.c:163
 msgid "Unmatched ( or \\("
 msgstr "Niedopasowany znak ( lub \\("
 
-#: regcomp.c:158
+#: regcomp.c:166
 msgid "Unmatched \\{"
 msgstr "Niedopasowany znak \\{"
 
-#: regcomp.c:164
+#: regcomp.c:169
+msgid "Invalid content of \\{\\}"
+msgstr "Nieprawidłowa zawartość \\{\\}"
+
+#: regcomp.c:172
 msgid "Invalid range end"
 msgstr "Nieprawidłowy koniec zakresu"
 
-#: regcomp.c:167
+#: regcomp.c:175
 msgid "Memory exhausted"
 msgstr "Pamięć wyczerpana"
 
-#: regcomp.c:170
+#: regcomp.c:178
 msgid "Invalid preceding regular expression"
 msgstr "Nieprawidłowe poprzedzające wyrażenie regularne"
 
-#: regcomp.c:173
+#: regcomp.c:181
 msgid "Premature end of regular expression"
 msgstr "Przedwczesny koniec wyrażenia regularnego"
 
-#: regcomp.c:179
+#: regcomp.c:184
+msgid "Regular expression too big"
+msgstr "Wyrażenie regularne jest zbyt duże"
+
+#: regcomp.c:187
 msgid "Unmatched ) or \\)"
 msgstr "Niedopasowany znak ) lub \\)"
 
-#: regcomp.c:704
+#: regcomp.c:712
 msgid "No previous regular expression"
 msgstr "Brak poprzedniego wyrażenia regularnego"
 
-#: symbol.c:741
+#: symbol.c:677
+#, fuzzy, c-format
+msgid "function `%s': can't use function `%s' as a parameter name"
+msgstr "funkcja `%s': nie można użyć nazwy funkcji jako nazwy parametru"
+
+#: symbol.c:809
 msgid "can not pop main context"
 msgstr "nie można zdjąć głównego kontekstu"
 
+#~ msgid "`getline var' invalid inside `%s' rule"
+#~ msgstr "nieprawidłowy `getline var' wewnątrz reguły `%s'"
+
+#~ msgid "`getline' invalid inside `%s' rule"
+#~ msgstr "nieprawidłowy `getline' wewnątrz reguły `%s'"
+
+#~ msgid "no (known) protocol supplied in special filename `%s'"
+#~ msgstr "nie dostarczono (znanego) protokołu w specjalnym pliku `%s'"
+
+#~ msgid "special file name `%s' is incomplete"
+#~ msgstr "specjalna nazwa pliku `%s' jest niekompletna"
+
+#~ msgid "must supply a remote hostname to `/inet'"
+#~ msgstr "należy dostarczyć nazwę zdalnego hosta do `/inet'"
+
+#~ msgid "must supply a remote port to `/inet'"
+#~ msgstr "należy dostarczyć numer zdalnego portu do `/inet'"
+
+#~ msgid ""
+#~ "\t# %s block(s)\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\t# %s blok(i)\n"
+#~ "\n"
+
 #~ msgid "range of the form `[%c-%c]' is locale dependent"
 #~ msgstr "zasięg formy `[%c-%c]' jest zależny od lokalizacji"
 
-#~ msgid "attempt to use function `%s' as an array"
-#~ msgstr "próba użycia funkcji `%s' jako tablicy"
-
 #~ msgid "reference to uninitialized element `%s[\"%.*s\"]'"
 #~ msgstr "odwołanie do niezainicjowanego elementu `%s[\"%.*s\"]'"
 
@@ -3565,11 +3622,6 @@ msgstr "nie można zdjąć głównego kontekstu"
 #~ msgid "function `%s' not defined"
 #~ msgstr "funkcja `%s' nie została zdefiniowana"
 
-#~ msgid "non-redirected `getline' invalid inside `%s' rule"
-#~ msgstr ""
-#~ "komenda `getline' bez przekierowania jest nieprawidłowa wewnątrz reguły `"
-#~ "%s'"
-
 #~ msgid "error reading input file `%s': %s"
 #~ msgstr "błąd podczas czytania z pliku `%s': %s"
 
diff --git a/po/sv.gmo b/po/sv.gmo
index 11006e58..70c34bbb 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 79b0bca8..5c53e5f8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,17 +1,18 @@
 # Swedish translation of gawk
 # Copyright © 2003, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gawk package.
+#
 # Martin Sjögren <md9ms@mdstud.chalmers.se>, 2001-2002.
 # Christer Andersson <klamm@comhem.se>, 2007.
 # Göran Uddeborg <goeran@uddeborg.se>, 2011, 2012, 2013, 2014.
 #
-# $Revision: 1.14 $
+# $Revision: 1.15 $
 msgid ""
 msgstr ""
 "Project-Id-Version: gawk 4.1.0b\n"
-"Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2014-04-08 19:23+0300\n"
-"PO-Revision-Date: 2014-01-21 17:40+0100\n"
+"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
+"POT-Creation-Date: 2015-02-26 20:05+0200\n"
+"PO-Revision-Date: 2014-09-22 09:12+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -38,9 +39,9 @@ msgstr "försök att använda skalärparametern �%s� som en vektor"
 msgid "attempt to use scalar `%s' as an array"
 msgstr "försök att använda skalären �%s� som en vektor"
 
-#: array.c:409 array.c:576 builtin.c:85 builtin.c:1615 builtin.c:1661
-#: builtin.c:1674 builtin.c:2102 builtin.c:2116 eval.c:1122 eval.c:1126
-#: eval.c:1531
+#: array.c:409 array.c:576 builtin.c:85 builtin.c:1606 builtin.c:1652
+#: builtin.c:1665 builtin.c:2092 builtin.c:2106 eval.c:1149 eval.c:1153
+#: eval.c:1558
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "försök att använda vektorn �%s� i skalärsammanhang"
@@ -99,413 +100,418 @@ msgstr ""
 "asorti: det går inte att använda en delvektor av andra argumentet som första "
 "argument"
 
-#: array.c:1314
+#: array.c:1313
 #, c-format
 msgid "`%s' is invalid as a function name"
 msgstr "�%s� är ogiltigt som ett funktionsnamn"
 
-#: array.c:1318
+#: array.c:1317
 #, c-format
 msgid "sort comparison function `%s' is not defined"
 msgstr "jämförelsefunktionen �%s� för sortering är inte definierad"
 
-#: awkgram.y:233
+#: awkgram.y:226
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "%s-block måste ha en åtgärdsdel"
 
-#: awkgram.y:236
+#: awkgram.y:229
 msgid "each rule must have a pattern or an action part"
 msgstr "varje regel måste ha ett mönster eller en åtgärdsdel"
 
-#: awkgram.y:325 awkgram.y:336
+#: awkgram.y:320 awkgram.y:331
 msgid "old awk does not support multiple `BEGIN' or `END' rules"
 msgstr "gamla awk stöder inte flera �BEGIN�- eller �END�-regler"
 
-#: awkgram.y:373
+#: awkgram.y:368
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "�%s“ är en inbyggd funktion, den kan inte definieras om"
 
-#: awkgram.y:419
+#: awkgram.y:417
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr "regexp-konstanten \"//\" ser ut som en C++-kommentar men är inte det"
 
-#: awkgram.y:423
+#: awkgram.y:421
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr "regexp-konstanten \"/%s/\" ser ut som en C-kommentar men är inte det"
 
-#: awkgram.y:515
+#: awkgram.y:513
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "upprepade case-värden i switch-sats: %s"
 
-#: awkgram.y:536
+#: awkgram.y:534
 msgid "duplicate `default' detected in switch body"
 msgstr "flera \"default\" upptäcktes i switch-sats"
 
-#: awkgram.y:796 awkgram.y:3723
+#: awkgram.y:794 awkgram.y:3751
 msgid "`break' is not allowed outside a loop or switch"
 msgstr "\"break\" är inte tillåtet utanför en slinga eller switch"
 
-#: awkgram.y:805 awkgram.y:3715
+#: awkgram.y:803 awkgram.y:3743
 msgid "`continue' is not allowed outside a loop"
 msgstr "\"continue\" är inte tillåtet utanför en slinga"
 
-#: awkgram.y:815
+#: awkgram.y:813
 #, c-format
 msgid "`next' used in %s action"
 msgstr "\"next\" använt i %s-åtgärd"
 
-#: awkgram.y:824
+#: awkgram.y:822
 #, c-format
 msgid "`nextfile' used in %s action"
 msgstr "\"nextfile\" använt i %s-åtgärd"
 
-#: awkgram.y:848
+#: awkgram.y:846
 msgid "`return' used outside function context"
 msgstr "\"return\" använd utanför funktion"
 
-#: awkgram.y:922
+#: awkgram.y:920
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "ensamt \"print\" i BEGIN eller END-regel bör troligen vara 'print \"\"'"
 
-#: awkgram.y:988 awkgram.y:1037
+#: awkgram.y:986 awkgram.y:1035
 msgid "`delete' is not allowed with SYMTAB"
 msgstr "�delete� är inte tillåtet med SYMTAB"
 
-#: awkgram.y:990 awkgram.y:1039
+#: awkgram.y:988 awkgram.y:1037
 msgid "`delete' is not allowed with FUNCTAB"
 msgstr "�delete� är inte tillåtet med FUNCTAB"
 
-#: awkgram.y:1024 awkgram.y:1028
+#: awkgram.y:1022 awkgram.y:1026
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "\"delete(array)\" är en icke portabel tawk-utökning"
 
-#: awkgram.y:1149
+#: awkgram.y:1147
 msgid "multistage two-way pipelines don't work"
 msgstr "flerstegs dubbelriktade rör fungerar inte"
 
-#: awkgram.y:1264
+#: awkgram.y:1262
 msgid "regular expression on right of assignment"
 msgstr "reguljärt uttryck i högerledet av en tilldelning"
 
-#: awkgram.y:1275
+#: awkgram.y:1273
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "reguljärt uttryck på vänster sida om en \"~\"- eller \"!~\"-operator"
 
-#: awkgram.y:1291 awkgram.y:1442
+#: awkgram.y:1289 awkgram.y:1431
 msgid "old awk does not support the keyword `in' except after `for'"
 msgstr "gamla awk stöder inte operatorn \"**\""
 
-#: awkgram.y:1301
+#: awkgram.y:1299
 msgid "regular expression on right of comparison"
 msgstr "reguljärt uttryck i högerledet av en jämförelse"
 
-#: awkgram.y:1417
-#, c-format
-msgid "`getline var' invalid inside `%s' rule"
-msgstr "\"getline var\" är ogiltigt inuti \"%s\"-regel"
-
-#: awkgram.y:1420
-#, c-format
-msgid "`getline' invalid inside `%s' rule"
+#: awkgram.y:1411
+#, fuzzy, c-format
+msgid "non-redirected `getline' invalid inside `%s' rule"
 msgstr "\"getline är ogiltigt inuti \"%s\"-regel"
 
-#: awkgram.y:1425
+#: awkgram.y:1414
 msgid "non-redirected `getline' undefined inside END action"
 msgstr "icke omdirigerad \"getline\" odefinierad inuti END-åtgärd"
 
-#: awkgram.y:1444
+#: awkgram.y:1433
 msgid "old awk does not support multidimensional arrays"
 msgstr "gamla awk stöder inte flerdimensionella vektorer"
 
-#: awkgram.y:1541
+#: awkgram.y:1530
 msgid "call of `length' without parentheses is not portable"
 msgstr "anrop av \"length\" utan parenteser är inte portabelt"
 
-#: awkgram.y:1607
+#: awkgram.y:1596
 msgid "indirect function calls are a gawk extension"
 msgstr "indirekta funktionsanrop är en gawk-utökning"
 
-#: awkgram.y:1620
+#: awkgram.y:1609
 #, c-format
 msgid "can not use special variable `%s' for indirect function call"
 msgstr ""
 "det går inte att använda specialvariabeln \"%s\" för indirekta fuktionsanrop"
 
-#: awkgram.y:1698
+#: awkgram.y:1635
+#, c-format
+msgid "attempt to use non-function `%s' in function call"
+msgstr ""
+
+#: awkgram.y:1699
 msgid "invalid subscript expression"
 msgstr "ogiltig indexuttryck"
 
-#: awkgram.y:2048 awkgram.y:2068 gawkapi.c:206 gawkapi.c:224 msg.c:126
+#: awkgram.y:2045 awkgram.y:2065 gawkapi.c:206 gawkapi.c:224 msg.c:126
 msgid "warning: "
 msgstr "varning: "
 
-#: awkgram.y:2066 gawkapi.c:192 gawkapi.c:221 msg.c:158
+#: awkgram.y:2063 gawkapi.c:192 gawkapi.c:221 msg.c:158
 msgid "fatal: "
 msgstr "ödesdigert: "
 
-#: awkgram.y:2116
+#: awkgram.y:2113
 msgid "unexpected newline or end of string"
 msgstr "oväntat nyradstecken eller slut på strängen"
 
-#: awkgram.y:2383 awkgram.y:2459 awkgram.y:2682 debug.c:523 debug.c:539
+#: awkgram.y:2392 awkgram.y:2468 awkgram.y:2691 debug.c:523 debug.c:539
 #: debug.c:2812 debug.c:5055
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "kan inte öppna källfilen \"%s\" för läsning (%s)"
 
-#: awkgram.y:2384 awkgram.y:2509
+#: awkgram.y:2393 awkgram.y:2518
 #, c-format
 msgid "can't open shared library `%s' for reading (%s)"
 msgstr "kan inte öppna det delade biblioteket �%s� för läsning (%s)"
 
-#: awkgram.y:2386 awkgram.y:2460 awkgram.y:2510 builtin.c:135 debug.c:5206
+#: awkgram.y:2395 awkgram.y:2469 awkgram.y:2519 builtin.c:135 debug.c:5206
 msgid "reason unknown"
 msgstr "okänd anledning"
 
-#: awkgram.y:2395 awkgram.y:2419
+#: awkgram.y:2404 awkgram.y:2428
 #, c-format
 msgid "can't include `%s' and use it as a program file"
 msgstr "kan inte inkludera �%s� och använda den som en programfil"
 
-#: awkgram.y:2408
+#: awkgram.y:2417
 #, c-format
 msgid "already included source file `%s'"
 msgstr "inkluderade redan källfilen \"%s\""
 
-#: awkgram.y:2409
+#: awkgram.y:2418
 #, c-format
 msgid "already loaded shared library `%s'"
 msgstr "inkluderade redan det delade biblioteket �%s�"
 
-#: awkgram.y:2444
+#: awkgram.y:2453
 msgid "@include is a gawk extension"
 msgstr "@include är en gawk-utökning"
 
-#: awkgram.y:2450
+#: awkgram.y:2459
 msgid "empty filename after @include"
 msgstr "tomt filnamn efter @include"
 
-#: awkgram.y:2494
+#: awkgram.y:2503
 msgid "@load is a gawk extension"
 msgstr "@load är en gawk-utökning"
 
-#: awkgram.y:2500
+#: awkgram.y:2509
 msgid "empty filename after @load"
 msgstr "tomt filnamn efter @load"
 
-#: awkgram.y:2634
+#: awkgram.y:2643
 msgid "empty program text on command line"
 msgstr "tom programtext på kommandoraden"
 
-#: awkgram.y:2749
+#: awkgram.y:2758
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "kan inte läsa källfilen \"%s\" (%s)"
 
-#: awkgram.y:2760
+#: awkgram.y:2769
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "källfilen \"%s\" är tom"
 
-#: awkgram.y:2937
+#: awkgram.y:2828
+#, c-format
+msgid "PEBKAC error: invalid character '\\%03o' in source code"
+msgstr ""
+
+#: awkgram.y:2959
 msgid "source file does not end in newline"
 msgstr "källfilen slutar inte med en ny rad"
 
-#: awkgram.y:3042
+#: awkgram.y:3062
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr "oavslutat reguljärt uttryck slutar med \"\\\" i slutet av filen"
 
-#: awkgram.y:3066
+#: awkgram.y:3089
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 "%s: %d: tawk-modifierare för reguljära uttryck \"/.../%c\" fungerar inte i "
 "gawk"
 
-#: awkgram.y:3070
+#: awkgram.y:3093
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 "tawk-modifierare för reguljära uttryck \"/.../%c\" fungerar inte i gawk"
 
-#: awkgram.y:3077
+#: awkgram.y:3100
 msgid "unterminated regexp"
 msgstr "oavslutat reguljärt uttryck"
 
-#: awkgram.y:3081
+#: awkgram.y:3104
 msgid "unterminated regexp at end of file"
 msgstr "oavslutat reguljärt uttryck i slutet av filen"
 
-#: awkgram.y:3140
+#: awkgram.y:3162
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "Användning av \"\\ #...\" för radfortsättning är inte portabelt"
 
-#: awkgram.y:3156
+#: awkgram.y:3178
 msgid "backslash not last character on line"
 msgstr "sista tecknet på raden är inte ett omvänt snedstreck"
 
-#: awkgram.y:3217
+#: awkgram.y:3239
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX tillåter inte operatorn \"**=\""
 
-#: awkgram.y:3219
+#: awkgram.y:3241
 msgid "old awk does not support operator `**='"
 msgstr "gamla awk stöder inte operatorn \"**=\""
 
-#: awkgram.y:3228
+#: awkgram.y:3250
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX tillåter inte operatorn \"**\""
 
-#: awkgram.y:3230
+#: awkgram.y:3252
 msgid "old awk does not support operator `**'"
 msgstr "gamla awk stöder inte operatorn \"**\""
 
-#: awkgram.y:3265
+#: awkgram.y:3287
 msgid "operator `^=' is not supported in old awk"
 msgstr "operatorn \"^=\" stöds inte i gamla awk"
 
-#: awkgram.y:3273
+#: awkgram.y:3295
 msgid "operator `^' is not supported in old awk"
 msgstr "operatorn \"^\" stöds inte i gamla awk"
 
-#: awkgram.y:3366 awkgram.y:3382 command.y:1178
+#: awkgram.y:3392 awkgram.y:3410 command.y:1180
 msgid "unterminated string"
 msgstr "oavslutad sträng"
 
-#: awkgram.y:3603
+#: awkgram.y:3631
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "ogiltigt tecken \"%c\" i uttryck"
 
-#: awkgram.y:3650
+#: awkgram.y:3678
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "\"%s\" är en gawk-utökning"
 
-#: awkgram.y:3655
+#: awkgram.y:3683
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX tillåter inte \"%s\""
 
-#: awkgram.y:3663
+#: awkgram.y:3691
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "\"%s\" stöds inte i gamla awk"
 
-#: awkgram.y:3753
+#: awkgram.y:3781
 msgid "`goto' considered harmful!\n"
 msgstr "\"goto\" anses skadlig!\n"
 
-#: awkgram.y:3787
+#: awkgram.y:3815
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "%d är ett ogiltigt antal argument för %s"
 
-#: awkgram.y:3822
+#: awkgram.y:3850
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 "%s: bokstavlig sträng som sista argument till ersättning har ingen effekt"
 
-#: awkgram.y:3827
+#: awkgram.y:3855
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "%s: tredje argumentet är inte ett ändringsbart objekt"
 
-#: awkgram.y:3910 awkgram.y:3913
+#: awkgram.y:3938 awkgram.y:3941
 msgid "match: third argument is a gawk extension"
 msgstr "match: tredje argumentet är en gawk-utökning"
 
-#: awkgram.y:3967 awkgram.y:3970
+#: awkgram.y:3995 awkgram.y:3998
 msgid "close: second argument is a gawk extension"
 msgstr "close: andra argumentet är en gawk-utökning"
 
-#: awkgram.y:3982
+#: awkgram.y:4010
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "användandet av dcgettext(_\"...\") är felaktigt: ta bort det inledande "
 "understrykningstecknet"
 
-#: awkgram.y:3997
+#: awkgram.y:4025
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr ""
 "användandet av dcngettext(_\"...\") är felaktigt: ta bort det inledande "
 "understrykningstecknet"
 
-#: awkgram.y:4016
+#: awkgram.y:4044
 msgid "index: regexp constant as second argument is not allowed"
 msgstr "index: reguljäruttryck som andra argumentet är inte tillåtet"
 
-#: awkgram.y:4069
+#: awkgram.y:4097
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "funktionen \"%s\": parametern \"%s\" överskuggar en global variabel"
 
-#: awkgram.y:4126 debug.c:4041 debug.c:4084 debug.c:5204
+#: awkgram.y:4154 debug.c:4041 debug.c:4084 debug.c:5204
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "kunde inte öppna \"%s\" för skrivning (%s)"
 
-#: awkgram.y:4127
+#: awkgram.y:4155
 msgid "sending variable list to standard error"
 msgstr "skickar variabellista till standard fel"
 
-#: awkgram.y:4135
+#: awkgram.y:4163
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: misslyckades att stänga (%s)"
 
-#: awkgram.y:4160
+#: awkgram.y:4188
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() anropad två gånger!"
 
-#: awkgram.y:4168
+#: awkgram.y:4196
 msgid "there were shadowed variables."
 msgstr "det fanns överskuggade variabler."
 
-#: awkgram.y:4239
+#: awkgram.y:4267
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "funktionsnamnet \"%s\" är definierat sedan tidigare"
 
-#: awkgram.y:4285
+#: awkgram.y:4313
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "funktionen \"%s\": kan inte använda funktionsnamn som parameternamn"
 
-#: awkgram.y:4288
+#: awkgram.y:4316
 #, c-format
 msgid "function `%s': can't use special variable `%s' as a function parameter"
 msgstr ""
 "funktionen \"%s\": det går inte att använda specialvariabeln \"%s\" som en "
 "funktionsparameter"
 
-#: awkgram.y:4296
+#: awkgram.y:4324
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "funktionen \"%s\": parameter %d, \"%s\", är samma som parameter %d"
 
-#: awkgram.y:4383 awkgram.y:4389
+#: awkgram.y:4411 awkgram.y:4417
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "funktionen \"%s\" anropad men aldrig definierad"
 
-#: awkgram.y:4393
+#: awkgram.y:4421
 #, c-format
 msgid "function `%s' defined but never called directly"
 msgstr "funktionen \"%s\" definierad men aldrig anropad direkt"
 
-#: awkgram.y:4425
+#: awkgram.y:4453
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr "konstant reguljärt uttryck för parameter %d ger ett booleskt värde"
 
-#: awkgram.y:4484
+#: awkgram.y:4468
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -514,23 +520,23 @@ msgstr ""
 "funktionen \"%s\" anropad med blanktecken mellan namnet och \"(\",\n"
 "eller använd som variabel eller vektor"
 
-#: awkgram.y:4720
+#: awkgram.y:4674
 msgid "division by zero attempted"
 msgstr "försökte dividera med noll"
 
-#: awkgram.y:4729
+#: awkgram.y:4683
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "försökte dividera med noll i \"%%\""
 
-#: awkgram.y:5049
+#: awkgram.y:5003
 msgid ""
 "cannot assign a value to the result of a field post-increment expression"
 msgstr ""
 "kan inte tilldela ett värde till uttryck som är en efterinkrementering av "
 "ett fält"
 
-#: awkgram.y:5052
+#: awkgram.y:5006
 #, c-format
 msgid "invalid target of assignment (opcode %s)"
 msgstr "ogiltigt mål för tilldelning (op-kod %s)"
@@ -570,189 +576,199 @@ msgstr ""
 msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr "fflush: \"%s\" är inte en öppen fil, rör eller koprocess"
 
-#: builtin.c:362
+#: builtin.c:351
 msgid "index: received non-string first argument"
 msgstr "index: första argumentet är inte en sträng"
 
-#: builtin.c:364
+#: builtin.c:353
 msgid "index: received non-string second argument"
 msgstr "index: andra argumentet är inte en sträng"
 
-#: builtin.c:488 mpfr.c:757
+#: builtin.c:466 mpfr.c:777
 msgid "int: received non-numeric argument"
 msgstr "int: fick ett ickenumeriskt argument"
 
-#: builtin.c:525
+#: builtin.c:503
 msgid "length: received array argument"
 msgstr "length: fick ett vektorargument"
 
-#: builtin.c:528
+#: builtin.c:506
 msgid "`length(array)' is a gawk extension"
 msgstr "\"length(array)\" är en gawk-utökning"
 
-#: builtin.c:544
+#: builtin.c:525
 msgid "length: received non-string argument"
 msgstr "length: fick ett argument som inte är en sträng"
 
-#: builtin.c:575
+#: builtin.c:554
 msgid "log: received non-numeric argument"
 msgstr "log: fick ett ickenumeriskt argument"
 
-#: builtin.c:578
+#: builtin.c:557
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: fick ett negativt argumentet %g"
 
-#: builtin.c:776 builtin.c:781
+#: builtin.c:755 builtin.c:760 builtin.c:911
 msgid "fatal: must use `count$' on all formats or none"
 msgstr "ödesdigert: måste använda \"count$\" på alla eller inga format"
 
-#: builtin.c:851
+#: builtin.c:830
 #, c-format
 msgid "field width is ignored for `%%' specifier"
 msgstr "fältbredd ignoreras för \"%%\"-specificerare"
 
-#: builtin.c:853
+#: builtin.c:832
 #, c-format
 msgid "precision is ignored for `%%' specifier"
 msgstr "precision ignoreras för \"%%\"-specificerare"
 
-#: builtin.c:855
+#: builtin.c:834
 #, c-format
 msgid "field width and precision are ignored for `%%' specifier"
 msgstr "fältbredd och precision ignoreras för \"%%\"-specificerare"
 
-#: builtin.c:906
+#: builtin.c:885
 msgid "fatal: `$' is not permitted in awk formats"
 msgstr "ödesdigert: \"$\" tillåts inte i awk-format"
 
-#: builtin.c:915
+#: builtin.c:894
 msgid "fatal: arg count with `$' must be > 0"
 msgstr "ödesdigert: argumentantalet med \"$\" måste vara > 0"
 
-#: builtin.c:919
+#: builtin.c:898
 #, c-format
 msgid "fatal: arg count %ld greater than total number of supplied arguments"
 msgstr "ödesdigert: argumentantalet %ld är större än antalet givna argument"
 
-#: builtin.c:923
+#: builtin.c:902
 msgid "fatal: `$' not permitted after period in format"
 msgstr "ödesdigert: \"$\" tillåts inte efter en punkt i formatet"
 
-#: builtin.c:939
+#: builtin.c:921
 msgid "fatal: no `$' supplied for positional field width or precision"
 msgstr ""
 "ödesdigert: inget \"$\" bifogat för positionsangiven fältbredd eller "
 "precision"
 
-#: builtin.c:1009
+#: builtin.c:991
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "\"l\" är meningslös i awk-format, ignorerad"
 
-#: builtin.c:1013
+#: builtin.c:995
 msgid "fatal: `l' is not permitted in POSIX awk formats"
 msgstr "ödesdigert: \"l\" tillåts inte i POSIX awk-format"
 
-#: builtin.c:1026
+#: builtin.c:1008
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "\"L\" är meningslös i awk-format, ignorerad"
 
-#: builtin.c:1030
+#: builtin.c:1012
 msgid "fatal: `L' is not permitted in POSIX awk formats"
 msgstr "ödesdigert: \"L\" tillåts inte i POSIX awk-format"
 
-#: builtin.c:1043
+#: builtin.c:1025
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "\"h\" är meningslös i awk-format, ignorerad"
 
-#: builtin.c:1047
+#: builtin.c:1029
 msgid "fatal: `h' is not permitted in POSIX awk formats"
 msgstr "ödesdigert: \"h\" tillåts inte i POSIX awk-format"
 
-#: builtin.c:1463
+#: builtin.c:1055
+#, fuzzy, c-format
+msgid "[s]printf: value %g is too big for %%c format"
+msgstr "[s]printf: värdet %g är utanför \"%%%c\"-formatets giltiga intervall"
+
+#: builtin.c:1068
+#, fuzzy, c-format
+msgid "[s]printf: value %g is not a valid wide character"
+msgstr "[s]printf: värdet %g är utanför \"%%%c\"-formatets giltiga intervall"
+
+#: builtin.c:1454
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf: värdet %g är utanför \"%%%c\"-formatets giltiga intervall"
 
-#: builtin.c:1561
+#: builtin.c:1552
 #, c-format
 msgid "ignoring unknown format specifier character `%c': no argument converted"
 msgstr ""
 "ignorerar okänt formatspecifikationstecken \"%c\": inget argument konverterat"
 
-#: builtin.c:1566
+#: builtin.c:1557
 msgid "fatal: not enough arguments to satisfy format string"
 msgstr "ödesdigert: för få argument för formatsträngen"
 
-#: builtin.c:1568
+#: builtin.c:1559
 msgid "^ ran out for this one"
 msgstr "^ tog slut här"
 
-#: builtin.c:1575
+#: builtin.c:1566
 msgid "[s]printf: format specifier does not have control letter"
-msgstr "[s]printf: formatspecifieraren har ingen kommandobokstav"
+msgstr "[s]printf: formatspecificeraren har ingen kommandobokstav"
 
-#: builtin.c:1578
+#: builtin.c:1569
 msgid "too many arguments supplied for format string"
 msgstr "för många argument för formatsträngen"
 
-#: builtin.c:1634
+#: builtin.c:1625
 msgid "sprintf: no arguments"
 msgstr "sprintf: inga argument"
 
-#: builtin.c:1657 builtin.c:1668
+#: builtin.c:1648 builtin.c:1659
 msgid "printf: no arguments"
 msgstr "printf: inga argument"
 
-#: builtin.c:1711
+#: builtin.c:1702
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: fick ickenumeriskt argument"
 
-#: builtin.c:1715
+#: builtin.c:1706
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: anropad med negativt argument %g"
 
-#: builtin.c:1746
+#: builtin.c:1737
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: längden %g är inte >= 1"
 
-#: builtin.c:1748
+#: builtin.c:1739
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: längden %g är inte >= 0"
 
-#: builtin.c:1755
+#: builtin.c:1753
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: längden %g som inte är ett heltal kommer huggas av"
 
-#: builtin.c:1760
+#: builtin.c:1758
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr "substr: längden %g är för stor för strängindexering, huggas av till %g"
 
-#: builtin.c:1772
+#: builtin.c:1770
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: startindex %g är ogiltigt, använder 1"
 
-#: builtin.c:1777
+#: builtin.c:1775
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr "substr: startindex %g som inte är ett heltal kommer huggas av"
 
-#: builtin.c:1802
+#: builtin.c:1798
 msgid "substr: source string is zero length"
 msgstr "substr: källsträngen är tom"
 
-#: builtin.c:1818
+#: builtin.c:1812
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: startindex %g är bortom strängens slut"
 
-#: builtin.c:1826
+#: builtin.c:1820
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -760,186 +776,192 @@ msgstr ""
 "substr: längden %g vid startindex %g överskrider det första argumentets "
 "längd (%lu)"
 
-#: builtin.c:1900
+#: builtin.c:1890
 msgid "strftime: format value in PROCINFO[\"strftime\"] has numeric type"
 msgstr "strftime: formatvärde i PROCINFO[\"strftime\"] har numerisk typ"
 
-#: builtin.c:1923
+#: builtin.c:1913
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: fick ett ickenumeriskt andra argument"
 
-#: builtin.c:1927
+#: builtin.c:1917
 msgid "strftime: second argument less than 0 or too big for time_t"
-msgstr "strftime: andra argimentet mindre än 0 eller för stort för time_t"
+msgstr "strftime: andra argumentet mindre än 0 eller för stort för time_t"
 
-#: builtin.c:1934
+#: builtin.c:1924
 msgid "strftime: received non-string first argument"
 msgstr "strftime: fick ett första argument som inte är en sträng"
 
-#: builtin.c:1941
+#: builtin.c:1931
 msgid "strftime: received empty format string"
 msgstr "strftime: fick en tom formatsträng"
 
-#: builtin.c:2007
+#: builtin.c:1997
 msgid "mktime: received non-string argument"
 msgstr "mktime: fick ett argument som inte är en sträng"
 
-#: builtin.c:2024
+#: builtin.c:2014
 msgid "mktime: at least one of the values is out of the default range"
 msgstr "mktime: åtminstone ett av värdena är utanför standardintervallet"
 
-#: builtin.c:2059
+#: builtin.c:2049
 msgid "'system' function not allowed in sandbox mode"
 msgstr "funktionen \"system\" är inte tillåten i sandlådeläge"
 
-#: builtin.c:2064
+#: builtin.c:2054
 msgid "system: received non-string argument"
 msgstr "system: fick ett argument som inte är en sträng"
 
-#: builtin.c:2184
+#: builtin.c:2174
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "referens till icke initierat fält \"$%d\""
 
-#: builtin.c:2271
+#: builtin.c:2259
 msgid "tolower: received non-string argument"
 msgstr "tolower: fick ett argument som inte är en sträng"
 
-#: builtin.c:2305
+#: builtin.c:2290
 msgid "toupper: received non-string argument"
 msgstr "toupper: fick ett argument som inte är en sträng"
 
-#: builtin.c:2341 mpfr.c:672
+#: builtin.c:2323 mpfr.c:679
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: fick ett ickenumeriskt första argument"
 
-#: builtin.c:2343 mpfr.c:674
+#: builtin.c:2325 mpfr.c:681
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: fick ett ickenumeriskt andra argument"
 
-#: builtin.c:2362
+#: builtin.c:2344
 msgid "sin: received non-numeric argument"
 msgstr "sin: fick ett ickenumeriskt argument"
 
-#: builtin.c:2378
+#: builtin.c:2360
 msgid "cos: received non-numeric argument"
 msgstr "cos: fick ett ickenumeriskt argument"
 
-#: builtin.c:2431 mpfr.c:1156
+#: builtin.c:2413 mpfr.c:1176
 msgid "srand: received non-numeric argument"
 msgstr "srand: fick ett ickenumeriskt argument"
 
-#: builtin.c:2462
+#: builtin.c:2444
 msgid "match: third argument is not an array"
 msgstr "match: tredje argumentet är inte en vektor"
 
-#: builtin.c:2734
-msgid "gensub: third argument of 0 treated as 1"
+#: builtin.c:2705
+#, fuzzy, c-format
+msgid "gensub: third argument `%.*s' treated as 1"
 msgstr "gensub: nollan i tredje argumentet behandlad som en etta"
 
-#: builtin.c:3030
+#: builtin.c:2720
+#, fuzzy, c-format
+msgid "gensub: third argument %g treated as 1"
+msgstr "gensub: nollan i tredje argumentet behandlad som en etta"
+
+#: builtin.c:3020
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: fick ett ickenumeriskt första argument"
 
-#: builtin.c:3032
+#: builtin.c:3022
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift: fick ett ickenumeriskt andra argument"
 
-#: builtin.c:3038
+#: builtin.c:3028
 #, c-format
 msgid "lshift(%f, %f): negative values will give strange results"
 msgstr "lshift(%f, %f): negativa värden kommer ge konstiga resultat"
 
-#: builtin.c:3040
+#: builtin.c:3030
 #, c-format
 msgid "lshift(%f, %f): fractional values will be truncated"
 msgstr "lshift(%f, %f): flyttalsvärden kommer huggas av"
 
-#: builtin.c:3042
+#: builtin.c:3032
 #, c-format
 msgid "lshift(%f, %f): too large shift value will give strange results"
 msgstr "lshift(%f, %f): för stort skiftvärde kommer ge konstiga resultat"
 
-#: builtin.c:3067
+#: builtin.c:3057
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: fick ett ickenumeriskt första argument"
 
-#: builtin.c:3069
+#: builtin.c:3059
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift: fick ett ickenumeriskt andra argument"
 
-#: builtin.c:3075
+#: builtin.c:3065
 #, c-format
 msgid "rshift(%f, %f): negative values will give strange results"
 msgstr "rshift(%f, %f): negativa värden kommer ge konstiga resultat"
 
-#: builtin.c:3077
+#: builtin.c:3067
 #, c-format
 msgid "rshift(%f, %f): fractional values will be truncated"
 msgstr "rshift(%f, %f): flyttalsvärden kommer huggas av"
 
-#: builtin.c:3079
+#: builtin.c:3069
 #, c-format
 msgid "rshift(%f, %f): too large shift value will give strange results"
 msgstr "rshift(%f, %f): för stor skiftvärde kommer ge konstiga resultat"
 
-#: builtin.c:3104 mpfr.c:968
+#: builtin.c:3094 mpfr.c:988
 msgid "and: called with less than two arguments"
 msgstr "and: anropad med mindre än två argument"
 
-#: builtin.c:3109
+#: builtin.c:3099
 #, c-format
 msgid "and: argument %d is non-numeric"
 msgstr "and: argument %d är inte numeriskt"
 
-#: builtin.c:3113
+#: builtin.c:3103
 #, c-format
 msgid "and: argument %d negative value %g will give strange results"
 msgstr "and: argument %d med negativt värde %g kommer ge konstiga resultat"
 
-#: builtin.c:3136 mpfr.c:1000
+#: builtin.c:3126 mpfr.c:1020
 msgid "or: called with less than two arguments"
-msgstr "or: anropad med färre än två argmuent"
+msgstr "or: anropad med färre än två argument"
 
-#: builtin.c:3141
+#: builtin.c:3131
 #, c-format
 msgid "or: argument %d is non-numeric"
 msgstr "or: argument %d är inte numeriskt"
 
-#: builtin.c:3145
+#: builtin.c:3135
 #, c-format
 msgid "or: argument %d negative value %g will give strange results"
 msgstr "or: argument %d med negativt värde %g kommer ge konstiga resultat"
 
-#: builtin.c:3167 mpfr.c:1031
+#: builtin.c:3157 mpfr.c:1051
 msgid "xor: called with less than two arguments"
 msgstr "xor: anropad med färre än två argument"
 
-#: builtin.c:3173
+#: builtin.c:3163
 #, c-format
 msgid "xor: argument %d is non-numeric"
 msgstr "xor: argument %d är inte numeriskt"
 
-#: builtin.c:3177
+#: builtin.c:3167
 #, c-format
 msgid "xor: argument %d negative value %g will give strange results"
 msgstr "xor: argument %d med negativt värde %g kommer ge konstiga resultat"
 
-#: builtin.c:3202 mpfr.c:787
+#: builtin.c:3192 mpfr.c:807
 msgid "compl: received non-numeric argument"
 msgstr "compl: fick ett ickenumeriskt argument"
 
-#: builtin.c:3208
+#: builtin.c:3198
 #, c-format
 msgid "compl(%f): negative value will give strange results"
 msgstr "compl(%f): negativt värde kommer ge konstiga resultat"
 
-#: builtin.c:3210
+#: builtin.c:3200
 #, c-format
 msgid "compl(%f): fractional value will be truncated"
 msgstr "compl(%f): flyttalsvärde kommer huggas av"
 
-#: builtin.c:3379
+#: builtin.c:3369
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: \"%s\" är inte en giltig lokalkategori"
@@ -1087,7 +1109,7 @@ msgstr "delete [brytpunkter] [intervall] - radera angivna brytpunkter."
 
 #: command.y:831
 msgid "disable [breakpoints] [range] - disable specified breakpoints."
-msgstr "disable [brytpunkger] [intervall] - avaktivera angivna brytpunkter."
+msgstr "disable [brytpunkter] [intervall] - avaktivera angivna brytpunkter."
 
 #: command.y:833
 msgid "display [var] - print value of variable each time the program stops."
@@ -1237,47 +1259,56 @@ msgstr "up [N] - flytta N ramar uppåt i stacken."
 msgid "watch var - set a watchpoint for a variable."
 msgstr "watch var - sätt en observationspunkt för en variabel."
 
-#: command.y:1011 debug.c:401 msg.c:135
+#: command.y:901
+#, fuzzy
+msgid ""
+"where [N] - (same as backtrace) print trace of all or N innermost (outermost "
+"if N < 0) frames."
+msgstr ""
+"backtrace [N] - skriv ett spår över alla eller N innersta (yttersta om N < "
+"0) ramar."
+
+#: command.y:1013 debug.c:401 msg.c:135
 #, c-format
 msgid "error: "
 msgstr "fel: "
 
-#: command.y:1051
+#: command.y:1053
 #, c-format
 msgid "can't read command (%s)\n"
 msgstr "kan inte läsa kommando (%s)\n"
 
-#: command.y:1065
+#: command.y:1067
 #, c-format
 msgid "can't read command (%s)"
 msgstr "kan inte läsa kommandot (%s)"
 
-#: command.y:1116
+#: command.y:1118
 msgid "invalid character in command"
 msgstr "ogiltigt tecken i kommandot"
 
-#: command.y:1152
+#: command.y:1154
 #, c-format
 msgid "unknown command - \"%.*s\", try help"
 msgstr "okänt kommando - \"%.*s\", försök med help"
 
-#: command.y:1222
+#: command.y:1224
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.y:1284
+#: command.y:1286
 msgid "invalid character"
 msgstr "ogiltigt tecken"
 
-#: command.y:1455
+#: command.y:1457
 #, c-format
 msgid "undefined command: %s\n"
 msgstr "odefinierat kommando: %s\n"
 
 #: debug.c:252
 msgid "set or show the number of lines to keep in history file."
-msgstr "sätt eller visa antalet rader att behålla i historiefilen."
+msgstr "sätt eller visa antalet rader att behålla i historikfilen."
 
 #: debug.c:254
 msgid "set or show the list command window size."
@@ -1293,7 +1324,7 @@ msgstr "sätt eller visa felsökningsprompten."
 
 #: debug.c:260
 msgid "(un)set or show saving of command history (value=on|off)."
-msgstr "slå av/på eller visa sparandet av kommandohisterik (värde=on|off)."
+msgstr "slå av/på eller visa sparandet av kommandohistorik (värde=on|off)."
 
 #: debug.c:262
 msgid "(un)set or show saving of options (value=on|off)."
@@ -1561,7 +1592,7 @@ msgstr "Ogiltigt ramnummer"
 #, c-format
 msgid "Note: breakpoint %d (enabled, ignore next %ld hits), also set at %s:%d"
 msgstr ""
-"Observera: brytpunkt %d (aktiverad, ingorera följande %ld träffar), är också "
+"Observera: brytpunkt %d (aktiverad, ignorera följande %ld träffar), är också "
 "satt vid %s:%d"
 
 #: debug.c:2207
@@ -1604,7 +1635,7 @@ msgstr "Kan inte hitta regeln!!!\n"
 #: debug.c:2375
 #, c-format
 msgid "Can't set breakpoint at `%s':%d\n"
-msgstr "Kan inte sätta än brytpunkt vid �%s�:%d\n"
+msgstr "Kan inte sätta en brytpunkt vid �%s�:%d\n"
 
 #: debug.c:2387
 #, c-format
@@ -1680,7 +1711,7 @@ msgstr "fel: kan inte starta om, åtgärden är inte tillåten\n"
 #: debug.c:2942
 #, c-format
 msgid "error (%s): cannot restart, ignoring rest of the commands\n"
-msgstr "fel (%s): kan inte starta om, ingorerar resten av kommandona\n"
+msgstr "fel (%s): kan inte starta om, ignorerar resten av kommandona\n"
 
 #: debug.c:2950
 #, c-format
@@ -1799,68 +1830,70 @@ msgid "`return' not allowed in current context; statement ignored"
 msgstr ""
 "�return� är inte tillåtet i det aktuella sammanhanget; satsen ignoreras"
 
-#: debug.c:5590
+#: debug.c:5604
 #, c-format
 msgid "No symbol `%s' in current context"
 msgstr "Ingen symbol �%s� i aktuell omgivning"
 
-#: dfa.c:1118 dfa.c:1121 dfa.c:1142 dfa.c:1150 dfa.c:1162 dfa.c:1197
-#: dfa.c:1206 dfa.c:1209 dfa.c:1214 dfa.c:1228 dfa.c:1275
+#: dfa.c:1063 dfa.c:1066 dfa.c:1085 dfa.c:1095 dfa.c:1107 dfa.c:1143
+#: dfa.c:1152 dfa.c:1155 dfa.c:1160 dfa.c:1174 dfa.c:1222
 msgid "unbalanced ["
 msgstr "obalanserad ["
 
-#: dfa.c:1174
+#: dfa.c:1119
 msgid "invalid character class"
 msgstr "ogiltig teckenklass"
 
-#: dfa.c:1316
+#: dfa.c:1265
 msgid "character class syntax is [[:space:]], not [:space:]"
 msgstr "syntaxen för teckenklass är [[:space:]], inte [:space:]"
 
-#: dfa.c:1366
+#: dfa.c:1327
 msgid "unfinished \\ escape"
 msgstr "oavslutad \\-följd"
 
-#: dfa.c:1513 regcomp.c:161
-msgid "Invalid content of \\{\\}"
+#: dfa.c:1474
+#, fuzzy
+msgid "invalid content of \\{\\}"
 msgstr "Ogiltigt innehåll i \\{\\}"
 
-#: dfa.c:1516 regcomp.c:176
-msgid "Regular expression too big"
+#: dfa.c:1477
+#, fuzzy
+msgid "regular expression too big"
 msgstr "Reguljärt uttryck för stort"
 
-#: dfa.c:1936
+#: dfa.c:1912
 msgid "unbalanced ("
 msgstr "obalanserad ("
 
-#: dfa.c:2062
+#: dfa.c:2038
 msgid "no syntax specified"
 msgstr "ingen syntax angiven"
 
-#: dfa.c:2070
+#: dfa.c:2046
 msgid "unbalanced )"
 msgstr "obalanserad )"
 
-#: eval.c:394
+#: eval.c:396
 #, c-format
 msgid "unknown nodetype %d"
 msgstr "okänd nodtyp %d"
 
-#: eval.c:405 eval.c:419
+#: eval.c:407 eval.c:421
 #, c-format
 msgid "unknown opcode %d"
 msgstr "okänd op-kod %d"
 
-#: eval.c:416
+#: eval.c:418
 #, c-format
 msgid "opcode %s not an operator or keyword"
 msgstr "op-kod %s är inte en operator eller ett nyckelord"
 
-#: eval.c:472
+#: eval.c:474
 msgid "buffer overflow in genflags2str"
 msgstr "buffertöverflöd i genflags2str"
 
-#: eval.c:675
+#: eval.c:676
 #, c-format
 msgid ""
 "\n"
@@ -1871,216 +1904,216 @@ msgstr ""
 "\t# Funktionsanropsstack:\n"
 "\n"
 
-#: eval.c:704
+#: eval.c:705
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "\"IGNORECASE\" är en gawk-utökning"
 
-#: eval.c:736
+#: eval.c:737
 msgid "`BINMODE' is a gawk extension"
 msgstr "\"BINMODE\" är en gawk-utökning"
 
-#: eval.c:794
+#: eval.c:795
 #, c-format
 msgid "BINMODE value `%s' is invalid, treated as 3"
 msgstr "BINMODE-värde \"%s\" är ogiltigt, behandlas som 3"
 
-#: eval.c:885
+#: eval.c:912
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "felaktig \"%sFMT\"-specifikation \"%s\""
 
-#: eval.c:969
+#: eval.c:996
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "slår av \"--lint\" på grund av en tilldelning till \"LINT\""
 
-#: eval.c:1147
+#: eval.c:1174
 #, c-format
 msgid "reference to uninitialized argument `%s'"
 msgstr "referens till icke initierat argument \"%s\""
 
-#: eval.c:1148
+#: eval.c:1175
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "referens till icke initierad variabel \"%s\""
 
-#: eval.c:1166
+#: eval.c:1193
 msgid "attempt to field reference from non-numeric value"
 msgstr "försök att fältreferera från ickenumeriskt värde"
 
-#: eval.c:1168
+#: eval.c:1195
 msgid "attempt to field reference from null string"
 msgstr "försök till fältreferens från en tom sträng"
 
-#: eval.c:1176
+#: eval.c:1203
 #, c-format
 msgid "attempt to access field %ld"
 msgstr "försök att komma åt fält nummer %ld"
 
-#: eval.c:1185
+#: eval.c:1212
 #, c-format
 msgid "reference to uninitialized field `$%ld'"
 msgstr "referens till icke initierat fält \"$%ld\""
 
-#: eval.c:1272
+#: eval.c:1299
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "funktionen \"%s\" anropad med fler argument än vad som deklarerats"
 
-#: eval.c:1473
+#: eval.c:1500
 #, c-format
 msgid "unwind_stack: unexpected type `%s'"
 msgstr "unwind_stack: oväntad typ \"%s\""
 
-#: eval.c:1569
+#: eval.c:1596
 msgid "division by zero attempted in `/='"
 msgstr "försökte dividera med noll i \"/=\""
 
-#: eval.c:1576
+#: eval.c:1603
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "försökte dividera med noll i \"%%=\""
 
-#: ext.c:89 ext.c:171
+#: ext.c:65 ext.c:147
 msgid "extensions are not allowed in sandbox mode"
 msgstr "utökningar är inte tillåtna i sandlådeläge"
 
-#: ext.c:92
+#: ext.c:68
 msgid "-l / @load are gawk extensions"
 msgstr "-l / @load är gawk-utökningar"
 
-#: ext.c:95
+#: ext.c:71
 msgid "load_ext: received NULL lib_name"
 msgstr "load_ext: mottog NULL-lib_name"
 
-#: ext.c:98
+#: ext.c:74
 #, c-format
 msgid "load_ext: cannot open library `%s' (%s)\n"
 msgstr "load_ext: kan inte öppna biblioteket �%s� (%s)\n"
 
-#: ext.c:104
+#: ext.c:80
 #, c-format
 msgid ""
 "load_ext: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
 msgstr ""
 "load_ext: biblioteket �%s�: definierar inte �plugin_is_GPL_compatible� (%s)\n"
 
-#: ext.c:110
+#: ext.c:86
 #, c-format
 msgid "load_ext: library `%s': cannot call function `%s' (%s)\n"
 msgstr "load_ext: biblioteket �%s�: kan inte anropa funktionen �%s� (%s)\n"
 
-#: ext.c:114
+#: ext.c:90
 #, c-format
 msgid "load_ext: library `%s' initialization routine `%s' failed\n"
 msgstr ""
 "load_ext: initieringsrutinen �%2$s� i biblioteket �%1$s� misslyckades\n"
 
-#: ext.c:174
+#: ext.c:150
 msgid "`extension' is a gawk extension"
 msgstr "\"extension\" är en gawk-utökning"
 
-#: ext.c:177
+#: ext.c:153
 msgid "extension: received NULL lib_name"
 msgstr "utökning: mottog NULL-lib_name"
 
-#: ext.c:180
+#: ext.c:156
 #, c-format
 msgid "extension: cannot open library `%s' (%s)"
 msgstr "extension: kan inte öppna biblioteket �%s� (%s)"
 
-#: ext.c:186
+#: ext.c:162
 #, c-format
 msgid ""
 "extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)"
 msgstr ""
 "extension: biblioteket �%s�: definierar inte �plugin_is_GPL_compatible� (%s)"
 
-#: ext.c:190
+#: ext.c:166
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)"
 msgstr "extension: biblioteket �%s�: kan inte anropa funktionen �%s� (%s)"
 
-#: ext.c:221
+#: ext.c:197
 msgid "make_builtin: missing function name"
 msgstr "make_builtin: funktionsnamn saknas"
 
-#: ext.c:236
+#: ext.c:212
 #, c-format
 msgid "make_builtin: can't redefine function `%s'"
 msgstr "make_builtin: det går inte att definiera om funktionen �%s�"
 
-#: ext.c:240
+#: ext.c:216
 #, c-format
 msgid "make_builtin: function `%s' already defined"
 msgstr "make_builtin: funktionen �%s� är redan definierad"
 
-#: ext.c:244
+#: ext.c:220
 #, c-format
 msgid "make_builtin: function name `%s' previously defined"
 msgstr "make_builtin: funktionsnamnet �%s� är definierat sedan tidigare"
 
-#: ext.c:246
+#: ext.c:222
 #, c-format
 msgid "make_builtin: can't use gawk built-in `%s' as function name"
 msgstr ""
 "make_builtin: kan inte använda gawks inbyggda �%s� som ett funktionsnamn"
 
-#: ext.c:249 ext.c:304
+#: ext.c:225 ext.c:280
 #, c-format
 msgid "make_builtin: negative argument count for function `%s'"
 msgstr "make_builtin: negativt argumentantal för funktionen \"%s\""
 
-#: ext.c:276
+#: ext.c:252
 msgid "extension: missing function name"
 msgstr "extension: saknar funktionsnamn"
 
-#: ext.c:279 ext.c:283
+#: ext.c:255 ext.c:259
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: ogiltigt tecken \"%c\" i funktionsnamnet \"%s\""
 
-#: ext.c:291
+#: ext.c:267
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: det går inte att definiera om funktionen \"%s\""
 
-#: ext.c:295
+#: ext.c:271
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr "extension: funktionen \"%s\" är redan definierad"
 
-#: ext.c:299
+#: ext.c:275
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "extension: funktionsnamnet \"%s\" är definierat sedan tidigare"
 
-#: ext.c:301
+#: ext.c:277
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 "extension: kan inte använda gawks inbyggda \"%s\" som ett funktionsnamn"
 
-#: ext.c:375
+#: ext.c:351
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "funktionen \"%s\" definierades för att ta maximalt %d argument"
 
-#: ext.c:378
+#: ext.c:354
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "funktionen \"%s\": argument %d saknas"
 
-#: ext.c:395
+#: ext.c:371
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "funktionen \"%s\": argument %d: försök att använda skalär som vektor"
 
-#: ext.c:399
+#: ext.c:375
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr "funktionen \"%s\": argument %d: försök att använda vektor som skalär"
 
-#: ext.c:413
+#: ext.c:389
 msgid "dynamic loading of library not supported"
 msgstr "dynamisk laddning av bibliotek stödjs inte"
 
@@ -2224,7 +2257,7 @@ msgstr "wait: anropad med för många argument"
 msgid "inplace_begin: in-place editing already active"
 msgstr "inplace_begin: redigering på plats är redan aktivt"
 
-#: extension/inplace.c:133 extension/inplace.c:207
+#: extension/inplace.c:133 extension/inplace.c:210
 #, c-format
 msgid "inplace_begin: expects 2 arguments but called with %d"
 msgstr "inplace_begin: förväntar sig 2 argument men anropad med %d"
@@ -2254,55 +2287,55 @@ msgstr "inplace_begin: �%s� är inte en vanlig fil"
 msgid "inplace_begin: mkstemp(`%s') failed (%s)"
 msgstr "inplace_begin: mkstemp(�%s�) misslyckades (%s)"
 
-#: extension/inplace.c:178
+#: extension/inplace.c:181
 #, c-format
 msgid "inplace_begin: chmod failed (%s)"
 msgstr "inplace_begin: chmod misslyckades (%s)"
 
-#: extension/inplace.c:185
+#: extension/inplace.c:188
 #, c-format
 msgid "inplace_begin: dup(stdout) failed (%s)"
 msgstr "inplace_begin: dup(standard ut) misslyckades (%s)"
 
-#: extension/inplace.c:188
+#: extension/inplace.c:191
 #, c-format
 msgid "inplace_begin: dup2(%d, stdout) failed (%s)"
 msgstr "inplace_begin: dup2(%d, standard ut) misslyckades (%s)"
 
-#: extension/inplace.c:191
+#: extension/inplace.c:194
 #, c-format
 msgid "inplace_begin: close(%d) failed (%s)"
 msgstr "inplace_begin: close(%d) misslyckades (%s)"
 
-#: extension/inplace.c:210
+#: extension/inplace.c:213
 msgid "inplace_end: cannot retrieve 1st argument as a string filename"
 msgstr "inplace_end: kan inte hämta 1:a argumentet som en filnamnssträng"
 
-#: extension/inplace.c:217
+#: extension/inplace.c:220
 msgid "inplace_end: in-place editing not active"
 msgstr "inplace_end: redigering på plats är inte aktivt"
 
-#: extension/inplace.c:223
+#: extension/inplace.c:226
 #, c-format
 msgid "inplace_end: dup2(%d, stdout) failed (%s)"
 msgstr "inplace_end: dup2(%d, standard ut) misslyckades (%s)"
 
-#: extension/inplace.c:226
+#: extension/inplace.c:229
 #, c-format
 msgid "inplace_end: close(%d) failed (%s)"
 msgstr "inplace_end: close(%d) misslyckades (%s)"
 
-#: extension/inplace.c:230
+#: extension/inplace.c:233
 #, c-format
 msgid "inplace_end: fsetpos(stdout) failed (%s)"
 msgstr "inplace_end: fsetpos(standard ut) misslyckades (%s)"
 
-#: extension/inplace.c:243
+#: extension/inplace.c:246
 #, c-format
 msgid "inplace_end: link(`%s', `%s') failed (%s)"
 msgstr "inplace_end: link(�%s�, �%s�) misslyckades (%s)"
 
-#: extension/inplace.c:253
+#: extension/inplace.c:256
 #, c-format
 msgid "inplace_end: rename(`%s', `%s') failed (%s)"
 msgstr "inplace_end: rename(�%s�, �%s�) misslyckades (%s)"
@@ -2344,50 +2377,54 @@ msgstr "readfile: anropad med för många argument"
 msgid "readfile: called with no arguments"
 msgstr "readfile: anropad utan argument"
 
-#: extension/rwarray.c:124
+#: extension/revoutput.c:125
+msgid "revoutput: could not initialize REVOUT variable"
+msgstr ""
+
+#: extension/rwarray.c:124 extension/rwarray0.c:109
 msgid "writea: called with too many arguments"
 msgstr "writea: anropad med för många argument"
 
-#: extension/rwarray.c:131
+#: extension/rwarray.c:131 extension/rwarray0.c:116
 #, c-format
 msgid "do_writea: argument 0 is not a string\n"
 msgstr "do_writea: argument 0 är inte en sträng\n"
 
-#: extension/rwarray.c:137
+#: extension/rwarray.c:137 extension/rwarray0.c:122
 #, c-format
 msgid "do_writea: argument 1 is not an array\n"
 msgstr "do_writea: argument 1 är inte en vektor\n"
 
-#: extension/rwarray.c:184
+#: extension/rwarray.c:184 extension/rwarray0.c:169
 #, c-format
 msgid "write_array: could not flatten array\n"
 msgstr "write_array: kunde inte platta till vektor\n"
 
-#: extension/rwarray.c:198
+#: extension/rwarray.c:198 extension/rwarray0.c:183
 #, c-format
 msgid "write_array: could not release flattened array\n"
 msgstr "write_array: kunde inte släppa en tillplattad vektor\n"
 
-#: extension/rwarray.c:280
+#: extension/rwarray.c:280 extension/rwarray0.c:265
 msgid "reada: called with too many arguments"
 msgstr "reada: anropad med för många argument"
 
-#: extension/rwarray.c:287
+#: extension/rwarray.c:287 extension/rwarray0.c:272
 #, c-format
 msgid "do_reada: argument 0 is not a string\n"
 msgstr "do_reada: argument 0 är inte en sträng\n"
 
-#: extension/rwarray.c:293
+#: extension/rwarray.c:293 extension/rwarray0.c:278
 #, c-format
 msgid "do_reada: argument 1 is not an array\n"
 msgstr "do_reada: argument 1 är inte en vektor\n"
 
-#: extension/rwarray.c:337
+#: extension/rwarray.c:337 extension/rwarray0.c:322
 #, c-format
 msgid "do_reada: clear_array failed\n"
 msgstr "do_reada: clear_array misslyckades\n"
 
-#: extension/rwarray.c:374
+#: extension/rwarray.c:374 extension/rwarray0.c:358
 #, c-format
 msgid "read_array: set_array_element failed\n"
 msgstr "read_array: set_array_element misslyckades\n"
@@ -2416,90 +2453,90 @@ msgstr "sleep: argumentet är negativt"
 msgid "sleep: not supported on this platform"
 msgstr "sleep: stödjs inte på denna plattform"
 
-#: field.c:345
+#: field.c:346
 msgid "NF set to negative value"
 msgstr "NF satt till ett negativt värde"
 
-#: field.c:971 field.c:978 field.c:982
+#: field.c:958 field.c:965 field.c:969
 msgid "split: fourth argument is a gawk extension"
 msgstr "split: fjärde argumentet är en gawk-utökning"
 
-#: field.c:975
+#: field.c:962
 msgid "split: fourth argument is not an array"
 msgstr "split: fjärde argumentet är inte en vektor"
 
-#: field.c:989
+#: field.c:976
 msgid "split: second argument is not an array"
 msgstr "split: andra argumentet är inte en vektor"
 
-#: field.c:993
+#: field.c:980
 msgid "split: cannot use the same array for second and fourth args"
 msgstr ""
 "split: det går inte att använda samma vektor som andra och fjärde argument"
 
-#: field.c:998
+#: field.c:985
 msgid "split: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "split: det går inte att använda en delvektor av andra argumentet som fjärde "
 "argument"
 
-#: field.c:1001
+#: field.c:988
 msgid "split: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "split: det går inte att använda en delvektor av fjärde argumentet som andra "
 "argument"
 
-#: field.c:1032
+#: field.c:1019
 msgid "split: null string for third arg is a gawk extension"
 msgstr "split: tom sträng som tredje argument är en gawk-utökning"
 
-#: field.c:1072
+#: field.c:1059
 msgid "patsplit: fourth argument is not an array"
 msgstr "patsplit: fjärde argumentet är inte en vektor"
 
-#: field.c:1077
+#: field.c:1064
 msgid "patsplit: second argument is not an array"
 msgstr "patsplit: andra argumentet är inte en vektor"
 
-#: field.c:1083
+#: field.c:1070
 msgid "patsplit: third argument must be non-null"
 msgstr "patsplit: tredje argumentet får inte vara tomt"
 
-#: field.c:1087
+#: field.c:1074
 msgid "patsplit: cannot use the same array for second and fourth args"
 msgstr ""
 "patsplit: det går inte att använda samma vektor som andra och fjärde argument"
 
-#: field.c:1092
+#: field.c:1079
 msgid "patsplit: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "patsplit: det går inte att använda en delvektor av andra argumentet som "
 "fjärde argument"
 
-#: field.c:1095
+#: field.c:1082
 msgid "patsplit: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "patsplit: det går inte att använda en delvektor av fjärde argumentet som "
 "andra argument"
 
-#: field.c:1133
+#: field.c:1120
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "\"FIELDWIDTHS\" är en gawk-utökning"
 
-#: field.c:1197
+#: field.c:1184
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "ogiltigt FIELDWITHS-värde i närheten av \"%s\""
 
-#: field.c:1270
+#: field.c:1257
 msgid "null string for `FS' is a gawk extension"
 msgstr "tom sträng som \"FS\" är en gawk-utökning"
 
-#: field.c:1274
+#: field.c:1261
 msgid "old awk does not support regexps as value of `FS'"
 msgstr "gamla awk stöder inte reguljära uttryck som värden på \"FS\""
 
-#: field.c:1393
+#: field.c:1380
 msgid "`FPAT' is a gawk extension"
 msgstr "\"FPAT\" är en gawk-utökning"
 
@@ -2515,20 +2552,20 @@ msgstr "node_to_awk_value: mottog null-nod"
 msgid "node_to_awk_value: received null val"
 msgstr "node_to_awk_value: mottog null-värde"
 
-#: gawkapi.c:807
+#: gawkapi.c:809
 msgid "remove_element: received null array"
 msgstr "remove_element: fick en null-vektor"
 
-#: gawkapi.c:810
+#: gawkapi.c:812
 msgid "remove_element: received null subscript"
 msgstr "remove_element: mottog null-index"
 
-#: gawkapi.c:947
+#: gawkapi.c:949
 #, c-format
 msgid "api_flatten_array: could not convert index %d\n"
 msgstr "api_flatten_array: kunde inte konvertera index %d\n"
 
-#: gawkapi.c:952
+#: gawkapi.c:954
 #, c-format
 msgid "api_flatten_array: could not convert value %d\n"
 msgstr "api_flatten_array: kunde inte konvertera värdet %d\n"
@@ -2588,288 +2625,269 @@ msgstr "%s: flaggan \"-W %s\" tillåter inte något argument\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: flaggan \"-W %s\" kräver ett argument\n"
 
-#: io.c:392
+#: io.c:423
 #, c-format
 msgid "command line argument `%s' is a directory: skipped"
 msgstr "kommandoradsargumentet \"%s\" är en katalog: hoppas över"
 
-#: io.c:395 io.c:513
+#: io.c:426 io.c:544
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "kan inte öppna filen \"%s\" för läsning (%s)"
 
-#: io.c:640
+#: io.c:671
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "stängning av fd %d (\"%s\") misslyckades (%s)"
 
-#: io.c:716
+#: io.c:749
 msgid "redirection not allowed in sandbox mode"
 msgstr "omdirigering är inte tillåten i sandlådeläge"
 
-#: io.c:750
+#: io.c:783
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "uttrycket i \"%s\"-omdirigering har bara numeriskt värde"
 
-#: io.c:756
+#: io.c:789
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "uttrycket för \"%s\"-omdirigering har en tom sträng som värde"
 
-#: io.c:761
+#: io.c:794
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "filnamnet \"%s\" för \"%s\"-omdirigering kan vara resultatet av ett logiskt "
 "uttryck"
 
-#: io.c:809
+#: io.c:842
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "onödig blandning av \">\" och \">>\" för filen \"%.*s\""
 
-#: io.c:863
+#: io.c:896
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "kan inte öppna röret \"%s\" för utmatning (%s)"
 
-#: io.c:873
+#: io.c:906
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "kan inte öppna röret \"%s\" för inmatning (%s)"
 
-#: io.c:904
+#: io.c:937
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr "kan inte öppna tvåvägsröret \"%s\" för in-/utmatning (%s)"
 
-#: io.c:986
+#: io.c:1019
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "kan inte dirigera om från \"%s\" (%s)"
 
-#: io.c:989
+#: io.c:1022
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "kan inte dirigera om till \"%s\" (%s)"
 
-#: io.c:1040
+#: io.c:1073
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "nådde systembegränsningen för öppna filer: börjar multiplexa fildeskriptorer"
 
-#: io.c:1056
+#: io.c:1089
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "stängning av \"%s\" misslyckades (%s)"
 
-#: io.c:1064
+#: io.c:1097
 msgid "too many pipes or input files open"
 msgstr "för många rör eller indatafiler öppna"
 
-#: io.c:1086
+#: io.c:1119
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: andra argumentet måste vara \"to\" eller \"from\""
 
-#: io.c:1103
+#: io.c:1136
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr "close: \"%.*s\" är inte en öppen fil, rör eller koprocess"
 
-#: io.c:1108
+#: io.c:1141
 msgid "close of redirection that was never opened"
 msgstr "stängning av omdirigering som aldrig öppnades"
 
-#: io.c:1205
+#: io.c:1238
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: omdirigeringen \"%s\" öppnades inte med \"|&\", andra argumentet "
 "ignorerat"
 
-#: io.c:1222
+#: io.c:1255
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "felstatus (%d) från rörstängning av \"%s\" (%s)"
 
-#: io.c:1225
+#: io.c:1258
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "felstatus (%d) från filstängning av \"%s\" (%s)"
 
-#: io.c:1245
+#: io.c:1278
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "ingen explicit stängning av uttaget \"%s\" tillhandahållen"
 
-#: io.c:1248
+#: io.c:1281
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "ingen explicit stängning av koprocessen \"%s\" tillhandahållen"
 
-#: io.c:1251
+#: io.c:1284
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "ingen explicit stängning av röret \"%s\" tillhandahållen"
 
-#: io.c:1254
+#: io.c:1287
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "ingen explicit stängning av filen \"%s\" tillhandahållen"
 
-#: io.c:1284 io.c:1342 main.c:864 main.c:906
+#: io.c:1317 io.c:1375 main.c:628 main.c:670
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "fel vid skrivning till standard ut (%s)"
 
-#: io.c:1289 io.c:1348 main.c:866
+#: io.c:1322 io.c:1381 main.c:630
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "fel vid skrivning till standard fel (%s)"
 
-#: io.c:1297
+#: io.c:1330
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "rörspolning av \"%s\" misslyckades (%s)"
 
-#: io.c:1300
+#: io.c:1333
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "koprocesspolning av röret till \"%s\" misslyckades (%s)"
 
-#: io.c:1303
+#: io.c:1336
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "filspolning av \"%s\" misslyckades (%s)"
 
-#: io.c:1420
+#: io.c:1453
 #, c-format
 msgid "local port %s invalid in `/inet'"
 msgstr "lokal port %s ogiltig i \"/inet\""
 
-#: io.c:1438
+#: io.c:1471
 #, c-format
 msgid "remote host and port information (%s, %s) invalid"
 msgstr "ogiltig information (%s, %s) för fjärrvärd och fjärrport"
 
-#: io.c:1590
-#, c-format
-msgid "no (known) protocol supplied in special filename `%s'"
-msgstr ""
-"inget (känt) protokoll tillhandahållet i det speciella filnamnet \"%s\""
-
-#: io.c:1604
-#, c-format
-msgid "special file name `%s' is incomplete"
-msgstr "speciellt filnamn \"%s\" är ofullständigt"
-
-#: io.c:1621
-msgid "must supply a remote hostname to `/inet'"
-msgstr "måste tillhandahålla ett fjärrdatornamn till \"/inet\""
-
-#: io.c:1639
-msgid "must supply a remote port to `/inet'"
-msgstr "måste tillhandahålla en fjärrport till \"/inet\""
-
-#: io.c:1685
+#: io.c:1673
 msgid "TCP/IP communications are not supported"
 msgstr "TCP/IP-kommunikation stöds inte"
 
-#: io.c:1867
+#: io.c:1854
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "kunde inte öppna \"%s\", läge \"%s\""
 
-#: io.c:1917
+#: io.c:1904
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "stängning av huvudpty misslyckades (%s)"
 
-#: io.c:1919 io.c:2105 io.c:2305
+#: io.c:1906 io.c:2092 io.c:2293
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "stängning av standard ut i barnet misslyckades (%s)"
 
-#: io.c:1922
+#: io.c:1909
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr "flyttandet av slavpty till standard ut i barnet misslyckades (dup: %s)"
 
-#: io.c:1924 io.c:2110
+#: io.c:1911 io.c:2097
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "stängning av standard in i barnet misslyckades (%s)"
 
-#: io.c:1927
+#: io.c:1914
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr "flyttandet av slavpty till standard in i barnet misslyckades (dup: %s)"
 
-#: io.c:1929 io.c:1951
+#: io.c:1916 io.c:1938
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "stängning av slavpty misslyckades (%s)"
 
-#: io.c:2040 io.c:2108 io.c:2276 io.c:2308
+#: io.c:2027 io.c:2095 io.c:2264 io.c:2296
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr "flyttande av rör till standard ut i barnet misslyckades (dup: %s)"
 
-#: io.c:2047 io.c:2113
+#: io.c:2034 io.c:2100
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr "flyttande av rör till standard in i barnet misslyckades (dup: %s)"
 
-#: io.c:2073 io.c:2298
+#: io.c:2060 io.c:2286
 msgid "restoring stdout in parent process failed\n"
-msgstr "återställande av standard ut i förälderprocessen misslyckades\n"
+msgstr "återställande av standard ut i föräldraprocessen misslyckades\n"
 
-#: io.c:2081
+#: io.c:2068
 msgid "restoring stdin in parent process failed\n"
-msgstr "återställande av standard in i förälderprocessen misslyckades\n"
+msgstr "återställande av standard in i föräldraprocessen misslyckades\n"
 
-#: io.c:2116 io.c:2310 io.c:2324
+#: io.c:2103 io.c:2298 io.c:2313
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "stängning av röret misslyckades (%s)"
 
-#: io.c:2174
+#: io.c:2162
 msgid "`|&' not supported"
 msgstr "\"|&\" stöds inte"
 
-#: io.c:2261
+#: io.c:2249
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "kan inte öppna röret \"%s\" (%s)"
 
-#: io.c:2318
+#: io.c:2307
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "kan inte skapa barnprocess för \"%s\" (fork: %s)"
 
-#: io.c:2790
+#: io.c:2734
 msgid "register_input_parser: received NULL pointer"
 msgstr "register_input_parser: mottog NULL-pekare"
 
-#: io.c:2818
+#: io.c:2762
 #, c-format
 msgid "input parser `%s' conflicts with previously installed input parser `%s'"
 msgstr ""
 "inmatningstolken �%s� står i konflikt med tidigare installerad "
 "inmatningstolk �%s�"
 
-#: io.c:2825
+#: io.c:2769
 #, c-format
 msgid "input parser `%s' failed to open `%s'"
 msgstr "inmatningstolken �%s� misslyckades att öppna �%s�"
 
-#: io.c:2845
+#: io.c:2789
 msgid "register_output_wrapper: received NULL pointer"
 msgstr "register_output_wrapper: mottog NULL-pekare"
 
-#: io.c:2873
+#: io.c:2817
 #, c-format
 msgid ""
 "output wrapper `%s' conflicts with previously installed output wrapper `%s'"
@@ -2877,16 +2895,16 @@ msgstr ""
 "utmatningsomslag �%s� står i konflikt med tidigare installerat "
 "utmatningsomslag �%s�"
 
-#: io.c:2880
+#: io.c:2824
 #, c-format
 msgid "output wrapper `%s' failed to open `%s'"
-msgstr "utmatningsomslag �%s� misslyckades att öpnna �%s�"
+msgstr "utmatningsomslag �%s� misslyckades att öppna �%s�"
 
-#: io.c:2901
+#: io.c:2845
 msgid "register_output_processor: received NULL pointer"
 msgstr "register_output_processor: mottog NULL-pekare"
 
-#: io.c:2930
+#: io.c:2874
 #, c-format
 msgid ""
 "two-way processor `%s' conflicts with previously installed two-way processor "
@@ -2895,210 +2913,197 @@ msgstr ""
 "tvåvägsprocessorn �%s� står i konflikt med tidigare installerad "
 "tvåvägsprocessor �%s�"
 
-#: io.c:2939
+#: io.c:2883
 #, c-format
 msgid "two way processor `%s' failed to open `%s'"
 msgstr "tvåvägsprocessorn �%s� misslyckades att öppna �%s�"
 
-#: io.c:3064
+#: io.c:3008
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "datafilen \"%s\" är tom"
 
-#: io.c:3106 io.c:3114
+#: io.c:3050 io.c:3058
 msgid "could not allocate more input memory"
 msgstr "kunde inte allokera mer indataminne"
 
-#: io.c:3682
+#: io.c:3636
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "flerteckensvärdet av \"RS\" är en gawk-utökning"
 
-#: io.c:3771
+#: io.c:3783
 msgid "IPv6 communication is not supported"
 msgstr "IPv6-kommunikation stöds inte"
 
-#: main.c:405
-msgid "empty argument to `-e/--source' ignored"
-msgstr "tomt argument till \"-e/--source\" ignorerat"
-
-#: main.c:495
-#, c-format
-msgid "%s: option `-W %s' unrecognized, ignored\n"
-msgstr "%s: flaggan \"-W %s\" okänd, ignorerad\n"
-
-#: main.c:541
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: flaggan kräver ett argument -- %c\n"
-
-#: main.c:562
+#: main.c:321
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr "miljövariabeln \"POSIXLY_CORRECT\" satt: slår på \"--posix\""
 
-#: main.c:568
+#: main.c:327
 msgid "`--posix' overrides `--traditional'"
 msgstr "\"--posix\" åsidosätter \"--traditional\""
 
-#: main.c:579
+#: main.c:338
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr "\"--posix\"/\"--traditional\" åsidosätter \"--non-decimal-data\""
 
-#: main.c:583
+#: main.c:342
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "att köra %s setuid root kan vara ett säkerhetsproblem"
 
-#: main.c:588
+#: main.c:346
 msgid "`--posix' overrides `--characters-as-bytes'"
 msgstr "�--posix� åsidosätter �--character-as-bytes�"
 
-#: main.c:647
+#: main.c:404
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "kan inte sätta binärläge på standard in (%s)"
 
-#: main.c:650
+#: main.c:407
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "kan inte sätta binärläge på standard ut (%s)"
 
-#: main.c:652
+#: main.c:409
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "kan inte sätta binärläge på standard fel (%s)"
 
-#: main.c:710
+#: main.c:469
 msgid "no program text at all!"
 msgstr "ingen programtext alls!"
 
-#: main.c:799
+#: main.c:563
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 "Användning: %s [POSIX- eller GNU-stilsflaggor] -f progfil [--] fil ...\n"
 
-#: main.c:801
+#: main.c:565
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr "Användning: %s [POSIX- eller GNU-stilsflaggor] %cprogram%c fil ...\n"
 
-#: main.c:806
+#: main.c:570
 msgid "POSIX options:\t\tGNU long options: (standard)\n"
 msgstr "POSIX-flaggor:\t\tGNU långa flaggor: (standard)\n"
 
-#: main.c:807
+#: main.c:571
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f progfil\t\t--file=progfil\n"
 
-#: main.c:808
+#: main.c:572
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F fs\t\t\t--field-separator=fs\n"
 
-#: main.c:809
+#: main.c:573
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr "\t-v var=värde\t\t--assign=var=värde\n"
 
-#: main.c:810
+#: main.c:574
 msgid "Short options:\t\tGNU long options: (extensions)\n"
 msgstr "Korta flaggor:\t\tGNU långa flaggor: (utökningar)\n"
 
-#: main.c:811
+#: main.c:575
 msgid "\t-b\t\t\t--characters-as-bytes\n"
 msgstr "\t-b\t\t\t--characters-as-bytes\n"
 
-#: main.c:812
+#: main.c:576
 msgid "\t-c\t\t\t--traditional\n"
 msgstr "\t-c\t\t\t--traditional\n"
 
-#: main.c:813
+#: main.c:577
 msgid "\t-C\t\t\t--copyright\n"
 msgstr "\t-C\t\t\t--copyright\n"
 
-#: main.c:814
+#: main.c:578
 msgid "\t-d[file]\t\t--dump-variables[=file]\n"
 msgstr "\t-d[fil]\t\t\t--dump-variables[=fil]\n"
 
-#: main.c:815
+#: main.c:579
 msgid "\t-D[file]\t\t--debug[=file]\n"
 msgstr "\t-D[fil]\t\t\t--debug[=fil]\n"
 
-#: main.c:816
+#: main.c:580
 msgid "\t-e 'program-text'\t--source='program-text'\n"
 msgstr "\t-e 'programtext'\t--source='programtext'\n"
 
-#: main.c:817
+#: main.c:581
 msgid "\t-E file\t\t\t--exec=file\n"
 msgstr "\t-E fil\t\t\t--exec=fil\n"
 
-#: main.c:818
+#: main.c:582
 msgid "\t-g\t\t\t--gen-pot\n"
 msgstr "\t-g\t\t\t--gen-pot\n"
 
-#: main.c:819
+#: main.c:583
 msgid "\t-h\t\t\t--help\n"
 msgstr "\t-h\t\t\t--help\n"
 
-#: main.c:820
+#: main.c:584
 msgid "\t-i includefile\t\t--include=includefile\n"
 msgstr "\t-i inkluderingsfil\t--include=inkluderingsfil\n"
 
-#: main.c:821
+#: main.c:585
 msgid "\t-l library\t\t--load=library\n"
 msgstr "\t-l bibliotek\t\t--load=bibliotek\n"
 
-#: main.c:822
-msgid "\t-L [fatal]\t\t--lint[=fatal]\n"
+#: main.c:586
+#, fuzzy
+msgid "\t-L[fatal|invalid]\t--lint[=fatal|invalid]\n"
 msgstr "\t-L [fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:823
-msgid "\t-n\t\t\t--non-decimal-data\n"
-msgstr "\t-n\t\t\t--non-decimal-data\n"
-
-#: main.c:824
+#: main.c:587
 msgid "\t-M\t\t\t--bignum\n"
 msgstr "\t-M\t\t\t--bignum\n"
 
-#: main.c:825
+#: main.c:588
 msgid "\t-N\t\t\t--use-lc-numeric\n"
 msgstr "\t-N\t\t\t--use-lc-numeric\n"
 
-#: main.c:826
+#: main.c:589
+msgid "\t-n\t\t\t--non-decimal-data\n"
+msgstr "\t-n\t\t\t--non-decimal-data\n"
+
+#: main.c:590
 msgid "\t-o[file]\t\t--pretty-print[=file]\n"
 msgstr "\t-o[fil]\t\t\t--pretty-print[=fil]\n"
 
-#: main.c:827
+#: main.c:591
 msgid "\t-O\t\t\t--optimize\n"
 msgstr "\t-O\t\t\t--optimize\n"
 
-#: main.c:828
+#: main.c:592
 msgid "\t-p[file]\t\t--profile[=file]\n"
 msgstr "\t-p[fil]\t\t\t--profile[=fil]\n"
 
-#: main.c:829
+#: main.c:593
 msgid "\t-P\t\t\t--posix\n"
 msgstr "\t-P\t\t\t--posix\n"
 
-#: main.c:830
+#: main.c:594
 msgid "\t-r\t\t\t--re-interval\n"
 msgstr "\t-r\t\t\t--re-interval\n"
 
-#: main.c:831
+#: main.c:595
 msgid "\t-S\t\t\t--sandbox\n"
 msgstr "\t-S\t\t\t--sandbox\n"
 
-#: main.c:832
+#: main.c:596
 msgid "\t-t\t\t\t--lint-old\n"
 msgstr "\t-t\t\t\t--lint-old\n"
 
-#: main.c:833
+#: main.c:597
 msgid "\t-V\t\t\t--version\n"
 msgstr "\t-V\t\t\t--version\n"
 
-#: main.c:835
+#: main.c:599
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr "\t-W nostalgia\t\t--nostalgia\n"
 
-#: main.c:838
+#: main.c:602
 msgid "\t-Y\t\t--parsedebug\n"
 msgstr "\t-Y\t\t--parsedebug\n"
 
@@ -3107,7 +3112,7 @@ msgstr "\t-Y\t\t--parsedebug\n"
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: main.c:847
+#: main.c:611
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -3121,7 +3126,7 @@ msgstr ""
 "Rapportera synpunkter på översättningen till <tp-sv@listor.tp-sv.se>.\n"
 "\n"
 
-#: main.c:851
+#: main.c:615
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -3131,7 +3136,7 @@ msgstr ""
 "Normalt läser det från standard in och skriver till standard ut.\n"
 "\n"
 
-#: main.c:855
+#: main.c:619
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -3141,7 +3146,7 @@ msgstr ""
 "\tgawk '{ sum += $1 }; END { print sum }' fil\n"
 "\tgawk -F: '{ print $1 }' /etc/passwd\n"
 
-#: main.c:880
+#: main.c:644
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
@@ -3160,7 +3165,7 @@ msgstr ""
 "någon senare version.\n"
 "\n"
 
-#: main.c:888
+#: main.c:652
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3174,122 +3179,140 @@ msgstr ""
 "General Public License för ytterligare information.\n"
 "\n"
 
-#: main.c:894
+#: main.c:658
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program. If not, see http://www.gnu.org/licenses/.\n"
 msgstr ""
 "Du bör ha fått en kopia av GNU General Public License tillsammans\n"
-"med detta program. Om inte, se http//www.gnu.org/liceences/.\n"
+"med detta program.  Om inte, se http://www.gnu.org/licenses/.\n"
 
-#: main.c:931
+#: main.c:695
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft sätter inte FS till tab i POSIX-awk"
 
-#: main.c:1208
+#: main.c:982
 #, c-format
 msgid "unknown value for field spec: %d\n"
 msgstr "okänt värde till fältspecifikation: %d\n"
 
-#: main.c:1306
+#: main.c:1080
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
 "\n"
 msgstr "%s: Argumentet \"%s\" till \"-v\" är inte på formatet \"var=värde\"\n"
 
-#: main.c:1332
+#: main.c:1106
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "\"%s\" är inte ett giltigt variabelnamn"
 
-#: main.c:1335
+#: main.c:1109
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "\"%s\" är inte ett variabelnamn, letar efter filen \"%s=%s\""
 
-#: main.c:1339
+#: main.c:1113
 #, c-format
 msgid "cannot use gawk builtin `%s' as variable name"
 msgstr "kan inte använda gawks inbyggda \"%s\" som ett funktionsnamn"
 
-#: main.c:1344
+#: main.c:1118
 #, c-format
 msgid "cannot use function `%s' as variable name"
 msgstr "kan inte använda funktionen \"%s\" som variabelnamn"
 
-#: main.c:1397
+#: main.c:1171
 msgid "floating point exception"
 msgstr "flyttalsundantag"
 
-#: main.c:1404
+#: main.c:1178
 msgid "fatal error: internal error"
 msgstr "ödesdigert fel: internt fel"
 
-#: main.c:1419
+#: main.c:1193
 msgid "fatal error: internal error: segfault"
 msgstr "ödesdigert fel: internt fel: segmenteringsfel"
 
-#: main.c:1431
+#: main.c:1205
 msgid "fatal error: internal error: stack overflow"
 msgstr "ödesdigert fel: internt fel: stackspill"
 
-#: main.c:1490
+#: main.c:1264
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "ingen föröppnad fd %d"
 
-#: main.c:1497
+#: main.c:1271
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "kunde inte föröppna /dev/null för fd %d"
 
-#: mpfr.c:550
+#: main.c:1485
+msgid "empty argument to `-e/--source' ignored"
+msgstr "tomt argument till \"-e/--source\" ignorerat"
+
+#: main.c:1556
+msgid "-M ignored: MPFR/GMP support not compiled in"
+msgstr ""
+
+#: main.c:1577
+#, c-format
+msgid "%s: option `-W %s' unrecognized, ignored\n"
+msgstr "%s: flaggan \"-W %s\" okänd, ignorerad\n"
+
+#: main.c:1630
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: flaggan kräver ett argument -- %c\n"
+
+#: mpfr.c:557
 #, c-format
 msgid "PREC value `%.*s' is invalid"
 msgstr "PREC-värdet �%.*s� är ogiltigt"
 
-#: mpfr.c:608
+#: mpfr.c:615
 #, c-format
 msgid "RNDMODE value `%.*s' is invalid"
 msgstr "RNDMODE-värdet �%.*s� är ogiltigt"
 
-#: mpfr.c:698
+#: mpfr.c:711
 #, c-format
 msgid "%s: received non-numeric argument"
 msgstr "%s: fick ett ickenumeriskt argument"
 
-#: mpfr.c:800
+#: mpfr.c:820
 msgid "compl(%Rg): negative value will give strange results"
 msgstr "compl(%Rg): negativt värde kommer ge konstiga resultat"
 
-#: mpfr.c:804
+#: mpfr.c:824
 msgid "comp(%Rg): fractional value will be truncated"
 msgstr "compl(%Rg): flyttalsvärden kommer huggas av"
 
-#: mpfr.c:816
+#: mpfr.c:836
 #, c-format
 msgid "cmpl(%Zd): negative values will give strange results"
 msgstr "cmpl(%Zd): negativt värde kommer ge konstiga resultat"
 
-#: mpfr.c:835
+#: mpfr.c:855
 #, c-format
 msgid "%s: received non-numeric argument #%d"
 msgstr "%s: fick ett ickenumeriskt argument nr. %d"
 
-#: mpfr.c:845
+#: mpfr.c:865
 msgid "%s: argument #%d has invalid value %Rg, using 0"
 msgstr "%s: argument nr. %d har ogiltigt värde %Rg, använder 0"
 
-#: mpfr.c:857
+#: mpfr.c:877
 msgid "%s: argument #%d negative value %Rg will give strange results"
 msgstr "%s: argument nr. %d negativa värde %Rg kommer ge konstiga resultat"
 
-#: mpfr.c:863
+#: mpfr.c:883
 msgid "%s: argument #%d fractional value %Rg will be truncated"
 msgstr "%s: argument nr. %d flyttalsvärde %Rg kommer huggas av"
 
-#: mpfr.c:878
+#: mpfr.c:898
 #, c-format
 msgid "%s: argument #%d negative value %Zd will give strange results"
 msgstr "%s: argument nr. %d negativa värde %Zd kommer ge konstiga resultat"
@@ -3299,24 +3322,24 @@ msgstr "%s: argument nr. %d negativa värde %Zd kommer ge konstiga resultat"
 msgid "cmd. line:"
 msgstr "kommandorad:"
 
-#: node.c:421
+#: node.c:409
 msgid "backslash at end of string"
 msgstr "omvänt snedstreck i slutet av strängen"
 
-#: node.c:500
+#: node.c:488
 #, c-format
 msgid "old awk does not support the `\\%c' escape sequence"
 msgstr "gamla awk stöder inte kontrollsekvensen \"\\%c\""
 
-#: node.c:551
+#: node.c:539
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX tillåter inte \"\\x\"-kontrollsekvenser"
 
-#: node.c:557
+#: node.c:545
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "inga hexadecimala siffror i \"\\x\"-kontrollsekvenser"
 
-#: node.c:579
+#: node.c:567
 #, c-format
 msgid ""
 "hex escape \\x%.*s of %d characters probably not interpreted the way you "
@@ -3325,12 +3348,12 @@ msgstr ""
 "hexkod \\x%.*s med %d tecken tolkas förmodligen inte på det sätt du "
 "förväntar dig"
 
-#: node.c:594
+#: node.c:582
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "kontrollsekvensen \"\\%c\" behandlad som bara \"%c\""
 
-#: node.c:739
+#: node.c:726
 msgid ""
 "Invalid multibyte data detected. There may be a mismatch between your data "
 "and your locale."
@@ -3358,12 +3381,12 @@ msgid "sending profile to standard error"
 msgstr "skickar profilen till standard fel"
 
 #: profile.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t# %s block(s)\n"
+"\t# %s rule(s)\n"
 "\n"
 msgstr ""
-"\t# %s-block\n"
+"\t# Regel/regler\n"
 "\n"
 
 #: profile.c:198
@@ -3380,11 +3403,11 @@ msgstr ""
 msgid "internal error: %s with null vname"
 msgstr "internt fel: %s med null vname"
 
-#: profile.c:537
+#: profile.c:538
 msgid "internal error: builtin with null fname"
 msgstr "internt fel: inbyggd med tomt fname"
 
-#: profile.c:949
+#: profile.c:958
 #, c-format
 msgid ""
 "\t# Loaded extensions (-l and/or @load)\n"
@@ -3393,12 +3416,12 @@ msgstr ""
 "\t# Laddade utvidgningar (-l och/eller @load)\n"
 "\n"
 
-#: profile.c:972
+#: profile.c:981
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# gawkprofil, skapad %s\n"
 
-#: profile.c:1475
+#: profile.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -3407,7 +3430,7 @@ msgstr ""
 "\n"
 "\t# Funktioner, listade alfabetiskt\n"
 
-#: profile.c:1513
+#: profile.c:1559
 #, c-format
 msgid "redir2str: unknown redirection type %d"
 msgstr "redir2str: okänd omdirigeringstyp %d"
@@ -3418,70 +3441,107 @@ msgid "regexp component `%.*s' should probably be `[%.*s]'"
 msgstr ""
 "komponenten \"%.*s\" i reguljäruttryck skall förmodligen vara \"[%.*s]\""
 
-#: regcomp.c:131
+#: regcomp.c:139
 msgid "Success"
 msgstr "Lyckades"
 
-#: regcomp.c:134
+#: regcomp.c:142
 msgid "No match"
 msgstr "Misslyckades"
 
-#: regcomp.c:137
+#: regcomp.c:145
 msgid "Invalid regular expression"
 msgstr "Ogiltigt reguljärt uttryck"
 
-#: regcomp.c:140
+#: regcomp.c:148
 msgid "Invalid collation character"
 msgstr "Ogiltigt kollationeringstecken"
 
-#: regcomp.c:143
+#: regcomp.c:151
 msgid "Invalid character class name"
 msgstr "Ogiltigt teckenklassnamn"
 
-#: regcomp.c:146
+#: regcomp.c:154
 msgid "Trailing backslash"
 msgstr "Eftersläpande omvänt snedstreck"
 
-#: regcomp.c:149
+#: regcomp.c:157
 msgid "Invalid back reference"
 msgstr "Ogiltig bakåtrerefens"
 
-#: regcomp.c:152
-msgid "Unmatched [ or [^"
+#: regcomp.c:160
+#, fuzzy
+msgid "Unmatched [, [^, [:, [., or [="
 msgstr "Obalanserad [ eller [^"
 
-#: regcomp.c:155
+#: regcomp.c:163
 msgid "Unmatched ( or \\("
 msgstr "Obalanserad ( eller \\("
 
-#: regcomp.c:158
+#: regcomp.c:166
 msgid "Unmatched \\{"
 msgstr "Obalanserad \\{"
 
-#: regcomp.c:164
+#: regcomp.c:169
+msgid "Invalid content of \\{\\}"
+msgstr "Ogiltigt innehåll i \\{\\}"
+
+#: regcomp.c:172
 msgid "Invalid range end"
 msgstr "Ogiltigt omfångsslut"
 
-#: regcomp.c:167
+#: regcomp.c:175
 msgid "Memory exhausted"
 msgstr "Minnet slut"
 
-#: regcomp.c:170
+#: regcomp.c:178
 msgid "Invalid preceding regular expression"
 msgstr "Ogiltigt föregående reguljärt uttryck"
 
-#: regcomp.c:173
+#: regcomp.c:181
 msgid "Premature end of regular expression"
 msgstr "För tidigt slut på reguljärt uttryck"
 
-#: regcomp.c:179
+#: regcomp.c:184
+msgid "Regular expression too big"
+msgstr "Reguljärt uttryck för stort"
+
+#: regcomp.c:187
 msgid "Unmatched ) or \\)"
 msgstr "Obalanserad ) eller \\)"
 
-#: regcomp.c:704
+#: regcomp.c:712
 msgid "No previous regular expression"
 msgstr "Inget föregående reguljärt uttryck"
 
-#: symbol.c:741
+#: symbol.c:677
+#, fuzzy, c-format
+msgid "function `%s': can't use function `%s' as a parameter name"
+msgstr "funktionen \"%s\": kan inte använda funktionsnamn som parameternamn"
+
+#: symbol.c:809
 msgid "can not pop main context"
 msgstr "kan inte poppa huvudsammanhang"
+
+#~ msgid "`getline var' invalid inside `%s' rule"
+#~ msgstr "\"getline var\" är ogiltigt inuti \"%s\"-regel"
+
+#~ msgid "no (known) protocol supplied in special filename `%s'"
+#~ msgstr ""
+#~ "inget (känt) protokoll tillhandahållet i det speciella filnamnet \"%s\""
+
+#~ msgid "special file name `%s' is incomplete"
+#~ msgstr "speciellt filnamn \"%s\" är ofullständigt"
+
+#~ msgid "must supply a remote hostname to `/inet'"
+#~ msgstr "måste tillhandahålla ett fjärrdatornamn till \"/inet\""
+
+#~ msgid "must supply a remote port to `/inet'"
+#~ msgstr "måste tillhandahålla en fjärrport till \"/inet\""
+
+#~ msgid ""
+#~ "\t# %s block(s)\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\t# %s-block\n"
+#~ "\n"
diff --git a/po/vi.gmo b/po/vi.gmo
index 10c710dc..3d4f023d 100644
--- a/po/vi.gmo
+++ b/po/vi.gmo
diff --git a/po/vi.po b/po/vi.po
index faa458a1..2bd6f429 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gawk-4.1.0b\n"
-"Report-Msgid-Bugs-To: arnold@skeeve.com\n"
-"POT-Creation-Date: 2014-04-08 19:23+0300\n"
+"Report-Msgid-Bugs-To: bug-gawk@gnu.org\n"
+"POT-Creation-Date: 2015-02-26 20:05+0200\n"
 "PO-Revision-Date: 2014-01-16 14:52+0700\n"
 "Last-Translator: Trần Ng�c Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -40,9 +40,9 @@ msgstr "cố dùng tham số vô hướng “%s� như là mảng"
 msgid "attempt to use scalar `%s' as an array"
 msgstr "cố dùng “%s� vô hướng như là mảng"
 
-#: array.c:409 array.c:576 builtin.c:85 builtin.c:1615 builtin.c:1661
-#: builtin.c:1674 builtin.c:2102 builtin.c:2116 eval.c:1122 eval.c:1126
-#: eval.c:1531
+#: array.c:409 array.c:576 builtin.c:85 builtin.c:1606 builtin.c:1652
+#: builtin.c:1665 builtin.c:2092 builtin.c:2106 eval.c:1149 eval.c:1153
+#: eval.c:1558
 #, c-format
 msgid "attempt to use array `%s' in a scalar context"
 msgstr "cố gắng dùng mảng “%s� trong một ngữ cảnh vô hướng"
@@ -101,422 +101,427 @@ msgstr ""
 "asorti (một chương trình xắp xếp thứ tự): không thể sử dụng mảng con của "
 "tham số thứ hai cho tham số thứ nhất"
 
-#: array.c:1314
+#: array.c:1313
 #, c-format
 msgid "`%s' is invalid as a function name"
 msgstr "“%s� không phải là tên hàm hợp lệ"
 
-#: array.c:1318
+#: array.c:1317
 #, c-format
 msgid "sort comparison function `%s' is not defined"
 msgstr "chưa định nghĩa hàm so sánh xắp xếp “%s�"
 
-#: awkgram.y:233
+#: awkgram.y:226
 #, c-format
 msgid "%s blocks must have an action part"
 msgstr "M�i khối %s phải có một phần kiểu hành động"
 
-#: awkgram.y:236
+#: awkgram.y:229
 msgid "each rule must have a pattern or an action part"
 msgstr "M�i quy tắc phải có một mẫu hay phần kiểu hành động"
 
-#: awkgram.y:325 awkgram.y:336
+#: awkgram.y:320 awkgram.y:331
 msgid "old awk does not support multiple `BEGIN' or `END' rules"
 msgstr ""
 "awk cũ không hỗ trợ nhi�u quy tắc kiểu “BEGIN� (bắt đầu) hay “END� (kết thúc)"
 
-#: awkgram.y:373
+#: awkgram.y:368
 #, c-format
 msgid "`%s' is a built-in function, it cannot be redefined"
 msgstr "“%s� là một hàm có sẵn nên nó không thể được định nghĩa lại."
 
-#: awkgram.y:419
+#: awkgram.y:417
 msgid "regexp constant `//' looks like a C++ comment, but is not"
 msgstr ""
 "hằng biểu thức chính quy “//� trông giống như một chú thích C++, nhưng mà "
 "không phải"
 
-#: awkgram.y:423
+#: awkgram.y:421
 #, c-format
 msgid "regexp constant `/%s/' looks like a C comment, but is not"
 msgstr ""
 "hằng biểu thức chính quy “/%s/� trông giống như một chú thích C, nhưng mà "
 "không phải"
 
-#: awkgram.y:515
+#: awkgram.y:513
 #, c-format
 msgid "duplicate case values in switch body: %s"
 msgstr "gặp giá trị case trùng trong thân chuyển đổi (switch body): %s"
 
-#: awkgram.y:536
+#: awkgram.y:534
 msgid "duplicate `default' detected in switch body"
 msgstr ""
 "đã phát hiện trùng “default� trong thân cấu trúc đi�u khiển ch�n lựa (switch)"
 
-#: awkgram.y:796 awkgram.y:3723
+#: awkgram.y:794 awkgram.y:3751
 msgid "`break' is not allowed outside a loop or switch"
 msgstr ""
 "không cho phép “break� (ngắt) nằm ở ngoại vòng lặp hay cấu trúc ch�n lựa"
 
-#: awkgram.y:805 awkgram.y:3715
+#: awkgram.y:803 awkgram.y:3743
 msgid "`continue' is not allowed outside a loop"
 msgstr "không cho phép “continue� (tiếp tục) ở ngoài một vòng lặp"
 
-#: awkgram.y:815
+#: awkgram.y:813
 #, c-format
 msgid "`next' used in %s action"
 msgstr "“next� (kế tiếp) được dùng trong hành động %s"
 
-#: awkgram.y:824
+#: awkgram.y:822
 #, c-format
 msgid "`nextfile' used in %s action"
 msgstr "“nextfile� (tập tin kế tiếp) được dùng trong hành động %s"
 
-#: awkgram.y:848
+#: awkgram.y:846
 msgid "`return' used outside function context"
 msgstr "“return� (trở v�) được dùng ở ngoại ngữ cảnh hàm"
 
-#: awkgram.y:922
+#: awkgram.y:920
 msgid "plain `print' in BEGIN or END rule should probably be `print \"\"'"
 msgstr ""
 "“print� (in) thư�ng trong quy tắc “BEGIN� (bắt đầu) hay “END� (kết thúc) gần "
 "như chắc chắn nên là “print���"
 
-#: awkgram.y:988 awkgram.y:1037
+#: awkgram.y:986 awkgram.y:1035
 msgid "`delete' is not allowed with SYMTAB"
 msgstr "“delete� không được phép với SYMTAB"
 
-#: awkgram.y:990 awkgram.y:1039
+#: awkgram.y:988 awkgram.y:1037
 msgid "`delete' is not allowed with FUNCTAB"
 msgstr "“delete� không được phép với FUNCTAB"
 
-#: awkgram.y:1024 awkgram.y:1028
+#: awkgram.y:1022 awkgram.y:1026
 msgid "`delete(array)' is a non-portable tawk extension"
 msgstr "“delete array� (xoá mảng) là phần mở rộng gawk không khả chuyển"
 
-#: awkgram.y:1149
+#: awkgram.y:1147
 msgid "multistage two-way pipelines don't work"
 msgstr "đư�ng ống dẫn hai chiếu đa giai đoạn không phải hoạt động được"
 
-#: awkgram.y:1264
+#: awkgram.y:1262
 msgid "regular expression on right of assignment"
 msgstr "biểu thức chính quy nằm bên phải phép gán"
 
-#: awkgram.y:1275
+#: awkgram.y:1273
 msgid "regular expression on left of `~' or `!~' operator"
 msgstr "biểu thức chính quy nằm bên trái toán tử “~� hay “!~�"
 
-#: awkgram.y:1291 awkgram.y:1442
+#: awkgram.y:1289 awkgram.y:1431
 msgid "old awk does not support the keyword `in' except after `for'"
 msgstr "awk cũ không hỗ trợ từ khoá “in�, trừ khi nằm sau “for�"
 
-#: awkgram.y:1301
+#: awkgram.y:1299
 msgid "regular expression on right of comparison"
 msgstr "biểu thức chính quy nằm bên phải sự so sánh"
 
-#: awkgram.y:1417
-#, c-format
-msgid "`getline var' invalid inside `%s' rule"
-msgstr "“getline var� không hợp lệ bên trong quy tắc “%s�"
-
-#: awkgram.y:1420
-#, c-format
-msgid "`getline' invalid inside `%s' rule"
+#: awkgram.y:1411
+#, fuzzy, c-format
+msgid "non-redirected `getline' invalid inside `%s' rule"
 msgstr "“getline� không hợp lệ trong quy tắc “%s�"
 
-#: awkgram.y:1425
+#: awkgram.y:1414
 msgid "non-redirected `getline' undefined inside END action"
 msgstr ""
 "trong hành động “END� (kết thúc) có “getline� (lấy dòng) không được chuyển "
 "hướng lại và chưa được định nghĩa."
 
-#: awkgram.y:1444
+#: awkgram.y:1433
 msgid "old awk does not support multidimensional arrays"
 msgstr "awk cũ không hỗ trợ mảng đa chi�u"
 
-#: awkgram.y:1541
+#: awkgram.y:1530
 msgid "call of `length' without parentheses is not portable"
 msgstr ""
 "l�i g�i “length� (độ dài) mà không có dấu ngoặc đơn là không tương thích "
 "trên các hệ thống khác"
 
-#: awkgram.y:1607
+#: awkgram.y:1596
 msgid "indirect function calls are a gawk extension"
 msgstr "cuộc g�i hàm gián tiếp là một phần mở rộng gawk"
 
-#: awkgram.y:1620
+#: awkgram.y:1609
 #, c-format
 msgid "can not use special variable `%s' for indirect function call"
 msgstr "không thể dùng biến đặc biệt “%s� cho cú g�i hàm gián tiếp"
 
-#: awkgram.y:1698
+#: awkgram.y:1635
+#, fuzzy, c-format
+msgid "attempt to use non-function `%s' in function call"
+msgstr "cố gắng dùng hàm “%s� như mảng"
+
+#: awkgram.y:1699
 msgid "invalid subscript expression"
 msgstr "biểu thức in thấp không hợp lệ"
 
-#: awkgram.y:2048 awkgram.y:2068 gawkapi.c:206 gawkapi.c:224 msg.c:126
+#: awkgram.y:2045 awkgram.y:2065 gawkapi.c:206 gawkapi.c:224 msg.c:126
 msgid "warning: "
 msgstr "cảnh báo: "
 
-#: awkgram.y:2066 gawkapi.c:192 gawkapi.c:221 msg.c:158
+#: awkgram.y:2063 gawkapi.c:192 gawkapi.c:221 msg.c:158
 msgid "fatal: "
 msgstr "lỗi nghiêm tr�ng: "
 
-#: awkgram.y:2116
+#: awkgram.y:2113
 msgid "unexpected newline or end of string"
 msgstr "gặp dòng mới hay kết thúc chuỗi bất ng�"
 
-#: awkgram.y:2383 awkgram.y:2459 awkgram.y:2682 debug.c:523 debug.c:539
+#: awkgram.y:2392 awkgram.y:2468 awkgram.y:2691 debug.c:523 debug.c:539
 #: debug.c:2812 debug.c:5055
 #, c-format
 msgid "can't open source file `%s' for reading (%s)"
 msgstr "không thể mở tập tin nguồn “%s� để đ�c (%s)"
 
-#: awkgram.y:2384 awkgram.y:2509
+#: awkgram.y:2393 awkgram.y:2518
 #, c-format
 msgid "can't open shared library `%s' for reading (%s)"
 msgstr "không thể mở tập thư viện chia sẻ “%s� để đ�c (%s)"
 
-#: awkgram.y:2386 awkgram.y:2460 awkgram.y:2510 builtin.c:135 debug.c:5206
+#: awkgram.y:2395 awkgram.y:2469 awkgram.y:2519 builtin.c:135 debug.c:5206
 msgid "reason unknown"
 msgstr "không rõ lý do"
 
-#: awkgram.y:2395 awkgram.y:2419
+#: awkgram.y:2404 awkgram.y:2428
 #, c-format
 msgid "can't include `%s' and use it as a program file"
 msgstr "không thể bao gồm “%s� và dùng nó như là tập tin chương trình"
 
-#: awkgram.y:2408
+#: awkgram.y:2417
 #, c-format
 msgid "already included source file `%s'"
 msgstr "đã sẵn bao gồm tập tin nguồn “%s�"
 
-#: awkgram.y:2409
+#: awkgram.y:2418
 #, c-format
 msgid "already loaded shared library `%s'"
 msgstr "thư viện dùng chung “%s� đã được sẵn được tải rồi"
 
-#: awkgram.y:2444
+#: awkgram.y:2453
 msgid "@include is a gawk extension"
 msgstr "@include là phần mở rộng của gawk"
 
-#: awkgram.y:2450
+#: awkgram.y:2459
 msgid "empty filename after @include"
 msgstr "tập tin trống sau @include"
 
-#: awkgram.y:2494
+#: awkgram.y:2503
 msgid "@load is a gawk extension"
 msgstr "@load là một phần mở rộng gawk"
 
-#: awkgram.y:2500
+#: awkgram.y:2509
 msgid "empty filename after @load"
 msgstr "tên tập tin trống sau @load"
 
-#: awkgram.y:2634
+#: awkgram.y:2643
 msgid "empty program text on command line"
 msgstr "gặp đoạn chữ chương trình rỗng nằm trên dòng lệnh"
 
-#: awkgram.y:2749
+#: awkgram.y:2758
 #, c-format
 msgid "can't read sourcefile `%s' (%s)"
 msgstr "không thể đ�c tập tin nguồn “%s� (%s)"
 
-#: awkgram.y:2760
+#: awkgram.y:2769
 #, c-format
 msgid "source file `%s' is empty"
 msgstr "tập tin nguồn “%s� là rỗng"
 
-#: awkgram.y:2937
+#: awkgram.y:2828
+#, c-format
+msgid "PEBKAC error: invalid character '\\%03o' in source code"
+msgstr ""
+
+#: awkgram.y:2959
 msgid "source file does not end in newline"
 msgstr "tập tin nguồn không kết thúc với một dòng mới"
 
-#: awkgram.y:3042
+#: awkgram.y:3062
 msgid "unterminated regexp ends with `\\' at end of file"
 msgstr ""
 "biểu thức chính quy chưa được chấm dứt kết thúc với “\\� tại kết thúc của "
 "tập tin"
 
-#: awkgram.y:3066
+#: awkgram.y:3089
 #, c-format
 msgid "%s: %d: tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 "%s: %d: bộ sửa đổi biểu thức chính quy tawk “/.../%c� không hoạt động được "
 "trong gawk"
 
-#: awkgram.y:3070
+#: awkgram.y:3093
 #, c-format
 msgid "tawk regex modifier `/.../%c' doesn't work in gawk"
 msgstr ""
 "bộ sửa đổi biểu thức chính quy tawk “/.../%c� không hoạt động được trong gawk"
 
-#: awkgram.y:3077
+#: awkgram.y:3100
 msgid "unterminated regexp"
 msgstr "biểu thức chính quy chưa được chấm dứt"
 
-#: awkgram.y:3081
+#: awkgram.y:3104
 msgid "unterminated regexp at end of file"
 msgstr "biểu thức chính quy chưa được chấm dứt nằm tại kết thúc của tập tin"
 
-#: awkgram.y:3140
+#: awkgram.y:3162
 msgid "use of `\\ #...' line continuation is not portable"
 msgstr "không thể mang khả năng dùng “\\#...� để tiếp tục dòng"
 
-#: awkgram.y:3156
+#: awkgram.y:3178
 msgid "backslash not last character on line"
 msgstr "dấu gạch ngược không phải là ký tự cuối cùng nằm trên dòng"
 
-#: awkgram.y:3217
+#: awkgram.y:3239
 msgid "POSIX does not allow operator `**='"
 msgstr "POSIX không cho phép toán tử “**=�"
 
-#: awkgram.y:3219
+#: awkgram.y:3241
 msgid "old awk does not support operator `**='"
 msgstr "awk cũ không hỗ trợ toán tử “**=�"
 
-#: awkgram.y:3228
+#: awkgram.y:3250
 msgid "POSIX does not allow operator `**'"
 msgstr "POSIX không cho phép toán tử “**�"
 
-#: awkgram.y:3230
+#: awkgram.y:3252
 msgid "old awk does not support operator `**'"
 msgstr "awk cũ không hỗ trợ toán tử “**�"
 
-#: awkgram.y:3265
+#: awkgram.y:3287
 msgid "operator `^=' is not supported in old awk"
 msgstr "awk cũ không hỗ trợ toán tử “^=�"
 
-#: awkgram.y:3273
+#: awkgram.y:3295
 msgid "operator `^' is not supported in old awk"
 msgstr "awk cũ không hỗ trợ toán tử “^�"
 
-#: awkgram.y:3366 awkgram.y:3382 command.y:1178
+#: awkgram.y:3392 awkgram.y:3410 command.y:1180
 msgid "unterminated string"
 msgstr "chuỗi không được chấm dứt"
 
-#: awkgram.y:3603
+#: awkgram.y:3631
 #, c-format
 msgid "invalid char '%c' in expression"
 msgstr "có ký tự không hợp lệ “%c� nằm trong biểu thức"
 
-#: awkgram.y:3650
+#: awkgram.y:3678
 #, c-format
 msgid "`%s' is a gawk extension"
 msgstr "“%s� là một phần mở rộng gawk"
 
-#: awkgram.y:3655
+#: awkgram.y:3683
 #, c-format
 msgid "POSIX does not allow `%s'"
 msgstr "POSIX không cho phép “%s�"
 
-#: awkgram.y:3663
+#: awkgram.y:3691
 #, c-format
 msgid "`%s' is not supported in old awk"
 msgstr "awk kiểu cũ không hỗ trợ “%s�"
 
-#: awkgram.y:3753
+#: awkgram.y:3781
 msgid "`goto' considered harmful!\n"
 msgstr "“goto� được xem là có hại!\n"
 
-#: awkgram.y:3787
+#: awkgram.y:3815
 #, c-format
 msgid "%d is invalid as number of arguments for %s"
 msgstr "“%d� không hợp lệ khi là số đối số cho “%s�"
 
-#: awkgram.y:3822
+#: awkgram.y:3850
 #, c-format
 msgid "%s: string literal as last arg of substitute has no effect"
 msgstr ""
 "%s: khi đối số cuối cùng của sự thay thế, hằng mã nguồn chuỗi không có tác "
 "dụng"
 
-#: awkgram.y:3827
+#: awkgram.y:3855
 #, c-format
 msgid "%s third parameter is not a changeable object"
 msgstr "tham số thứ ba %s không phải là một đối tượng có thể thay đổi"
 
-#: awkgram.y:3910 awkgram.y:3913
+#: awkgram.y:3938 awkgram.y:3941
 msgid "match: third argument is a gawk extension"
 msgstr "match: (khớp) đối số thứ ba là phần mở rộng gawk"
 
-#: awkgram.y:3967 awkgram.y:3970
+#: awkgram.y:3995 awkgram.y:3998
 msgid "close: second argument is a gawk extension"
 msgstr "close: (đóng) đối số thứ hai là phần mở rộng gawk"
 
-#: awkgram.y:3982
+#: awkgram.y:4010
 msgid "use of dcgettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "dùng “dcgettext(_\"...\")� không đúng: hãy gỡ b� gạch dưới nằm trước"
 
-#: awkgram.y:3997
+#: awkgram.y:4025
 msgid "use of dcngettext(_\"...\") is incorrect: remove leading underscore"
 msgstr "dùng “dcgettext(_\"...\")� không đúng: hãy gỡ b� gạch dưới nằm trước"
 
-#: awkgram.y:4016
+#: awkgram.y:4044
 msgid "index: regexp constant as second argument is not allowed"
 msgstr ""
 "index: (chỉ mục) không cho phép hằng biểu thức chính quy làm đối số thứ hai"
 
-#: awkgram.y:4069
+#: awkgram.y:4097
 #, c-format
 msgid "function `%s': parameter `%s' shadows global variable"
 msgstr "hàm “%s�: tham số “%s� che biến toàn cục"
 
-#: awkgram.y:4126 debug.c:4041 debug.c:4084 debug.c:5204
+#: awkgram.y:4154 debug.c:4041 debug.c:4084 debug.c:5204
 #, c-format
 msgid "could not open `%s' for writing (%s)"
 msgstr "không mở được “%s� để ghi (%s)"
 
-#: awkgram.y:4127
+#: awkgram.y:4155
 msgid "sending variable list to standard error"
 msgstr "đang gởi danh sách biến tới thiết bị lỗi chuẩn"
 
-#: awkgram.y:4135
+#: awkgram.y:4163
 #, c-format
 msgid "%s: close failed (%s)"
 msgstr "%s: gặp lỗi khi đóng (%s)"
 
-#: awkgram.y:4160
+#: awkgram.y:4188
 msgid "shadow_funcs() called twice!"
 msgstr "shadow_funcs() (hàm bóng) được g�i hai lần!"
 
-#: awkgram.y:4168
+#: awkgram.y:4196
 msgid "there were shadowed variables."
 msgstr "có biến bị bóng."
 
-#: awkgram.y:4239
+#: awkgram.y:4267
 #, c-format
 msgid "function name `%s' previously defined"
 msgstr "tên hàm “%s� trước đây đã được định nghĩa rồi"
 
-#: awkgram.y:4285
+#: awkgram.y:4313
 #, c-format
 msgid "function `%s': can't use function name as parameter name"
 msgstr "hàm “%s�: không thể dùng tên hàm như là tên tham số"
 
-#: awkgram.y:4288
+#: awkgram.y:4316
 #, c-format
 msgid "function `%s': can't use special variable `%s' as a function parameter"
 msgstr "hàm “%s�: không thể dùng biến đặc biệt “%s� như là tham số hàm"
 
-#: awkgram.y:4296
+#: awkgram.y:4324
 #, c-format
 msgid "function `%s': parameter #%d, `%s', duplicates parameter #%d"
 msgstr "hàm “%s�: tham số “#%d�, “%s�, nhân đôi tham số “#%d�"
 
-#: awkgram.y:4383 awkgram.y:4389
+#: awkgram.y:4411 awkgram.y:4417
 #, c-format
 msgid "function `%s' called but never defined"
 msgstr "hàm “%s� được g�i nhưng mà chưa định nghĩa"
 
-#: awkgram.y:4393
+#: awkgram.y:4421
 #, c-format
 msgid "function `%s' defined but never called directly"
 msgstr "hàm “%s� được định nghĩa nhưng mà chưa được g�i trực tiếp bao gi�"
 
-#: awkgram.y:4425
+#: awkgram.y:4453
 #, c-format
 msgid "regexp constant for parameter #%d yields boolean value"
 msgstr "hằng biểu thức chính quy cho tham số “#%d� làm giá trị luận lý (bun)"
 
-#: awkgram.y:4484
+#: awkgram.y:4468
 #, c-format
 msgid ""
 "function `%s' called with space between name and `(',\n"
@@ -525,21 +530,21 @@ msgstr ""
 "hàm “%s� được g�i với dấu cách nằm giữa tên và “(�\n"
 "hoặc được dùng như là biến hay mảng"
 
-#: awkgram.y:4720
+#: awkgram.y:4674
 msgid "division by zero attempted"
 msgstr "gặp phép chia cho số không"
 
-#: awkgram.y:4729
+#: awkgram.y:4683
 #, c-format
 msgid "division by zero attempted in `%%'"
 msgstr "gặp phép chia cho số không trong “%%�"
 
-#: awkgram.y:5049
+#: awkgram.y:5003
 msgid ""
 "cannot assign a value to the result of a field post-increment expression"
 msgstr "không thể gán giá trị cho kết quả của biểu thức trư�ng tăng-trước"
 
-#: awkgram.y:5052
+#: awkgram.y:5006
 #, c-format
 msgid "invalid target of assignment (opcode %s)"
 msgstr "gán đich không hợp lệ (mã thi hành “%s�)"
@@ -582,194 +587,204 @@ msgid "fflush: `%s' is not an open file, pipe or co-process"
 msgstr ""
 "fflush: “%s� không phải là tập tin, ống dẫn hay đồng tiến trình được mở"
 
-#: builtin.c:362
+#: builtin.c:351
 msgid "index: received non-string first argument"
 msgstr "index: (chỉ số) đã nhận đối số thứ nhất không phải là chuỗi"
 
-#: builtin.c:364
+#: builtin.c:353
 msgid "index: received non-string second argument"
 msgstr "index: (chỉ số) đã nhận đối số thứ hai không phải là chuỗi"
 
-#: builtin.c:488 mpfr.c:757
+#: builtin.c:466 mpfr.c:777
 msgid "int: received non-numeric argument"
 msgstr "int: (số nguyên?) đã nhận đối số không phải thuộc số"
 
-#: builtin.c:525
+#: builtin.c:503
 msgid "length: received array argument"
 msgstr "length: (chi�u dài) đã nhận mảng đối số"
 
-#: builtin.c:528
+#: builtin.c:506
 msgid "`length(array)' is a gawk extension"
 msgstr "“length(array)� (độ dài mảng) là một phần mở rộng gawk"
 
-#: builtin.c:544
+#: builtin.c:525
 msgid "length: received non-string argument"
 msgstr "length: (chi�u dài) đã nhận đối số không phải chuỗi"
 
-#: builtin.c:575
+#: builtin.c:554
 msgid "log: received non-numeric argument"
 msgstr "log: (nhật ký) đã nhận đối số không phải thuộc số"
 
-#: builtin.c:578
+#: builtin.c:557
 #, c-format
 msgid "log: received negative argument %g"
 msgstr "log: (nhật ký) đã nhận đối số âm “%g�"
 
-#: builtin.c:776 builtin.c:781
+#: builtin.c:755 builtin.c:760 builtin.c:911
 msgid "fatal: must use `count$' on all formats or none"
 msgstr "lỗi nghiêm tr�ng: phải dùng “count$� với m�i dạng thức hay không gì cả"
 
-#: builtin.c:851
+#: builtin.c:830
 #, c-format
 msgid "field width is ignored for `%%' specifier"
 msgstr "chi�u rộng trư�ng bị b� qua đối với bộ chỉ định “%%�"
 
-#: builtin.c:853
+#: builtin.c:832
 #, c-format
 msgid "precision is ignored for `%%' specifier"
 msgstr "độ chính xác bị b� qua đối với bộ chỉ định “%%�"
 
-#: builtin.c:855
+#: builtin.c:834
 #, c-format
 msgid "field width and precision are ignored for `%%' specifier"
 msgstr "chi�u rộng trư�ng và độ chính xác bị b� qua đối với bộ chỉ định “%%�"
 
-#: builtin.c:906
+#: builtin.c:885
 msgid "fatal: `$' is not permitted in awk formats"
 msgstr "lỗi nghiêm tr�ng: không cho phép “$� trong định dạng awk"
 
-#: builtin.c:915
+#: builtin.c:894
 msgid "fatal: arg count with `$' must be > 0"
 msgstr "lỗi nghiêm tr�ng: số lượng đối số với “$� phải >0"
 
-#: builtin.c:919
+#: builtin.c:898
 #, c-format
 msgid "fatal: arg count %ld greater than total number of supplied arguments"
 msgstr ""
 "lỗi nghiêm tr�ng: số lượng đối số %ld lớn hơn tổng số đối số được cung cấp"
 
-#: builtin.c:923
+#: builtin.c:902
 msgid "fatal: `$' not permitted after period in format"
 msgstr "lỗi nghiêm tr�ng: không cho phép “$� nằm sau dấu chấm trong định dạng"
 
-#: builtin.c:939
+#: builtin.c:921
 msgid "fatal: no `$' supplied for positional field width or precision"
 msgstr ""
 "lỗi nghiêm tr�ng: chưa cung cấp “$� cho độ rộng trư�ng thuộc vị trí hay cho "
 "độ chính xác"
 
-#: builtin.c:1009
+#: builtin.c:991
 msgid "`l' is meaningless in awk formats; ignored"
 msgstr "chữ “l� không có nghĩa trong định dạng awk nên bị b� qua"
 
-#: builtin.c:1013
+#: builtin.c:995
 msgid "fatal: `l' is not permitted in POSIX awk formats"
 msgstr "lỗi nghiêm tr�ng: không cho phép chữ “l� nằm trong định dạng awk POSIX"
 
-#: builtin.c:1026
+#: builtin.c:1008
 msgid "`L' is meaningless in awk formats; ignored"
 msgstr "chữ “L� không có nghĩa trong định dạng awk nên bị b� qua"
 
-#: builtin.c:1030
+#: builtin.c:1012
 msgid "fatal: `L' is not permitted in POSIX awk formats"
 msgstr "lỗi nghiêm tr�ng: không cho phép chữ “L� nằm trong định dạng awk POSIX"
 
-#: builtin.c:1043
+#: builtin.c:1025
 msgid "`h' is meaningless in awk formats; ignored"
 msgstr "chữ “h� không có nghĩa trong định dạng awk nên bị b� qua"
 
-#: builtin.c:1047
+#: builtin.c:1029
 msgid "fatal: `h' is not permitted in POSIX awk formats"
 msgstr "lỗi nghiêm tr�ng: không cho phép chữ “h� nằm trong định dạng awk POSIX"
 
-#: builtin.c:1463
+#: builtin.c:1055
+#, fuzzy, c-format
+msgid "[s]printf: value %g is too big for %%c format"
+msgstr "[s]printf: giá trị %g ở ngoại phạm vi cho dạng thức “%%%c�"
+
+#: builtin.c:1068
+#, fuzzy, c-format
+msgid "[s]printf: value %g is not a valid wide character"
+msgstr "[s]printf: giá trị %g ở ngoại phạm vi cho dạng thức “%%%c�"
+
+#: builtin.c:1454
 #, c-format
 msgid "[s]printf: value %g is out of range for `%%%c' format"
 msgstr "[s]printf: giá trị %g ở ngoại phạm vi cho dạng thức “%%%c�"
 
-#: builtin.c:1561
+#: builtin.c:1552
 #, c-format
 msgid "ignoring unknown format specifier character `%c': no argument converted"
 msgstr ""
 "đang b� qua ký tự ghi rõ định dạng không rõ “%c�: không có đối số được "
 "chuyển đổi"
 
-#: builtin.c:1566
+#: builtin.c:1557
 msgid "fatal: not enough arguments to satisfy format string"
 msgstr "lỗi nghiêm tr�ng: chưa có đủ đối số để đáp ứng chuỗi định dạng"
 
-#: builtin.c:1568
+#: builtin.c:1559
 msgid "^ ran out for this one"
 msgstr "bị hết “^� cho cái này"
 
-#: builtin.c:1575
+#: builtin.c:1566
 msgid "[s]printf: format specifier does not have control letter"
 msgstr "[s]printf: chỉ định định dạng không có ký hiệu đi�u khiển"
 
-#: builtin.c:1578
+#: builtin.c:1569
 msgid "too many arguments supplied for format string"
 msgstr "quá nhi�u đối số được cung cấp cho chuỗi định dạng"
 
-#: builtin.c:1634
+#: builtin.c:1625
 msgid "sprintf: no arguments"
 msgstr "sprintf: không có đối số"
 
-#: builtin.c:1657 builtin.c:1668
+#: builtin.c:1648 builtin.c:1659
 msgid "printf: no arguments"
 msgstr "printf: không có đối số"
 
-#: builtin.c:1711
+#: builtin.c:1702
 msgid "sqrt: received non-numeric argument"
 msgstr "sqrt: (căn bậc hai) đã nhận đối số không phải thuộc số"
 
-#: builtin.c:1715
+#: builtin.c:1706
 #, c-format
 msgid "sqrt: called with negative argument %g"
 msgstr "sqrt: (căn bậc hai) đã g�i với đối số âm “%g�"
 
-#: builtin.c:1746
+#: builtin.c:1737
 #, c-format
 msgid "substr: length %g is not >= 1"
 msgstr "substr: (chuỗi con) độ dài %g không phải ≥1"
 
-#: builtin.c:1748
+#: builtin.c:1739
 #, c-format
 msgid "substr: length %g is not >= 0"
 msgstr "substr: (chuỗi con) độ dài %g không phải ≥0"
 
-#: builtin.c:1755
+#: builtin.c:1753
 #, c-format
 msgid "substr: non-integer length %g will be truncated"
 msgstr "substr: (chuỗi con) sẽ cắt xén độ dài không phải số nguyên “%g�"
 
-#: builtin.c:1760
+#: builtin.c:1758
 #, c-format
 msgid "substr: length %g too big for string indexing, truncating to %g"
 msgstr ""
 "substr: (chuỗi con) độ dài %g là quá lớn cho chỉ số chuỗi, nên xén ngắn "
 "thành %g"
 
-#: builtin.c:1772
+#: builtin.c:1770
 #, c-format
 msgid "substr: start index %g is invalid, using 1"
 msgstr "substr: (chuỗi con) chỉ số đầu “%g� không hợp lệ nên dùng 1"
 
-#: builtin.c:1777
+#: builtin.c:1775
 #, c-format
 msgid "substr: non-integer start index %g will be truncated"
 msgstr ""
 "substr: (chuỗi con) chỉ số đầu không phải số nguyên “%g� sẽ bị cắt ngắn"
 
-#: builtin.c:1802
+#: builtin.c:1798
 msgid "substr: source string is zero length"
 msgstr "substr: (chuỗi con) chuỗi nguồn có độ dài số không"
 
-#: builtin.c:1818
+#: builtin.c:1812
 #, c-format
 msgid "substr: start index %g is past end of string"
 msgstr "substr: (chuỗi con) chỉ số đầu %g nằm sau kết thúc của chuỗi"
 
-#: builtin.c:1826
+#: builtin.c:1820
 #, c-format
 msgid ""
 "substr: length %g at start index %g exceeds length of first argument (%lu)"
@@ -777,191 +792,197 @@ msgstr ""
 "substr: (chuỗi con) độ dài %g chỉ số đầu %g vượt quá độ dài của đối số đầu "
 "(%lu)"
 
-#: builtin.c:1900
+#: builtin.c:1890
 msgid "strftime: format value in PROCINFO[\"strftime\"] has numeric type"
 msgstr ""
 "strftime: giá trị định dạng trong PROCINFO[�strftime�] phải thuộc kiểu số"
 
-#: builtin.c:1923
+#: builtin.c:1913
 msgid "strftime: received non-numeric second argument"
 msgstr "strftime: đã nhận đối số thứ hai khác thuộc số"
 
-#: builtin.c:1927
+#: builtin.c:1917
 msgid "strftime: second argument less than 0 or too big for time_t"
 msgstr "strftime: tham số thứ hai nh� hơn 0 hay quá lớn dành cho time_t"
 
-#: builtin.c:1934
+#: builtin.c:1924
 msgid "strftime: received non-string first argument"
 msgstr "strftime: đã nhận đối số thứ nhất khác chuỗi"
 
-#: builtin.c:1941
+#: builtin.c:1931
 msgid "strftime: received empty format string"
 msgstr "strftime: đã nhận chuỗi định dạng rỗng"
 
-#: builtin.c:2007
+#: builtin.c:1997
 msgid "mktime: received non-string argument"
 msgstr "mktime: đã nhận đối số khác chuỗi"
 
-#: builtin.c:2024
+#: builtin.c:2014
 msgid "mktime: at least one of the values is out of the default range"
 msgstr "mktime: ít nhất một của những giá trị nằm ở ngoại phạm vi mặc định"
 
-#: builtin.c:2059
+#: builtin.c:2049
 msgid "'system' function not allowed in sandbox mode"
 msgstr "hàm “system� không cho phép ở chế độ khuôn đúc"
 
-#: builtin.c:2064
+#: builtin.c:2054
 msgid "system: received non-string argument"
 msgstr "system: (hệ thống) đã nhận đối số khác chuỗi"
 
-#: builtin.c:2184
+#: builtin.c:2174
 #, c-format
 msgid "reference to uninitialized field `$%d'"
 msgstr "gặp tham chiếu đến trư�ng chưa được khởi tạo “$%d�"
 
-#: builtin.c:2271
+#: builtin.c:2259
 msgid "tolower: received non-string argument"
 msgstr "tolower: (đến thấp hơn) đã nhận đối số khác chuỗi"
 
-#: builtin.c:2305
+#: builtin.c:2290
 msgid "toupper: received non-string argument"
 msgstr "toupper: (đến cao hơn) đã nhận đối số khác chuỗi"
 
-#: builtin.c:2341 mpfr.c:672
+#: builtin.c:2323 mpfr.c:679
 msgid "atan2: received non-numeric first argument"
 msgstr "atan2: đã nhận đối số thứ nhất khác thuộc số"
 
-#: builtin.c:2343 mpfr.c:674
+#: builtin.c:2325 mpfr.c:681
 msgid "atan2: received non-numeric second argument"
 msgstr "atan2: đã nhận đối số thứ hai khác thuộc số"
 
-#: builtin.c:2362
+#: builtin.c:2344
 msgid "sin: received non-numeric argument"
 msgstr "sin: đã nhận đối số không phải thuộc số"
 
-#: builtin.c:2378
+#: builtin.c:2360
 msgid "cos: received non-numeric argument"
 msgstr "cos: đã nhận đối số không phải thuộc số"
 
-#: builtin.c:2431 mpfr.c:1156
+#: builtin.c:2413 mpfr.c:1176
 msgid "srand: received non-numeric argument"
 msgstr "srand: đã nhận đối số không phải thuộc số"
 
-#: builtin.c:2462
+#: builtin.c:2444
 msgid "match: third argument is not an array"
 msgstr "match: (khớp) đối số thứ ba không phải là mảng"
 
-#: builtin.c:2734
-msgid "gensub: third argument of 0 treated as 1"
+#: builtin.c:2705
+#, fuzzy, c-format
+msgid "gensub: third argument `%.*s' treated as 1"
 msgstr "gensub: đối số thứ ba của 0 được xử lý như 1"
 
-#: builtin.c:3030
+#: builtin.c:2720
+#, fuzzy, c-format
+msgid "gensub: third argument %g treated as 1"
+msgstr "gensub: đối số thứ ba của 0 được xử lý như 1"
+
+#: builtin.c:3020
 msgid "lshift: received non-numeric first argument"
 msgstr "lshift: đã nhận đối số đầu không phải thuộc số"
 
-#: builtin.c:3032
+#: builtin.c:3022
 msgid "lshift: received non-numeric second argument"
 msgstr "lshift: (dịch bên trái) đã nhận đối số thứ hai khác thuộc số"
 
-#: builtin.c:3038
+#: builtin.c:3028
 #, c-format
 msgid "lshift(%f, %f): negative values will give strange results"
 msgstr "lshift(%f, %f): giá trị âm sẽ gây ra kết quả không như mong muốn"
 
-#: builtin.c:3040
+#: builtin.c:3030
 #, c-format
 msgid "lshift(%f, %f): fractional values will be truncated"
 msgstr "lshift(%f, %f): giá trị thuộc phân số sẽ bị cắt ngắn"
 
-#: builtin.c:3042
+#: builtin.c:3032
 #, c-format
 msgid "lshift(%f, %f): too large shift value will give strange results"
 msgstr ""
 "lshift(%f, %f): giá trị dịch quá lớn sẽ gây ra kết quả không như mong muốn"
 
-#: builtin.c:3067
+#: builtin.c:3057
 msgid "rshift: received non-numeric first argument"
 msgstr "rshift: đã nhận đối số thứ nhất khác thuộc số"
 
-#: builtin.c:3069
+#: builtin.c:3059
 msgid "rshift: received non-numeric second argument"
 msgstr "rshift: (dịch phải) đã nhận đối số thứ hai khác thuộc số"
 
-#: builtin.c:3075
+#: builtin.c:3065
 #, c-format
 msgid "rshift(%f, %f): negative values will give strange results"
 msgstr "rshift(%f, %f): giá trị âm sẽ gây ra kết quả không như mong muốn"
 
-#: builtin.c:3077
+#: builtin.c:3067
 #, c-format
 msgid "rshift(%f, %f): fractional values will be truncated"
 msgstr "rshift(%f, %f): giá trị thuộc kiểu phân số sẽ bị xén ngắn"
 
-#: builtin.c:3079
+#: builtin.c:3069
 #, c-format
 msgid "rshift(%f, %f): too large shift value will give strange results"
 msgstr ""
 "rshift(%f, %f): giá trị dịch quá lớn sẽ gây ra kết quả không như mong muốn"
 
-#: builtin.c:3104 mpfr.c:968
+#: builtin.c:3094 mpfr.c:988
 msgid "and: called with less than two arguments"
 msgstr "and: được g�i với ít hơn hai đối số"
 
-#: builtin.c:3109
+#: builtin.c:3099
 #, c-format
 msgid "and: argument %d is non-numeric"
 msgstr "and: đối số  %d không phải thuộc số"
 
-#: builtin.c:3113
+#: builtin.c:3103
 #, c-format
 msgid "and: argument %d negative value %g will give strange results"
 msgstr ""
 "and: (và) đối số %d giá trị âm %g sẽ đưa lại kết quả không như mong muốn"
 
-#: builtin.c:3136 mpfr.c:1000
+#: builtin.c:3126 mpfr.c:1020
 msgid "or: called with less than two arguments"
 msgstr "or: (hoặc) được g�i với ít hơn hai đối số"
 
-#: builtin.c:3141
+#: builtin.c:3131
 #, c-format
 msgid "or: argument %d is non-numeric"
 msgstr "or: (hoặc) đối số %d không thuộc kiểu số"
 
-#: builtin.c:3145
+#: builtin.c:3135
 #, c-format
 msgid "or: argument %d negative value %g will give strange results"
 msgstr ""
 "or: (hoặc) đối số %d giá trị âm %g sẽ đưa lại kết quả không như mong muốn"
 
-#: builtin.c:3167 mpfr.c:1031
+#: builtin.c:3157 mpfr.c:1051
 msgid "xor: called with less than two arguments"
 msgstr "xor: được g�i với ít hơn hai đối số"
 
-#: builtin.c:3173
+#: builtin.c:3163
 #, c-format
 msgid "xor: argument %d is non-numeric"
 msgstr "xor: đối số %d không thuộc kiểu số"
 
-#: builtin.c:3177
+#: builtin.c:3167
 #, c-format
 msgid "xor: argument %d negative value %g will give strange results"
 msgstr "xor: đối số %d giá trị âm %g sẽ đưa lại kết quả không như mong muốn"
 
-#: builtin.c:3202 mpfr.c:787
+#: builtin.c:3192 mpfr.c:807
 msgid "compl: received non-numeric argument"
 msgstr "compl: (biên dịch) đã nhận được đối số không-phải-số"
 
-#: builtin.c:3208
+#: builtin.c:3198
 #, c-format
 msgid "compl(%f): negative value will give strange results"
 msgstr "compl(%f): giá trị âm sẽ gây ra kết quả không như mong đợi"
 
-#: builtin.c:3210
+#: builtin.c:3200
 #, c-format
 msgid "compl(%f): fractional value will be truncated"
 msgstr "compl(%f): giá trị thuộc phân số sẽ bị cắt ngắn"
 
-#: builtin.c:3379
+#: builtin.c:3369
 #, c-format
 msgid "dcgettext: `%s' is not a valid locale category"
 msgstr "dcgettext: “%s� không phải là một phân loại mi�n địa phương hợp lệ"
@@ -1261,40 +1282,49 @@ msgstr "up [N] - chuyển xuống N khung stack."
 msgid "watch var - set a watchpoint for a variable."
 msgstr "watch var - đặt điểm theo dõi cho một biến."
 
-#: command.y:1011 debug.c:401 msg.c:135
+#: command.y:901
+#, fuzzy
+msgid ""
+"where [N] - (same as backtrace) print trace of all or N innermost (outermost "
+"if N < 0) frames."
+msgstr ""
+"backtrace [N] - in vết của tất cả hay N khung trong cùng nhất (ngoài cùng "
+"nhất nếu N < 0)."
+
+#: command.y:1013 debug.c:401 msg.c:135
 #, c-format
 msgid "error: "
 msgstr "lá»—i: "
 
-#: command.y:1051
+#: command.y:1053
 #, c-format
 msgid "can't read command (%s)\n"
 msgstr "không thể đ�c lệnh (%s)\n"
 
-#: command.y:1065
+#: command.y:1067
 #, c-format
 msgid "can't read command (%s)"
 msgstr "không thể đ�c lệnh (%s)"
 
-#: command.y:1116
+#: command.y:1118
 msgid "invalid character in command"
 msgstr "ký tự trong câu lệnh không hợp lệ"
 
-#: command.y:1152
+#: command.y:1154
 #, c-format
 msgid "unknown command - \"%.*s\", try help"
 msgstr "không hiểu lệnh - “%.*s�, hãy gõ lệnh trợ giúp “help�"
 
-#: command.y:1222
+#: command.y:1224
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.y:1284
+#: command.y:1286
 msgid "invalid character"
 msgstr "ký tự không hợp lệ"
 
-#: command.y:1455
+#: command.y:1457
 #, c-format
 msgid "undefined command: %s\n"
 msgstr "lệnh chưa định nghĩa: %s\n"
@@ -1821,68 +1851,70 @@ msgstr "“%sâ€� không được phép trong ngữ cảnh hiện hành; câu lá»
 msgid "`return' not allowed in current context; statement ignored"
 msgstr "“return� không được phép trong ngữ cảnh hiện hành; câu lệnh bị b� qua"
 
-#: debug.c:5590
+#: debug.c:5604
 #, c-format
 msgid "No symbol `%s' in current context"
 msgstr "Không có ký hiệu “%s� trong ngữ cảnh hiện th�i"
 
-#: dfa.c:1118 dfa.c:1121 dfa.c:1142 dfa.c:1150 dfa.c:1162 dfa.c:1197
-#: dfa.c:1206 dfa.c:1209 dfa.c:1214 dfa.c:1228 dfa.c:1275
+#: dfa.c:1063 dfa.c:1066 dfa.c:1085 dfa.c:1095 dfa.c:1107 dfa.c:1143
+#: dfa.c:1152 dfa.c:1155 dfa.c:1160 dfa.c:1174 dfa.c:1222
 msgid "unbalanced ["
 msgstr "thiếu dấu ngoặc vuông mở ["
 
-#: dfa.c:1174
+#: dfa.c:1119
 msgid "invalid character class"
 msgstr "sai lớp ký tự"
 
-#: dfa.c:1316
+#: dfa.c:1265
 msgid "character class syntax is [[:space:]], not [:space:]"
 msgstr "cú pháp lớp ký tự là [[:dấu_cách:]], không phải [:dấu_cách:]"
 
-#: dfa.c:1366
+#: dfa.c:1327
 msgid "unfinished \\ escape"
 msgstr "chưa kết thúc dãy thoát \\"
 
-#: dfa.c:1513 regcomp.c:161
-msgid "Invalid content of \\{\\}"
+#: dfa.c:1474
+#, fuzzy
+msgid "invalid content of \\{\\}"
 msgstr "Nội dung của “\\{\\}� không hợp lệ"
 
-#: dfa.c:1516 regcomp.c:176
-msgid "Regular expression too big"
+#: dfa.c:1477
+#, fuzzy
+msgid "regular expression too big"
 msgstr "Biểu thức chính quy quá lớn"
 
-#: dfa.c:1936
+#: dfa.c:1912
 msgid "unbalanced ("
 msgstr "thiếu dấu ("
 
-#: dfa.c:2062
+#: dfa.c:2038
 msgid "no syntax specified"
 msgstr "chưa chỉ rõ cú pháp"
 
-#: dfa.c:2070
+#: dfa.c:2046
 msgid "unbalanced )"
 msgstr "thiếu dấu )"
 
-#: eval.c:394
+#: eval.c:396
 #, c-format
 msgid "unknown nodetype %d"
 msgstr "không biết kiểu nút %d"
 
-#: eval.c:405 eval.c:419
+#: eval.c:407 eval.c:421
 #, c-format
 msgid "unknown opcode %d"
 msgstr "gặp opcode (mã thao tác) không rõ %d"
 
-#: eval.c:416
+#: eval.c:418
 #, c-format
 msgid "opcode %s not an operator or keyword"
 msgstr "mã lệnh %s không phải là một toán tử hoặc từ khoá"
 
-#: eval.c:472
+#: eval.c:474
 msgid "buffer overflow in genflags2str"
 msgstr "tràn bộ đệm trong “genflags2str� (tạo ra c� đến chuỗi)"
 
-#: eval.c:675
+#: eval.c:676
 #, c-format
 msgid ""
 "\n"
@@ -1893,217 +1925,217 @@ msgstr ""
 "\t# Ngăn xếp g�i hàm:\n"
 "\n"
 
-#: eval.c:704
+#: eval.c:705
 msgid "`IGNORECASE' is a gawk extension"
 msgstr "“IGNORECASE� (b� qua chữ HOA/thư�ng) là phần mở rộng gawk"
 
-#: eval.c:736
+#: eval.c:737
 msgid "`BINMODE' is a gawk extension"
 msgstr "“BINMODE� (chế độ nhị phân) là phần mở rộng gawk"
 
-#: eval.c:794
+#: eval.c:795
 #, c-format
 msgid "BINMODE value `%s' is invalid, treated as 3"
 msgstr "Giá trị BINMODE (chế độ nhị phân) “%s� không hợp lệ nên đã coi là 3"
 
-#: eval.c:885
+#: eval.c:912
 #, c-format
 msgid "bad `%sFMT' specification `%s'"
 msgstr "đặc tả “%sFMT� sai “%s�"
 
-#: eval.c:969
+#: eval.c:996
 msgid "turning off `--lint' due to assignment to `LINT'"
 msgstr "đang tắt “--lint� do việc gán cho “LINT�"
 
-#: eval.c:1147
+#: eval.c:1174
 #, c-format
 msgid "reference to uninitialized argument `%s'"
 msgstr "gặp tham chiếu đến đối số chưa được khởi tạo “%s�"
 
-#: eval.c:1148
+#: eval.c:1175
 #, c-format
 msgid "reference to uninitialized variable `%s'"
 msgstr "gặp tham chiếu đến biến chưa được khởi tạo “%s�"
 
-#: eval.c:1166
+#: eval.c:1193
 msgid "attempt to field reference from non-numeric value"
 msgstr "cố gắng tham chiếu trư�ng từ giá trị khác thuộc số"
 
-#: eval.c:1168
+#: eval.c:1195
 msgid "attempt to field reference from null string"
 msgstr "cố gắng tham chiếu trư�ng từ chuỗi trống rỗng"
 
-#: eval.c:1176
+#: eval.c:1203
 #, c-format
 msgid "attempt to access field %ld"
 msgstr "cố gắng để truy cập trư�ng %ld"
 
-#: eval.c:1185
+#: eval.c:1212
 #, c-format
 msgid "reference to uninitialized field `$%ld'"
 msgstr "tham chiếu đến trư�ng chưa được khởi tạo “$%ld�"
 
-#: eval.c:1272
+#: eval.c:1299
 #, c-format
 msgid "function `%s' called with more arguments than declared"
 msgstr "hàm “%s� được g�i với nhi�u số đối số hơn số được khai báo"
 
-#: eval.c:1473
+#: eval.c:1500
 #, c-format
 msgid "unwind_stack: unexpected type `%s'"
 msgstr "unwind_stack: không cần kiểu “%s�"
 
-#: eval.c:1569
+#: eval.c:1596
 msgid "division by zero attempted in `/='"
 msgstr "gặp phép chia cho số không trong “/=�"
 
-#: eval.c:1576
+#: eval.c:1603
 #, c-format
 msgid "division by zero attempted in `%%='"
 msgstr "gặp phép chia cho số không trong “%%=�"
 
-#: ext.c:89 ext.c:171
+#: ext.c:65 ext.c:147
 msgid "extensions are not allowed in sandbox mode"
 msgstr "phần mở rộng không cho phép ở chế độ khuôn đúc"
 
-#: ext.c:92
+#: ext.c:68
 msgid "-l / @load are gawk extensions"
 msgstr "-l / @load là một phần mở rộng gawk"
 
-#: ext.c:95
+#: ext.c:71
 msgid "load_ext: received NULL lib_name"
 msgstr "load_ext: nhận được NULL lib_name"
 
-#: ext.c:98
+#: ext.c:74
 #, c-format
 msgid "load_ext: cannot open library `%s' (%s)\n"
 msgstr "load_ext: không thể mở thư viện “%s� (%s)\n"
 
-#: ext.c:104
+#: ext.c:80
 #, c-format
 msgid ""
 "load_ext: library `%s': does not define `plugin_is_GPL_compatible' (%s)\n"
 msgstr ""
 "load_ext: thư viện “%s�: chưa định nghĩa “plugin_is_GPL_compatible� (%s)\n"
 
-#: ext.c:110
+#: ext.c:86
 #, c-format
 msgid "load_ext: library `%s': cannot call function `%s' (%s)\n"
 msgstr "load_ext: thư viện “%s�: không thể g�i hàm “%s� (%s)\n"
 
-#: ext.c:114
+#: ext.c:90
 #, c-format
 msgid "load_ext: library `%s' initialization routine `%s' failed\n"
 msgstr "load_ext: thư viện “%s� thủ tục khởi tạo “%s� gặp lỗi\n"
 
-#: ext.c:174
+#: ext.c:150
 msgid "`extension' is a gawk extension"
 msgstr "“extension� là một phần mở rộng gawk"
 
-#: ext.c:177
+#: ext.c:153
 msgid "extension: received NULL lib_name"
 msgstr "extension: nhận được NULL lib_name"
 
-#: ext.c:180
+#: ext.c:156
 #, c-format
 msgid "extension: cannot open library `%s' (%s)"
 msgstr "phần mở rộng: không thể mở thư viện “%s� (%s)"
 
-#: ext.c:186
+#: ext.c:162
 #, c-format
 msgid ""
 "extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)"
 msgstr ""
 "phần mở rộng: thư viện “%s�: chưa định nghĩa “plugin_is_GPL_compatible� (%s)"
 
-#: ext.c:190
+#: ext.c:166
 #, c-format
 msgid "extension: library `%s': cannot call function `%s' (%s)"
 msgstr "phần mở rộng: thư viện “%s�: không thể g�i hàm “%s� (%s)"
 
-#: ext.c:221
+#: ext.c:197
 msgid "make_builtin: missing function name"
 msgstr "make_builtin: thiếu tên hàm"
 
-#: ext.c:236
+#: ext.c:212
 #, c-format
 msgid "make_builtin: can't redefine function `%s'"
 msgstr "make_builtin: không thể định nghĩa lại hàm “%s�"
 
-#: ext.c:240
+#: ext.c:216
 #, c-format
 msgid "make_builtin: function `%s' already defined"
 msgstr "make_builtin: hàm “%s� đã được định nghĩa rồi"
 
-#: ext.c:244
+#: ext.c:220
 #, c-format
 msgid "make_builtin: function name `%s' previously defined"
 msgstr "make_builtin: hàm “%s� đã được định nghĩa trước đây rồi"
 
-#: ext.c:246
+#: ext.c:222
 #, c-format
 msgid "make_builtin: can't use gawk built-in `%s' as function name"
 msgstr ""
 "make_builtin: không thể sử dụng “%s� như là một hàm được xây dựng sẵn trong "
 "gawk"
 
-#: ext.c:249 ext.c:304
+#: ext.c:225 ext.c:280
 #, c-format
 msgid "make_builtin: negative argument count for function `%s'"
 msgstr "make_builtin: đối số dành cho số đếm bị âm cho hàm “%s�"
 
-#: ext.c:276
+#: ext.c:252
 msgid "extension: missing function name"
 msgstr "extension: (phần mở rộng) tên hàm còn thiếu"
 
-#: ext.c:279 ext.c:283
+#: ext.c:255 ext.c:259
 #, c-format
 msgid "extension: illegal character `%c' in function name `%s'"
 msgstr "extension: (phần mở rộng) gặp ký tự cấm “%c� nằm trong tên hàm “%s�"
 
-#: ext.c:291
+#: ext.c:267
 #, c-format
 msgid "extension: can't redefine function `%s'"
 msgstr "extension: (phần mở rộng) không thể định nghĩa lại hàm “%s�"
 
-#: ext.c:295
+#: ext.c:271
 #, c-format
 msgid "extension: function `%s' already defined"
 msgstr "extension: (phần mở rộng) hàm “%s� đã được định nghĩa"
 
-#: ext.c:299
+#: ext.c:275
 #, c-format
 msgid "extension: function name `%s' previously defined"
 msgstr "tên hàm “%s� đã được định nghĩa trước đó"
 
-#: ext.c:301
+#: ext.c:277
 #, c-format
 msgid "extension: can't use gawk built-in `%s' as function name"
 msgstr ""
 "extension: (phần mở rộng) không thể dùng đi�u có sẵn của gawk “%s� như là "
 "tên hàm"
 
-#: ext.c:375
+#: ext.c:351
 #, c-format
 msgid "function `%s' defined to take no more than %d argument(s)"
 msgstr "hàm “%s� được định nghĩa để chấp nhấn %d đối số tối đa"
 
-#: ext.c:378
+#: ext.c:354
 #, c-format
 msgid "function `%s': missing argument #%d"
 msgstr "hàm “%s�: thiếu đối số #%d"
 
-#: ext.c:395
+#: ext.c:371
 #, c-format
 msgid "function `%s': argument #%d: attempt to use scalar as an array"
 msgstr "hàm “%s�: đối số thứ %d: cố gắng dùng kiểu vô hướng như là mảng"
 
-#: ext.c:399
+#: ext.c:375
 #, c-format
 msgid "function `%s': argument #%d: attempt to use array as a scalar"
 msgstr "hàm “%s�: đối số thứ %d: cố gắng dùng mảng như là kiểu vô hướng"
 
-#: ext.c:413
+#: ext.c:389
 msgid "dynamic loading of library not supported"
 msgstr "tải động của thư viện không được hỗ trợ"
 
@@ -2247,7 +2279,7 @@ msgstr "wait: được g�i với quá nhi�u đối số"
 msgid "inplace_begin: in-place editing already active"
 msgstr "inplace_begin: sửa in-place đã sẵn được kích hoạt rồi"
 
-#: extension/inplace.c:133 extension/inplace.c:207
+#: extension/inplace.c:133 extension/inplace.c:210
 #, c-format
 msgid "inplace_begin: expects 2 arguments but called with %d"
 msgstr "inplace_begin: cần 2 đối số như lại được g�i với %d"
@@ -2276,55 +2308,55 @@ msgstr "inplace_begin: “%s� không phải là tập tin thư�ng"
 msgid "inplace_begin: mkstemp(`%s') failed (%s)"
 msgstr "inplace_begin: mkstemp(“%s�) gặp lỗi (%s)"
 
-#: extension/inplace.c:178
+#: extension/inplace.c:181
 #, c-format
 msgid "inplace_begin: chmod failed (%s)"
 msgstr "inplace_begin: chmod gặp lỗi (%s)"
 
-#: extension/inplace.c:185
+#: extension/inplace.c:188
 #, c-format
 msgid "inplace_begin: dup(stdout) failed (%s)"
 msgstr "inplace_begin: dup(stdout) gặp lỗi (%s)"
 
-#: extension/inplace.c:188
+#: extension/inplace.c:191
 #, c-format
 msgid "inplace_begin: dup2(%d, stdout) failed (%s)"
 msgstr "inplace_begin: dup2(%d, stdout) gặp lỗi (%s)"
 
-#: extension/inplace.c:191
+#: extension/inplace.c:194
 #, c-format
 msgid "inplace_begin: close(%d) failed (%s)"
 msgstr "inplace_begin: close(%d) gặp lỗi (%s)"
 
-#: extension/inplace.c:210
+#: extension/inplace.c:213
 msgid "inplace_end: cannot retrieve 1st argument as a string filename"
 msgstr "inplace_end: không thể lấy lại đối số thứ nhất như là một tên tập tin"
 
-#: extension/inplace.c:217
+#: extension/inplace.c:220
 msgid "inplace_end: in-place editing not active"
 msgstr "inplace_end: việc sửa in-place không được kích hoạt"
 
-#: extension/inplace.c:223
+#: extension/inplace.c:226
 #, c-format
 msgid "inplace_end: dup2(%d, stdout) failed (%s)"
 msgstr "inplace_end: dup2(%d, stdout) gặp lỗi (%s)"
 
-#: extension/inplace.c:226
+#: extension/inplace.c:229
 #, c-format
 msgid "inplace_end: close(%d) failed (%s)"
 msgstr "inplace_end: close(%d) gặp lỗi (%s)"
 
-#: extension/inplace.c:230
+#: extension/inplace.c:233
 #, c-format
 msgid "inplace_end: fsetpos(stdout) failed (%s)"
 msgstr "inplace_end: fsetpos(stdout) gặp lỗi (%s)"
 
-#: extension/inplace.c:243
+#: extension/inplace.c:246
 #, c-format
 msgid "inplace_end: link(`%s', `%s') failed (%s)"
 msgstr "inplace_end: link(“%s�, “%s�) gặp lỗi (%s)"
 
-#: extension/inplace.c:253
+#: extension/inplace.c:256
 #, c-format
 msgid "inplace_end: rename(`%s', `%s') failed (%s)"
 msgstr "inplace_end: rename(“%s�, “%s�) gặp lỗi (%s)"
@@ -2366,50 +2398,54 @@ msgstr "readfile: được g�i với quá nhi�u đối số"
 msgid "readfile: called with no arguments"
 msgstr "readfile: được g�i mà không có đối số"
 
-#: extension/rwarray.c:124
+#: extension/revoutput.c:125
+msgid "revoutput: could not initialize REVOUT variable"
+msgstr ""
+
+#: extension/rwarray.c:124 extension/rwarray0.c:109
 msgid "writea: called with too many arguments"
 msgstr "writea: được g�i với quá nhi�u đối số"
 
-#: extension/rwarray.c:131
+#: extension/rwarray.c:131 extension/rwarray0.c:116
 #, c-format
 msgid "do_writea: argument 0 is not a string\n"
 msgstr "do_writea: đối số 0 không phải là một chuỗi\n"
 
-#: extension/rwarray.c:137
+#: extension/rwarray.c:137 extension/rwarray0.c:122
 #, c-format
 msgid "do_writea: argument 1 is not an array\n"
 msgstr "do_writea: đối số 1 không phải là một mảng\n"
 
-#: extension/rwarray.c:184
+#: extension/rwarray.c:184 extension/rwarray0.c:169
 #, c-format
 msgid "write_array: could not flatten array\n"
 msgstr "write_array: không thể làm phẳng mảng\n"
 
-#: extension/rwarray.c:198
+#: extension/rwarray.c:198 extension/rwarray0.c:183
 #, c-format
 msgid "write_array: could not release flattened array\n"
 msgstr "write_array: không thể giải phóng mảng được làm phẳng\n"
 
-#: extension/rwarray.c:280
+#: extension/rwarray.c:280 extension/rwarray0.c:265
 msgid "reada: called with too many arguments"
 msgstr "reada: được g�i với quá nhi�u đối số"
 
-#: extension/rwarray.c:287
+#: extension/rwarray.c:287 extension/rwarray0.c:272
 #, c-format
 msgid "do_reada: argument 0 is not a string\n"
 msgstr "do_reada: đối số 0 không phải là một chuỗi\n"
 
-#: extension/rwarray.c:293
+#: extension/rwarray.c:293 extension/rwarray0.c:278
 #, c-format
 msgid "do_reada: argument 1 is not an array\n"
 msgstr "do_reada: đối số 1 không phải là một mảng\n"
 
-#: extension/rwarray.c:337
+#: extension/rwarray.c:337 extension/rwarray0.c:322
 #, c-format
 msgid "do_reada: clear_array failed\n"
 msgstr "do_reada: clear_array gặp lỗi\n"
 
-#: extension/rwarray.c:374
+#: extension/rwarray.c:374 extension/rwarray0.c:358
 #, c-format
 msgid "read_array: set_array_element failed\n"
 msgstr "read_array: set_array_element gặp lỗi\n"
@@ -2438,93 +2474,93 @@ msgstr "sleep: đối số âm"
 msgid "sleep: not supported on this platform"
 msgstr "sleep: không được hỗ trợ trên n�n tảng này"
 
-#: field.c:345
+#: field.c:346
 msgid "NF set to negative value"
 msgstr "“NF� được đặt thành giá trị âm"
 
-#: field.c:971 field.c:978 field.c:982
+#: field.c:958 field.c:965 field.c:969
 msgid "split: fourth argument is a gawk extension"
 msgstr "split (chia tách): đối số thứ tư là phần mở rộng gawk"
 
-#: field.c:975
+#: field.c:962
 msgid "split: fourth argument is not an array"
 msgstr "split (chia tách): đối số thứ tư không phải là mảng"
 
-#: field.c:989
+#: field.c:976
 msgid "split: second argument is not an array"
 msgstr "split: (chia tách) đối số thứ hai không phải là mảng"
 
-#: field.c:993
+#: field.c:980
 msgid "split: cannot use the same array for second and fourth args"
 msgstr ""
 "split (chia tách): không thể sử dụng cùng một mảng có cả đối số thứ hai và "
 "thứ tư"
 
-#: field.c:998
+#: field.c:985
 msgid "split: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "split (phân tách): không thể sử dụng mảng con của tham số thứ hai cho tham "
 "số thứ tư"
 
-#: field.c:1001
+#: field.c:988
 msgid "split: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "split (phân tách): không thể sử dụng mảng con của tham số thứ tư cho tham số "
 "thứ hai"
 
-#: field.c:1032
+#: field.c:1019
 msgid "split: null string for third arg is a gawk extension"
 msgstr ""
 "split: (chia tách) chuỗi vô giá trị cho đối số thứ ba là phần mở rộng gawk"
 
-#: field.c:1072
+#: field.c:1059
 msgid "patsplit: fourth argument is not an array"
 msgstr "patsplit: đối số thứ tư không phải là mảng"
 
-#: field.c:1077
+#: field.c:1064
 msgid "patsplit: second argument is not an array"
 msgstr "patsplit: đối số thứ hai không phải là mảng"
 
-#: field.c:1083
+#: field.c:1070
 msgid "patsplit: third argument must be non-null"
 msgstr "patsplit: đối số thứ ba không phải không rỗng"
 
-#: field.c:1087
+#: field.c:1074
 msgid "patsplit: cannot use the same array for second and fourth args"
 msgstr ""
 "patsplit (chương trình chia tách): không thể sử dụng cùng một mảng cho cả "
 "hai đối số thứ hai và thứ tư"
 
-#: field.c:1092
+#: field.c:1079
 msgid "patsplit: cannot use a subarray of second arg for fourth arg"
 msgstr ""
 "patsplit (chương trình phân tách): không thể sử dụng mảng con của tham số "
 "thứ hai cho tham số thứ tư"
 
-#: field.c:1095
+#: field.c:1082
 msgid "patsplit: cannot use a subarray of fourth arg for second arg"
 msgstr ""
 "patsplit (chương trình phân tách): không thể sử dụng mảng con của tham số "
 "thứ tư cho tham số thứ hai"
 
-#: field.c:1133
+#: field.c:1120
 msgid "`FIELDWIDTHS' is a gawk extension"
 msgstr "“FIELDWIDTHS� (độ rộng trư�ng) là phần mở rộng gawk"
 
-#: field.c:1197
+#: field.c:1184
 #, c-format
 msgid "invalid FIELDWIDTHS value, near `%s'"
 msgstr "giá trị FIELDWIDTHS (độ rộng trư�ng) không hợp lệ, gần “%s�"
 
-#: field.c:1270
+#: field.c:1257
 msgid "null string for `FS' is a gawk extension"
 msgstr "chuỗi vô giá trị cho “FS� là phần mở rộng gawk"
 
-#: field.c:1274
+#: field.c:1261
 msgid "old awk does not support regexps as value of `FS'"
 msgstr "awk cũ không hỗ trợ biểu thức chính quy làm giá trị của “FS�"
 
-#: field.c:1393
+#: field.c:1380
 msgid "`FPAT' is a gawk extension"
 msgstr "“FPAT� là phần mở rộng của gawk"
 
@@ -2540,20 +2576,20 @@ msgstr "node_to_awk_value: nút nhận được là null"
 msgid "node_to_awk_value: received null val"
 msgstr "node_to_awk_value: biến nhận được là null"
 
-#: gawkapi.c:807
+#: gawkapi.c:809
 msgid "remove_element: received null array"
 msgstr "remove_element: mảng nhận được là null"
 
-#: gawkapi.c:810
+#: gawkapi.c:812
 msgid "remove_element: received null subscript"
 msgstr "remove_element: nhận được là null"
 
-#: gawkapi.c:947
+#: gawkapi.c:949
 #, c-format
 msgid "api_flatten_array: could not convert index %d\n"
 msgstr "api_flatten_array: không thể chuyển đổi chỉ số %d\n"
 
-#: gawkapi.c:952
+#: gawkapi.c:954
 #, c-format
 msgid "api_flatten_array: could not convert value %d\n"
 msgstr "api_flatten_array: không thể chuyển đổi giá trị %d\n"
@@ -2613,313 +2649,295 @@ msgstr "%s: tùy ch�n “-W %s� không cho phép đối số\n"
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: tùy ch�n “-W %s� yêu cầu một đối số\n"
 
-#: io.c:392
+#: io.c:423
 #, c-format
 msgid "command line argument `%s' is a directory: skipped"
 msgstr "tham số dòng lệnh “%s� là một thư mục: đã bị b� qua"
 
-#: io.c:395 io.c:513
+#: io.c:426 io.c:544
 #, c-format
 msgid "cannot open file `%s' for reading (%s)"
 msgstr "không mở được tập tin “%s� để đ�c (%s)"
 
-#: io.c:640
+#: io.c:671
 #, c-format
 msgid "close of fd %d (`%s') failed (%s)"
 msgstr "lỗi đóng fd %d (“%s�) (%s)"
 
-#: io.c:716
+#: io.c:749
 msgid "redirection not allowed in sandbox mode"
 msgstr "chuyển hướng không cho phép ở chế độ khuôn đúc"
 
-#: io.c:750
+#: io.c:783
 #, c-format
 msgid "expression in `%s' redirection only has numeric value"
 msgstr "biểu thức trong đi�u chuyển hướng “%s� chỉ có giá trị thuộc số"
 
-#: io.c:756
+#: io.c:789
 #, c-format
 msgid "expression for `%s' redirection has null string value"
 msgstr "biểu thức cho đi�u chuyển hướng “%s� có giá trị chuỗi vô giá trị"
 
-#: io.c:761
+#: io.c:794
 #, c-format
 msgid "filename `%s' for `%s' redirection may be result of logical expression"
 msgstr ""
 "tên tập tin “%s� cho đi�u chuyển hướng “%s� có lẽ là kết quả của biểu thức "
 "luận lý"
 
-#: io.c:809
+#: io.c:842
 #, c-format
 msgid "unnecessary mixing of `>' and `>>' for file `%.*s'"
 msgstr "không cần hợp “>� và “>>� cho tập tin “%.*s�"
 
-#: io.c:863
+#: io.c:896
 #, c-format
 msgid "can't open pipe `%s' for output (%s)"
 msgstr "không thể mở ống dẫn “%s� để xuất (%s)"
 
-#: io.c:873
+#: io.c:906
 #, c-format
 msgid "can't open pipe `%s' for input (%s)"
 msgstr "không thể mở ống dẫn “%s� để nhập (%s)"
 
-#: io.c:904
+#: io.c:937
 #, c-format
 msgid "can't open two way pipe `%s' for input/output (%s)"
 msgstr "không thể mở ống dẫn hai chi�u “%s� để nhập/xuất (%s)"
 
-#: io.c:986
+#: io.c:1019
 #, c-format
 msgid "can't redirect from `%s' (%s)"
 msgstr "không thể chuyển hướng từ “%s� (%s)"
 
-#: io.c:989
+#: io.c:1022
 #, c-format
 msgid "can't redirect to `%s' (%s)"
 msgstr "không thể chuyển hướng đến “%s� (%s)"
 
-#: io.c:1040
+#: io.c:1073
 msgid ""
 "reached system limit for open files: starting to multiplex file descriptors"
 msgstr ""
 "đã tới giới hạn hệ thống v� tập tin được mở nên bắt đầu phối hợp nhi�u dòng "
 "đi�u mô tả tập tin"
 
-#: io.c:1056
+#: io.c:1089
 #, c-format
 msgid "close of `%s' failed (%s)."
 msgstr "lỗi đóng “%s� (%s)"
 
-#: io.c:1064
+#: io.c:1097
 msgid "too many pipes or input files open"
 msgstr "quá nhi�u ống dẫn hay tập tin nhập được mở"
 
-#: io.c:1086
+#: io.c:1119
 msgid "close: second argument must be `to' or `from'"
 msgstr "close: (đóng) đối số thứ hai phải là “to� (đến) hay “from� (từ)"
 
-#: io.c:1103
+#: io.c:1136
 #, c-format
 msgid "close: `%.*s' is not an open file, pipe or co-process"
 msgstr ""
 "close: (đóng) “%.*s� không phải là tập tin, ống dẫn hay đồng tiến trình đã "
 "được mở"
 
-#: io.c:1108
+#: io.c:1141
 msgid "close of redirection that was never opened"
 msgstr "đóng một chuyển hướng mà nó chưa từng được mở"
 
-#: io.c:1205
+#: io.c:1238
 #, c-format
 msgid "close: redirection `%s' not opened with `|&', second argument ignored"
 msgstr ""
 "close: chuyển hướng “%s� không được mở bởi “|&� nên đối số thứ hai bị b� qua"
 
-#: io.c:1222
+#: io.c:1255
 #, c-format
 msgid "failure status (%d) on pipe close of `%s' (%s)"
 msgstr "trạng thái thất bại (%d) khi đóng ống dẫn “%s� (%s)"
 
-#: io.c:1225
+#: io.c:1258
 #, c-format
 msgid "failure status (%d) on file close of `%s' (%s)"
 msgstr "trạng thái thất bại (%d) khi đóng tập tin “%s� (%s)"
 
-#: io.c:1245
+#: io.c:1278
 #, c-format
 msgid "no explicit close of socket `%s' provided"
 msgstr "không cung cấp lệnh đóng ổ cắm “%s� rõ ràng"
 
-#: io.c:1248
+#: io.c:1281
 #, c-format
 msgid "no explicit close of co-process `%s' provided"
 msgstr "không cung cấp lệnh đóng đồng tiến trình “%s� rõ ràng"
 
-#: io.c:1251
+#: io.c:1284
 #, c-format
 msgid "no explicit close of pipe `%s' provided"
 msgstr "không cung cấp lệnh đóng đư�ng ống dẫn lệnh “%s� rõ ràng"
 
-#: io.c:1254
+#: io.c:1287
 #, c-format
 msgid "no explicit close of file `%s' provided"
 msgstr "không cung cấp lệnh đóng tập tin “%s� rõ ràng"
 
-#: io.c:1284 io.c:1342 main.c:864 main.c:906
+#: io.c:1317 io.c:1375 main.c:628 main.c:670
 #, c-format
 msgid "error writing standard output (%s)"
 msgstr "gặp lỗi khi ghi đầu ra tiêu chuẩn (%s)"
 
-#: io.c:1289 io.c:1348 main.c:866
+#: io.c:1322 io.c:1381 main.c:630
 #, c-format
 msgid "error writing standard error (%s)"
 msgstr "gặp lỗi khi ghi thiết bị lỗi chuẩn (%s)"
 
-#: io.c:1297
+#: io.c:1330
 #, c-format
 msgid "pipe flush of `%s' failed (%s)."
 msgstr "lỗi xoá sạch ống dẫn “%s� (%s)"
 
-#: io.c:1300
+#: io.c:1333
 #, c-format
 msgid "co-process flush of pipe to `%s' failed (%s)."
 msgstr "lỗi xoá sạch ống dẫn đồng tiến trình đến “%s� (%s)"
 
-#: io.c:1303
+#: io.c:1336
 #, c-format
 msgid "file flush of `%s' failed (%s)."
 msgstr "lỗi xoá sạch tập tin “%s� (%s)"
 
-#: io.c:1420
+#: io.c:1453
 #, c-format
 msgid "local port %s invalid in `/inet'"
 msgstr "cổng cục bộ %s không hợp lệ trong “/inet�"
 
-#: io.c:1438
+#: io.c:1471
 #, c-format
 msgid "remote host and port information (%s, %s) invalid"
 msgstr "thông tin v� máy/cổng ở xa (%s, %s) không phải hợp lệ"
 
-#: io.c:1590
-#, c-format
-msgid "no (known) protocol supplied in special filename `%s'"
-msgstr "trong tên tập tin đặc biệt “%s� không cung cấp giao thức (đã biết) nào"
-
-#: io.c:1604
-#, c-format
-msgid "special file name `%s' is incomplete"
-msgstr "tên tập tin đặc biệt “%s� chưa xong"
-
-#: io.c:1621
-msgid "must supply a remote hostname to `/inet'"
-msgstr "phải cung cấp một tên máy chủ cho </inet>"
-
-#: io.c:1639
-msgid "must supply a remote port to `/inet'"
-msgstr "phải cung cấp một cổng máy chủ cho </inet>"
-
-#: io.c:1685
+#: io.c:1673
 msgid "TCP/IP communications are not supported"
 msgstr "truy�n thông TCP/IP không được hỗ trợ"
 
-#: io.c:1867
+#: io.c:1854
 #, c-format
 msgid "could not open `%s', mode `%s'"
 msgstr "không mở được “%s�, chế độ “%s�"
 
-#: io.c:1917
+#: io.c:1904
 #, c-format
 msgid "close of master pty failed (%s)"
 msgstr "gặp lỗi khi đóng thiết bị cuối giả (%s)"
 
-#: io.c:1919 io.c:2105 io.c:2305
+#: io.c:1906 io.c:2092 io.c:2293
 #, c-format
 msgid "close of stdout in child failed (%s)"
 msgstr "lỗi đóng đầu ra tiêu chuẩn trong tiến trình con (%s)"
 
-#: io.c:1922
+#: io.c:1909
 #, c-format
 msgid "moving slave pty to stdout in child failed (dup: %s)"
 msgstr ""
 "gặp lỗi khi di chuyển pty (thiết bị cuối giả) phụ thuộc đến thiết bị đầu ra "
 "tiêu chuẩn trong con (trùng: %s)"
 
-#: io.c:1924 io.c:2110
+#: io.c:1911 io.c:2097
 #, c-format
 msgid "close of stdin in child failed (%s)"
 msgstr "lỗi đóng thiết bị nhập chuẩn trong tiến trình con (%s)"
 
-#: io.c:1927
+#: io.c:1914
 #, c-format
 msgid "moving slave pty to stdin in child failed (dup: %s)"
 msgstr ""
 "lỗi di chuyển pty (thiết bị cuối giả) phụ tới thiết bị nhập chuẩn trong đi�u "
 "con (nhân đôi: %s)"
 
-#: io.c:1929 io.c:1951
+#: io.c:1916 io.c:1938
 #, c-format
 msgid "close of slave pty failed (%s)"
 msgstr "đóng pty (thiết bị cuối giả) phụ thuộc gặp lỗi (%s)"
 
-#: io.c:2040 io.c:2108 io.c:2276 io.c:2308
+#: io.c:2027 io.c:2095 io.c:2264 io.c:2296
 #, c-format
 msgid "moving pipe to stdout in child failed (dup: %s)"
 msgstr ""
 "lỗi di chuyển ống dẫn đến thiết bị xuất chuẩn trong tiến trình con (trùng: "
 "%s)"
 
-#: io.c:2047 io.c:2113
+#: io.c:2034 io.c:2100
 #, c-format
 msgid "moving pipe to stdin in child failed (dup: %s)"
 msgstr ""
 "lỗi di chuyển ống dẫn đến thiết bị nhập chuẩn trong tiến trình con (trùng: "
 "%s)"
 
-#: io.c:2073 io.c:2298
+#: io.c:2060 io.c:2286
 msgid "restoring stdout in parent process failed\n"
 msgstr "phục hồi đầu ra tiêu chuẩn trong tiến trình mẹ gặp lỗi\n"
 
-#: io.c:2081
+#: io.c:2068
 msgid "restoring stdin in parent process failed\n"
 msgstr "phục hồi đầu vào tiêu chuẩn trong tiến trình mẹ gặp lỗi\n"
 
-#: io.c:2116 io.c:2310 io.c:2324
+#: io.c:2103 io.c:2298 io.c:2313
 #, c-format
 msgid "close of pipe failed (%s)"
 msgstr "đóng ống dẫn gặp lỗi (%s)"
 
-#: io.c:2174
+#: io.c:2162
 msgid "`|&' not supported"
 msgstr "“|&� không được hỗ trợ"
 
-#: io.c:2261
+#: io.c:2249
 #, c-format
 msgid "cannot open pipe `%s' (%s)"
 msgstr "không thể mở ống dẫn “%s� (%s)"
 
-#: io.c:2318
+#: io.c:2307
 #, c-format
 msgid "cannot create child process for `%s' (fork: %s)"
 msgstr "không thể tạo tiến trình con cho “%s� (fork: %s)"
 
-#: io.c:2790
+#: io.c:2734
 msgid "register_input_parser: received NULL pointer"
 msgstr "register_input_parser: nhận được con tr� NULL"
 
-#: io.c:2818
+#: io.c:2762
 #, c-format
 msgid "input parser `%s' conflicts with previously installed input parser `%s'"
 msgstr ""
 "bộ phân tích đầu vào “%s� xung đột với bộ phân tích đầu vào được cài đặt "
 "trước đó “%s�"
 
-#: io.c:2825
+#: io.c:2769
 #, c-format
 msgid "input parser `%s' failed to open `%s'"
 msgstr "bộ phân tích đầu vào “%s� gặp lỗi khi mở “%s�"
 
-#: io.c:2845
+#: io.c:2789
 msgid "register_output_wrapper: received NULL pointer"
 msgstr "register_output_wrapper: nhận được con tr� NULL"
 
-#: io.c:2873
+#: io.c:2817
 #, c-format
 msgid ""
 "output wrapper `%s' conflicts with previously installed output wrapper `%s'"
 msgstr ""
 "bộ bao kết xuất “%s� xung đột với bộ bao kết xuất được cài đặt trước đó “%s�"
 
-#: io.c:2880
+#: io.c:2824
 #, c-format
 msgid "output wrapper `%s' failed to open `%s'"
 msgstr "bộ bao kết xuất “%s� gặp lỗi khi mở “%s�"
 
-#: io.c:2901
+#: io.c:2845
 msgid "register_output_processor: received NULL pointer"
 msgstr "register_output_processor: nhận được con tr� NULL"
 
-#: io.c:2930
+#: io.c:2874
 #, c-format
 msgid ""
 "two-way processor `%s' conflicts with previously installed two-way processor "
@@ -2928,221 +2946,208 @@ msgstr ""
 "bộ xử lý hai hướng “%s� xung đột với bộ xử lý hai hướng đã được cài đặt "
 "trước đó “%s�"
 
-#: io.c:2939
+#: io.c:2883
 #, c-format
 msgid "two way processor `%s' failed to open `%s'"
 msgstr "bộ xử lý hai hướng “%s� gặp lỗi khi mở “%s�"
 
-#: io.c:3064
+#: io.c:3008
 #, c-format
 msgid "data file `%s' is empty"
 msgstr "tập tin dữ liệu “%s� là rỗng"
 
-#: io.c:3106 io.c:3114
+#: io.c:3050 io.c:3058
 msgid "could not allocate more input memory"
 msgstr "không thể cấp phát bộ nhớ nhập thêm nữa"
 
-#: io.c:3682
+#: io.c:3636
 msgid "multicharacter value of `RS' is a gawk extension"
 msgstr "giá trị đa ký tự của “RS� là phần mở rộng gawk"
 
-#: io.c:3771
+#: io.c:3783
 msgid "IPv6 communication is not supported"
 msgstr "Truy�n thông trên IPv6 không được hỗ trợ"
 
-#: main.c:405
-msgid "empty argument to `-e/--source' ignored"
-msgstr "đối số rỗng cho tuỳ ch�n “-e/--source� bị b� qua"
-
-#: main.c:495
-#, c-format
-msgid "%s: option `-W %s' unrecognized, ignored\n"
-msgstr "%s: tùy ch�n “-W %s� không được nhận diện nên bị b� qua\n"
-
-#: main.c:541
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: tùy ch�n cần đến đối số “-- %c�\n"
-
-#: main.c:562
+#: main.c:321
 msgid "environment variable `POSIXLY_CORRECT' set: turning on `--posix'"
 msgstr ""
 "biến môi trư�ng “POSIXLY_CORRECT� (đúng kiểu POSIX) đã được đặt; đang bật "
 "tùy ch�n “--posix�"
 
-#: main.c:568
+#: main.c:327
 msgid "`--posix' overrides `--traditional'"
 msgstr "tùy ch�n “--posix� có quy�n cao hơn “--traditional� (truy�n thống)"
 
-#: main.c:579
+#: main.c:338
 msgid "`--posix'/`--traditional' overrides `--non-decimal-data'"
 msgstr ""
 "“--posix�/“--traditional� (cổ điển) có quy�n cao hơn “--non-decimal-"
 "data� (dữ liệu khác thập phân)"
 
-#: main.c:583
+#: main.c:342
 #, c-format
 msgid "running %s setuid root may be a security problem"
 msgstr "việc chạy %s với tư cách “setuid root� có thể rủi r� bảo mật"
 
-#: main.c:588
+#: main.c:346
 msgid "`--posix' overrides `--characters-as-bytes'"
 msgstr "“--posix� đè lên “--characters-as-bytes�"
 
-#: main.c:647
+#: main.c:404
 #, c-format
 msgid "can't set binary mode on stdin (%s)"
 msgstr "không thể đặt chế độ nhị phân trên đầu vào tiêu chuẩn (%s)"
 
-#: main.c:650
+#: main.c:407
 #, c-format
 msgid "can't set binary mode on stdout (%s)"
 msgstr "không thể đặt chế độ nhị phân trên đầu ra tiêu chuẩn (%s)"
 
-#: main.c:652
+#: main.c:409
 #, c-format
 msgid "can't set binary mode on stderr (%s)"
 msgstr "không thể đặt chế độ nhị phân trên đầu ra lỗi tiêu chuẩn (%s)"
 
-#: main.c:710
+#: main.c:469
 msgid "no program text at all!"
 msgstr "không có đoạn chữ chương trình nào cả!"
 
-#: main.c:799
+#: main.c:563
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] -f progfile [--] file ...\n"
 msgstr ""
 "Cách dùng: %s [tùy ch�n kiểu POSIX hay GNU] -f tập_tin_chương_trình [--] "
 "tập_tin ...\n"
 
-#: main.c:801
+#: main.c:565
 #, c-format
 msgid "Usage: %s [POSIX or GNU style options] [--] %cprogram%c file ...\n"
 msgstr ""
 "Cách dùng: %s [tùy ch�n kiểu POSIX hay GNU] [--] %cchương_trình%c "
 "tập_tin ...\n"
 
-#: main.c:806
+#: main.c:570
 msgid "POSIX options:\t\tGNU long options: (standard)\n"
 msgstr "Tùy ch�n POSIX:\t\t\tTùy ch�n dài GNU: (tiêu chuẩn)\n"
 
-#: main.c:807
+#: main.c:571
 msgid "\t-f progfile\t\t--file=progfile\n"
 msgstr "\t-f tập_tin_chương_trình\t--file=tập_tin_chương_trình\n"
 
-#: main.c:808
+#: main.c:572
 msgid "\t-F fs\t\t\t--field-separator=fs\n"
 msgstr "\t-F fs\t\t\t--field-separator=ký_hiệu_phân_cách_trư�ng\n"
 
-#: main.c:809
+#: main.c:573
 msgid "\t-v var=val\t\t--assign=var=val\n"
 msgstr ""
 "\t-v var=giá_trị\t\t--assign=biến=giá_trị\n"
 "(assign: gán)\n"
 
-#: main.c:810
+#: main.c:574
 msgid "Short options:\t\tGNU long options: (extensions)\n"
 msgstr "Tuỳ ch�n ngắn:\t\t\tTuỳ ch�n GNU dạng dài: (mở rộng)\n"
 
-#: main.c:811
+#: main.c:575
 msgid "\t-b\t\t\t--characters-as-bytes\n"
 msgstr "\t-b\t\t\t--characters-as-bytes\n"
 
-#: main.c:812
+#: main.c:576
 msgid "\t-c\t\t\t--traditional\n"
 msgstr "\t-c\t\t\t--traditional\n"
 
-#: main.c:813
+#: main.c:577
 msgid "\t-C\t\t\t--copyright\n"
 msgstr "\t-C\t\t\t--copyright\n"
 
-#: main.c:814
+#: main.c:578
 msgid "\t-d[file]\t\t--dump-variables[=file]\n"
 msgstr "\t-d[tập_tin]\t\t--dump-variables[=tập_tin]\n"
 
-#: main.c:815
+#: main.c:579
 msgid "\t-D[file]\t\t--debug[=file]\n"
 msgstr "\t-D[tập_tin]\t\t--debug[=tập_tin]\n"
 
-#: main.c:816
+#: main.c:580
 msgid "\t-e 'program-text'\t--source='program-text'\n"
 msgstr "\t-e “program-text�\t--source=“program-text�\n"
 
-#: main.c:817
+#: main.c:581
 msgid "\t-E file\t\t\t--exec=file\n"
 msgstr "\t-E file\t\t\t--exec=tập_tin\n"
 
-#: main.c:818
+#: main.c:582
 msgid "\t-g\t\t\t--gen-pot\n"
 msgstr "\t-g\t\t\t--gen-pot\n"
 
-#: main.c:819
+#: main.c:583
 msgid "\t-h\t\t\t--help\n"
 msgstr "\t-h\t\t\t--help\n"
 
-#: main.c:820
+#: main.c:584
 msgid "\t-i includefile\t\t--include=includefile\n"
 msgstr "\t-i includefile\t\t--include=tập-tin-bao-gồm\n"
 
-#: main.c:821
+#: main.c:585
 msgid "\t-l library\t\t--load=library\n"
 msgstr "\t-l library\t\t--load=thư-viện\n"
 
-#: main.c:822
-msgid "\t-L [fatal]\t\t--lint[=fatal]\n"
+#: main.c:586
+#, fuzzy
+msgid "\t-L[fatal|invalid]\t--lint[=fatal|invalid]\n"
 msgstr "\t-L [fatal]\t\t--lint[=fatal]\n"
 
-#: main.c:823
-msgid "\t-n\t\t\t--non-decimal-data\n"
-msgstr "\t-n\t\t\t--non-decimal-data\n"
-
-#: main.c:824
+#: main.c:587
 msgid "\t-M\t\t\t--bignum\n"
 msgstr "\t-M\t\t\t--bignum\n"
 
-#: main.c:825
+#: main.c:588
 msgid "\t-N\t\t\t--use-lc-numeric\n"
 msgstr "\t-N\t\t\t--use-lc-numeric\n"
 
-#: main.c:826
+#: main.c:589
+msgid "\t-n\t\t\t--non-decimal-data\n"
+msgstr "\t-n\t\t\t--non-decimal-data\n"
+
+#: main.c:590
 msgid "\t-o[file]\t\t--pretty-print[=file]\n"
 msgstr "\t-o[tập_tin]\t\t--pretty-print[=tập_tin]\n"
 
-#: main.c:827
+#: main.c:591
 msgid "\t-O\t\t\t--optimize\n"
 msgstr "\t-O\t\t\t--optimize  (tạm dịch: tối_ưu_hoá)\n"
 
-#: main.c:828
+#: main.c:592
 msgid "\t-p[file]\t\t--profile[=file]\n"
 msgstr "\t-p[tập_tin]\t\t--profile[=tập_tin]\n"
 
-#: main.c:829
+#: main.c:593
 msgid "\t-P\t\t\t--posix\n"
 msgstr "\t-P\t\t\t--posix\n"
 
-#: main.c:830
+#: main.c:594
 msgid "\t-r\t\t\t--re-interval\n"
 msgstr "\t-r\t\t\t--re-interval\n"
 
-#: main.c:831
+#: main.c:595
 msgid "\t-S\t\t\t--sandbox\n"
 msgstr "\t-S\t\t\t--sandbox\n"
 
-#: main.c:832
+#: main.c:596
 msgid "\t-t\t\t\t--lint-old\n"
 msgstr "\t-t\t\t\t--lint-old\n"
 
-#: main.c:833
+#: main.c:597
 msgid "\t-V\t\t\t--version\n"
 msgstr "\t-V\t\t\t--version\n"
 
-#: main.c:835
+#: main.c:599
 msgid "\t-W nostalgia\t\t--nostalgia\n"
 msgstr ""
 "\t-W nostalgia\t\t--nostalgia\n"
 "(nỗi luyến tiếc quá khứ)\n"
 
-#: main.c:838
+#: main.c:602
 msgid "\t-Y\t\t--parsedebug\n"
 msgstr "\t-Y\t\t--parsedebug\n"
 
@@ -3151,7 +3156,7 @@ msgstr "\t-Y\t\t--parsedebug\n"
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: main.c:847
+#: main.c:611
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info', which is\n"
@@ -3166,7 +3171,7 @@ msgstr ""
 "Thông báo lỗi dịch cho: <http://translationproject.org/team/vi.html>.\n"
 "\n"
 
-#: main.c:851
+#: main.c:615
 msgid ""
 "gawk is a pattern scanning and processing language.\n"
 "By default it reads standard input and writes standard output.\n"
@@ -3176,7 +3181,7 @@ msgstr ""
 "Mặc định, nó đ�c từ đầu vào tiêu chuẩn và ghi ra đầu ra tiêu chuẩn.\n"
 "\n"
 
-#: main.c:855
+#: main.c:619
 msgid ""
 "Examples:\n"
 "\tgawk '{ sum += $1 }; END { print sum }' file\n"
@@ -3186,7 +3191,7 @@ msgstr ""
 "\tgawk \"{ sum += $1 }; END { print sum }\" file\n"
 "\tgawk -F: \"{ print $1 }\" /etc/passwd\n"
 
-#: main.c:880
+#: main.c:644
 #, c-format
 msgid ""
 "Copyright (C) 1989, 1991-%d Free Software Foundation.\n"
@@ -3205,7 +3210,7 @@ msgstr ""
 "của Giấy Phép này, hoặc là (tùy ch�n) bất kỳ phiên bản mới hơn.\n"
 "\n"
 
-#: main.c:888
+#: main.c:652
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3219,7 +3224,7 @@ msgstr ""
 "Hãy xem Giấy phép Công Chung GNU (GPL) để biết chi tiết.\n"
 "\n"
 
-#: main.c:894
+#: main.c:658
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program. If not, see http://www.gnu.org/licenses/.\n"
@@ -3227,16 +3232,16 @@ msgstr ""
 "Bạn nên nhận một bản sao của Giấy Phép Công Cộng GNU cùng với chương\n"
 "trình này. Nếu chưa có, bạn xem tại <http://www.gnu.org/licenses/>.\n"
 
-#: main.c:931
+#: main.c:695
 msgid "-Ft does not set FS to tab in POSIX awk"
 msgstr "-Ft không đặt FS (hệ thống tập tin?) vào tab trong awk POSIX"
 
-#: main.c:1208
+#: main.c:982
 #, c-format
 msgid "unknown value for field spec: %d\n"
 msgstr "không hiểu giá trị dành cho đặc tả trư�ng: %d\n"
 
-#: main.c:1306
+#: main.c:1080
 #, c-format
 msgid ""
 "%s: `%s' argument to `-v' not in `var=value' form\n"
@@ -3245,98 +3250,116 @@ msgstr ""
 "%s: đối số “%s� cho “-v� không có dạng “biến=giá_trị�\n"
 "\n"
 
-#: main.c:1332
+#: main.c:1106
 #, c-format
 msgid "`%s' is not a legal variable name"
 msgstr "“%s� không phải là tên biến hợp lệ"
 
-#: main.c:1335
+#: main.c:1109
 #, c-format
 msgid "`%s' is not a variable name, looking for file `%s=%s'"
 msgstr "“%s� không phải là tên biến; đang tìm tập tin “%s=%s�"
 
-#: main.c:1339
+#: main.c:1113
 #, c-format
 msgid "cannot use gawk builtin `%s' as variable name"
 msgstr "không thể dùng builtin (dựng sẵn) của gawk “%s� như là tên biến"
 
-#: main.c:1344
+#: main.c:1118
 #, c-format
 msgid "cannot use function `%s' as variable name"
 msgstr "không thể dùng hàm “%s� như là tên biến"
 
-#: main.c:1397
+#: main.c:1171
 msgid "floating point exception"
 msgstr "ngoại lệ số thực dấu chấm động"
 
-#: main.c:1404
+#: main.c:1178
 msgid "fatal error: internal error"
 msgstr "lỗi nghiêm tr�ng: lỗi nội bộ"
 
-#: main.c:1419
+#: main.c:1193
 msgid "fatal error: internal error: segfault"
 msgstr "lỗi nghiêm tr�ng: lỗi nội bộ: lỗi phân đoạn"
 
-#: main.c:1431
+#: main.c:1205
 msgid "fatal error: internal error: stack overflow"
 msgstr "lỗi nghiêm tr�ng: lỗi nội bộ: tràn ngăn xếp"
 
-#: main.c:1490
+#: main.c:1264
 #, c-format
 msgid "no pre-opened fd %d"
 msgstr "không có fd (bộ mô tả tập tin) %d đã mở trước"
 
-#: main.c:1497
+#: main.c:1271
 #, c-format
 msgid "could not pre-open /dev/null for fd %d"
 msgstr "không thể mở trước “/dev/null� cho fd %d"
 
-#: mpfr.c:550
+#: main.c:1485
+msgid "empty argument to `-e/--source' ignored"
+msgstr "đối số rỗng cho tuỳ ch�n “-e/--source� bị b� qua"
+
+#: main.c:1556
+msgid "-M ignored: MPFR/GMP support not compiled in"
+msgstr ""
+
+#: main.c:1577
+#, c-format
+msgid "%s: option `-W %s' unrecognized, ignored\n"
+msgstr "%s: tùy ch�n “-W %s� không được nhận diện nên bị b� qua\n"
+
+#: main.c:1630
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: tùy ch�n cần đến đối số “-- %c�\n"
+
+#: mpfr.c:557
 #, c-format
 msgid "PREC value `%.*s' is invalid"
 msgstr "giá trị PREC “%.*s� là không hợp lệ"
 
-#: mpfr.c:608
+#: mpfr.c:615
 #, c-format
 msgid "RNDMODE value `%.*s' is invalid"
 msgstr "giá trị RNDMODE “%.*s� là không hợp lệ"
 
-#: mpfr.c:698
+#: mpfr.c:711
 #, c-format
 msgid "%s: received non-numeric argument"
 msgstr "%s: đã nhận đối số không phải thuộc số"
 
-#: mpfr.c:800
+#: mpfr.c:820
 msgid "compl(%Rg): negative value will give strange results"
 msgstr "compl(%Rg): giá trị âm sẽ gây ra kết quả không như mong muốn"
 
-#: mpfr.c:804
+#: mpfr.c:824
 msgid "comp(%Rg): fractional value will be truncated"
 msgstr "compl(%Rg): giá trị thuộc phân số sẽ bị cắt ngắn"
 
-#: mpfr.c:816
+#: mpfr.c:836
 #, c-format
 msgid "cmpl(%Zd): negative values will give strange results"
 msgstr "cmpl(%Zd): giá trị âm sẽ gây ra kết quả không như mong muốn"
 
-#: mpfr.c:835
+#: mpfr.c:855
 #, c-format
 msgid "%s: received non-numeric argument #%d"
 msgstr "%s: đã nhận đối số không phải thuộc số #%d"
 
-#: mpfr.c:845
+#: mpfr.c:865
 msgid "%s: argument #%d has invalid value %Rg, using 0"
 msgstr "%s: đối số #%d có giá trị không hợp lệ %Rg, dùng 0"
 
-#: mpfr.c:857
+#: mpfr.c:877
 msgid "%s: argument #%d negative value %Rg will give strange results"
 msgstr "%s: đối số #%d giá trị âm %Rg sẽ gây ra kết quả không như mong muốn"
 
-#: mpfr.c:863
+#: mpfr.c:883
 msgid "%s: argument #%d fractional value %Rg will be truncated"
 msgstr "%s: đối số #%d giá trị phần phân số %Rg sẽ bị cắt cụt"
 
-#: mpfr.c:878
+#: mpfr.c:898
 #, c-format
 msgid "%s: argument #%d negative value %Zd will give strange results"
 msgstr "%s: đối số #%d có giá trị âm %Zd sẽ đưa ra kết quả không như mong muốn"
@@ -3346,24 +3369,24 @@ msgstr "%s: đối số #%d có giá trị âm %Zd sẽ Ä‘Æ°a ra kết quả khÃ
 msgid "cmd. line:"
 msgstr "dòng lệnh:"
 
-#: node.c:421
+#: node.c:409
 msgid "backslash at end of string"
 msgstr "gặp dấu gạch ngược tại kết thúc của chuỗi"
 
-#: node.c:500
+#: node.c:488
 #, c-format
 msgid "old awk does not support the `\\%c' escape sequence"
 msgstr "awk cũ không hỗ trợ thoát chuỗi  “\\%c�"
 
-#: node.c:551
+#: node.c:539
 msgid "POSIX does not allow `\\x' escapes"
 msgstr "POSIX không cho phép thoát chuỗi “\\x�"
 
-#: node.c:557
+#: node.c:545
 msgid "no hex digits in `\\x' escape sequence"
 msgstr "không có số thập lúc nằm trong thoát chuỗi “\\x�"
 
-#: node.c:579
+#: node.c:567
 #, c-format
 msgid ""
 "hex escape \\x%.*s of %d characters probably not interpreted the way you "
@@ -3372,12 +3395,12 @@ msgstr ""
 "thoát chuỗi thập lục \\x%.*s chứa %d ký tự mà rất có thể không phải được đ�c "
 "bằng cách dự định"
 
-#: node.c:594
+#: node.c:582
 #, c-format
 msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "thoát chuỗi “\\%c� được xử lý như là “%c� chuẩn"
 
-#: node.c:739
+#: node.c:726
 msgid ""
 "Invalid multibyte data detected. There may be a mismatch between your data "
 "and your locale."
@@ -3407,12 +3430,12 @@ msgid "sending profile to standard error"
 msgstr "đang gởi hồ sơ cho thiết bị lỗi chuẩn"
 
 #: profile.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t# %s block(s)\n"
+"\t# %s rule(s)\n"
 "\n"
 msgstr ""
-"\t# %s khối\n"
+"\t# Quy tắc\n"
 "\n"
 
 #: profile.c:198
@@ -3429,11 +3452,11 @@ msgstr ""
 msgid "internal error: %s with null vname"
 msgstr "lỗi nội bộ: %s với vname (tên biến?) vô giá trị"
 
-#: profile.c:537
+#: profile.c:538
 msgid "internal error: builtin with null fname"
 msgstr "lỗi nội bộ: phần dựng sẵn với fname là null"
 
-#: profile.c:949
+#: profile.c:958
 #, c-format
 msgid ""
 "\t# Loaded extensions (-l and/or @load)\n"
@@ -3442,12 +3465,12 @@ msgstr ""
 "\t# Các phần mở rộng được tải (-l và/hoặc @load)\n"
 "\n"
 
-#: profile.c:972
+#: profile.c:981
 #, c-format
 msgid "\t# gawk profile, created %s\n"
 msgstr "\t# hồ sơ gawk, được tạo %s\n"
 
-#: profile.c:1475
+#: profile.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -3456,7 +3479,7 @@ msgstr ""
 "\n"
 "\t# Danh sách các hàm theo thứ tự abc\n"
 
-#: profile.c:1513
+#: profile.c:1559
 #, c-format
 msgid "redir2str: unknown redirection type %d"
 msgstr "redir2str: không hiểu kiểu chuyển hướng %d"
@@ -3468,80 +3491,114 @@ msgstr ""
 "thành phần của biểu thức chính qui (regexp) “%.*s� gần như chắc chắn nên là "
 "“[%.*s]�"
 
-#: regcomp.c:131
+#: regcomp.c:139
 msgid "Success"
 msgstr "Thành công"
 
-#: regcomp.c:134
+#: regcomp.c:142
 msgid "No match"
 msgstr "Không khớp"
 
-#: regcomp.c:137
+#: regcomp.c:145
 msgid "Invalid regular expression"
 msgstr "Biểu thức chính quy không hợp lệ"
 
-#: regcomp.c:140
+#: regcomp.c:148
 msgid "Invalid collation character"
 msgstr "Ký tự đối chiếu không hợp lệ"
 
-#: regcomp.c:143
+#: regcomp.c:151
 msgid "Invalid character class name"
 msgstr "Tên hạng ký tự không hợp lệ"
 
-#: regcomp.c:146
+#: regcomp.c:154
 msgid "Trailing backslash"
 msgstr "Gặp dấu gạch ngược thừa"
 
-#: regcomp.c:149
+#: regcomp.c:157
 msgid "Invalid back reference"
 msgstr "Tham chiếu ngược không hợp lệ"
 
-#: regcomp.c:152
-msgid "Unmatched [ or [^"
+#: regcomp.c:160
+#, fuzzy
+msgid "Unmatched [, [^, [:, [., or [="
 msgstr "Chưa khớp “[� hay “[^�"
 
-#: regcomp.c:155
+#: regcomp.c:163
 msgid "Unmatched ( or \\("
 msgstr "Chưa khớp “(� hay “\\(�"
 
-#: regcomp.c:158
+#: regcomp.c:166
 msgid "Unmatched \\{"
 msgstr "Chưa khớp “\\{�"
 
-#: regcomp.c:164
+#: regcomp.c:169
+msgid "Invalid content of \\{\\}"
+msgstr "Nội dung của “\\{\\}� không hợp lệ"
+
+#: regcomp.c:172
 msgid "Invalid range end"
 msgstr "Kết thúc phạm vi không hợp lệ"
 
-#: regcomp.c:167
+#: regcomp.c:175
 msgid "Memory exhausted"
 msgstr "Hết bộ nhớ"
 
-#: regcomp.c:170
+#: regcomp.c:178
 msgid "Invalid preceding regular expression"
 msgstr "Biểu thức chính quy nằm trước không hợp lệ"
 
-#: regcomp.c:173
+#: regcomp.c:181
 msgid "Premature end of regular expression"
 msgstr "Kết thúc quá sớm của biểu thức chính quy"
 
-#: regcomp.c:179
+#: regcomp.c:184
+msgid "Regular expression too big"
+msgstr "Biểu thức chính quy quá lớn"
+
+#: regcomp.c:187
 msgid "Unmatched ) or \\)"
 msgstr "Chưa khớp “)� hoặc “\\)�"
 
-#: regcomp.c:704
+#: regcomp.c:712
 msgid "No previous regular expression"
 msgstr "Không có biểu thức chính quy nằm trước"
 
-#: symbol.c:741
+#: symbol.c:677
+#, fuzzy, c-format
+msgid "function `%s': can't use function `%s' as a parameter name"
+msgstr "hàm “%s�: không thể dùng tên hàm như là tên tham số"
+
+#: symbol.c:809
 msgid "can not pop main context"
 msgstr "không thể pop (lấy ra) ngữ cảnh chính"
 
+#~ msgid "`getline var' invalid inside `%s' rule"
+#~ msgstr "“getline var� không hợp lệ bên trong quy tắc “%s�"
+
+#~ msgid "no (known) protocol supplied in special filename `%s'"
+#~ msgstr ""
+#~ "trong tên tập tin đặc biệt “%s� không cung cấp giao thức (đã biết) nào"
+
+#~ msgid "special file name `%s' is incomplete"
+#~ msgstr "tên tập tin đặc biệt “%s� chưa xong"
+
+#~ msgid "must supply a remote hostname to `/inet'"
+#~ msgstr "phải cung cấp một tên máy chủ cho </inet>"
+
+#~ msgid "must supply a remote port to `/inet'"
+#~ msgstr "phải cung cấp một cổng máy chủ cho </inet>"
+
+#~ msgid ""
+#~ "\t# %s block(s)\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\t# %s khối\n"
+#~ "\n"
+
 #~ msgid "range of the form `[%c-%c]' is locale dependent"
 #~ msgstr "vùng của dạng thức “[%c-%c]� phụ thuộc vào vị trí"
 
-#~ msgid "attempt to use function `%s' as an array"
-#~ msgstr "cố gắng dùng hàm “%s� như mảng"
-
 #~ msgid "reference to uninitialized element `%s[\"%.*s\"]'"
 #~ msgstr "tham chiếu đến phần tử chưa khởi tạo “%s[�%.*s�]�"
 
diff --git a/profile.c b/profile.c
index 6cb4c6a4..1126de1b 100644
--- a/profile.c
+++ b/profile.c
@@ -26,6 +26,7 @@
 #include "awk.h"
 
 static void pprint(INSTRUCTION *startp, INSTRUCTION *endp, bool in_for_header);
+static void end_line(INSTRUCTION *ip);
 static void pp_parenthesize(NODE *n);
 static void parenthesize(int type, NODE *left, NODE *right);
 static char *pp_list(int nargs, const char *paren, const char *delim);
@@ -36,7 +37,8 @@ static bool is_scalar(int type);
 static int prec_level(int type);
 static void pp_push(int type, char *s, int flag);
 static NODE *pp_pop(void);
-static void pp_free(NODE *n);
+static void pprint(INSTRUCTION *startp, INSTRUCTION *endp, bool in_for_header);
+static void print_comment(INSTRUCTION *pc, long in);
 const char *redir2str(int redirtype);
 
 #define pp_str	vname
@@ -100,10 +102,12 @@ indent(long count)
 {
 	int i;
 
-	if (count == 0)
-		fprintf(prof_fp, "\t");
-	else
-		fprintf(prof_fp, "%6ld  ", count);
+	if (do_profile) {
+		if (count == 0)
+			fprintf(prof_fp, "\t");
+		else
+			fprintf(prof_fp, "%6ld  ", count);
+	}
 
 	assert(indent_level >= 0);
 	for (i = 0; i < indent_level; i++)
@@ -173,7 +177,8 @@ pprint(INSTRUCTION *startp, INSTRUCTION *endp, bool in_for_header)
 	NODE *t1;
 	char *str;
 	NODE *t2;
-	INSTRUCTION *ip;
+	INSTRUCTION *ip1;
+	INSTRUCTION *ip2;
 	NODE *m;
 	char *tmp;
 	int rule;
@@ -183,42 +188,75 @@ pprint(INSTRUCTION *startp, INSTRUCTION *endp, bool in_for_header)
 		if (pc->source_line > 0)
 			sourceline = pc->source_line;
 
+		/* skip leading EOL comment as it has already been printed  */
+		if (pc->opcode == Op_comment
+		    && pc->memory->comment_type == EOL_COMMENT)
+			continue;
 		switch (pc->opcode) {
 		case Op_rule:
+			/*
+			 * Rules are three instructions long.
+			 * See append_rule in awkgram.y. 
+			 * The first has the Rule Op Code, nexti etc. 
+			 * The second, (pc + 1) has firsti and lasti:
+			 * 	the first/last ACTION instructions for this rule. 
+			 * The third has first_line and last_line:
+			 * 	the first and last source line numbers.
+			 */
 			source = pc->source_file;
 			rule = pc->in_rule;
 
 			if (rule != Rule) {
-				if (! rule_count[rule]++)
-					fprintf(prof_fp, _("\t# %s block(s)\n\n"), ruletab[rule]);
-				fprintf(prof_fp, "\t%s {\n", ruletab[rule]);
-				ip = (pc + 1)->firsti;
+				/* Allow for pre-non-rule-block comment  */
+				if (pc->nexti != (pc +1)->firsti
+				    && pc->nexti->opcode == Op_comment
+				    && pc->nexti->memory->comment_type == FULL_COMMENT)
+					print_comment(pc->nexti, -1);
+				ip1 = (pc + 1)->firsti;
+				ip2 = (pc + 1)->lasti;
+
+				if (do_profile) {
+					if (! rule_count[rule]++)
+						fprintf(prof_fp, _("\t# %s rule(s)\n\n"), ruletab[rule]);
+					indent(0);
+				}
+				fprintf(prof_fp, "%s {", ruletab[rule]);
+				end_line(pc);
 			} else {
-				if (! rule_count[rule]++)
+				if (do_profile && ! rule_count[rule]++)
 					fprintf(prof_fp, _("\t# Rule(s)\n\n"));
-				ip = pc->nexti;
-				indent(ip->exec_count);
-				if (ip != (pc + 1)->firsti) {		/* non-empty pattern */
-					pprint(ip->nexti, (pc + 1)->firsti, false);
-					t1 = pp_pop();
-					fprintf(prof_fp, "%s {", t1->pp_str);
-					pp_free(t1);
-					ip = (pc + 1)->firsti;
-
-					if (do_profile && ip->exec_count > 0)
-						fprintf(prof_fp, " # %ld", ip->exec_count);
-
-					fprintf(prof_fp, "\n");
+				ip1 = pc->nexti;
+				indent(ip1->exec_count);
+				if (ip1 != (pc + 1)->firsti) {		/* non-empty pattern */
+					pprint(ip1->nexti, (pc + 1)->firsti, false);
+					/* Allow for case where the "pattern" is just a comment  */
+					if (ip1->nexti->nexti->nexti != (pc +1)->firsti
+					    || ip1->nexti->opcode != Op_comment) {
+						t1 = pp_pop();
+						fprintf(prof_fp, "%s {", t1->pp_str);
+						pp_free(t1);
+					} else 
+						fprintf(prof_fp, "{");
+					ip1 = (pc + 1)->firsti;
+					ip2 = (pc + 1)->lasti;
+
+					if (do_profile && ip1->exec_count > 0)
+						fprintf(prof_fp, " # %ld", ip1->exec_count);
+
+					end_line(ip1);
 				} else {
 					fprintf(prof_fp, "{\n");
-					ip = (pc + 1)->firsti;
+					ip1 = (pc + 1)->firsti;
+					ip2 = (pc + 1)->lasti;
 				}
-				ip = ip->nexti;
+				ip1 = ip1->nexti;
 			}
 			indent_in();
-			pprint(ip, (pc + 1)->lasti, false);
+			pprint(ip1, ip2, false);
 			indent_out();
-			fprintf(prof_fp, "\t}\n\n");
+			if (do_profile)
+				indent(0);
+			fprintf(prof_fp, "}\n\n");
 			pc = (pc + 1)->lasti;
 			break;
 
@@ -303,7 +341,7 @@ cleanup:
 				pp_free(t2);
 				pp_free(t1);
 				if (! in_for_header)
-					fprintf(prof_fp, "\n");
+					end_line(pc);
 				break;
 
 			default:
@@ -341,6 +379,14 @@ cleanup:
 		case Op_exp:
 		case Op_quotient:
 		case Op_mod:
+			t2 = pp_pop();
+			t1 = pp_pop();
+			if (prec_level(t2->type) > prec_level(t1->type)
+					&& is_binary(t1->type))  /* (a - b) * 1 */
+				pp_parenthesize(t1);
+			else
+				parenthesize(pc->opcode, t1, t2);
+			goto finish_binary_group;
 		case Op_equal:
 		case Op_notequal:
 		case Op_less:
@@ -349,7 +395,11 @@ cleanup:
 		case Op_geq:
 			t2 = pp_pop();
 			t1 = pp_pop();
+			if (prec_level(t2->type) > prec_level(t1->type)
+					&& is_binary(t1->type))  /* (a - b) * 1 */
+				pp_parenthesize(t1);
 			parenthesize(pc->opcode, t1, t2);
+	finish_binary_group:
 			str = pp_group3(t1->pp_str, op2str(pc->opcode), t2->pp_str);
 			pp_free(t1);
 			pp_free(t2);
@@ -375,7 +425,8 @@ cleanup:
 		case Op_unary_plus:
 		case Op_not:
 			t1 = pp_pop();
-			if (is_binary(t1->type))
+			if (is_binary(t1->type)
+			    || (((OPCODE) t1->type) == pc->opcode && pc->opcode == Op_unary_minus))
 				pp_parenthesize(t1);
 
 			/* optypes table (eval.c) includes space after ! */
@@ -408,7 +459,7 @@ cleanup:
 			pp_free(t2);
 			pp_free(t1);
 			if (! in_for_header)
-				fprintf(prof_fp, "\n");
+				end_line(pc);
 			break; 
 
 		case Op_concat:
@@ -429,7 +480,7 @@ cleanup:
 			} else 				
 				fprintf(prof_fp, "%s %s", op2str(Op_K_delete), array);
 			if (! in_for_header)
-				fprintf(prof_fp, "\n");
+				end_line(pc);
 			pp_free(t1);
 		}
 			break;
@@ -541,7 +592,7 @@ cleanup:
 				fprintf(prof_fp, "%s%s", op2str(pc->opcode), tmp);
 			efree(tmp);
 			if (! in_for_header)
-				fprintf(prof_fp, "\n");
+				end_line(pc);
 			break;
 
 		case Op_push_re:
@@ -659,33 +710,33 @@ cleanup:
 			t1 = pp_pop();
 			fprintf(prof_fp, "%s", t1->pp_str);
 			if (! in_for_header)
-				fprintf(prof_fp, "\n");
+				end_line(pc);
 			pp_free(t1);
 			break;
 
 		case Op_line_range:
-			ip = pc + 1;
-			pprint(pc->nexti, ip->condpair_left, false);
-			pprint(ip->condpair_left->nexti, ip->condpair_right, false);
+			ip1 = pc + 1;
+			pprint(pc->nexti, ip1->condpair_left, false);
+			pprint(ip1->condpair_left->nexti, ip1->condpair_right, false);
 			t2 = pp_pop();
 			t1 = pp_pop();
 			str = pp_group3(t1->pp_str, ", ", t2->pp_str);
 			pp_free(t1);
 			pp_free(t2);
 			pp_push(Op_line_range, str, CAN_FREE);
-			pc = ip->condpair_right;
+			pc = ip1->condpair_right;
 			break;
 
 		case Op_K_while:
-			ip = pc + 1;
-			indent(ip->while_body->exec_count);
+			ip1 = pc + 1;
+			indent(ip1->while_body->exec_count);
 			fprintf(prof_fp, "%s (", op2str(pc->opcode));
-			pprint(pc->nexti, ip->while_body, false);
+			pprint(pc->nexti, ip1->while_body, false);
 			t1 = pp_pop();
 			fprintf(prof_fp, "%s) {\n", t1->pp_str);
 			pp_free(t1);
 			indent_in();
-			pprint(ip->while_body->nexti, pc->target_break, false);
+			pprint(ip1->while_body->nexti, pc->target_break, false);
 			indent_out();
 			indent(SPACEOVER);
 			fprintf(prof_fp, "}\n");
@@ -693,13 +744,13 @@ cleanup:
 			break;
 
 		case Op_K_do:
-			ip = pc + 1;
+			ip1 = pc + 1;
 			indent(pc->nexti->exec_count);
 			fprintf(prof_fp, "%s {\n", op2str(pc->opcode));
 			indent_in();
-			pprint(pc->nexti->nexti, ip->doloop_cond, false);
+			pprint(pc->nexti->nexti, ip1->doloop_cond, false);
 			indent_out();
-			pprint(ip->doloop_cond, pc->target_break, false);
+			pprint(ip1->doloop_cond, pc->target_break, false);
 			indent(SPACEOVER);
 			t1 = pp_pop();
 			fprintf(prof_fp, "} %s (%s)\n", op2str(Op_K_while), t1->pp_str);
@@ -708,24 +759,24 @@ cleanup:
 			break;
 
 		case Op_K_for:
-			ip = pc + 1;
-			indent(ip->forloop_body->exec_count);
+			ip1 = pc + 1;
+			indent(ip1->forloop_body->exec_count);
 			fprintf(prof_fp, "%s (", op2str(pc->opcode));	
 
 			/* If empty for looop header, print it a little more nicely. */
 			if (   pc->nexti->opcode == Op_no_op
-			    && ip->forloop_cond == pc->nexti
+			    && ip1->forloop_cond == pc->nexti
 			    && pc->target_continue->opcode == Op_jmp) {
 				fprintf(prof_fp, ";;");
 			} else {
-				pprint(pc->nexti, ip->forloop_cond, true);
+				pprint(pc->nexti, ip1->forloop_cond, true);
 				fprintf(prof_fp, "; ");
 
-				if (ip->forloop_cond->opcode == Op_no_op &&
-						ip->forloop_cond->nexti == ip->forloop_body)
+				if (ip1->forloop_cond->opcode == Op_no_op &&
+						ip1->forloop_cond->nexti == ip1->forloop_body)
 					fprintf(prof_fp, "; ");
 				else {
-					pprint(ip->forloop_cond, ip->forloop_body, true);
+					pprint(ip1->forloop_cond, ip1->forloop_body, true);
 					t1 = pp_pop();
 					fprintf(prof_fp, "%s; ", t1->pp_str);
 					pp_free(t1);
@@ -735,7 +786,7 @@ cleanup:
 			}
 			fprintf(prof_fp, ") {\n");
 			indent_in();
-			pprint(ip->forloop_body->nexti, pc->target_continue, false);
+			pprint(ip1->forloop_body->nexti, pc->target_continue, false);
 			indent_out();
 			indent(SPACEOVER);
 			fprintf(prof_fp, "}\n");
@@ -747,20 +798,20 @@ cleanup:
 			char *array;
 			const char *item;
 
-			ip = pc + 1;
+			ip1 = pc + 1;
 			t1 = pp_pop();
 			array = t1->pp_str;
-			m = ip->forloop_cond->array_var;
+			m = ip1->forloop_cond->array_var;
 			if (m->type == Node_param_list)
 				item = func_params[m->param_cnt].param;
 			else
 				item = m->vname;
-			indent(ip->forloop_body->exec_count);
+			indent(ip1->forloop_body->exec_count);
 			fprintf(prof_fp, "%s (%s%s%s) {\n", op2str(Op_K_arrayfor),
 						item, op2str(Op_in_array), array);
 			indent_in();
 			pp_free(t1);
-			pprint(ip->forloop_body->nexti, pc->target_break, false);
+			pprint(ip1->forloop_body->nexti, pc->target_break, false);
 			indent_out();
 			indent(SPACEOVER);
 			fprintf(prof_fp, "}\n");			
@@ -769,13 +820,13 @@ cleanup:
 			break;
 
 		case Op_K_switch:
-			ip = pc + 1;
+			ip1 = pc + 1;
 			fprintf(prof_fp, "%s (", op2str(pc->opcode));
-			pprint(pc->nexti, ip->switch_start, false);
+			pprint(pc->nexti, ip1->switch_start, false);
 			t1 = pp_pop();
 			fprintf(prof_fp, "%s) {\n", t1->pp_str);
 			pp_free(t1);
-			pprint(ip->switch_start, ip->switch_end, false);
+			pprint(ip1->switch_start, ip1->switch_end, false);
 			indent(SPACEOVER);
 			fprintf(prof_fp, "}\n");
 			pc = pc->target_break;
@@ -802,12 +853,12 @@ cleanup:
 			fprintf(prof_fp, "%s) {", t1->pp_str);
 			pp_free(t1);
 
-			ip = pc->branch_if;
-			if (ip->exec_count > 0)
-				fprintf(prof_fp, " # %ld", ip->exec_count);
-			fprintf(prof_fp, "\n");
+			ip1 = pc->branch_if;
+			if (ip1->exec_count > 0)
+				fprintf(prof_fp, " # %ld", ip1->exec_count);
+			end_line(pc);
 			indent_in();
-			pprint(ip->nexti, pc->branch_else, false);
+			pprint(ip1->nexti, pc->branch_else, false);
 			indent_out();
 			pc = pc->branch_else;
 			if (pc->nexti->opcode == Op_no_op) {
@@ -832,11 +883,11 @@ cleanup:
 			size_t len;
 
 			pprint(pc->nexti, pc->branch_if, false);
-			ip = pc->branch_if;
-			pprint(ip->nexti, pc->branch_else, false);
-			ip = pc->branch_else->nexti;
+			ip1 = pc->branch_if;
+			pprint(ip1->nexti, pc->branch_else, false);
+			ip1 = pc->branch_else->nexti;
 
-			pc = ip->nexti;
+			pc = ip1->nexti;
 			assert(pc->opcode == Op_cond_exp);
 			pprint(pc->nexti, pc->branch_end, false);	
 
@@ -861,6 +912,13 @@ cleanup:
 				indent(pc->exec_count);
 			break;
 
+		case Op_comment:
+			print_comment(pc, 0);
+			break;
+
+		case Op_list:
+			break;
+
 		default:
 			cant_happen();
 		}
@@ -870,6 +928,21 @@ cleanup:
 	}
 }
 
+/* end_line --- end pretty print line with new line or on-line comment  */
+
+void 
+end_line(INSTRUCTION *ip)
+{
+	if (ip->nexti->opcode == Op_comment
+	    && ip->nexti->memory->comment_type == EOL_COMMENT) {
+		fprintf(prof_fp, "\t");
+		print_comment(ip->nexti, -1);
+		ip = ip->nexti->nexti;
+	}
+	else 
+		fprintf(prof_fp, "\n");
+}
+
 /* pp_string_fp --- printy print a string to the fp */
 
 /*
@@ -889,11 +962,11 @@ pp_string_fp(Func_print print_func, FILE *fp, const char *in_str,
 
 	slen = strlen(str);
 	for (count = 0; slen > 0; slen--, str++) {
+		print_func(fp, "%c", *str);
 		if (++count >= BREAKPOINT && breaklines) {
 			print_func(fp, "%c\n%c", delim, delim);
 			count = 0;
-		} else
-			print_func(fp, "%c", *str);
+		}
 	}
 	efree(s);
 }
@@ -943,6 +1016,31 @@ print_lib_list(FILE *prof_fp)
 		fprintf(prof_fp, "\n");
 }
 
+/* print_comment --- print comment text with proper indentation */
+
+static void
+print_comment(INSTRUCTION* pc, long in)
+{
+	char *text;
+	size_t count;
+	bool after_newline = false;
+
+	count = pc->memory->stlen;
+	text = pc->memory->stptr;
+
+	if (in >= 0)
+		indent(in);    /* is this correct? Where should comments go?  */
+	for (; count > 0; count--, text++) {
+		if (after_newline) {
+			indent(in);
+			after_newline = false;
+		}
+		putc(*text, prof_fp);
+		if (*text == '\n')
+			after_newline = true;
+	}
+}
+
 /* dump_prog --- dump the program */
 
 /*
@@ -957,7 +1055,8 @@ dump_prog(INSTRUCTION *code)
 
 	(void) time(& now);
 	/* \n on purpose, with \n in ctime() output */
-	fprintf(prof_fp, _("\t# gawk profile, created %s\n"), ctime(& now));
+	if (do_profile)
+		fprintf(prof_fp, _("\t# gawk profile, created %s\n"), ctime(& now));
 	print_lib_list(prof_fp);
 	pprint(code, NULL, false);
 }
@@ -980,44 +1079,47 @@ prec_level(int type)
 	case Op_func_call:
 	case Op_K_delete_loop:
 	case Op_builtin:
-		return 15;
+		return 16;
 
 	case Op_field_spec:
 	case Op_field_spec_lhs:
-		return 14;
-
-	case Op_exp:
-		return 13;
+		return 15;
 
 	case Op_preincrement:
 	case Op_predecrement:
 	case Op_postincrement:
 	case Op_postdecrement:
-		return 12;
+		return 14;
+
+	case Op_exp:
+		return 13;
 
 	case Op_unary_minus:
 	case Op_unary_plus:
 	case Op_not:
-		return 11;
+		return 12;
 
 	case Op_times:
 	case Op_quotient:
 	case Op_mod:
-		return 10;
+		return 11;
 
 	case Op_plus:
 	case Op_minus:
-		return 9;
+		return 10;
 
 	case Op_concat:
 	case Op_assign_concat:
-		return 8;
+		return 9;
 
 	case Op_equal:
 	case Op_notequal:
 	case Op_greater:
+	case Op_less:
 	case Op_leq:
 	case Op_geq:
+		return 8;
+
 	case Op_match:
 	case Op_nomatch:
 		return 7;
@@ -1026,7 +1128,6 @@ prec_level(int type)
 	case Op_K_getline_redir:
 		return 6;
 
-	case Op_less:
 	case Op_in_array:
 		return 5;
 
@@ -1146,6 +1247,24 @@ pp_parenthesize(NODE *sp)
 	sp->flags |= CAN_FREE;
 }
 
+/* div_on_left_mul_on_right --- have / or % on left and * on right */
+
+static bool
+div_on_left_mul_on_right(int o1, int o2)
+{
+	OPCODE op1 = (OPCODE) o1;
+	OPCODE op2 = (OPCODE) o2;
+
+	switch (op1) {
+	case Op_quotient:
+	case Op_mod:
+		return (op2 == Op_times);
+
+	default:
+		return false;
+	}
+}
+
 /* parenthesize --- parenthesize two nodes relative to parent node type */
 
 static void
@@ -1155,9 +1274,11 @@ parenthesize(int type, NODE *left, NODE *right)
 	int lprec = prec_level(left->type);
 	int prec = prec_level(type);
 
-	if (lprec < prec)
+	if (lprec < prec
+	    || (lprec == prec && div_on_left_mul_on_right(left->type, type)))
 		pp_parenthesize(left);
-	if (rprec < prec)
+	if (rprec < prec
+	    || (rprec == prec && div_on_left_mul_on_right(type, right->type)))
 		pp_parenthesize(right);
 }
 
@@ -1318,6 +1439,14 @@ pp_list(int nargs, const char *paren, const char *delim)
 	return str;					
 }
 
+/* is_unary_minus --- return true if string starts with unary minus */
+
+static bool
+is_unary_minus(const char *str)
+{
+	return str[0] == '-' && str[1] != '-';
+}
+
 /* pp_concat --- handle concatenation and correct parenthesizing of expressions */
 
 static char *
@@ -1359,7 +1488,12 @@ pp_concat(int nargs)
 		pl_l = prec_level(pp_args[i]->type);
 		pl_r = prec_level(pp_args[i+1]->type);
 
-		if (is_scalar(pp_args[i]->type) && is_scalar(pp_args[i+1]->type)) {
+		if (i >= 2 && is_unary_minus(r->pp_str)) {
+			*s++ = '(';
+			memcpy(s, r->pp_str, r->pp_len);
+			s += r->pp_len;
+			*s++ = ')';
+		} else if (is_scalar(pp_args[i]->type) && is_scalar(pp_args[i+1]->type)) {
 			memcpy(s, r->pp_str, r->pp_len);
 			s += r->pp_len;
 		} else if (pl_l <= pl_r || is_scalar(pp_args[i+1]->type)) {
@@ -1381,7 +1515,7 @@ pp_concat(int nargs)
 	pl_l = prec_level(pp_args[nargs-1]->type);
 	pl_r = prec_level(pp_args[nargs]->type);
 	r = pp_args[nargs];
-	if (pl_l >= pl_r && ! is_scalar(pp_args[nargs]->type)) {
+	if (is_unary_minus(r->pp_str) || ((pl_l >= pl_r && ! is_scalar(pp_args[nargs]->type)))) {
 		*s++ = '(';
 		memcpy(s, r->pp_str, r->pp_len);
 		s += r->pp_len;
@@ -1435,14 +1569,24 @@ pp_func(INSTRUCTION *pc, void *data ATTRIBUTE_UNUSED)
 	static bool first = true;
 	NODE *func;
 	int pcount;
+	INSTRUCTION *fp;
 
 	if (first) {
 		first = false;
-		fprintf(prof_fp, _("\n\t# Functions, listed alphabetically\n"));
+		if (do_profile)
+			fprintf(prof_fp, _("\n\t# Functions, listed alphabetically\n"));
 	}
 
+	fp = pc->nexti->nexti;
 	func = pc->func_body;
 	fprintf(prof_fp, "\n");
+
+	/* print any function comment */
+	if (fp->opcode == Op_comment && fp->source_line == 0) {
+		print_comment(fp, -1);	/* -1 ==> don't indent */
+		fp = fp->nexti;
+	}
+
 	indent(pc->nexti->exec_count);
 	fprintf(prof_fp, "%s %s(", op2str(Op_K_function), func->vname);
 	pcount = func->param_cnt;
@@ -1452,11 +1596,16 @@ pp_func(INSTRUCTION *pc, void *data ATTRIBUTE_UNUSED)
 		if (j < pcount - 1)
 			fprintf(prof_fp, ", ");
 	}
-	fprintf(prof_fp, ")\n\t{\n");
+	fprintf(prof_fp, ")\n");
+	if (do_profile)
+		indent(0);
+	fprintf(prof_fp, "{\n");
 	indent_in();
-	pprint(pc->nexti->nexti, NULL, false);	/* function body */
+	pprint(fp, NULL, false);	/* function body */
 	indent_out();
-	fprintf(prof_fp, "\t}\n");
+	if (do_profile)
+		indent(0);
+	fprintf(prof_fp, "}\n");
 	return 0;
 }
 
diff --git a/re.c b/re.c
index 9118129e..7abb9430 100644
--- a/re.c
+++ b/re.c
@@ -54,12 +54,9 @@ make_regexp(const char *s, size_t len, bool ignorecase, bool dfa, bool canfatal)
 	 * It is 0, when the current character is a singlebyte character.
 	 */
 	size_t is_multibyte = 0;
-#if MBS_SUPPORT
 	mbstate_t mbs;
 
-	if (gawk_mb_cur_max > 1)
-		memset(&mbs, 0, sizeof(mbstate_t)); /* Initialize.  */
-#endif
+	memset(&mbs, 0, sizeof(mbstate_t)); /* Initialize.  */
 
 	if (first) {
 		first = false;
@@ -87,7 +84,6 @@ make_regexp(const char *s, size_t len, bool ignorecase, bool dfa, bool canfatal)
 	dest = buf;
 
 	while (src < end) {
-#if MBS_SUPPORT
 		if (gawk_mb_cur_max > 1 && ! is_multibyte) {
 			/* The previous byte is a singlebyte character, or last byte
 			   of a multibyte character.  We check the next character.  */
@@ -100,7 +96,6 @@ make_regexp(const char *s, size_t len, bool ignorecase, bool dfa, bool canfatal)
 				is_multibyte = 0;
 			}
 		}
-#endif
 
 		/* We skip multibyte character, since it must not be a special
 		   character.  */
@@ -284,13 +279,18 @@ research(Regexp *rp, char *str, int start,
 	if (rp->dfa && ! no_bol && ! need_start) {
 		char save;
 		size_t count = 0;
+		struct dfa *superset = dfasuperset(rp->dfareg);
 		/*
 		 * dfa likes to stick a '\n' right after the matched
 		 * text.  So we just save and restore the character.
 		 */
 		save = str[start+len];
-		ret = dfaexec(rp->dfareg, str+start, str+start+len, true,
-					&count, &try_backref);
+		if (superset)
+			ret = dfaexec(superset, str+start, str+start+len,
+							true, NULL, NULL);
+		if (ret)
+			ret = dfaexec(rp->dfareg, str+start, str+start+len,
+						true, &count, &try_backref);
 		str[start+len] = save;
 	}
 
@@ -616,40 +616,3 @@ again:
 done:
 	s[length] = save;
 }
-
-/* regexflags2str --- make regex flags printable */
-
-const char *
-regexflags2str(int flags)
-{
-	static const struct flagtab regextab[] = {
-		{ RE_BACKSLASH_ESCAPE_IN_LISTS,	"RE_BACKSLASH_ESCAPE_IN_LISTS" },
-		{ RE_BK_PLUS_QM,		"RE_BK_PLUS_QM" },
-		{ RE_CHAR_CLASSES,		"RE_CHAR_CLASSES" },
-		{ RE_CONTEXT_INDEP_ANCHORS,	"RE_CONTEXT_INDEP_ANCHORS" },
-		{ RE_CONTEXT_INDEP_OPS,		"RE_CONTEXT_INDEP_OPS" },
-		{ RE_CONTEXT_INVALID_OPS,	"RE_CONTEXT_INVALID_OPS" },
-		{ RE_DOT_NEWLINE,		"RE_DOT_NEWLINE" },
-		{ RE_DOT_NOT_NULL,		"RE_DOT_NOT_NULL" },
-		{ RE_HAT_LISTS_NOT_NEWLINE,	"RE_HAT_LISTS_NOT_NEWLINE" },
-		{ RE_INTERVALS,			"RE_INTERVALS" },
-		{ RE_LIMITED_OPS,		"RE_LIMITED_OPS" },
-		{ RE_NEWLINE_ALT,		"RE_NEWLINE_ALT" },
-		{ RE_NO_BK_BRACES,		"RE_NO_BK_BRACES" },
-		{ RE_NO_BK_PARENS,		"RE_NO_BK_PARENS" },
-		{ RE_NO_BK_REFS,		"RE_NO_BK_REFS" },
-		{ RE_NO_BK_VBAR,		"RE_NO_BK_VBAR" },
-		{ RE_NO_EMPTY_RANGES,		"RE_NO_EMPTY_RANGES" },
-		{ RE_UNMATCHED_RIGHT_PAREN_ORD,	"RE_UNMATCHED_RIGHT_PAREN_ORD" },
-		{ RE_NO_POSIX_BACKTRACKING,	"RE_NO_POSIX_BACKTRACKING" },
-		{ RE_NO_GNU_OPS,		"RE_NO_GNU_OPS" },
-		{ RE_DEBUG,			"RE_DEBUG" },
-		{ RE_INVALID_INTERVAL_ORD,	"RE_INVALID_INTERVAL_ORD" },
-		{ RE_ICASE,			"RE_ICASE" },
-		{ RE_CARET_ANCHORS_HERE,	"RE_CARET_ANCHORS_HERE" },
-		{ RE_CONTEXT_INVALID_DUP,	"RE_CONTEXT_INVALID_DUP" },
-		{ 0,				NULL }
-	};
-
-	return genflags2str(flags, regextab);
-}
diff --git a/regcomp.c b/regcomp.c
index 1f6d978a..f58cb091 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -17,6 +17,14 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#ifdef _LIBC
+# include <locale/weight.h>
+#endif
+
 static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern,
 					  size_t length, reg_syntax_t syntax);
 static void re_compile_fastmap_iter (regex_t *bufp,
@@ -149,7 +157,7 @@ const char __re_error_msgid[] attribute_hidden =
     gettext_noop ("Invalid back reference") /* REG_ESUBREG */
     "\0"
 #define REG_EBRACK_IDX	(REG_ESUBREG_IDX + sizeof "Invalid back reference")
-    gettext_noop ("Unmatched [ or [^")	/* REG_EBRACK */
+    gettext_noop ("Unmatched [, [^, [:, [., or [=")	/* REG_EBRACK */
     "\0"
 #define REG_EPAREN_IDX	(REG_EBRACK_IDX + sizeof "Unmatched [ or [^")
     gettext_noop ("Unmatched ( or \\(") /* REG_EPAREN */
@@ -3163,6 +3171,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
       re_token_t token2;
 
       start_elem.opr.name = start_name_buf;
+      start_elem.type = COLL_SYM;
       ret = parse_bracket_element (&start_elem, regexp, token, token_len, dfa,
 				   syntax, first_round);
       if (BE (ret != REG_NOERROR, 0))
@@ -3206,6 +3215,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
       if (is_range_exp == 1)
 	{
 	  end_elem.opr.name = end_name_buf;
+	  end_elem.type = COLL_SYM;
 	  ret = parse_bracket_element (&end_elem, regexp, &token2, token_len2,
 				       dfa, syntax, 1);
 	  if (BE (ret != REG_NOERROR, 0))
@@ -3479,8 +3489,6 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
       int32_t idx1, idx2;
       unsigned int ch;
       size_t len;
-      /* This #include defines a local function!  */
-# include <locale/weight.h>
       /* Calculate the index for equivalence class.  */
       cp = name;
       table = (const int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
@@ -3490,7 +3498,7 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
 						   _NL_COLLATE_EXTRAMB);
       indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE,
 						_NL_COLLATE_INDIRECTMB);
-      idx1 = findidx (&cp, -1);
+      idx1 = findidx (table, indirect, extra, &cp, -1);
       if (BE (idx1 == 0 || *cp != '\0', 0))
 	/* This isn't a valid character.  */
 	return REG_ECOLLATE;
@@ -3502,7 +3510,7 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
 	{
 	  char_buf[0] = ch;
 	  cp = char_buf;
-	  idx2 = findidx (&cp, 1);
+	  idx2 = findidx (table, indirect, extra, &cp, 1);
 /*
 	  idx2 = table[ch];
 */
diff --git a/regex.c b/regex.c
index f56e8692..ed6a4f5d 100644
--- a/regex.c
+++ b/regex.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
diff --git a/regex.h b/regex.h
index 3d26a606..d1c478ec 100644
--- a/regex.h
+++ b/regex.h
@@ -1,6 +1,6 @@
 /* Definitions for data structures and routines for the regular
    expression library.
-   Copyright (C) 1985, 1989-2014 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1989-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/regex_internal.c b/regex_internal.c
index 9e427081..5a5b9363 100644
--- a/regex_internal.c
+++ b/regex_internal.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
diff --git a/regex_internal.h b/regex_internal.h
index c8981a08..9aab5e52 100644
--- a/regex_internal.h
+++ b/regex_internal.h
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -26,18 +26,16 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mbsupport.h" /* gawk */
-
 #if defined HAVE_LANGINFO_H || defined HAVE_LANGINFO_CODESET || defined _LIBC
 # include <langinfo.h>
 #endif
 #if defined HAVE_LOCALE_H || defined _LIBC
 # include <locale.h>
 #endif
-#if MBS_SUPPORT && (defined HAVE_WCHAR_H || defined _LIBC)
+#if defined HAVE_WCHAR_H || defined _LIBC
 # include <wchar.h>
 #endif /* HAVE_WCHAR_H || _LIBC */
-#if MBS_SUPPORT && (defined HAVE_WCTYPE_H || defined _LIBC)
+#if defined HAVE_WCTYPE_H || defined _LIBC
 # include <wctype.h>
 #endif /* HAVE_WCTYPE_H || _LIBC */
 #if defined HAVE_STDBOOL_H || defined _LIBC
@@ -81,7 +79,6 @@ is_blank (int c)
 # ifndef _RE_DEFINE_LOCALE_FUNCTIONS
 #  define _RE_DEFINE_LOCALE_FUNCTIONS 1
 #   include <locale/localeinfo.h>
-#   include <locale/elem-hash.h>
 #   include <locale/coll-lookup.h>
 # endif
 #endif
@@ -109,7 +106,7 @@ is_blank (int c)
 # define SIZE_MAX ((size_t) -1)
 #endif
 
-#if MBS_SUPPORT || _LIBC
+#if ! defined(__DJGPP__) && (defined(GAWK) || _LIBC)
 # define RE_ENABLE_I18N
 #endif
 
@@ -794,7 +791,7 @@ re_string_elem_size_at (const re_string_t *pstr, int idx)
       indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE,
 						_NL_COLLATE_INDIRECTMB);
       p = pstr->mbs + idx;
-      findidx (&p, pstr->len - idx);
+      findidx (table, indirect, extra, &p, pstr->len - idx);
       return p - pstr->mbs - idx;
     }
   else
diff --git a/regexec.c b/regexec.c
index 77795f69..30f2ec74 100644
--- a/regexec.c
+++ b/regexec.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2013 Free Software Foundation, Inc.
+   Copyright (C) 2002-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -3762,6 +3762,10 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
    one collating element like '.', '[a-z]', opposite to the other nodes
    can only accept one byte.  */
 
+# ifdef _LIBC
+#  include <locale/weight.h>
+# endif
+
 static int
 internal_function
 check_node_accept_bytes (const re_dfa_t *dfa, int node_idx,
@@ -3883,8 +3887,6 @@ check_node_accept_bytes (const re_dfa_t *dfa, int node_idx,
 	  const int32_t *table, *indirect;
 	  const unsigned char *weights, *extra;
 	  const char *collseqwc;
-	  /* This #include defines a local function!  */
-#  include <locale/weight.h>
 
 	  /* match with collating_symbol?  */
 	  if (cset->ncoll_syms)
@@ -3940,7 +3942,7 @@ check_node_accept_bytes (const re_dfa_t *dfa, int node_idx,
 		_NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB);
 	      indirect = (const int32_t *)
 		_NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
-	      int32_t idx = findidx (&cp, elem_len);
+	      int32_t idx = findidx (table, indirect, extra, &cp, elem_len);
 	      if (idx > 0)
 		for (i = 0; i < cset->nequiv_classes; ++i)
 		  {
diff --git a/replace.c b/replace.c
index 71a8dc51..6d345f52 100644
--- a/replace.c
+++ b/replace.c
@@ -111,6 +111,6 @@
 #include "missing_d/strcoll.c"
 #endif
 
-#if ! MBS_SUPPORT
+#if defined(__DJGPP__)
 #include "missing_d/wcmisc.c"
 #endif
diff --git a/symbol.c b/symbol.c
index e89214c0..845d3797 100644
--- a/symbol.c
+++ b/symbol.c
@@ -3,7 +3,7 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2013 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2015 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
@@ -565,7 +565,6 @@ load_symbols()
 
 	sym_array->parent_array = PROCINFO_node;
 	sym_array->vname = estrdup("identifiers", 11);
-	make_aname(sym_array);
 
 	user = make_string("user", 4);
 	extension = make_string("extension", 9);
@@ -626,6 +625,67 @@ load_symbols()
 	unref(array);
 }
 
+/* check_param_names --- make sure no parameter is the name of a function */
+
+bool
+check_param_names(void)
+{
+	int i, j;
+	NODE **list;
+	NODE *f;
+	long max;
+	bool result = true;
+	NODE n;
+
+	if (func_table->table_size == 0)
+		return result;
+
+	max = func_table->table_size * 2;
+
+	memset(& n, 0, sizeof n);
+	n.type = Node_val;
+	n.flags = STRING|STRCUR;
+	n.stfmt = -1;
+
+	/*
+	 * assoc_list() returns an array with two elements per awk array
+	 * element. Elements i and i+1 in the C array represent the key
+	 * and value of element j in the awk array. Thus the loops use += 2
+	 * to go through the awk array.
+	 *
+	 * In this case, the name is in list[i], and the function is
+	 * in list[i+1]. Just what we need.
+	 */
+
+	list = assoc_list(func_table, "@unsorted", ASORTI);
+
+	for (i = 0; i < max; i += 2) {
+		f = list[i+1];
+		if (f->type == Node_builtin_func || f->param_cnt == 0)
+			continue;
+
+		/* loop over each param in function i */
+		for (j = 0; j < f->param_cnt; j++) {
+			/* compare to function names */
+
+			/* use a fake node to avoid malloc/free of make_string */
+			n.stptr = f->fparms[j].param;
+			n.stlen = strlen(f->fparms[j].param);
+
+			if (in_array(func_table, & n)) {
+				error(
+			_("function `%s': can't use function `%s' as a parameter name"),
+					list[i]->stptr,
+					f->fparms[j].param);
+				result = false;
+			}
+		}
+	}
+
+	efree(list);
+	return result;
+}
+
 #define pool_size	d.dl
 #define freei		x.xi
 static INSTRUCTION *pool_list;
diff --git a/test/ChangeLog b/test/ChangeLog
index 8e89f0d2..f9e49945 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,8 +1,270 @@
+2015-04-02         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* id.ok, mpfrsqrt.awk: Update after rename of div() --> intdiv().
+
+2015-03-31         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (indirectbuiltin): New test.
+	* indirectbuiltin.awk, indirectbuiltin.ok: New files.
+
+2015-03-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am: Remove defvar test and reference to files; test
+	code moved into extension/testext.c.
+	* defvar.awk, defvar.ok: Removed.
+	* testext.ok: Updated.
+
+2015-03-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* id.ok: Update after fixes in code.
+
+2015-03-24         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* Makefile.am (EXTRA_DIST): Add exitval3.awk and exitval3.ok.
+	(BASIC_TESTS): Add new test exitval3.
+	* exitval3.awk, exitval3.ok: New files.
+
+2015-03-17         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* inplace1.ok, inplace2.ok, inplace3.ok: Update error message line
+	numbers to reflect changes to inplace.awk.
+
+2015-03-17         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (mpfrmemok1): New test.
+	* mpfrmemok1.awk, mpfrmemok1.ok: New files.
+
+2015-03-10         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (fpat4): New test.
+	* fpat4.awk, fpat4.ok: New files.
+
+2015-03-08         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* nonfatal3.awk, nonfatal3.ok: Adjust for portability.
+	Thanks to Hermann Peifer for the report.
+
+2015-03-06         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* charasbytes.awk, ofs1.awk, range1.awk, sortglos.awk,
+	sortglos.in: Remove execute permission.
+
+2015-03-02         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* nonfatal1.awk: Do not print ERRNO, since the value appears to be
+	platform-dependent.  Instead, print (ERRNO != "").
+	* nonfatal1.ok: Update.
+
+2015-02-28         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* Makefile.am (EXTRA_DIST): Add nonfatal3.{awk,ok}.
+	(GAWK_EXT_TESTS): Add nonfatal3.
+	* nonfatal1.awk: Replace "ti10/357" with "local:host/25", since
+	"local:host" should be a universally bad hostname due to the
+	invalid ":" character.
+	* nonfatal1.ok: Update.
+	* nonfatal3.{awk,ok}: New test for connecting to a TCP port where
+	nobody is listening.
+
+2015-02-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* nonfatal1.ok: Update after code changes.
+
+2015-02-26         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (EXTRA_DIST): Add profile0.in which got forgotten
+	earlier. Ooops.
+
+2015-02-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (crlf): New test.
+	* crlf.awk, crlf.ok: New files.
+
+2015-02-10         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (profile0): New test.
+	* profile0.awk, profile0.in, profile0.ok: New files.
+
+2015-02-08         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* nonfatal1.awk, nonfatal2.awk: String is now "NONFATAL".
+
+2015-02-06         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (nonfatal1, nonfatal2): New tests.
+	* nonfatal1.awk, nonfatal1.ok: New files.
+	* nonfatal2.awk, nonfatal2.ok: New files.
+
+2015-02-01         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (paramasfunc1, paramasfunc2): Now need --posix.
+	* indirectcall.awk: Restore after code change.
+
+2015-01-30         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (callparam, paramasfunc1, paramasfunc2): New tests.
+	* callparam.awk, callparam.ok: New files.
+	* paramasfunc1.awk, paramasfunc1.ok: New files.
+	* paramasfunc2.awk, paramasfunc2.ok: New files.
+	* exit.sh, indirectcall.awk: Update after code change.
+
+2015-01-19         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (profile8): Actually add the test and the files.
+	Thanks to Hermann Peifer for the report.
+
+2015-01-16         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (profile8): New test.
+	* profile8.awk, profile8.ok: New files.
+
+2015-01-14         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (dumpvars): Grep out ENVIRON and PROCINFO since
+	those can be different depending on who runs the test.
+	* dumpvars.ok, id.ok: Updated after code changes.
+
+2015-01-07         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (regexpbrack): New test.
+	* regexpbrack.awk, regexpbrack.in, regexpbrack.ok: New files.
+
+	Unrelated:
+
+	* Makefile.am (printfbad4): New test.
+	* printfbad4.awk, printfbad4.ok: New files.
+
+	Unrelated:
+
+	* testext.ok: Adjust for code changes.
+
+2015-01-06         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* Makefile.am (EXTRA_DIST): Add defvar.awk and defvar.ok.
+	(SHLIB_TESTS): Add defvar.
+	(defvar): New test.
+	* defvar.awk, defvar.ok: New files.
+
+2015-01-05         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* Makefile.am (EXTRA_DIST): Add getfile.awk and getfile.ok.
+	(SHLIB_TESTS): Add getfile.
+	(getfile): New test.
+	* getfile.awk, getfile.ok: New files.
+
+2015-01-05         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* Makefile.am (EXTRA_DIST): Add timeout.awk and timeout.ok.
+	(BASIC_TESTS): Remove errno.
+	(GAWK_EXT_TESTS): Add errno and timeout.
+	* timeout.awk, timeout.ok: New files.
+
+2015-01-05         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* Makefile.am (EXTRA_DIST): Add errno.awk, errno.in, and errno.ok.
+	(BASIC_TESTS): Add errno.
+	(errno): New test.
+	* errno.awk, errno.in, errno.ok: New files.
+
+2014-12-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (badbuild): New test.
+	* badbuild.awk, badbuild.in, badbuild.ok: New files.
+
+2014-12-24         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* Makefile.am (check): If tests don't pass, run 'make diffout'
+	and exit 1. Should help distros to notice when they have built
+	gawk incorrectly. (Can you say "Fedora", boys and girls?)
+
+2014-12-12         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* profile5.ok: Updated after code changes.
+
+2014-11-26         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Gentests: Fix gensub call after adding warning.
+
+2014-11-26         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gensub2.ok: Update after code changes.
+
+2014-11-16         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (sortglos): New test.
+	* sortglos.awk, sortglos.in, sortglos.ok: New files.
+	Thanks to Antonio Columbo.
+
+2014-11-09         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* mbprintf4.awk: Add record and line number for debugging.
+	* mpprint4.ok: Adjust.
+
+2014-11-06         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* testext.ok: Add results from new test_get_file test.
+
+2014-11-02         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (profile7): New test.
+	(profile6): Add missing @ in front of gawk run.
+	* profile7.awk, profile7.ok: New files.
+
+2014-11-01         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (profile6): Actually run profiling. Should make test
+	output consistent with what's in master.
+	* profile6.ok: Updated.
+
+2014-10-30         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (profile6): New test.
+	* profile6.awk, profile6.ok: New files.
+
+2014-10-17         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* Makefile.am (profile1, testext): Use explicit ./foo.awk to avoid
+	assumptions about AWKPATH in the environment.
+
+2014-10-12         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (charset-msg-start): Add a list of needed locales.
+	Suggested by Shaun Jackman <sjackman@gmail.com>.
+
+2014-10-05         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* profile2.ok, profile3.ok, profile4.ok, profile5.ok:
+	Adjusted after minor code change. Again.
+
+2014-10-04         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (genpot): New test.
+	* genpot.awk, genpot.ok: New files.
+
+2014-09-29         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* testext.ok: Adjusted after minor code change.
+
+2014-09-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* profile2.ok, profile3.ok, profile4.ok, profile5.ok:
+	Adjusted after minor code change.
+
 2014-09-18         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* filefuncs.awk: Change to build directory instead of "..".
 	* Makefile.am (filefuncs): Pass in $(abs_top_builddir).
 
+2014-09-13         Stephen Davies        <sdavies@sdc.com.au>
+
+	* Makefile.am (profile4, profile5): Changes processing to not delete
+	the first two lines. This is no longer needed.
+	* profile4.ok, profile5.ok: Changed to suit new rules and comments.
+
+2014-09-10         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* profile2.ok, profile4.ok, profile5.ok: Update for new code.
+
 2014-09-05         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* functab4.awk: Changed to use stat instead of chdir since
@@ -292,6 +554,10 @@
 	in locations with spaces in their names (think Windows or Mac OS X).
 	* Gentests: Ditto for when creating Maketests file.
 
+2013-07-30         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* profile2.ok, profile5.ok: Update.
+
 2013-07-04         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* Makefile.am (mbprintf4): New test.
diff --git a/test/Gentests b/test/Gentests
index 460edbae..5a7aaa09 100755
--- a/test/Gentests
+++ b/test/Gentests
@@ -123,7 +123,7 @@ END {
 			printf "WARNING: --lint-old target `%s' is missing.\n", x > "/dev/stderr"
 	for (x in files)
 		if (!(x in unused) && \
-		    !(gensub(/\.(awk|in)$/,"","",x) in targets))
+		    !(gensub(/\.(awk|in)$/,"",1,x) in targets))
 			printf "WARNING: unused file `%s'.\n", x > "/dev/stderr"
 }
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 1c14ea81..b45eaf95 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,7 @@
 #
 # test/Makefile.am --- automake input file for gawk
 #
-# Copyright (C) 1988-2014 the Free Software Foundation, Inc.
+# Copyright (C) 1988-2015 the Free Software Foundation, Inc.
 #
 # This file is part of GAWK, the GNU implementation of the
 # AWK Programming Language.
@@ -123,12 +123,17 @@ EXTRA_DIST = \
 	badargs.ok \
 	badassign1.awk \
 	badassign1.ok \
+	badbuild.awk \
+	badbuild.in \
+	badbuild.ok \
 	beginfile1.awk \
 	beginfile1.ok \
 	beginfile2.in \
 	beginfile2.ok \
 	beginfile2.sh \
 	binmode1.ok \
+	callparam.awk \
+	callparam.ok \
 	charasbytes.awk \
 	charasbytes.in \
 	charasbytes.ok \
@@ -164,6 +169,8 @@ EXTRA_DIST = \
 	concat4.ok \
 	convfmt.awk \
 	convfmt.ok \
+	crlf.awk \
+	crlf.ok \
 	datanonl.awk \
 	datanonl.in \
 	datanonl.ok \
@@ -205,6 +212,9 @@ EXTRA_DIST = \
 	dynlj.ok \
 	eofsplit.awk \
 	eofsplit.ok \
+	errno.awk \
+	errno.in \
+	errno.ok \
 	exit.ok \
 	exit.sh \
 	exit2.awk \
@@ -214,6 +224,8 @@ EXTRA_DIST = \
 	exitval2.awk \
 	exitval2.ok \
 	exitval2.w32 \
+	exitval3.awk \
+	exitval3.ok \
 	fcall_exit.awk \
 	fcall_exit.ok \
 	fcall_exit2.awk \
@@ -278,6 +290,8 @@ EXTRA_DIST = \
 	fpat3.awk \
 	fpat3.in \
 	fpat3.ok \
+	fpat4.awk \
+	fpat4.ok \
 	fpatnull.awk \
 	fpatnull.in \
 	fpatnull.ok \
@@ -324,11 +338,15 @@ EXTRA_DIST = \
 	fwtest3.awk \
 	fwtest3.in \
 	fwtest3.ok \
+	genpot.awk \
+	genpot.ok \
 	gensub.awk \
 	gensub.in \
 	gensub.ok \
 	gensub2.awk \
 	gensub2.ok \
+	getfile.awk \
+	getfile.ok \
 	getline.awk \
 	getline.in \
 	getline.ok \
@@ -418,6 +436,8 @@ EXTRA_DIST = \
 	include.awk \
 	include.ok \
 	include2.ok \
+	indirectbuiltin.awk \
+	indirectbuiltin.ok \
 	indirectcall.awk \
 	indirectcall.in \
 	indirectcall.ok \
@@ -526,6 +546,8 @@ EXTRA_DIST = \
 	mpfrexprange.ok \
 	mpfrieee.awk \
 	mpfrieee.ok \
+	mpfrmemok1.awk \
+	mpfrmemok1.ok \
 	mpfrnegzero.awk \
 	mpfrnegzero.ok \
 	mpfrnr.awk \
@@ -590,6 +612,12 @@ EXTRA_DIST = \
 	nondec.ok \
 	nondec2.awk \
 	nondec2.ok \
+	nonfatal1.awk \
+	nonfatal1.ok \
+	nonfatal2.awk \
+	nonfatal2.ok \
+	nonfatal3.awk \
+	nonfatal3.ok \
 	nonl.awk \
 	nonl.ok \
 	noparms.awk \
@@ -637,6 +665,10 @@ EXTRA_DIST = \
 	out1.ok \
 	out2.ok \
 	out3.ok \
+	paramasfunc1.awk \
+	paramasfunc1.ok \
+	paramasfunc2.awk \
+	paramasfunc2.ok \
 	paramdup.awk \
 	paramdup.ok \
 	paramres.awk \
@@ -687,6 +719,8 @@ EXTRA_DIST = \
 	printfbad2.ok \
 	printfbad3.awk \
 	printfbad3.ok \
+	printfbad4.awk \
+	printfbad4.ok \
 	printfloat.awk \
 	printhuge.awk \
 	printhuge.ok \
@@ -697,6 +731,9 @@ EXTRA_DIST = \
 	prmreuse.ok \
 	procinfs.awk \
 	procinfs.ok \
+	profile0.awk \
+	profile0.in \
+	profile0.ok \
 	profile2.ok \
 	profile3.awk \
 	profile3.ok \
@@ -704,6 +741,12 @@ EXTRA_DIST = \
 	profile4.ok \
 	profile5.awk \
 	profile5.ok \
+	profile6.awk \
+	profile6.ok \
+	profile7.awk \
+	profile7.ok \
+	profile8.awk \
+	profile8.ok \
 	prt1eval.awk \
 	prt1eval.ok \
 	prtoeval.awk \
@@ -735,6 +778,9 @@ EXTRA_DIST = \
 	regeq.awk \
 	regeq.in \
 	regeq.ok \
+	regexpbrack.awk \
+	regexpbrack.in \
+	regexpbrack.ok \
 	regexprange.awk \
 	regexprange.ok \
 	reginttrad.awk \
@@ -827,6 +873,9 @@ EXTRA_DIST = \
 	sortfor.awk \
 	sortfor.in \
 	sortfor.ok \
+	sortglos.awk \
+	sortglos.in \
+	sortglos.ok \
 	sortu.awk \
 	sortu.ok \
 	space.ok \
@@ -908,6 +957,8 @@ EXTRA_DIST = \
 	testext.ok \
 	time.awk \
 	time.ok \
+	timeout.awk \
+	timeout.ok \
 	tradanch.awk \
 	tradanch.in \
 	tradanch.ok \
@@ -967,11 +1018,11 @@ BASIC_TESTS = \
 	arrayref arrymem1 arryref2 arryref3 arryref4 arryref5 arynasty \
 	arynocls aryprm1 aryprm2 aryprm3 aryprm4 aryprm5 aryprm6 aryprm7 \
 	aryprm8 arysubnm asgext awkpath \
-	back89 backgsub badassign1 \
-	childin clobber closebad clsflnam compare compare2 concat1 concat2 \
+	back89 backgsub badassign1 badbuild \
+	callparam childin clobber closebad clsflnam compare compare2 concat1 concat2 \
 	concat3 concat4 convfmt \
 	datanonl defref delargv delarpm2 delarprm delfunc dfamb1 dfastress dynlj \
-	eofsplit exit2 exitval1 exitval2 \
+	eofsplit exit2 exitval1 exitval2 exitval3 \
 	fcall_exit fcall_exit2 fldchg fldchgnf fnamedat fnarray fnarray2 \
 	fnaryscl fnasgnm fnmisc fordel forref forsimp fsbs fsrs fsspcoln \
 	fstabplus funsemnl funsmnam funstack \
@@ -986,13 +1037,14 @@ BASIC_TESTS = \
 	nlinstr nlstrina noeffect nofile nofmtch noloop1 noloop2 nonl \
 	noparms nors nulrsend numindex numsubstr \
 	octsub ofmt ofmta ofmtbig ofmtfidl ofmts ofs1 onlynl opasnidx opasnslf \
+	paramasfunc1 paramasfunc2 \
 	paramdup paramres paramtyp paramuninitglobal parse1 parsefld parseme \
 	pcntplus posix2008sub prdupval prec printf0 printf1 prmarscl prmreuse \
 	prt1eval prtoeval \
-	rand randtest range1 rebt8b1 redfilnm regeq regexprange regrange reindops \
+	rand randtest range1 rebt8b1 redfilnm regeq regexpbrack regexprange regrange reindops \
 	reparse resplit rri1 rs rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 \
 	rstest3 rstest4 rstest5 rswhite \
-	scalar sclforin sclifin sortempty splitargv splitarr splitdef \
+	scalar sclforin sclifin sortempty sortglos splitargv splitarr splitdef \
 	splitvar splitwht strcat1 strnum1 strtod subamp subi18n \
 	subsepnm subslash substr swaplns synerr1 synerr2 tradanch tweakfld \
 	uninit2 uninit3 uninit4 uninit5 uninitialized unterm uparrfs \
@@ -1006,23 +1058,26 @@ UNIX_TESTS = \
 GAWK_EXT_TESTS = \
 	aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
 	backw badargs beginfile1 beginfile2 binmode1 charasbytes \
-	colonwarn clos1way dbugeval delsub devfd devfd1 devfd2 dumpvars exit \
-	fieldwdth fpat1 fpat2 fpat3  fpatnull fsfwfs funlen \
+	colonwarn clos1way crlf dbugeval delsub devfd devfd1 devfd2 dumpvars errno exit \
+	fieldwdth fpat1 fpat2 fpat3 fpat4 fpatnull fsfwfs funlen \
 	functab1 functab2 functab3 fwtest fwtest2 fwtest3 \
-	gensub gensub2 getlndir gnuops2 gnuops3 gnureops \
+	genpot gensub gensub2 getlndir gnuops2 gnuops3 gnureops \
 	icasefs icasers id igncdym igncfs ignrcas2 ignrcase \
 	incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \
-	include include2 indirectcall indirectcall2 \
+	include include2 indirectbuiltin indirectcall indirectcall2 \
 	lint lintold lintwarn \
 	manyfiles match1 match2 match3 mbstr1 \
 	nastyparm next nondec nondec2 \
-	patsplit posix printfbad1 printfbad2 printfbad3 printhuge procinfs \
-	profile1 profile2 profile3 profile4 profile5 pty1 \
+	nonfatal1 nonfatal2 nonfatal3 \
+	patsplit posix printfbad1 printfbad2 printfbad3 printfbad4 printhuge procinfs \
+	profile0 profile1 profile2 profile3 profile4 profile5 profile6 profile7 \
+	profile8 pty1 \
 	rebuf regnul1 regnul2 regx8bit reginttrad reint reint2 rsgetline rsglstdin rsstart1 \
 	rsstart2 rsstart3 rstest6 shadow sortfor sortu split_after_fpat \
 	splitarg4 strftime \
 	strtonum switch2 symtab1 symtab2 symtab3 symtab4 symtab5 symtab6 \
-	symtab7 symtab8 symtab9
+	symtab7 symtab8 symtab9 \
+	timeout
 
 EXTRA_TESTS = inftest regtest
 
@@ -1030,8 +1085,8 @@ INET_TESTS = inetdayu inetdayt inetechu inetecht
 
 MACHINE_TESTS = double1 double2 fmtspcl intformat
 
-MPFR_TESTS = mpfrnr mpfrnegzero mpfrrem mpfrrnd mpfrieee mpfrexprange \
-	mpfrsort mpfrsqrt mpfrbigint
+MPFR_TESTS = mpfrnr mpfrnegzero mpfrmemok1 mpfrrem mpfrrnd mpfrieee \
+	mpfrexprange mpfrsort mpfrsqrt mpfrbigint
 
 LOCALE_CHARSET_TESTS = \
 	asort asorti backbigs1 backsmalls1 backsmalls2 \
@@ -1039,7 +1094,7 @@ LOCALE_CHARSET_TESTS = \
 	mbprintf1 mbprintf2 mbprintf3 mbprintf4 rebt8b2 rtlenmb sort1 sprintfc
 
 SHLIB_TESTS = \
-	fnmatch filefuncs fork fork2 fts functab4 inplace1 inplace2 inplace3 \
+	fnmatch filefuncs fork fork2 fts functab4 getfile inplace1 inplace2 inplace3 \
 	ordchr ordchr2 readdir readfile readfile2 revout revtwoway rwarray testext time
 
 # List of the tests which should be run with --lint option:
@@ -1093,7 +1148,7 @@ check:	msg \
 	charset-msg-start charset-tests charset-msg-end \
 	shlib-msg-start  shlib-tests     shlib-msg-end \
 	mpfr-msg-start   mpfr-tests      mpfr-msg-end
-	@$(MAKE) pass-fail
+	@$(MAKE) pass-fail || { $(MAKE) diffout; exit 1; }
 
 basic:	$(BASIC_TESTS)
 
@@ -1166,6 +1221,8 @@ charset-msg-start:
 	@echo "************************************************"
 	@echo "** Some or all of these tests may fail if you **"
 	@echo "** have inadequate or missing locale support  **"
+	@echo "** At least en_US.UTF-8, ru_RU.UTF-8 and      **"
+	@echo "** ja_JP.UTF-8 are needed.                    **"
 	@echo "************************************************"
 
 charset-msg-end:
@@ -1296,6 +1353,11 @@ devfd::
 	@$(AWK) 1 /dev/fd/4 /dev/fd/5 4<"$(srcdir)"/devfd.in4 5<"$(srcdir)"/devfd.in5 >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+errno:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 fflush::
 	@echo $@
 	@"$(srcdir)"/fflush.sh >_$@
@@ -1662,14 +1724,20 @@ beginfile2:
 dumpvars::
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) --dump-variables 1 < "$(srcdir)"/$@.in >/dev/null 2>&1 || echo EXIT CODE: $$? >>_$@
-	@mv awkvars.out _$@
+	@grep -v ENVIRON < awkvars.out | grep -v PROCINFO > _$@; rm awkvars.out
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+profile0:
+	@echo $@
+	@$(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk "$(srcdir)"/$@.in > /dev/null
+	@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 profile1:
 	@echo $@
 	@$(AWK) -f "$(srcdir)"/xref.awk "$(srcdir)"/dtdgport.awk > _$@.out1
 	@$(AWK) --pretty-print=ap-$@.out -f "$(srcdir)"/xref.awk
-	@$(AWK) -f ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out
+	@$(AWK) -f ./ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out
 	@$(CMP) _$@.out1 _$@.out2 && rm _$@.out[12] || { echo EXIT CODE: $$? >>_$@ ; \
 	cp "$(srcdir)"/dtdgport.awk $@.ok ; }
 	
@@ -1688,16 +1756,31 @@ profile3:
 
 profile4:
 	@echo $@
-	@$(AWK) --pretty-print=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null
-	@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
+	@$(AWK) --pretty-print=_$@ -f "$(srcdir)"/$@.awk > /dev/null
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 profile5:
 	@echo $@
-	@$(AWK) --pretty-print=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null
+	@$(AWK) --pretty-print=_$@ -f "$(srcdir)"/$@.awk > /dev/null
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+profile6:
+	@echo $@
+	@$(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null
+	@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+profile7:
+	@echo $@
+	@$(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null
 	@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+profile8:
+	@echo $@
+	@$(AWK) --pretty-print=_$@ -f "$(srcdir)"/$@.awk > /dev/null
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 posix2008sub:
 	@echo $@
 	@$(AWK) --posix -f "$(srcdir)"/$@.awk > _$@ 2>&1
@@ -1764,6 +1847,11 @@ mpfrrem:
 	@$(AWK) -M -f "$(srcdir)"/$@.awk > _$@ 2>&1
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+mpfrmemok1:
+	@echo $@
+	@$(AWK) -p/dev/stdout -M -f "$(srcdir)"/$@.awk 2>&1 | sed 1d > _$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 jarebug::
 	@echo $@
 	@"$(srcdir)"/$@.sh "$(AWKPROG)" "$(srcdir)"/$@.awk "$(srcdir)"/$@.in "_$@"
@@ -1860,9 +1948,14 @@ inplace3::
 testext::
 	@echo $@
 	@$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk
-	@$(AWK) -f testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk
 
+getfile:
+	@echo $@
+	@$(AWK) -v TESTEXT_QUIET=1 -ltestext -f $(srcdir)/$@.awk $(srcdir)/$@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 readdir:
 	@if [ "`uname`" = Linux ] && [ "`stat -f . 2>/dev/null | awk 'NR == 2 { print $$NF }'`" = nfs ];  then \
 	echo This test may fail on GNU/Linux systems when run on an NFS filesystem.; \
@@ -1977,6 +2070,20 @@ filefuncs:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk -v builddir="$(abs_top_builddir)"  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+genpot:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk --gen-pot >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+paramasfunc1::
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk --posix >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+paramasfunc2::
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk --posix >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 # Targets generated for other tests:
 include Maketests
diff --git a/test/Makefile.in b/test/Makefile.in
index b7e25511..8053df5c 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,7 @@
 #
 # test/Makefile.am --- automake input file for gawk
 #
-# Copyright (C) 1988-2014 the Free Software Foundation, Inc.
+# Copyright (C) 1988-2015 the Free Software Foundation, Inc.
 #
 # This file is part of GAWK, the GNU implementation of the
 # AWK Programming Language.
@@ -37,7 +37,17 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -100,9 +110,6 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Maketests $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs ChangeLog \
-	README
 subdir = test
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
@@ -118,6 +125,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -142,6 +150,8 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Maketests \
+	$(top_srcdir)/mkinstalldirs ChangeLog README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -205,6 +215,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POSUB = @POSUB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOCKET_LIBS = @SOCKET_LIBS@
@@ -369,12 +380,17 @@ EXTRA_DIST = \
 	badargs.ok \
 	badassign1.awk \
 	badassign1.ok \
+	badbuild.awk \
+	badbuild.in \
+	badbuild.ok \
 	beginfile1.awk \
 	beginfile1.ok \
 	beginfile2.in \
 	beginfile2.ok \
 	beginfile2.sh \
 	binmode1.ok \
+	callparam.awk \
+	callparam.ok \
 	charasbytes.awk \
 	charasbytes.in \
 	charasbytes.ok \
@@ -410,6 +426,8 @@ EXTRA_DIST = \
 	concat4.ok \
 	convfmt.awk \
 	convfmt.ok \
+	crlf.awk \
+	crlf.ok \
 	datanonl.awk \
 	datanonl.in \
 	datanonl.ok \
@@ -451,6 +469,9 @@ EXTRA_DIST = \
 	dynlj.ok \
 	eofsplit.awk \
 	eofsplit.ok \
+	errno.awk \
+	errno.in \
+	errno.ok \
 	exit.ok \
 	exit.sh \
 	exit2.awk \
@@ -460,6 +481,8 @@ EXTRA_DIST = \
 	exitval2.awk \
 	exitval2.ok \
 	exitval2.w32 \
+	exitval3.awk \
+	exitval3.ok \
 	fcall_exit.awk \
 	fcall_exit.ok \
 	fcall_exit2.awk \
@@ -524,6 +547,8 @@ EXTRA_DIST = \
 	fpat3.awk \
 	fpat3.in \
 	fpat3.ok \
+	fpat4.awk \
+	fpat4.ok \
 	fpatnull.awk \
 	fpatnull.in \
 	fpatnull.ok \
@@ -570,11 +595,15 @@ EXTRA_DIST = \
 	fwtest3.awk \
 	fwtest3.in \
 	fwtest3.ok \
+	genpot.awk \
+	genpot.ok \
 	gensub.awk \
 	gensub.in \
 	gensub.ok \
 	gensub2.awk \
 	gensub2.ok \
+	getfile.awk \
+	getfile.ok \
 	getline.awk \
 	getline.in \
 	getline.ok \
@@ -664,6 +693,8 @@ EXTRA_DIST = \
 	include.awk \
 	include.ok \
 	include2.ok \
+	indirectbuiltin.awk \
+	indirectbuiltin.ok \
 	indirectcall.awk \
 	indirectcall.in \
 	indirectcall.ok \
@@ -772,6 +803,8 @@ EXTRA_DIST = \
 	mpfrexprange.ok \
 	mpfrieee.awk \
 	mpfrieee.ok \
+	mpfrmemok1.awk \
+	mpfrmemok1.ok \
 	mpfrnegzero.awk \
 	mpfrnegzero.ok \
 	mpfrnr.awk \
@@ -836,6 +869,12 @@ EXTRA_DIST = \
 	nondec.ok \
 	nondec2.awk \
 	nondec2.ok \
+	nonfatal1.awk \
+	nonfatal1.ok \
+	nonfatal2.awk \
+	nonfatal2.ok \
+	nonfatal3.awk \
+	nonfatal3.ok \
 	nonl.awk \
 	nonl.ok \
 	noparms.awk \
@@ -883,6 +922,10 @@ EXTRA_DIST = \
 	out1.ok \
 	out2.ok \
 	out3.ok \
+	paramasfunc1.awk \
+	paramasfunc1.ok \
+	paramasfunc2.awk \
+	paramasfunc2.ok \
 	paramdup.awk \
 	paramdup.ok \
 	paramres.awk \
@@ -933,6 +976,8 @@ EXTRA_DIST = \
 	printfbad2.ok \
 	printfbad3.awk \
 	printfbad3.ok \
+	printfbad4.awk \
+	printfbad4.ok \
 	printfloat.awk \
 	printhuge.awk \
 	printhuge.ok \
@@ -943,6 +988,9 @@ EXTRA_DIST = \
 	prmreuse.ok \
 	procinfs.awk \
 	procinfs.ok \
+	profile0.awk \
+	profile0.in \
+	profile0.ok \
 	profile2.ok \
 	profile3.awk \
 	profile3.ok \
@@ -950,6 +998,12 @@ EXTRA_DIST = \
 	profile4.ok \
 	profile5.awk \
 	profile5.ok \
+	profile6.awk \
+	profile6.ok \
+	profile7.awk \
+	profile7.ok \
+	profile8.awk \
+	profile8.ok \
 	prt1eval.awk \
 	prt1eval.ok \
 	prtoeval.awk \
@@ -981,6 +1035,9 @@ EXTRA_DIST = \
 	regeq.awk \
 	regeq.in \
 	regeq.ok \
+	regexpbrack.awk \
+	regexpbrack.in \
+	regexpbrack.ok \
 	regexprange.awk \
 	regexprange.ok \
 	reginttrad.awk \
@@ -1073,6 +1130,9 @@ EXTRA_DIST = \
 	sortfor.awk \
 	sortfor.in \
 	sortfor.ok \
+	sortglos.awk \
+	sortglos.in \
+	sortglos.ok \
 	sortu.awk \
 	sortu.ok \
 	space.ok \
@@ -1154,6 +1214,8 @@ EXTRA_DIST = \
 	testext.ok \
 	time.awk \
 	time.ok \
+	timeout.awk \
+	timeout.ok \
 	tradanch.awk \
 	tradanch.in \
 	tradanch.ok \
@@ -1212,11 +1274,11 @@ BASIC_TESTS = \
 	arrayref arrymem1 arryref2 arryref3 arryref4 arryref5 arynasty \
 	arynocls aryprm1 aryprm2 aryprm3 aryprm4 aryprm5 aryprm6 aryprm7 \
 	aryprm8 arysubnm asgext awkpath \
-	back89 backgsub badassign1 \
-	childin clobber closebad clsflnam compare compare2 concat1 concat2 \
+	back89 backgsub badassign1 badbuild \
+	callparam childin clobber closebad clsflnam compare compare2 concat1 concat2 \
 	concat3 concat4 convfmt \
 	datanonl defref delargv delarpm2 delarprm delfunc dfamb1 dfastress dynlj \
-	eofsplit exit2 exitval1 exitval2 \
+	eofsplit exit2 exitval1 exitval2 exitval3 \
 	fcall_exit fcall_exit2 fldchg fldchgnf fnamedat fnarray fnarray2 \
 	fnaryscl fnasgnm fnmisc fordel forref forsimp fsbs fsrs fsspcoln \
 	fstabplus funsemnl funsmnam funstack \
@@ -1231,13 +1293,14 @@ BASIC_TESTS = \
 	nlinstr nlstrina noeffect nofile nofmtch noloop1 noloop2 nonl \
 	noparms nors nulrsend numindex numsubstr \
 	octsub ofmt ofmta ofmtbig ofmtfidl ofmts ofs1 onlynl opasnidx opasnslf \
+	paramasfunc1 paramasfunc2 \
 	paramdup paramres paramtyp paramuninitglobal parse1 parsefld parseme \
 	pcntplus posix2008sub prdupval prec printf0 printf1 prmarscl prmreuse \
 	prt1eval prtoeval \
-	rand randtest range1 rebt8b1 redfilnm regeq regexprange regrange reindops \
+	rand randtest range1 rebt8b1 redfilnm regeq regexpbrack regexprange regrange reindops \
 	reparse resplit rri1 rs rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 \
 	rstest3 rstest4 rstest5 rswhite \
-	scalar sclforin sclifin sortempty splitargv splitarr splitdef \
+	scalar sclforin sclifin sortempty sortglos splitargv splitarr splitdef \
 	splitvar splitwht strcat1 strnum1 strtod subamp subi18n \
 	subsepnm subslash substr swaplns synerr1 synerr2 tradanch tweakfld \
 	uninit2 uninit3 uninit4 uninit5 uninitialized unterm uparrfs \
@@ -1251,29 +1314,32 @@ UNIX_TESTS = \
 GAWK_EXT_TESTS = \
 	aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
 	backw badargs beginfile1 beginfile2 binmode1 charasbytes \
-	colonwarn clos1way dbugeval delsub devfd devfd1 devfd2 dumpvars exit \
-	fieldwdth fpat1 fpat2 fpat3  fpatnull fsfwfs funlen \
+	colonwarn clos1way crlf dbugeval delsub devfd devfd1 devfd2 dumpvars errno exit \
+	fieldwdth fpat1 fpat2 fpat3 fpat4 fpatnull fsfwfs funlen \
 	functab1 functab2 functab3 fwtest fwtest2 fwtest3 \
-	gensub gensub2 getlndir gnuops2 gnuops3 gnureops \
+	genpot gensub gensub2 getlndir gnuops2 gnuops3 gnureops \
 	icasefs icasers id igncdym igncfs ignrcas2 ignrcase \
 	incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \
-	include include2 indirectcall indirectcall2 \
+	include include2 indirectbuiltin indirectcall indirectcall2 \
 	lint lintold lintwarn \
 	manyfiles match1 match2 match3 mbstr1 \
 	nastyparm next nondec nondec2 \
-	patsplit posix printfbad1 printfbad2 printfbad3 printhuge procinfs \
-	profile1 profile2 profile3 profile4 profile5 pty1 \
+	nonfatal1 nonfatal2 nonfatal3 \
+	patsplit posix printfbad1 printfbad2 printfbad3 printfbad4 printhuge procinfs \
+	profile0 profile1 profile2 profile3 profile4 profile5 profile6 profile7 \
+	profile8 pty1 \
 	rebuf regnul1 regnul2 regx8bit reginttrad reint reint2 rsgetline rsglstdin rsstart1 \
 	rsstart2 rsstart3 rstest6 shadow sortfor sortu split_after_fpat \
 	splitarg4 strftime \
 	strtonum switch2 symtab1 symtab2 symtab3 symtab4 symtab5 symtab6 \
-	symtab7 symtab8 symtab9
+	symtab7 symtab8 symtab9 \
+	timeout
 
 EXTRA_TESTS = inftest regtest
 INET_TESTS = inetdayu inetdayt inetechu inetecht
 MACHINE_TESTS = double1 double2 fmtspcl intformat
-MPFR_TESTS = mpfrnr mpfrnegzero mpfrrem mpfrrnd mpfrieee mpfrexprange \
-	mpfrsort mpfrsqrt mpfrbigint
+MPFR_TESTS = mpfrnr mpfrnegzero mpfrmemok1 mpfrrem mpfrrnd mpfrieee \
+	mpfrexprange mpfrsort mpfrsqrt mpfrbigint
 
 LOCALE_CHARSET_TESTS = \
 	asort asorti backbigs1 backsmalls1 backsmalls2 \
@@ -1281,7 +1347,7 @@ LOCALE_CHARSET_TESTS = \
 	mbprintf1 mbprintf2 mbprintf3 mbprintf4 rebt8b2 rtlenmb sort1 sprintfc
 
 SHLIB_TESTS = \
-	fnmatch filefuncs fork fork2 fts functab4 inplace1 inplace2 inplace3 \
+	fnmatch filefuncs fork fork2 fts functab4 getfile inplace1 inplace2 inplace3 \
 	ordchr ordchr2 readdir readfile readfile2 revout revtwoway rwarray testext time
 
 
@@ -1340,7 +1406,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/Maketests $(am__configur
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu test/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -1349,6 +1414,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/Maketests $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1507,6 +1573,8 @@ uninstall-am:
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # Message stuff is to make it a little easier to follow.
 # Make the pass-fail last and dependent on others to avoid
@@ -1520,7 +1588,7 @@ check:	msg \
 	charset-msg-start charset-tests charset-msg-end \
 	shlib-msg-start  shlib-tests     shlib-msg-end \
 	mpfr-msg-start   mpfr-tests      mpfr-msg-end
-	@$(MAKE) pass-fail
+	@$(MAKE) pass-fail || { $(MAKE) diffout; exit 1; }
 
 basic:	$(BASIC_TESTS)
 
@@ -1593,6 +1661,8 @@ charset-msg-start:
 	@echo "************************************************"
 	@echo "** Some or all of these tests may fail if you **"
 	@echo "** have inadequate or missing locale support  **"
+	@echo "** At least en_US.UTF-8, ru_RU.UTF-8 and      **"
+	@echo "** ja_JP.UTF-8 are needed.                    **"
 	@echo "************************************************"
 
 charset-msg-end:
@@ -1721,6 +1791,11 @@ devfd::
 	@$(AWK) 1 /dev/fd/4 /dev/fd/5 4<"$(srcdir)"/devfd.in4 5<"$(srcdir)"/devfd.in5 >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+errno:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 fflush::
 	@echo $@
 	@"$(srcdir)"/fflush.sh >_$@
@@ -2087,14 +2162,20 @@ beginfile2:
 dumpvars::
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) --dump-variables 1 < "$(srcdir)"/$@.in >/dev/null 2>&1 || echo EXIT CODE: $$? >>_$@
-	@mv awkvars.out _$@
+	@grep -v ENVIRON < awkvars.out | grep -v PROCINFO > _$@; rm awkvars.out
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+profile0:
+	@echo $@
+	@$(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk "$(srcdir)"/$@.in > /dev/null
+	@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 profile1:
 	@echo $@
 	@$(AWK) -f "$(srcdir)"/xref.awk "$(srcdir)"/dtdgport.awk > _$@.out1
 	@$(AWK) --pretty-print=ap-$@.out -f "$(srcdir)"/xref.awk
-	@$(AWK) -f ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out
+	@$(AWK) -f ./ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out
 	@$(CMP) _$@.out1 _$@.out2 && rm _$@.out[12] || { echo EXIT CODE: $$? >>_$@ ; \
 	cp "$(srcdir)"/dtdgport.awk $@.ok ; }
 
@@ -2112,16 +2193,31 @@ profile3:
 
 profile4:
 	@echo $@
-	@$(AWK) --pretty-print=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null
-	@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
+	@$(AWK) --pretty-print=_$@ -f "$(srcdir)"/$@.awk > /dev/null
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 profile5:
 	@echo $@
-	@$(AWK) --pretty-print=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null
+	@$(AWK) --pretty-print=_$@ -f "$(srcdir)"/$@.awk > /dev/null
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+profile6:
+	@echo $@
+	@$(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null
 	@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+profile7:
+	@echo $@
+	@$(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null
+	@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+profile8:
+	@echo $@
+	@$(AWK) --pretty-print=_$@ -f "$(srcdir)"/$@.awk > /dev/null
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 posix2008sub:
 	@echo $@
 	@$(AWK) --posix -f "$(srcdir)"/$@.awk > _$@ 2>&1
@@ -2188,6 +2284,11 @@ mpfrrem:
 	@$(AWK) -M -f "$(srcdir)"/$@.awk > _$@ 2>&1
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+mpfrmemok1:
+	@echo $@
+	@$(AWK) -p/dev/stdout -M -f "$(srcdir)"/$@.awk 2>&1 | sed 1d > _$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 jarebug::
 	@echo $@
 	@"$(srcdir)"/$@.sh "$(AWKPROG)" "$(srcdir)"/$@.awk "$(srcdir)"/$@.in "_$@"
@@ -2284,9 +2385,14 @@ inplace3::
 testext::
 	@echo $@
 	@$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk
-	@$(AWK) -f testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk
 
+getfile:
+	@echo $@
+	@$(AWK) -v TESTEXT_QUIET=1 -ltestext -f $(srcdir)/$@.awk $(srcdir)/$@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 readdir:
 	@if [ "`uname`" = Linux ] && [ "`stat -f . 2>/dev/null | awk 'NR == 2 { print $$NF }'`" = nfs ];  then \
 	echo This test may fail on GNU/Linux systems when run on an NFS filesystem.; \
@@ -2399,6 +2505,21 @@ filefuncs:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk -v builddir="$(abs_top_builddir)"  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+genpot:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk --gen-pot >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+paramasfunc1::
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk --posix >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+paramasfunc2::
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk --posix >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
 addcomma:
@@ -2526,6 +2647,16 @@ badassign1:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+badbuild:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+callparam:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 childin:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2621,6 +2752,11 @@ exitval2:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+exitval3:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 fcall_exit:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -3093,6 +3229,11 @@ regeq:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+regexpbrack:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 regexprange:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -3178,6 +3319,11 @@ sortempty:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+sortglos:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 splitargv:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -3343,6 +3489,11 @@ backw:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+crlf:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 delsub:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -3368,6 +3519,11 @@ fpat3:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+fpat4:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 fpatnull:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -3478,6 +3634,11 @@ include:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+indirectbuiltin:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 indirectcall:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -3528,6 +3689,21 @@ nondec:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+nonfatal1:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+nonfatal2:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+nonfatal3:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 patsplit:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -3548,6 +3724,11 @@ printfbad3:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+printfbad4:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 procinfs:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -3648,6 +3829,11 @@ symtab7:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+timeout:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 double1:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index f8d5e8a9..219d592d 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -125,6 +125,16 @@ badassign1:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+badbuild:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+callparam:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 childin:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -220,6 +230,11 @@ exitval2:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+exitval3:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 fcall_exit:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -692,6 +707,11 @@ regeq:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+regexpbrack:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 regexprange:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -777,6 +797,11 @@ sortempty:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+sortglos:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 splitargv:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -942,6 +967,11 @@ backw:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+crlf:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 delsub:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -967,6 +997,11 @@ fpat3:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+fpat4:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 fpatnull:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1077,6 +1112,11 @@ include:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+indirectbuiltin:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 indirectcall:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1127,6 +1167,21 @@ nondec:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+nonfatal1:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+nonfatal2:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+nonfatal3:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 patsplit:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1147,6 +1202,11 @@ printfbad3:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+printfbad4:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 procinfs:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1247,6 +1307,11 @@ symtab7:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+timeout:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 double1:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/badbuild.awk b/test/badbuild.awk
new file mode 100644
index 00000000..12a6caeb
--- /dev/null
+++ b/test/badbuild.awk
@@ -0,0 +1,6 @@
+$1 == $2 == $3 {
+	print "Gawk was built incorrectly."
+	print "Use bison, not byacc or something else!"
+	print "(Really, why aren't you using the awkgram.c in the distribution?)"
+	exit 42
+}
diff --git a/test/badbuild.in b/test/badbuild.in
new file mode 100644
index 00000000..560711d4
--- /dev/null
+++ b/test/badbuild.in
@@ -0,0 +1 @@
+a a 1
diff --git a/test/badbuild.ok b/test/badbuild.ok
new file mode 100644
index 00000000..6d60f5a9
--- /dev/null
+++ b/test/badbuild.ok
@@ -0,0 +1,3 @@
+gawk: badbuild.awk:1: $1 == $2 == $3 {
+gawk: badbuild.awk:1:          ^ syntax error
+EXIT CODE: 1
diff --git a/test/callparam.awk b/test/callparam.awk
new file mode 100644
index 00000000..b925db01
--- /dev/null
+++ b/test/callparam.awk
@@ -0,0 +1,6 @@
+BEGIN { f() }
+
+function f(	a, b)
+{
+	a = b()
+}
diff --git a/test/callparam.ok b/test/callparam.ok
new file mode 100644
index 00000000..00a027e8
--- /dev/null
+++ b/test/callparam.ok
@@ -0,0 +1,2 @@
+gawk: callparam.awk:5: error: attempt to use non-function `b' in function call
+EXIT CODE: 1
diff --git a/test/charasbytes.awk b/test/charasbytes.awk
index feb195c8..feb195c8 100755..100644
--- a/test/charasbytes.awk
+++ b/test/charasbytes.awk
diff --git a/test/crlf.awk b/test/crlf.awk
new file mode 100644
index 00000000..79be9eb6
--- /dev/null
+++ b/test/crlf.awk
@@ -0,0 +1,11 @@
+BEGIN {

+	print \

+		"hi there"

+	print "hello \

+world"

+	if ("foo" ~ /fo\

+o/)

+		print "matches"

+	else

+		print "does not match!"

+}

diff --git a/test/crlf.ok b/test/crlf.ok
new file mode 100644
index 00000000..0ba071b5
--- /dev/null
+++ b/test/crlf.ok
@@ -0,0 +1,3 @@
+hi there
+hello world
+matches
diff --git a/test/errno.awk b/test/errno.awk
new file mode 100644
index 00000000..bcb77614
--- /dev/null
+++ b/test/errno.awk
@@ -0,0 +1,10 @@
+BEGIN {
+  # check that PROCINFO["errno"] is working properly
+  getline
+  if (close(FILENAME)) {
+      print "Error `" ERRNO "' closing input file"
+      print "errno =", PROCINFO["errno"]
+  }
+  getline < (FILENAME "/bogus")
+  print (PROCINFO["errno"] > 0), ERRNO
+}
diff --git a/test/errno.in b/test/errno.in
new file mode 100644
index 00000000..a92d664b
--- /dev/null
+++ b/test/errno.in
@@ -0,0 +1,3 @@
+line 1
+line 2
+line 3
diff --git a/test/errno.ok b/test/errno.ok
new file mode 100644
index 00000000..181afdaf
--- /dev/null
+++ b/test/errno.ok
@@ -0,0 +1,3 @@
+Error `close of redirection that was never opened' closing input file
+errno = 0
+1 Not a directory
diff --git a/test/exit.sh b/test/exit.sh
index 9510dcdc..3922f83c 100755
--- a/test/exit.sh
+++ b/test/exit.sh
@@ -30,7 +30,7 @@ x='function f(){ exit}; BEGINFILE {f()}; NR>1{ f()}; END{print NR}'
 $AWK 'BEGIN { print "a\nb" }' | $AWK "$x"
 echo "-- 5"
 
-y='function strip(f) { sub(/.*\//, "", f); return f };'
+y='function strip(val) { sub(/.*\//, "", val); return val };'
 
 x='BEGINFILE{if(++i==1) exit;}; END{print i, strip(FILENAME)}'
 $AWK "$y$x" /dev/null $0
diff --git a/test/exitval3.awk b/test/exitval3.awk
new file mode 100644
index 00000000..33e8c433
--- /dev/null
+++ b/test/exitval3.awk
@@ -0,0 +1,2 @@
+BEGIN { exit 42 }
+END { exit }
diff --git a/test/exitval3.ok b/test/exitval3.ok
new file mode 100644
index 00000000..20f64b8c
--- /dev/null
+++ b/test/exitval3.ok
@@ -0,0 +1 @@
+EXIT CODE: 42
diff --git a/test/fpat4.awk b/test/fpat4.awk
new file mode 100644
index 00000000..79cd6a7f
--- /dev/null
+++ b/test/fpat4.awk
@@ -0,0 +1,105 @@
+BEGIN {
+	false = 0
+	true = 1
+
+	fpat[1] = "([^,]*)|(\"[^\"]+\")"
+	fpat[2] = fpat[1]
+	fpat[3] = fpat[1]
+	fpat[4] = "aa+"
+	fpat[5] = fpat[4]
+	fpat[6] = "[a-z]"
+
+	data[1] = "Robbins,,Arnold,"
+	data[2] = "Smith,,\"1234 A Pretty Place, NE\",Sometown,NY,12345-6789,USA"
+	data[3] = "Robbins,Arnold,\"1234 A Pretty Place, NE\",Sometown,NY,12345-6789,USA"
+	data[4] = "bbbaaacccdddaaaaaqqqq"
+	data[5] = "bbbaaacccdddaaaaaqqqqa" # should get trailing qqqa
+	data[6] = "aAbBcC"
+
+	for (i = 1; i in data; i++) {
+		printf("Splitting: <%s>\n", data[i])
+		n = mypatsplit(data[i], fields, fpat[i], seps)
+		m = patsplit(data[i], fields2, fpat[i], seps2)
+		print "n =", n, "m =", m
+		if (n != m) {
+			printf("ERROR: counts wrong!\n") > "/dev/stderr"
+			exit 1
+		}
+		for (j = 1; j <= n; j++) {
+			printf("fields[%d] = <%s>\tfields2[%d] = <%s>\n", j, fields[j], j, fields2[j])
+			if (fields[j] != fields2[j]) {
+				printf("ERROR: data %d, field %d mismatch!\n", i, j) > "/dev/stderr"
+				exit 1
+			}
+		}
+		for (j = 0; j in seps; j++) {
+			printf("seps[%d] = <%s>\tseps2[%d] = <%s>\n", j, seps[j], j, seps2[j])
+			if (seps[j] != seps2[j]) {
+				printf("ERROR: data %d, separator %d mismatch!\n", i, j) > "/dev/stderr"
+				exit 1
+			}
+		}
+	}
+}
+
+function mypatsplit(string, array, pattern, seps,
+			eosflag, non_empty, nf) # locals
+{
+	delete array
+	delete seps
+	if (length(string) == 0)
+		return 0
+
+	eosflag = non_empty = false
+	nf = 0
+	while (match(string, pattern)) {
+		if (RLENGTH > 0) {	# easy case
+			non_empty = true
+			if (! (nf in seps)) {
+				if (RSTART == 1)	# match at front of string
+					seps[nf] = ""
+				else
+					seps[nf] = substr(string, 1, RSTART - 1)
+			}
+			array[++nf] = substr(string, RSTART, RLENGTH)
+			string = substr(string, RSTART+RLENGTH)
+			if (length(string) == 0)
+				break
+		} else if (non_empty) {
+			# last match was non-empty, and at the
+			# current character we get a zero length match,
+			# which we don't want, so skip over it
+			non_empty = false
+			seps[nf] = substr(string, 1, 1)
+			string = substr(string, 2)
+		} else {
+			# 0 length match
+			if (! (nf in seps)) {
+				if (RSTART == 1)
+					seps[nf] = ""
+				else
+					seps[nf] = substr(string, 1, RSTART - 1)
+			}
+			array[++nf] = ""
+			if (! non_empty && ! eosflag) { # prev was empty
+				seps[nf] = substr(string, 1, 1)
+			}
+			if (RSTART == 1) {
+				string = substr(string, 2)
+			} else {
+				string = substr(string, RSTART + 1)
+			}
+			non_empty = false
+		}
+		if (length(string) == 0) {
+			if (eosflag)
+				break
+			else
+				eosflag = true
+		}
+	}
+	if (length(string) > 0)
+		seps[nf] = string
+
+	return length(array)
+}
diff --git a/test/fpat4.ok b/test/fpat4.ok
new file mode 100644
index 00000000..b4430aba
--- /dev/null
+++ b/test/fpat4.ok
@@ -0,0 +1,65 @@
+Splitting: <Robbins,,Arnold,>
+n = 4 m = 4
+fields[1] = <Robbins>	fields2[1] = <Robbins>
+fields[2] = <>	fields2[2] = <>
+fields[3] = <Arnold>	fields2[3] = <Arnold>
+fields[4] = <>	fields2[4] = <>
+seps[0] = <>	seps2[0] = <>
+seps[1] = <,>	seps2[1] = <,>
+seps[2] = <,>	seps2[2] = <,>
+seps[3] = <,>	seps2[3] = <,>
+Splitting: <Smith,,"1234 A Pretty Place, NE",Sometown,NY,12345-6789,USA>
+n = 7 m = 7
+fields[1] = <Smith>	fields2[1] = <Smith>
+fields[2] = <>	fields2[2] = <>
+fields[3] = <"1234 A Pretty Place, NE">	fields2[3] = <"1234 A Pretty Place, NE">
+fields[4] = <Sometown>	fields2[4] = <Sometown>
+fields[5] = <NY>	fields2[5] = <NY>
+fields[6] = <12345-6789>	fields2[6] = <12345-6789>
+fields[7] = <USA>	fields2[7] = <USA>
+seps[0] = <>	seps2[0] = <>
+seps[1] = <,>	seps2[1] = <,>
+seps[2] = <,>	seps2[2] = <,>
+seps[3] = <,>	seps2[3] = <,>
+seps[4] = <,>	seps2[4] = <,>
+seps[5] = <,>	seps2[5] = <,>
+seps[6] = <,>	seps2[6] = <,>
+Splitting: <Robbins,Arnold,"1234 A Pretty Place, NE",Sometown,NY,12345-6789,USA>
+n = 7 m = 7
+fields[1] = <Robbins>	fields2[1] = <Robbins>
+fields[2] = <Arnold>	fields2[2] = <Arnold>
+fields[3] = <"1234 A Pretty Place, NE">	fields2[3] = <"1234 A Pretty Place, NE">
+fields[4] = <Sometown>	fields2[4] = <Sometown>
+fields[5] = <NY>	fields2[5] = <NY>
+fields[6] = <12345-6789>	fields2[6] = <12345-6789>
+fields[7] = <USA>	fields2[7] = <USA>
+seps[0] = <>	seps2[0] = <>
+seps[1] = <,>	seps2[1] = <,>
+seps[2] = <,>	seps2[2] = <,>
+seps[3] = <,>	seps2[3] = <,>
+seps[4] = <,>	seps2[4] = <,>
+seps[5] = <,>	seps2[5] = <,>
+seps[6] = <,>	seps2[6] = <,>
+Splitting: <bbbaaacccdddaaaaaqqqq>
+n = 2 m = 2
+fields[1] = <aaa>	fields2[1] = <aaa>
+fields[2] = <aaaaa>	fields2[2] = <aaaaa>
+seps[0] = <bbb>	seps2[0] = <bbb>
+seps[1] = <cccddd>	seps2[1] = <cccddd>
+seps[2] = <qqqq>	seps2[2] = <qqqq>
+Splitting: <bbbaaacccdddaaaaaqqqqa>
+n = 2 m = 2
+fields[1] = <aaa>	fields2[1] = <aaa>
+fields[2] = <aaaaa>	fields2[2] = <aaaaa>
+seps[0] = <bbb>	seps2[0] = <bbb>
+seps[1] = <cccddd>	seps2[1] = <cccddd>
+seps[2] = <qqqqa>	seps2[2] = <qqqqa>
+Splitting: <aAbBcC>
+n = 3 m = 3
+fields[1] = <a>	fields2[1] = <a>
+fields[2] = <b>	fields2[2] = <b>
+fields[3] = <c>	fields2[3] = <c>
+seps[0] = <>	seps2[0] = <>
+seps[1] = <A>	seps2[1] = <A>
+seps[2] = <B>	seps2[2] = <B>
+seps[3] = <C>	seps2[3] = <C>
diff --git a/test/genpot.awk b/test/genpot.awk
new file mode 100644
index 00000000..990b0b5c
--- /dev/null
+++ b/test/genpot.awk
@@ -0,0 +1 @@
+{print _"This string is so long that gawk --gen-pot will break it and lose a letter at the break."}
diff --git a/test/genpot.ok b/test/genpot.ok
new file mode 100644
index 00000000..35c0cc99
--- /dev/null
+++ b/test/genpot.ok
@@ -0,0 +1,5 @@
+#: genpot.awk:1
+msgid "This string is so long that gawk --gen-pot will break it and lose a l"
+"etter at the break."
+msgstr ""
+
diff --git a/test/gensub2.ok b/test/gensub2.ok
index 89824140..318f940c 100644
--- a/test/gensub2.ok
+++ b/test/gensub2.ok
@@ -1,3 +1,4 @@
 xy
 xy
+gawk: gensub2.awk:4: warning: gensub: third argument `a' treated as 1
 yx
diff --git a/test/getfile.awk b/test/getfile.awk
new file mode 100644
index 00000000..6ee783f6
--- /dev/null
+++ b/test/getfile.awk
@@ -0,0 +1,35 @@
+function basename(x) {
+	return gensub(/^.*\//, "", 1, x)
+}
+
+BEGIN {
+	print "BEGIN"
+
+	cmd = "echo hello; echo goodbye"
+	rc = get_file(cmd, "<<", -1, res)
+	print "expected error result", rc, ERRNO
+	print "get_file returned", get_file(cmd, "|<", -1, res)
+	print "input_name", basename(res["input_name"])
+	print (cmd | getline x)
+	print x
+
+	# check that calling get_file on "" triggers the BEGINFILE rule
+	print "get_file returned", get_file("", "", -1, res)
+	print "input_name", basename(res["input_name"])
+	print "end BEGIN"
+}
+
+BEGINFILE {
+	printf "BEGINFILE (%s) ERRNO (%s)\n", basename(FILENAME), ERRNO
+}
+
+ENDFILE {
+	printf "ENDFILE (%s) ERRNO (%s)\n", basename(FILENAME), ERRNO
+}
+
+END {
+	print "END"
+	print (cmd | getline x)
+	print x
+	print close(cmd)
+}
diff --git a/test/getfile.ok b/test/getfile.ok
new file mode 100644
index 00000000..92c915f2
--- /dev/null
+++ b/test/getfile.ok
@@ -0,0 +1,17 @@
+BEGIN
+gawk: ./getfile.awk:9: warning: cannot open unrecognized file type `<<' for `echo hello; echo goodbye'
+get_file: get_file(echo hello; echo goodbye, <<, -1) failed
+expected error result 0 
+get_file returned 1
+input_name echo hello; echo goodbye
+1
+hello
+BEGINFILE (getfile.awk) ERRNO ()
+get_file returned 1
+input_name getfile.awk
+end BEGIN
+ENDFILE (getfile.awk) ERRNO ()
+END
+1
+goodbye
+0
diff --git a/test/id.ok b/test/id.ok
index 4cb39b32..bd26b473 100644
--- a/test/id.ok
+++ b/test/id.ok
@@ -14,6 +14,7 @@ sprintf -> builtin
 ROUNDMODE -> scalar
 strftime -> builtin
 systime -> builtin
+length -> builtin
 and -> builtin
 srand -> builtin
 FNR -> scalar
@@ -23,7 +24,6 @@ cos -> builtin
 TEXTDOMAIN -> scalar
 ORS -> scalar
 split -> builtin
-div -> builtin
 RSTART -> scalar
 compl -> builtin
 bindtextdomain -> builtin
@@ -62,6 +62,7 @@ sub -> builtin
 OFMT -> scalar
 RLENGTH -> scalar
 substr -> builtin
+intdiv -> builtin
 FPAT -> scalar
 RS -> scalar
 xor -> builtin
@@ -71,3 +72,4 @@ lshift -> builtin
 SYMTAB -> array
 strtonum -> builtin
 toupper -> builtin
+ENVIRON -> array
diff --git a/test/indirectbuiltin.awk b/test/indirectbuiltin.awk
new file mode 100644
index 00000000..4d5291d2
--- /dev/null
+++ b/test/indirectbuiltin.awk
@@ -0,0 +1,371 @@
+function print_result(category, fname, builtin_result, indirect_result)
+{
+	if (builtin_result == indirect_result)
+		printf("%s: %s: pass\n", category, fname)
+	else {
+		printf("%s: %s: fail: builtin: %s \tindirect: %s\n", category, fname,
+				builtin_result, indirect_result)
+		exit 1
+	}
+}
+
+
+BEGIN {
+# math functions
+
+	fun = "and"
+	b1 = and(0x11, 0x01)
+	i1 = @fun(0x11, 0x01)
+	print_result("math", fun, b1, i1)
+
+	fun = "atan2"
+	b1 = atan2(-1, 0)
+	i1 = @fun(-1, 0)
+	print_result("math", fun, b1, i1)
+
+	fun = "compl"
+	b1 = compl(0x1111)
+	i1 = @fun(0x1111)
+	print_result("math", fun, b1, i1)
+
+	fun = "cos"
+	b1 = cos(3.1415927 / 4)
+	i1 = @fun(3.1415927 / 4)
+	print_result("math", fun, b1, i1)
+
+	fun = "exp"
+	b1 = exp(2)
+	i1 = @fun(2)
+	print_result("math", fun, b1, i1)
+
+	fun = "int"
+	b1 = int(3.1415927)
+	i1 = @fun(3.1415927)
+	print_result("math", fun, b1, i1)
+
+	fun = "log"
+	b1 = log(10)
+	i1 = @fun(10)
+	print_result("math", fun, b1, i1)
+
+	fun = "lshift"
+	b1 = lshift(1, 2)
+	i1 = @fun(1, 2)
+	print_result("math", fun, b1, i1)
+
+	fun = "or"
+	b1 = or(0x10, 0x01)
+	i1 = @fun(0x10, 0x01)
+	print_result("math", fun, b1, i1)
+
+	fun = "rand"
+	srand(1)
+	b1 = rand();
+	srand(1)
+	i1 = @fun()
+	print_result("math", fun, b1, i1)
+
+	fun = "rshift"
+	b1 = rshift(0x10, 1)
+	i1 = @fun(0x10, 1)
+	print_result("math", fun, b1, i1)
+
+	fun = "sin"
+	b1 = sin(3.1415927 / 4)
+	i1 = @fun(3.1415927 / 4)
+	print_result("math", fun, b1, i1)
+
+	fun = "sqrt"
+	b1 = sqrt(2)
+	i1 = @fun(2)
+	print_result("math", fun, b1, i1)
+
+	srand()
+	fun = "srand"
+	b1 = srand()
+	i1 = @fun()
+	print_result("math", fun, b1, i1)
+
+	fun = "xor"
+	b1 = xor(0x11, 0x01)
+	i1 = @fun(0x11, 0x01)
+	print_result("math", fun, b1, i1)
+
+# string functions
+
+	fun = "gensub"
+	b1 = gensub("f", "q", "g", "ff11bb")
+	i1 = @fun("f", "q", "g", "ff11bb")
+	print_result("string", fun, b1, i1)
+
+	fun = "gsub"
+	$0 = "ff11bb"
+	b1 = gsub("f", "q")
+	b2 = $0
+	$0 = "ff11bb"
+	i1 = @fun("f", "q")
+	i2 = $0
+	print_result("string", fun, b1, i1)
+	if (b2 != i2) {
+		printf("string: %s: fail: $0 (%s) != $0 (%s)\n",
+			fun, b2, i2)
+		exit 1
+	}
+
+	fun = "index"
+	b1 = index("hi, how are you", "how")
+	i1 = @fun("hi, how are you", "how")
+	print_result("string", fun, b1, i1)
+
+	fun = "dcgettext"
+	b1 = dcgettext("hello, world")
+	i1 = @fun("hello, world")
+	print_result("string", fun, b1, i1)
+
+	fun = "dcngettext"
+	b1 = dcngettext("hello, world", "howdy", 2)
+	i1 = @fun("hello, world", "howdy", 2)
+	print_result("string", fun, b1, i1)
+
+	fun = "length"
+	b1 = length("hi, how are you")
+	i1 = @fun("hi, how are you")
+	print_result("string", fun, b1, i1)
+
+	fun = "sprintf"
+	b1 = sprintf("%s world", "hello")
+	i1 = @fun("%s world", "hello")
+	print_result("string", fun, b1, i1)
+
+	fun = "strtonum"
+	b1 = strtonum("0xdeadbeef")
+	i1 = @fun("0xdeadbeef")
+	print_result("string", fun, b1, i1)
+
+	fun = "sub"
+	$0 = "ff11bb"
+	b1 = sub("f", "q")
+	b2 = $0
+	$0 = "ff11bb"
+	i1 = @fun("f", "q")
+	i2 = $0
+	print_result("string", fun, b1, i1)
+	if (b2 != i2) {
+		printf("string: %s: fail: $0 (%s) != $0 (%s)\n",
+			fun, b2, i2)
+		exit 1
+	}
+
+	fun = "substr"
+	b1 = substr("0xdeadbeef", 7, 4)
+	i1 = @fun("0xdeadbeef", 7, 4)
+	print_result("string", fun, b1, i1)
+
+	fun = "tolower"
+	b1 = tolower("0xDeAdBeEf")
+	i1 = @fun("0xDeAdBeEf")
+	print_result("string", fun, b1, i1)
+
+	fun = "toupper"
+	b1 = toupper("0xDeAdBeEf")
+	i1 = @fun("0xDeAdBeEf")
+	print_result("string", fun, b1, i1)
+
+# time functions
+
+	fun = "mktime"
+	b1 = mktime("1990 02 11 12 00 00")
+	i1 = @fun("1990 02 11 12 00 00")
+	print_result("time", fun, b1, i1)
+
+	then = b1
+	fun = "strftime"
+	b1 = strftime(PROCINFO["strftime"], then)
+	i1 = @fun(PROCINFO["strftime"], then)
+	print_result("time", fun, b1, i1)
+
+	fun = "systime"
+	b1 = systime()
+	i1 = @fun()
+	print_result("time", fun, b1, i1)
+
+# regexp functions
+
+	fun = "match"
+	b1 = match("o+", "fooob")
+	rstart = RSTART
+	rlength = RLENGTH
+	i1 = @fun("o+", "fooob")
+	print_result("regexp", fun, b1, i1)
+	if (rstart != RSTART) {
+		printf("match: failure: biRSTART (%d) != iRSTART (%d)\n",
+			rstart, RSTART)
+		exit 1
+	}
+	if (rlength != RLENGTH) {
+		printf("match: failure: biRLENGTH (%d) != iRLENGTH (%d)\n",
+			rlength, RLENGTH)
+		exit 1
+	}
+
+	############## start patsplit ##############
+	fun = "patsplit"
+	delete data
+	delete data2
+	delete seps
+	delete seps2
+	b1 = patsplit("a:b:c:d", data, ":", seps)
+	i1 = @fun("a:b:c:d", data2, ":", seps2)
+	print_result("regexp", fun, b1, i1)
+	for (i in data) {
+		if ((! (i in data2)) || data[i] != data2[i]) {
+			printf("patsplit1a: fail: builtin data[%d] (%s) != indirect data[%d] (%s)\n",
+				i, data[i], i, data2[i])
+			exit 1
+		}
+	}
+	for (i in seps) {
+		if ((! (i in seps2)) || seps[i] != seps2[i]) {
+			printf("patsplit1b: fail: builtin seps[%d] (%s) != indirect seps[%d] (%s)\n",
+				i, seps[i], i, seps2[i])
+			exit 1
+		}
+	}
+
+	fun = "patsplit"
+	delete data
+	delete data2
+	b1 = patsplit("a:b:c:d", data, ":")
+	i1 = @fun("a:b:c:d", data2, ":")
+	print_result("regexp", fun, b1, i1)
+	for (i in data) {
+		if ((! (i in data2)) || data[i] != data2[i]) {
+			printf("patsplit2: fail: builtin data[%d] (%s) != indirect data[%d] (%s)\n",
+				i, data[i], i, data2[i])
+			exit 1
+		}
+	}
+
+	fun = "patsplit"
+	delete data
+	delete data2
+	FPAT = "[a-z]+"
+	b1 = patsplit("a b c d", data)
+	i1 = @fun("a b c d", data2)
+	print_result("regexp", fun, b1, i1)
+	for (i in data) {
+		if ((! (i in data2)) || data[i] != data2[i]) {
+			printf("patsplit3: fail: builtin data[%d] (%s) != indirect data[%d] (%s)\n",
+				i, data[i], i, data2[i])
+			exit 1
+		}
+	}
+	############## end patsplit ##############
+
+	############## start split ##############
+	fun = "split"
+	delete data
+	delete data2
+	delete seps
+	delete seps2
+	b1 = split("a:b:c:d", data, ":", seps)
+	i1 = @fun("a:b:c:d", data2, ":", seps2)
+	print_result("regexp", fun, b1, i1)
+	for (i in data) {
+		if ((! (i in data2)) || data[i] != data2[i]) {
+			printf("split1a: fail: builtin data[%d] (%s) != indirect data[%d] (%s)\n",
+				i, data[i], i, data2[i])
+			exit 1
+		}
+	}
+	for (i in seps) {
+		if ((! (i in seps2)) || seps[i] != seps2[i]) {
+			printf("split1b: fail: builtin seps[%d] (%s) != indirect seps[%d] (%s)\n",
+				i, seps[i], i, seps2[i])
+			exit 1
+		}
+	}
+
+	fun = "split"
+	delete data
+	delete data2
+	b1 = split("a:b:c:d", data, ":")
+	i1 = @fun("a:b:c:d", data2, ":")
+	print_result("regexp", fun, b1, i1)
+	for (i in data) {
+		if ((! (i in data2)) || data[i] != data2[i]) {
+			printf("split2: fail: builtin data[%d] (%s) != indirect data[%d] (%s)\n",
+				i, data[i], i, data2[i])
+			exit 1
+		}
+	}
+
+	fun = "split"
+	delete data
+	delete data2
+	b1 = split("a b c d", data)
+	i1 = @fun("a b c d", data2)
+	print_result("regexp", fun, b1, i1)
+	for (i in data) {
+		if ((! (i in data2)) || data[i] != data2[i]) {
+			printf("split3: fail: builtin data[%d] (%s) != indirect data[%d] (%s)\n",
+				i, data[i], i, data2[i])
+			exit 1
+		}
+	}
+	############## end split ##############
+
+# array functions
+
+	split("z y x w v u t", data)
+	fun = "asort"
+	asort(data, newdata)
+	@fun(data, newdata2)
+	print_result("array", fun, b1, i1)
+	for (i in newdata) {
+		if (! (i in newdata2) || newdata[i] != newdata2[i]) {
+			print fun ": failed, index", i
+			exit
+		}
+	}
+
+	for (i in data)
+		data2[data[i]] = i
+
+	fun = "asorti"
+	asorti(data2, newdata)
+	@fun(data2, newdata2)
+	print_result("array", fun, b1, i1)
+	for (i in newdata) {
+		if (! (i in newdata2) || newdata[i] != newdata2[i]) {
+			print fun ": failed, index", i, "value", newdata[i], newdata2[i]
+			exit
+		}
+	}
+
+	arr[1] = arr[2] = 42
+	fun = "isarray"
+	b1 = isarray(arr)
+	i1 = @fun(arr)
+	print_result("array", fun, b1, i1)
+
+# i/o functions
+
+	print("hi") > "x1.out"
+	print("hi") > "x2.out"
+
+	fun = "fflush"
+	b1 = fflush("x1.out")
+	i1 = @fun("x2.out")
+	print_result("i/o", fun, b1, i1)
+
+	fun = "close"
+	b1 = close("x1.out")
+	i1 = @fun("x2.out")
+	print_result("i/o", fun, b1, i1)
+
+	fun = "system"
+	b1 = system("rm x1.out")
+	i1 = @fun("rm x2.out")
+	print_result("i/o", fun, b1, i1)
+}
diff --git a/test/indirectbuiltin.ok b/test/indirectbuiltin.ok
new file mode 100644
index 00000000..312bbd76
--- /dev/null
+++ b/test/indirectbuiltin.ok
@@ -0,0 +1,43 @@
+math: and: pass
+math: atan2: pass
+math: compl: pass
+math: cos: pass
+math: exp: pass
+math: int: pass
+math: log: pass
+math: lshift: pass
+math: or: pass
+math: rand: pass
+math: rshift: pass
+math: sin: pass
+math: sqrt: pass
+math: srand: pass
+math: xor: pass
+string: gensub: pass
+string: gsub: pass
+string: index: pass
+string: dcgettext: pass
+string: dcngettext: pass
+string: length: pass
+string: sprintf: pass
+string: strtonum: pass
+string: sub: pass
+string: substr: pass
+string: tolower: pass
+string: toupper: pass
+time: mktime: pass
+time: strftime: pass
+time: systime: pass
+regexp: match: pass
+regexp: patsplit: pass
+regexp: patsplit: pass
+regexp: patsplit: pass
+regexp: split: pass
+regexp: split: pass
+regexp: split: pass
+array: asort: pass
+array: asorti: pass
+array: isarray: pass
+i/o: fflush: pass
+i/o: close: pass
+i/o: system: pass
diff --git a/test/inplace1.ok b/test/inplace1.ok
index ffcb768d..82562235 100644
--- a/test/inplace1.ok
+++ b/test/inplace1.ok
@@ -1,5 +1,5 @@
 before
-gawk: inplace:9: warning: inplace_begin: disabling in-place editing for invalid FILENAME `-'
+gawk: inplace:14: warning: inplace_begin: disabling in-place editing for invalid FILENAME `-'
 stdin start
 is bar replaced?
 stdin end
diff --git a/test/inplace2.ok b/test/inplace2.ok
index ffcb768d..82562235 100644
--- a/test/inplace2.ok
+++ b/test/inplace2.ok
@@ -1,5 +1,5 @@
 before
-gawk: inplace:9: warning: inplace_begin: disabling in-place editing for invalid FILENAME `-'
+gawk: inplace:14: warning: inplace_begin: disabling in-place editing for invalid FILENAME `-'
 stdin start
 is bar replaced?
 stdin end
diff --git a/test/inplace3.ok b/test/inplace3.ok
index 7cd960bc..a7b7254f 100644
--- a/test/inplace3.ok
+++ b/test/inplace3.ok
@@ -1,11 +1,11 @@
 before
-gawk: inplace:9: warning: inplace_begin: disabling in-place editing for invalid FILENAME `-'
+gawk: inplace:14: warning: inplace_begin: disabling in-place editing for invalid FILENAME `-'
 stdin start
 is bar replaced?
 stdin end
 after
 Before
-gawk: inplace:9: warning: inplace_begin: disabling in-place editing for invalid FILENAME `-'
+gawk: inplace:14: warning: inplace_begin: disabling in-place editing for invalid FILENAME `-'
 stdin start
 is foo replaced?
 stdin end
diff --git a/test/mbprintf4.awk b/test/mbprintf4.awk
index a4b2a218..1e436bca 100644
--- a/test/mbprintf4.awk
+++ b/test/mbprintf4.awk
@@ -1,32 +1,35 @@
 # printf with multi-byte text encoding, %c and %s, width and precision, and left-alignment.
 {
-	print "printf %c " $0
-	printf "|%c|\n", $0
-	printf "|%1c|\n", $0
-	printf "|%3c|\n", $0
+	count = 1
+
+	print NR, count++, "printf %c " $0
+	printf "%d:%d: |%c|\n", NR, count++, $0
+	printf "%d:%d: |%1c|\n", NR, count++, $0
+	printf "%d:%d: |%3c|\n", NR, count++, $0
 	# precision is ignored by %c.
-	printf "|%3.1c|\n", $0
-	printf "|%3.5c|\n", $0
-	print "printf %-c " $0
-	printf "|%-c|\n", $0
-	printf "|%-1c|\n", $0
-	printf "|%-3c|\n", $0
+	printf "%d:%d: |%3.1c|\n", NR, count++, $0
+	printf "%d:%d: |%3.5c|\n", NR, count++, $0
+	print NR, count++, "printf %-c " $0
+	printf "%d:%d: |%-c|\n", NR, count++, $0
+	printf "%d:%d: |%-1c|\n", NR, count++, $0
+	printf "%d:%d: |%-3c|\n", NR, count++, $0
 	# precision is ignored by %c.
-	printf "|%-3.1c|\n", $0
-	printf "|%-3.5c|\n", $0
+	printf "%d:%d: |%-3.1c|\n", NR, count++, $0
+	printf "%d:%d: |%-3.5c|\n", NR, count++, $0
 	printf ORS
 
-	print "printf %s " $0
-	printf "|%s|\n", $0
-	printf "|%1s|\n", $0
-	printf "|%3s|\n", $0
-	printf "|%3.1s|\n", $0
-	printf "|%3.5s|\n", $0
-	print "printf %-s " $0
-	printf "|%-s|\n", $0
-	printf "|%-1s|\n", $0
-	printf "|%-3s|\n", $0
-	printf "|%-3.1s|\n", $0
-	printf "|%-3.5s|\n", $0
+	print NR, count++, "printf %s " $0
+	printf "%d:%d: |%s|\n", NR, count++, $0
+	printf "%d:%d: |%1s|\n", NR, count++, $0
+	printf "%d:%d: |%3s|\n", NR, count++, $0
+	printf "%d:%d: |%3.1s|\n", NR, count++, $0
+	printf "%d:%d: |%3.5s|\n", NR, count++, $0
+
+	print NR, count++, "printf %-s " $0
+	printf "%d:%d: |%-s|\n", NR, count++, $0
+	printf "%d:%d: |%-1s|\n", NR, count++, $0
+	printf "%d:%d: |%-3s|\n", NR, count++, $0
+	printf "%d:%d: |%-3.1s|\n", NR, count++, $0
+	printf "%d:%d: |%-3.5s|\n", NR, count++, $0
 	printf ORS ORS
 }
diff --git a/test/mbprintf4.ok b/test/mbprintf4.ok
index 9b9dd4e2..e32fe408 100644
--- a/test/mbprintf4.ok
+++ b/test/mbprintf4.ok
@@ -1,81 +1,81 @@
-printf %c ú
-|ú|
-|ú|
-|  ú|
-|  ú|
-|  ú|
-printf %-c ú
-|ú|
-|ú|
-|ú  |
-|ú  |
-|ú  |
+1 1 printf %c ú
+1:2: |ú|
+1:3: |ú|
+1:4: |  ú|
+1:5: |  ú|
+1:6: |  ú|
+1 7 printf %-c ú
+1:8: |ú|
+1:9: |ú|
+1:10: |ú  |
+1:11: |ú  |
+1:12: |ú  |
 
-printf %s ú
-|ú|
-|ú|
-|  ú|
-|  ú|
-|  ú|
-printf %-s ú
-|ú|
-|ú|
-|ú  |
-|ú  |
-|ú  |
+1 13 printf %s ú
+1:14: |ú|
+1:15: |ú|
+1:16: |  ú|
+1:17: |  ú|
+1:18: |  ú|
+1 19 printf %-s ú
+1:20: |ú|
+1:21: |ú|
+1:22: |ú  |
+1:23: |ú  |
+1:24: |ú  |
 
 
-printf %c último
-|ú|
-|ú|
-|  ú|
-|  ú|
-|  ú|
-printf %-c último
-|ú|
-|ú|
-|ú  |
-|ú  |
-|ú  |
+2 1 printf %c último
+2:2: |ú|
+2:3: |ú|
+2:4: |  ú|
+2:5: |  ú|
+2:6: |  ú|
+2 7 printf %-c último
+2:8: |ú|
+2:9: |ú|
+2:10: |ú  |
+2:11: |ú  |
+2:12: |ú  |
 
-printf %s último
-|último|
-|último|
-|último|
-|  ú|
-|últim|
-printf %-s último
-|último|
-|último|
-|último|
-|ú  |
-|últim|
+2 13 printf %s último
+2:14: |último|
+2:15: |último|
+2:16: |último|
+2:17: |  ú|
+2:18: |últim|
+2 19 printf %-s último
+2:20: |último|
+2:21: |último|
+2:22: |último|
+2:23: |ú  |
+2:24: |últim|
 
 
-printf %c áé
-|á|
-|á|
-|  á|
-|  á|
-|  á|
-printf %-c áé
-|á|
-|á|
-|á  |
-|á  |
-|á  |
+3 1 printf %c áé
+3:2: |á|
+3:3: |á|
+3:4: |  á|
+3:5: |  á|
+3:6: |  á|
+3 7 printf %-c áé
+3:8: |á|
+3:9: |á|
+3:10: |á  |
+3:11: |á  |
+3:12: |á  |
 
-printf %s áé
-|áé|
-|áé|
-| áé|
-|  á|
-| áé|
-printf %-s áé
-|áé|
-|áé|
-|áé |
-|á  |
-|áé |
+3 13 printf %s áé
+3:14: |áé|
+3:15: |áé|
+3:16: | áé|
+3:17: |  á|
+3:18: | áé|
+3 19 printf %-s áé
+3:20: |áé|
+3:21: |áé|
+3:22: |áé |
+3:23: |á  |
+3:24: |áé |
 
 
diff --git a/test/mpfrmemok1.awk b/test/mpfrmemok1.awk
new file mode 100644
index 00000000..9331a34d
--- /dev/null
+++ b/test/mpfrmemok1.awk
@@ -0,0 +1,7 @@
+# This program tests that -M works with profiling.
+# It does not do anything real, but there should not be glibc memory
+# errors and it should be valgrind-clean too.
+
+BEGIN {
+	v = 0x0100000000000000000000000000000000
+}
diff --git a/test/mpfrmemok1.ok b/test/mpfrmemok1.ok
new file mode 100644
index 00000000..2389a2d5
--- /dev/null
+++ b/test/mpfrmemok1.ok
@@ -0,0 +1,7 @@
+
+	# BEGIN rule(s)
+
+	BEGIN {
+     1  	v = 340282366920938463463374607431768211456
+	}
+
diff --git a/test/mpfrsqrt.awk b/test/mpfrsqrt.awk
index 23a15c92..3fb1f5f8 100644
--- a/test/mpfrsqrt.awk
+++ b/test/mpfrsqrt.awk
@@ -14,7 +14,7 @@ a=11111111111111111111111111111111111111111111111111111111111
 print sqrt(a^2)
 #print sq_root(a^2)
 
-# ADR: Added for gawk-4.1-stable which doesn't have built-in div() function
+# ADR: Added for gawk-4.1-stable which doesn't have built-in intdiv() function
 if (PROCINFO["version"] < "4.1.60")
   print sq_root2(a^2)
 else
@@ -27,9 +27,9 @@ function sq_root(x, temp,r,z)
    z=0
    while (abs(z-temp)>1)
     { z=temp
-      div(x,temp,r)
+      intdiv(x,temp,r)
       temp=r["quotient"] + temp
-      div(temp,2,r)
+      intdiv(temp,2,r)
       temp=r["quotient"]
     }
    return temp
diff --git a/test/nonfatal1.awk b/test/nonfatal1.awk
new file mode 100644
index 00000000..a9228f3a
--- /dev/null
+++ b/test/nonfatal1.awk
@@ -0,0 +1,6 @@
+BEGIN {
+	PROCINFO["NONFATAL"]
+	# note that ":" is not a valid hostname character
+	print |& "/inet/tcp/0/local:host/25"
+	print (ERRNO != "")
+}
diff --git a/test/nonfatal1.ok b/test/nonfatal1.ok
new file mode 100644
index 00000000..51583f2c
--- /dev/null
+++ b/test/nonfatal1.ok
@@ -0,0 +1,2 @@
+gawk: nonfatal1.awk:4: warning: remote host and port information (local:host, 25) invalid
+1
diff --git a/test/nonfatal2.awk b/test/nonfatal2.awk
new file mode 100644
index 00000000..fedbba43
--- /dev/null
+++ b/test/nonfatal2.awk
@@ -0,0 +1,5 @@
+BEGIN {
+	PROCINFO["NONFATAL"] = 1
+	print > "/dev/no/such/file"
+	print ERRNO
+}
diff --git a/test/nonfatal2.ok b/test/nonfatal2.ok
new file mode 100644
index 00000000..ddc88691
--- /dev/null
+++ b/test/nonfatal2.ok
@@ -0,0 +1 @@
+No such file or directory
diff --git a/test/nonfatal3.awk b/test/nonfatal3.awk
new file mode 100644
index 00000000..b2a4ec9e
--- /dev/null
+++ b/test/nonfatal3.awk
@@ -0,0 +1,6 @@
+BEGIN {
+	PROCINFO["NONFATAL"]
+	# valid host but bogus port
+	print |& "/inet/tcp/0/localhost/0"
+	print ERRNO != ""
+}
diff --git a/test/nonfatal3.ok b/test/nonfatal3.ok
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/test/nonfatal3.ok
@@ -0,0 +1 @@
+1
diff --git a/test/ofs1.awk b/test/ofs1.awk
index 83b3c2a5..83b3c2a5 100755..100644
--- a/test/ofs1.awk
+++ b/test/ofs1.awk
diff --git a/test/paramasfunc1.awk b/test/paramasfunc1.awk
new file mode 100644
index 00000000..b0d06849
--- /dev/null
+++ b/test/paramasfunc1.awk
@@ -0,0 +1,9 @@
+BEGIN{ X() }
+
+function X(	abc)
+{
+	abc = "stamp out "
+	print abc abc()
+}
+
+function abc() { return "dark corners" }
diff --git a/test/paramasfunc1.ok b/test/paramasfunc1.ok
new file mode 100644
index 00000000..9ee95116
--- /dev/null
+++ b/test/paramasfunc1.ok
@@ -0,0 +1,3 @@
+gawk: paramasfunc1.awk:6: error: attempt to use non-function `abc' in function call
+gawk: error: function `X': can't use function `abc' as a parameter name
+EXIT CODE: 1
diff --git a/test/paramasfunc2.awk b/test/paramasfunc2.awk
new file mode 100644
index 00000000..849b3d1b
--- /dev/null
+++ b/test/paramasfunc2.awk
@@ -0,0 +1,10 @@
+BEGIN{ X() }
+
+function abc() { return "dark corners" }
+
+function X(	abc)
+{
+	abc = "stamp out "
+	print abc abc()
+}
+
diff --git a/test/paramasfunc2.ok b/test/paramasfunc2.ok
new file mode 100644
index 00000000..2cdf4f66
--- /dev/null
+++ b/test/paramasfunc2.ok
@@ -0,0 +1,3 @@
+gawk: paramasfunc2.awk:8: error: attempt to use non-function `abc' in function call
+gawk: error: function `X': can't use function `abc' as a parameter name
+EXIT CODE: 1
diff --git a/test/printfbad4.awk b/test/printfbad4.awk
new file mode 100644
index 00000000..dd9220ae
--- /dev/null
+++ b/test/printfbad4.awk
@@ -0,0 +1,5 @@
+BEGIN {
+	for (i = 1; i <= 10; i++) {
+		printf "%03$*d %2$d \n", 4, 5, i
+	}
+}
diff --git a/test/printfbad4.ok b/test/printfbad4.ok
new file mode 100644
index 00000000..71eed3d6
--- /dev/null
+++ b/test/printfbad4.ok
@@ -0,0 +1,2 @@
+gawk: printfbad4.awk:3: fatal: fatal: must use `count$' on all formats or none
+EXIT CODE: 2
diff --git a/test/profile0.awk b/test/profile0.awk
new file mode 100644
index 00000000..a42e94df
--- /dev/null
+++ b/test/profile0.awk
@@ -0,0 +1 @@
+NR == 1
diff --git a/test/profile0.in b/test/profile0.in
new file mode 100644
index 00000000..7bba8c8e
--- /dev/null
+++ b/test/profile0.in
@@ -0,0 +1,2 @@
+line 1
+line 2
diff --git a/test/profile0.ok b/test/profile0.ok
new file mode 100644
index 00000000..2e3c5728
--- /dev/null
+++ b/test/profile0.ok
@@ -0,0 +1,6 @@
+	# Rule(s)
+
+     2  NR == 1 { # 1
+     1  	print $0
+	}
+
diff --git a/test/profile2.ok b/test/profile2.ok
index 50c7e190..938d6858 100644
--- a/test/profile2.ok
+++ b/test/profile2.ok
@@ -1,4 +1,4 @@
-	# BEGIN block(s)
+	# BEGIN rule(s)
 
 	BEGIN {
      1  	if (sortcmd == "") {
diff --git a/test/profile3.ok b/test/profile3.ok
index 50172c48..bbf06541 100644
--- a/test/profile3.ok
+++ b/test/profile3.ok
@@ -1,4 +1,4 @@
-	# BEGIN block(s)
+	# BEGIN rule(s)
 
 	BEGIN {
      1  	the_func = "p"
diff --git a/test/profile4.ok b/test/profile4.ok
index 8ff4470f..9d2b9430 100644
--- a/test/profile4.ok
+++ b/test/profile4.ok
@@ -1,11 +1,9 @@
-	# BEGIN block(s)
-
-	BEGIN {
-		a = "foo" (c = "bar")
-		a = (b - c) "foo"
-		a = "foo" (b - c)
-		q = (d = "x") (e = "y")
-		a = (c = tolower("FOO")) in JUNK
-		x = y == 0 && z == 2 && q == 45
-	}
+BEGIN {
+	a = "foo" (c = "bar")
+	a = (b - c) "foo"
+	a = "foo" (b - c)
+	q = (d = "x") (e = "y")
+	a = (c = tolower("FOO")) in JUNK
+	x = y == 0 && z == 2 && q == 45
+}
 
diff --git a/test/profile5.ok b/test/profile5.ok
index cc83dc06..5bf04dcf 100644
--- a/test/profile5.ok
+++ b/test/profile5.ok
@@ -1,4770 +1,5858 @@
-	# BEGIN block(s)
+BEGIN {
+	_addlib("_BASE")
+}
+
+#___________________________________________________________________________________
+BEGIN {
+	BINMODE = "rw"
+	SUBSEP = "\000"
+	_NULARR[""]
+	delete _NULARR[""]
+	_INITBASE()
+}
+
+BEGIN {
+	_addlib("_sYS")
+}
+
+BEGIN {
+	_addlib("_rEG")
+}
+
+BEGIN {
+	_addlib("_INSTRUC")
+}
+
+#___________________________________________________________________________________
+BEGIN {
+	_delay_perfmsdelay = 11500
+}
+
+BEGIN {
+	_addlib("_ARR")
+}
+
+#___________________________________________________________________________________
+BEGIN {
+}
+
+BEGIN {	###########################################################################
+	_addlib("_EXTFN")
+}
+
+#___________________________________________________________________________________
+BEGIN {
+	delete _XCHR
+	delete _ASC
+	delete _CHR
+	t = ""
+	for (i = 0; i < 256; i++) {
+		_ASC[a = _CHR[i] = sprintf("%c", i)] = i
+		_QASC[a] = sprintf("%.3o", i)
+		_XCHR[_CHR[i]] = sprintf("%c", (i < 128 ? i + 128 : i - 128))
+	}
+	#_____________________________________________________________________________
+	
+	for (i = 0; i < 256; i++) {
+		_QSTRQ[_CHR[i]] = "\\" sprintf("%.3o", i)
+	}
+	#_______________________________________________________________________
+	
+	for (i = 0; i < 32; i++) {
+		_QSTR[_CHR[i]] = _QSTRQ[_CHR[i]]
+	}
+	for (; i < 128; i++) {
+		_QSTR[_CHR[i]] = _CHR[i]
+	}
+	for (; i < 256; i++) {
+		_QSTR[_CHR[i]] = _QSTRQ[_CHR[i]]
+	}
+	_QSTR["\\"] = "\\\\"
+	#_____________________________________________________________________________
+	
+	_CHR["CR"] = "\r"
+	_CHR["EOL"] = "\r\n"
+	_CHR["EOF"] = "\032"
+	_QSTR[_CHR["EOL"]] = "\\015\\012"
+	#_______________________________________________________________________
+	
+	_CHR["MONTH"][_CHR["MONTH"]["Jan"] = "01"] = "Jan"
+	_CHR["MONTH"][_CHR["MONTH"]["Feb"] = "02"] = "Feb"
+	_CHR["MONTH"][_CHR["MONTH"]["Mar"] = "03"] = "Mar"
+	_CHR["MONTH"][_CHR["MONTH"]["Apr"] = "04"] = "Apr"
+	_CHR["MONTH"][_CHR["MONTH"]["May"] = "05"] = "May"
+	_CHR["MONTH"][_CHR["MONTH"]["Jun"] = "06"] = "Jun"
+	_CHR["MONTH"][_CHR["MONTH"]["Jul"] = "07"] = "Jul"
+	_CHR["MONTH"][_CHR["MONTH"]["Aug"] = "08"] = "Aug"
+	_CHR["MONTH"][_CHR["MONTH"]["Sep"] = "09"] = "Sep"
+	_CHR["MONTH"][_CHR["MONTH"]["Oct"] = "10"] = "Oct"
+	_CHR["MONTH"][_CHR["MONTH"]["Nov"] = "11"] = "Nov"
+	_CHR["MONTH"][_CHR["MONTH"]["Dec"] = "12"] = "Dec"
+	#_____________________________________________________________________________
+	
+	_TAB_STEP_DEFAULT = 8
+	#_____________________________________________________________________________
+	
+	for (i = 0; i < 32; i++) {
+		_REXPSTR[_CHR[i]] = _QSTRQ[_CHR[i]]
+	}
+	for (; i < 256; i++) {
+		_REXPSTR[_CHR[i]] = _CHR[i]
+	}
+	_gensubfn("\\^$.()|{,}[-]?+*", ".", "_rexpstr_i0")
+}
+
+BEGIN {
+	_addlib("_SYSIO")
+}
+
+#___________________________________________________________________________________
+BEGIN {
+	_SYS_STDCON = "CON"
+	_CON_WIDTH = (match(_cmd("MODE " _SYS_STDCON " 2>NUL"), /Columns:[ \t]*([0-9]+)/, A) ? strtonum(A[1]) : 80)
+}
+
+BEGIN {
+	_addlib("_FILEIO")
+}
+
+#___________________________________________________________________________________
+BEGIN {
+	if (_SYS_STDOUT == "") {
+		_SYS_STDOUT = "/dev/stdout"
+	}
+	if (_SYS_STDERR == "") {
+		_SYS_STDERR = "/dev/stderr"
+	}
+	_CHR["SUBDIR"] = "\\"
+	if (_gawk_scriptlevel < 1) {
+		match(b = _cmd("echo %CD% 2>NUL"), /[^\x00-\x1F]*/)
+		ENVIRON["CD"] = _FILEIO_RD = _filerd(substr(b, RSTART, RLENGTH) _CHR["SUBDIR"])
+		_FILEIO_R = _filer(_FILEIO_RD)
+		_FILEIO_D = _filed(_FILEIO_RD)
+		_setmpath(_filerd(_FILEIO_RD "_tmp" _CHR["SUBDIR"]))
+	}
+}
+
+BEGIN {
+	_addlib("_tOBJ")
+}
+
+#___________________________________________________________________________________
+BEGIN {
+	_tInBy = "\212._tInBy"
+	_tgenuid_init()
+	_UIDS[""]
+	delete _UIDS[""]
+	_UIDSDEL[""]
+	delete _UIDSDEL[""]
+	_tPREV[""]
+	_tPARENT[""]
+	_tNEXT[""]
+	_tFCHLD[""]
+	_tQCHLD[""]
+	_tLCHLD[""]
+	_tLINK[""]
+	_tCLASS[""]
+	_tSTR[""]
+	_tDLINK[""]
+	_[""]
+	delete _[""]
+	_ptr[""]
+	delete _ptr[""]
+	_TMP0[""]
+	delete _TMP0[""]
+	_TMP1[""]
+	delete _TMP1[""]
+}
+
+BEGIN {
+	_addlib("_ERRLOG")
+}
+
+#___________________________________________________________________________________
+BEGIN {
+	if (_gawk_scriptlevel < 1) {
+		_ERRLOG_TF = 1
+		_ERRLOG_VF = 1
+		_ERRLOG_IF = 1
+		_ERRLOG_WF = 1
+		_ERRLOG_EF = 1
+		_ERRLOG_FF = 1
+		_wrfile(_errlog_file = _getmpfile("OUTPUT.LOG"), "")
+	}
+}
+
+BEGIN {
+	_addlib("_SHORTCUT")
+}
+
+#___________________________________________________________________________________
+BEGIN {
+	_shortcut_init()
+}
+
+BEGIN {	#########################################################
+	_addlib("_eXTFN")
+}
+
+#___________________________________________________________________________________
+BEGIN {
+	_extfn_init()
+}
 
-	BEGIN {
-		_addlib("_BASE")
-	}
+BEGIN {	############################################################
+	_addlib("_sHARE")
+}
 
-	BEGIN {
-		BINMODE = "rw"
-		SUBSEP = "\000"
-		_NULARR[""]
-		delete _NULARR[""]
-		_INITBASE()
-	}
+BEGIN {
+	_addlib("_FILEVER")
+}
 
-	BEGIN {
-		_addlib("_sYS")
-	}
+BEGIN {
+	_addlib("_DS")	###############################################################################
+	_PRODUCT_NAME = "Deployment Solution Control"
+	_PRODUCT_VERSION = "1.0"
+	_PRODUCT_COPYRIGHT = "Copyright (C) 2013 by CosumoGEN"
+	_PRODUCT_FILENAME = "_main.ewk"
+}
 
-	BEGIN {
-		_addlib("_rEG")
-	}
+# problem configuring uid by array charset: i can' understand what format of the array: possibly - remove array support
+# after removal of array format detection: there is unfinished conflicts: it is possible to totally remove array uid-gen initialization
 
-	BEGIN {
-		_addlib("_INSTRUC")
-	}
+#_____________________________________________________
+BEGIN {
+	_inituidefault()
+}
 
-	BEGIN {
-		_delay_perfmsdelay = 11500
-	}
+#_____________________________________________________
+BEGIN {
+	_initfilever()
+}
 
-	BEGIN {
-		_addlib("_ARR")
-	}
+#_____________________________________________________
+BEGIN {
+	_initshare()
+}
 
-	BEGIN {
-	}
+#_________________________________________________________________
+BEGIN {
+	_inspass(_IMPORT, "_import_data")
+}
 
-	BEGIN {
-		_addlib("_EXTFN")
-	}
+#_______________________________________________
+BEGIN {
+	_TEND[_ARRLEN] = 0
+	_TYPEWORD = "_TYPE"
+}
 
-	BEGIN {
-		delete _XCHR
-		delete _ASC
-		delete _CHR
-		t = ""
-		for (i = 0; i < 256; i++) {
-			_ASC[a = _CHR[i] = sprintf("%c", i)] = i
-			_QASC[a] = sprintf("%.3o", i)
-			_XCHR[_CHR[i]] = sprintf("%c", (i < 128 ? i + 128 : i - 128))
-		}
-		for (i = 0; i < 256; i++) {
-			_QSTRQ[_CHR[i]] = "\\" sprintf("%.3o", i)
-		}
-		for (i = 0; i < 32; i++) {
-			_QSTR[_CHR[i]] = _QSTRQ[_CHR[i]]
-		}
-		for (; i < 128; i++) {
-			_QSTR[_CHR[i]] = _CHR[i]
-		}
-		for (; i < 256; i++) {
-			_QSTR[_CHR[i]] = _QSTRQ[_CHR[i]]
-		}
-		_QSTR["\\"] = "\\\\"
-		_CHR["CR"] = "\r"
-		_CHR["EOL"] = "\r\n"
-		_CHR["EOF"] = "\032"
-		_QSTR[_CHR["EOL"]] = "\\015\\012"
-		_CHR["MONTH"][_CHR["MONTH"]["Jan"] = "01"] = "Jan"
-		_CHR["MONTH"][_CHR["MONTH"]["Feb"] = "02"] = "Feb"
-		_CHR["MONTH"][_CHR["MONTH"]["Mar"] = "03"] = "Mar"
-		_CHR["MONTH"][_CHR["MONTH"]["Apr"] = "04"] = "Apr"
-		_CHR["MONTH"][_CHR["MONTH"]["May"] = "05"] = "May"
-		_CHR["MONTH"][_CHR["MONTH"]["Jun"] = "06"] = "Jun"
-		_CHR["MONTH"][_CHR["MONTH"]["Jul"] = "07"] = "Jul"
-		_CHR["MONTH"][_CHR["MONTH"]["Aug"] = "08"] = "Aug"
-		_CHR["MONTH"][_CHR["MONTH"]["Sep"] = "09"] = "Sep"
-		_CHR["MONTH"][_CHR["MONTH"]["Oct"] = "10"] = "Oct"
-		_CHR["MONTH"][_CHR["MONTH"]["Nov"] = "11"] = "Nov"
-		_CHR["MONTH"][_CHR["MONTH"]["Dec"] = "12"] = "Dec"
-		_TAB_STEP_DEFAULT = 8
-		for (i = 0; i < 32; i++) {
-			_REXPSTR[_CHR[i]] = _QSTRQ[_CHR[i]]
-		}
-		for (; i < 256; i++) {
-			_REXPSTR[_CHR[i]] = _CHR[i]
-		}
-		_gensubfn("\\^$.()|{,}[-]?+*", ".", "_rexpstr_i0")
-	}
+#_______________________________________________
+BEGIN {
+	_ARRLEN = "\032LEN"
+	_ARRPTR = "\032PTR"
+	_ARRSTR = ""
+}
 
-	BEGIN {
-		_addlib("_SYSIO")
-	}
+#_____________________________________________________
+BEGIN {
+	_getperf_fn = "_nop"
+}
 
-	BEGIN {
-		_SYS_STDCON = "CON"
-		_CON_WIDTH = (match(_cmd("MODE " _SYS_STDCON " 2>NUL"), /Columns:[ \t]*([0-9]+)/, A) ? strtonum(A[1]) : 80)
-	}
+BEGIN {
+	_datablock_length = 262144
+}
 
-	BEGIN {
-		_addlib("_FILEIO")
-	}
+#_____________________________________________________
+BEGIN {
+	_initrdreg()
+}
 
-	BEGIN {
-		if (_SYS_STDOUT == "") {
-			_SYS_STDOUT = "/dev/stdout"
-		}
-		if (_SYS_STDERR == "") {
-			_SYS_STDERR = "/dev/stderr"
-		}
-		_CHR["SUBDIR"] = "\\"
-		if (_gawk_scriptlevel < 1) {
-			match(b = _cmd("echo %CD% 2>NUL"), /[^\x00-\x1F]*/)
-			ENVIRON["CD"] = _FILEIO_RD = _filerd(substr(b, RSTART, RLENGTH) _CHR["SUBDIR"])
-			_FILEIO_R = _filer(_FILEIO_RD)
-			_FILEIO_D = _filed(_FILEIO_RD)
-			_setmpath(_filerd(_FILEIO_RD "_tmp" _CHR["SUBDIR"]))
-		}
-	}
+#_____________________________________________________
+BEGIN {
+	_initregpath0()
+}
 
-	BEGIN {
-		_addlib("_tOBJ")
-	}
+#_____________________________________________________
+BEGIN {
+	_initsys()
+}
 
-	BEGIN {
-		_tInBy = "\212._tInBy"
-		_tgenuid_init()
-		_UIDS[""]
-		delete _UIDS[""]
-		_UIDSDEL[""]
-		delete _UIDSDEL[""]
-		_tPREV[""]
-		_tPARENT[""]
-		_tNEXT[""]
-		_tFCHLD[""]
-		_tQCHLD[""]
-		_tLCHLD[""]
-		_tLINK[""]
-		_tCLASS[""]
-		_tSTR[""]
-		_tDLINK[""]
-		_[""]
-		delete _[""]
-		_ptr[""]
-		delete _ptr[""]
-		_TMP0[""]
-		delete _TMP0[""]
-		_TMP1[""]
-		delete _TMP1[""]
-	}
+#_________________________________________________________________________________________
+##########################################################################################
 
-	BEGIN {
-		_addlib("_ERRLOG")
-	}
 
-	BEGIN {
-		if (_gawk_scriptlevel < 1) {
-			_ERRLOG_TF = 1
-			_ERRLOG_VF = 1
-			_ERRLOG_IF = 1
-			_ERRLOG_WF = 1
-			_ERRLOG_EF = 1
-			_ERRLOG_FF = 1
-			_wrfile(_errlog_file = _getmpfile("OUTPUT.LOG"), "")
-		}
-	}
 
-	BEGIN {
-		_addlib("_SHORTCUT")
-	}
 
-	BEGIN {
-		_shortcut_init()
-	}
 
-	BEGIN {
-		_addlib("_eXTFN")
-	}
 
-	BEGIN {
-		_extfn_init()
-	}
 
-	BEGIN {
-		_addlib("_sHARE")
-	}
+#BootDevice               BuildNumber  BuildType            Caption                                      CodeSet  CountryCode  CreationClassName      CSCreationClassName   CSDVersion      CSName  CurrentTimeZone  DataExecutionPrevention_32BitApplications  DataExecutionPrevention_Available  DataExecutionPrevention_Drivers  DataExecutionPrevention_SupportPolicy  Debug  Description  Distributed  EncryptionLevel  ForegroundApplicationBoost  FreePhysicalMemory  FreeSpaceInPagingFiles  FreeVirtualMemory  InstallDate                LargeSystemCache  LastBootUpTime             LocalDateTime              Locale  Manufacturer           MaxNumberOfProcesses  MaxProcessMemorySize  MUILanguages  Name                                                                                  NumberOfLicensedUsers  NumberOfProcesses  NumberOfUsers  OperatingSystemSKU  Organization  OSArchitecture  OSLanguage  OSProductSuite  OSType  OtherTypeDescription  PAEEnabled  PlusProductID  PlusVersionNumber  Primary  ProductType  RegisteredUser  SerialNumber             ServicePackMajorVersion  ServicePackMinorVersion  SizeStoredInPagingFiles  Status  SuiteMask  SystemDevice             SystemDirectory      SystemDrive  TotalSwapSpaceSize  TotalVirtualMemorySize  TotalVisibleMemorySize  Version   WindowsDirectory
+#\Device\HarddiskVolume1  7601         Multiprocessor Free  Microsoft Windows Server 2008 R2 Enterprise  1252     1            Win32_OperatingSystem  Win32_ComputerSystem  Service Pack 1  CPU     180              TRUE                                       TRUE                               TRUE                             3                                      FALSE               FALSE        256              0                           6925316             33518716                41134632           20110502192745.000000+180                    20130426120425.497469+180  20130510134606.932000+180  0409    Microsoft Corporation  -1                    8589934464            {"en-US"}     Microsoft Windows Server 2008 R2 Enterprise |C:\Windows|\Device\Harddisk0\Partition2  0                      116                2              10                                64-bit          1033        274             18                                                                          TRUE     3            Windows User    55041-507-2389175-84833  1                        0                        33554432                 OK      274        \Device\HarddiskVolume2  C:\Windows\system32  C:                               50311020                16758448                6.1.7601  C:\Windows
 
-	BEGIN {
-		_addlib("_FILEVER")
-	}
 
-	BEGIN {
-		_addlib("_DS")
-		_PRODUCT_NAME = "Deployment Solution Control"
-		_PRODUCT_VERSION = "1.0"
-		_PRODUCT_COPYRIGHT = "Copyright (C) 2013 by CosumoGEN"
-		_PRODUCT_FILENAME = "_main.ewk"
-	}
 
-	BEGIN {
-		_inituidefault()
-	}
 
-	BEGIN {
-		_initfilever()
-	}
 
-	BEGIN {
-		_initshare()
-	}
 
-	BEGIN {
-		_inspass(_IMPORT, "_import_data")
-	}
 
-	BEGIN {
-		_TEND[_ARRLEN] = 0
-		_TYPEWORD = "_TYPE"
-	}
 
-	BEGIN {
-		_ARRLEN = "\032LEN"
-		_ARRPTR = "\032PTR"
-		_ARRSTR = ""
-	}
 
-	BEGIN {
-		_getperf_fn = "_nop"
-	}
 
-	BEGIN {
-		_datablock_length = 262144
-	}
 
-	BEGIN {
-		_initrdreg()
-	}
 
-	BEGIN {
-		_initregpath0()
-	}
 
-	BEGIN {
-		_initsys()
+BEGIN {
+	a = ENVIRON["EGAWK_CMDLINE"]
+	gsub(/^[ \t]*/, "", a)
+	a = _lib_CMDLN(a)
+	if (a != "" && ! _LIBAPI["F"]["!"]) {
+		_out(_lib_HELP())
+		_fatal("Bad comandline argument `" a "'")
 	}
-
-	BEGIN {
-		a = ENVIRON["EGAWK_CMDLINE"]
-		gsub(/^[ \t]*/, "", a)
-		a = _lib_CMDLN(a)
-		if (a != "" && ! _LIBAPI["F"]["!"]) {
-			_out(_lib_HELP())
-			_fatal("Bad comandline argument `" a "'")
-		}
-		gsub(/^[ \t]*/, "", a)
-		ENVIRON["EGAWK_CMDLINE"] = a
-		_lib_APPLY()
-		if (_basexit_fl) {
-			exit 
-		}
-		_INIT()
-		_START()
-		_END()
+	gsub(/^[ \t]*/, "", a)
+	ENVIRON["EGAWK_CMDLINE"] = a
+	_lib_APPLY()
+	if (_basexit_fl) {
+		exit 
 	}
+	_INIT()
+	_START()
+	_END()
+}
 
-	# END block(s)
+#_____________________________________________________________________________
+END {
+	_EXIT()
+}
 
-	END {
-		_EXIT()
-	}
+#_______________________________________________________________________
+########################################################################
 
-	END {
-		if (_gawk_scriptlevel < 1) {
-			close(_errlog_file)
-			p = _Zimport(_rdfile(_errlog_file), _N())
-			if ((t = _get_errout(p)) != "") {
-				_expout(t, "/dev/stderr")
-			}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+END {
+	if (_gawk_scriptlevel < 1) {
+		close(_errlog_file)
+		p = _Zimport(_rdfile(_errlog_file), _N())
+		if ((t = _get_errout(p)) != "") {
+			_expout(t, "/dev/stderr")
 		}
 	}
+}
 
-	END {
-		if (_gawk_scriptlevel < 1) {
-			if (! _fileio_notdeltmpflag) {
-				_FILEIO_TMPATHS[_FILEIO_TMPRD]
-				_Foreach(_FILEIO_TMPATHS, "_uninit_del")
-			}
+##########################################################################################
+# PUBLIC:
+#_____________________________________________________________________________
+# _rFBRO(ptr)				- Return ptr of first-bro.				[TESTED]
+#						If !ptr then returns "".
+#_____________________________________________________________________________
+# _rLBRO(ptr)				- Return ptr of last-bro.				[TESTED]
+#						If !ptr then returns "".
+#_____________________________________________________________________________
+# _rQBRO(ptr)				- Returns brothers total quantity.			[TESTED]
+#						If !ptr then returns "".
+END {
+	if (_gawk_scriptlevel < 1) {
+		if (! _fileio_notdeltmpflag) {
+			_FILEIO_TMPATHS[_FILEIO_TMPRD]
+			_Foreach(_FILEIO_TMPATHS, "_uninit_del")
 		}
 	}
+}
 
-	END {
-		if (_constatstrln > 0) {
-			_constat()
-		}
+#___________________________________________________________________________________
+####################################################################################
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#___________________________________________________________________________________
+# fn	_dirtree(array,pathmask)
+#
+#	Return in `array' file tree from pathmask:
+#		array["file.filerdne"]="size date time"
+#		array["subdir.filerd"]["file.filerdne"]="size date time"
+#		array["subdir.filerd"]["file.filerd"][...]
+#
+#		The array will be cleared before any action. Function return pathmask w/o ltabspc and rtabspc.
+#___________________________________________________________________________________
+
+
+
+
+
+# OK:		change internal function's names to: w\o "_"
+# OK:		FLENGTH: should cover r-spcs
+# OK:		optimize REXP
+# OK:		add new symbols to dir/file names ( ! and + )
+# OK:		create _getfilepath()
+# OK:		del - conflict with WROOTDIR (do not update it)
+# OK:		dir/del - support for filemask ( * and ? )
+# OK:		how to define code injections: header\ender; and HANDLERS
+# OK:		units in header\ender? conline division...
+# OK:		_FILEPATH problem: it will not been defined at the moment when subscript0 starts - at the start TMPRD="_tmp"
+# OK:		del:	if del("dir\\") - then all ok except it NOT deleted "dir\\"	- _del function removed(renamed to __del)
+# OK:		tmpdirs: it delete only autotmp dir and only from script0
+# OK:		MICROTEST:	global testing of filepath (UNC! CORRECT RESULTS! )
+#	question about cache: did new just now generated absolute filepath cached in FILECACHE? its seems like NO
+# check _untmp: CONFLICT: if file or dir from autotmp dir will be untmp then it anyway will be deleted; but file or dir from other point never be deleted anyway - so what is the point of untmp?????
+#ERRLOG:	_setmpath:	warning!!!!!
+
+#___________________________________________________________________________________
+####################################################################################
+# PUBLIC:
+#___________________________________________________________________________________
+#
+#	fn	_rdfile(_filepath)
+#
+#		Read and return data from file specified in _filepath.
+#			If _filepath=="" then no action occured and return "".
+#			Function read and return data from file. No any changes in data occured.
+#			Function use _filerdne function internally. If some syntax error
+#				found in _filepath then function return "".
+#			If some error occured while reading data from file then fuction return ""
+#				and error-text is in ERRNO(and no close-file action will be occured!).
+#			If reading data completed successfully then function try to close
+#				file and if while closing file some error occured then function
+#				returns "" and error-text is in ERRNO.
+#			Otherwise function returns readed data.
+#_____________________________________________________________________________
+#
+#	fn	_wrfile(_filepath,_data)
+#
+#		Write data into file specified in _filepath.
+#			If _filepath=="" then no action occured and return "".
+#			Function write _data to file. No any changes in data occured.
+#			Function use _filerdne function internally. If some syntax error
+#				found in _filepath then function return "".
+#			If some error occured while writing data to file then fuction return ""
+#				and error-text is in ERRNO(and no close-file action will be occured!).
+#			If writing data completed successfully then function try to close
+#				file and if while closing file some error occured then function
+#				returns "" and error-text is in ERRNO.
+#			Otherwise function returns _filepath(re-processed).
+#___________________________________________________________________________________
+#
+#	fn	_filepath(_filepath)
+#
+#		Return re-processed root-dir-name-ext of _filepath.
+#			If _filepath=="" then no action occured and return "".
+#			If some syntax error found in _filepath then function return ""
+#				(and NO _filepath-cache-record will be created!).
+#_____________________________________________________________________________
+#
+#	fn	_filerdne(_filepath)
+#
+#		Return re-processed root-dir-filename of _filepath.
+#			If _filepath=="" then no action occured and return "".
+#			Function return result only if in _filepath present file-name(name
+#				and/or extension) - otherwise its return "".
+#			If some syntax error found in _filepath then function return ""
+#				(and NO _filepath-cache-record will be created!).
+#_____________________________________________________________________________
+#
+#	fn	_filerdn(_filepath)
+#
+#		Return re-processed root-dir-name of _filepath.
+#			If _filepath=="" then no action occured and return "".
+#			Function return result only if in _filepath present name field -
+#				- otherwise its return "".
+#			If some syntax error found in _filepath then function return ""
+#				(and NO _filepath-cache-record will be created!).
+#_____________________________________________________________________________
+#
+#	fn	_filerd(_filepath)
+#
+#		Return re-processed root-dir of _filepath.
+#			If _filepath=="" then no action occured and return "".
+#			If some syntax error found in _filepath then function return ""
+#				(and NO _filepath-cache-record will be created!).
+#_____________________________________________________________________________
+#
+#	fn	_filer(_filepath)
+#
+#		Return re-processed root of _filepath.
+#			If _filepath=="" then no action occured and return "".
+#			If some syntax error found in _filepath then function return ""
+#				(and NO _filepath-cache-record will be created!).
+#_____________________________________________________________________________
+#
+#	fn	_filed(_filepath)
+#
+#		Return re-processed dir of _filepath.
+#			If _filepath=="" then no action occured and return "".
+#			There is only one case when dir string can be =="" - when in
+#				_filepath specified unmounted drive(MS-format) and from-
+#				current-location address used(like Z:file.ext). In this
+#				case no rootdir-cache-record will be created.
+#			If some syntax error found in _filepath then function return ""
+#				(and NO _filepath-cache-record will be created!).
+#_____________________________________________________________________________
+#	fn	_filene(_filepath)
+#
+#		Return re-processed name-ext of _filepath.
+#			If _filepath=="" then no action occured and return "".
+#			Function return result only if in _filepath present file-name(name
+#				and/or extension) - otherwise its return "".
+#			If some syntax error found in _filepath then function return ""
+#				(and NO _filepath-cache-record will be created!).
+#_____________________________________________________________________________
+#
+#	fn	_filen(_filepath)
+#
+#		Return re-processed name of _filepath.
+#			If _filepath=="" then no action occured and return "".
+#			Function return result only if in _filepath present name field -
+#				- otherwise its return "".
+#			If some syntax error found in _filepath then function return ""
+#				(and NO _filepath-cache-record will be created!).
+#_____________________________________________________________________________
+#
+#	fn	_file(_filepath)
+#
+#		Return re-processed ext of _filepath.
+#			If _filepath=="" then no action occured and return "".
+#			Function return result only if in _filepath present ext field -
+#				- otherwise its return "".
+#			If some syntax error found in _filepath then function return ""
+#				(and NO _filepath-cache-record will be created!).
+#___________________________________________________________________________________
+#
+#	fn	_dir(_ARR,_filepathmask)
+#
+#		Get file-/folder-list of root-folder of _filepathmask.
+#			If _filepathmask=="" then no action occured and return "".
+#			_filepathmask can contain symbols like `*' and `?' as like
+#				its used in `dir'-shell command.
+#			Function gets file-/folder-list of specified root-dir-_filepathmask
+#				and return this list in array _ARR - where each element:
+#
+#			index - is the _filepath of file-or-folder name-ext
+#			value - contains 3 fields separated by " ":
+#				1. =="D" if this is folder
+#				   ==/[0-9]+/ if this is file - size of file in bytes
+#				2. ==date-of-creation of file or folder
+#				3. ==time-of-creation of file or folder
+#
+#			Function returns quantity of items in ARR.
+#___________________________________________________________________________________
+#
+#	fn	_filexist(_filepath)
+#
+#		Test if file or path or drive specified in _filepath is exist.
+#				If _filepath=="" then no action occured and return "".
+#				If some syntax error found in _filepath then function return ""
+#			(and NO _filepath-cache-record will be created!).
+#				Function returns _filepath if _filepath is exist. Otherwise
+#			function return 0.
+#_____________________________________________________________________________
+#
+#	fn	_filenotexist(_filepath)
+#
+#		Test if file or path or drive specified in _filepath is not exist.
+#			If _filepath=="" then no action occured and return "".
+#			If some syntax error found in _filepath then function return ""
+#				(and NO _filepath-cache-record will be created!).
+#			Function returns 1 if _filepath is not exist. Otherwise function
+#				return 0.
+#_____________________________________________________________________________
+#
+#	fn	_newdir(_filepath)
+#
+#		Create path specified in root-dir-_filepath.
+#			If _filepath=="" then no action occured and return "".
+#			If some syntax error found in _filepath then function return ""
+#				(and NO _filepath-cache-record will be created!).
+#			Function returns root-dir of _filepath.
+#_______________________________________________________________________
+#
+#	fn	_newdir(_filepath)
+#
+#		Create path specified in root-dir-_filepath. If this folder
+#		already exist then it will be completely cleared.
+#			If _filepath=="" then no action occured and return "".
+#			If some syntax error found in _filepath then function return ""
+#				(and NO _filepath-cache-record will be created!).
+#			Function returns root-dir of _filepath.
+#___________________________________________________________________________________
+#
+#	fn	_getmpfile(_filepath,_currfilepath)
+#
+#		Return ....
+#
+#_____________________________________________________________________________
+#
+#	fn	_getmpdir(_filepath,_currfilepath)
+#
+#		Return ...
+#
+#_____________________________________________________________________________
+#
+#	Temporary files folder.
+#
+#		Temporary files folder location is defined by _FILEIO_TMPRD.
+#		If it wasn't been initialized before program run or not been initialized
+#			by ENVIRON["TMPDIR"] then it will defined as the:
+#				`current rootdir(stored in _FILEIO_RD)\programname.TMP'
+#			In this case if its already exist then it will completely cleared when _FILEIO
+#			library initialization processed.
+#			And at the program uninitialization processed it will completely
+#			cleared if _FILEIO_TMPCLRFLAG is true.
+#___________________________________________________________________________________
+#
+#	var	_FILEIO_RD (ENVIRON["CD"])
+#
+#		This var can be set before running program. It can contain path which
+#		will be used as default current dir while program run.
+#		If this var is set before program runs - then it will be refreshed by the
+#			_filerd it will be used as default current dir while program run.
+#		If this var is not set before program runs - then ENVIRON["CD"] can also
+#			set up default current dir while program run. If it set before program
+#			begin then it will be refreshed by the _filerd - and also writed into
+#			_FILEIO_RD.
+#		If both _FILEIO_RD and ENVIRON["CD"] are not set before program begins
+#			then real current root\dir will be writed into both _FILEIO_RD and
+#			ENVIRON["CD"] and it will be used as default current dir while program run.
+#
+#___________________________________________________________________________________
+#
+#	var	_FILEIO_TMPRD (ENVIRON["TMPRD"])
+#
+#		This var can be set before running program. It can contain path which
+#		will be used as default temporary files root-folder while program run.
+#		If this var is set before program runs - then it will be refreshed by the
+#			_filerd - and also writed into ENVIRON["TMPRD"].
+#		If this var is not set before program runs - then ENVIRON["TMPRD"] can also
+#			set up default temporary files root-folder while program run. If it set
+#			before program begin then it will be refreshed by the _filerd - and
+#			also writed into _FILEIO_TMPRD.
+#		If both _FILEIO_TMPRD and ENVIRON["TMPRD"] are not set before program begins
+#			then new folder into path specified by the _FILEIO_RD(after its handling)
+#			will be writed into both _FILEIO_TMPRD and ENVIRON["TMPRD"] and it
+#			will be used as default temporary files root-folder while program run.
+#___________________________________________________________________________________
+#
+#	var	_FILEPATH
+#
+#		This var contain filepath of working script. It should be setting up externally.
+#
+#	var	_gawk_scriptlevel
+#___________________________________________________________________________________
+####################################################################################
+END {
+	if (_constatstrln > 0) {
+		_constat()
 	}
+}
 
+#___________________________________________________________________________________
+####################################################################################
 
-	# Functions, listed alphabetically
 
-	function W(p, p0, p1)
-	{
-		if (isarray(p0)) {
-			delete p0[p]
-			if (isarray(p1)) {
-				for (i in p1) {
-					if (isarray(p1[i])) {
-						p0[p][i][""]
-						delete p0[p][i][""]
-						_N_i0(p0[p][i], p1[i])
-					} else {
-						p0[p][i] = p1[i]
-					}
-				}
-				return p
-			}
-			return (p0[p] = p1)
-		}
-		delete _[p][p0]
+
+
+
+
+
+# make sure that stdout contain only expected characters
+# make sure that stderr contain only expected characters
+# redesign & reformat keys and its outputs
+# try different key combinations
+# add lib-specified to all libs
+
+
+#_______________________________________________________________________
+function W(p, p0, p1)
+{
+	if (isarray(p0)) {
+		delete p0[p]
 		if (isarray(p1)) {
 			for (i in p1) {
 				if (isarray(p1[i])) {
-					_[p][p0][i][""]
-					delete _[p][p0][i][""]
-					_N_i0(_[p][p0][i], p1[i])
+					p0[p][i][""]
+					delete p0[p][i][""]
+					_N_i0(p0[p][i], p1[i])
 				} else {
-					_[p][p0][i] = p1[i]
+					p0[p][i] = p1[i]
 				}
 			}
 			return p
 		}
-		return (_[p][p0] = p1)
+		return (p0[p] = p1)
 	}
-
-	function _ARR(c, t, P)
-	{
-		switch (c) {
-		case "_lib_CMDLN":
-			return t
-		case "_lib_APPLY":
-			return 
-		case "_lib_HELP":
-			return 
-		case "_lib_NAMEVER":
-			return _ln("_ARR 1.0")
-		case "_lib_BEGIN":
-			return 
-		case "_lib_END":
-			return 
-		}
-	}
-
-	function _BASE(c, t, P, A)
-	{
-		switch (c) {
-		case "_lib_CMDLN":
-			if (match(t, /^((--([Vv])ersion)|(-([Vv])))[ \t]*/, A)) {
-				t = substr(t, RLENGTH + 1)
-				_cmdln_version = A[3] A[5]
+	delete _[p][p0]
+	if (isarray(p1)) {
+		for (i in p1) {
+			if (isarray(p1[i])) {
+				_[p][p0][i][""]
+				delete _[p][p0][i][""]
+				_N_i0(_[p][p0][i], p1[i])
 			} else {
-				if (match(t, /^((-?\?)|(--help))[ \t]*/)) {
-					t = substr(t, RLENGTH + 1)
-					_cmdln_help = 1
-				} else {
-					if (match(t, /^--[ \t]*/)) {
-						return _endpass(substr(t, RLENGTH + 1))
-					}
-				}
-			}
-			return t
-		case "_lib_APPLY":
-			if (_cmdln_help) {
-				match(_fbaccr(_LIBAPI, "_lib_HELP"), /^([^\x00]*)\x00([^\x01]*)\x01(.*)/, A)
-				_out(A[2] A[1] A[3])
-				return _endpass(_basexit_fl = 1)
+				_[p][p0][i] = p1[i]
 			}
-			if (_cmdln_version) {
-				_out(_ln(_PRODUCT_NAME " v" _PRODUCT_VERSION) _ln(_PRODUCT_COPYRIGHT) _ln() ((_cmdln_version == "v" ? "" : _lib_NAMEVER())))
-				return _endpass(_basexit_fl = 1)
-			}
-			return 
-		case "_lib_HELP":
-			return ("\000" _ln(_PRODUCT_NAME " v" _PRODUCT_VERSION) _ln(_PRODUCT_COPYRIGHT) _ln() _ln(" Usage:") _ln() _ln("    " _PRODUCT_FILENAME " [/key1 /key2...] [-- cmdline]") _ln() _ln(" keys:") _ln() "\001" _ln("    -v -V --version                    - output product version and (if /V) all modules") _ln("    ? -? --help                        - output this help page") _ln("    --                                 - command line string edge"))
-		case "_lib_NAMEVER":
-			return _ln("_BASE 3.0")
-		case "_lib_BEGIN":
-			return 
-		case "_lib_END":
-			return 
-		}
-	}
-
-	function _DS(c, t, P, a, A)
-	{
-		switch (c) {
-		case "_lib_CMDLN":
-			return t
-		case "_lib_APPLY":
-			return 
-		case "_lib_HELP":
-			return (_ln() _ln(" Usage: " _PRODUCT_NAME " [/key1 /key2...] sourcefile [cmdline]") _ln())
-		case "_lib_NAMEVER":
-			return 
-		case "_lib_BEGIN":
-			return 
-		case "_lib_END":
-			return 
 		}
+		return p
 	}
+	return (_[p][p0] = p1)
+}
 
-	function _END()
-	{
+##########################################################
+function _ARR(c, t, P)
+{
+	switch (c) {
+	case "_lib_CMDLN":
+		return t
+		#___________________________________________________________
+		
+	case "_lib_APPLY":
+		return 
+		#___________________________________________________________
+		
+	case "_lib_HELP":
+		return 
+		#___________________________________________________________
+		
+	case "_lib_NAMEVER":
+		return _ln("_ARR 1.0")
+		#___________________________________________________________
+		
+	case "_lib_BEGIN":
+		return 
+		#___________________________________________________________
+		
+	case "_lib_END":
+		return 
 	}
+}
 
-	function _ERRLOG(c, t, P, a, b, A)
-	{
-		switch (c) {
-		case "_lib_CMDLN":
-			if (match(t, /^[ \t]*-L:([TtVvIiWwEeFf]*)[ \t]*/, A)) {
+##########################################################
+function _BASE(c, t, P, A)
+{
+	switch (c) {
+	case "_lib_CMDLN":
+		if (match(t, /^((--([Vv])ersion)|(-([Vv])))[ \t]*/, A)) {
+			t = substr(t, RLENGTH + 1)
+			_cmdln_version = A[3] A[5]
+		} else {
+			if (match(t, /^((-?\?)|(--help))[ \t]*/)) {
 				t = substr(t, RLENGTH + 1)
-				_errlog_errflkey = _errlog_errflkey A[1]
-			}
-			return t
-		case "_lib_APPLY":
-			if (_errlog_errflkey) {
-				split(_errlog_errflkey, A, "")
-				for (a = 1; a in A; a++) {
-					if (A[a] == toupper(A[a])) {
-						b = 1
-					} else {
-						b = ""
-					}
-					switch (toupper(A[a])) {
-					case "T":
-						_ERRLOG_TF = b
-						break
-					case "V":
-						_ERRLOG_VF = b
-						break
-					case "I":
-						_ERRLOG_IF = b
-						break
-					case "W":
-						_ERRLOG_WF = b
-						break
-					case "E":
-						_ERRLOG_EF = b
-						break
-					case "F":
-						_ERRLOG_FF = b
-						break
-					}
-				}
-				if (_ERRLOG_IF) {
-					_info("Log-message types inherited acc/deny: " "TRACE " ((_ERRLOG_TF ? "ON" : "OFF")) "/" "VERBOSE " ((_ERRLOG_VF ? "ON" : "OFF")) "/" "INFO " ((_ERRLOG_IF ? "ON" : "OFF")) "/" "WARNING " ((_ERRLOG_WF ? "ON" : "OFF")) "/" "ERROR " ((_ERRLOG_EF ? "ON" : "OFF")) "/" "FATAL " ((_ERRLOG_FF ? "ON" : "OFF")))
+				_cmdln_help = 1
+			} else {
+				if (match(t, /^--[ \t]*/)) {
+					return _endpass(substr(t, RLENGTH + 1))
 				}
 			}
-			return 
-		case "_lib_HELP":
-			return (_ln("    -L:TtVvIiWwEeFf                    - enable(upcase: TVIWEF) or disable(lowcase: tviwef) allowable type of") _ln("                                         log messages. Trace/Verbose/Informational/Warning/Error/Fatal.") _ln())
-		case "_lib_NAMEVER":
-			return _ln("_ERRLOG 1.0")
-		case "_lib_BEGIN":
-			P["_ERRLOG_TF"] = _ERRLOG_TF
-			P["_ERRLOG_VF"] = _ERRLOG_VF
-			P["_ERRLOG_IF"] = _ERRLOG_IF
-			P["_ERRLOG_WF"] = _ERRLOG_WF
-			P["_ERRLOG_EF"] = _ERRLOG_EF
-			P["_ERRLOG_FF"] = _ERRLOG_FF
-			P["_errlog_file"] = "/dev/stderr"
-			return 
 		}
+		return t
+		#___________________________________________________________
+		
+	case "_lib_APPLY":
+		if (_cmdln_help) {
+			match(_fbaccr(_LIBAPI, "_lib_HELP"), /^([^\x00]*)\x00([^\x01]*)\x01(.*)/, A)
+			_out(A[2] A[1] A[3])
+			return _endpass(_basexit_fl = 1)
+		}
+		if (_cmdln_version) {
+			_out(_ln(_PRODUCT_NAME " v" _PRODUCT_VERSION) _ln(_PRODUCT_COPYRIGHT) _ln() ((_cmdln_version == "v" ? "" : _lib_NAMEVER())))
+			return _endpass(_basexit_fl = 1)
+		}
+		return 
+		#___________________________________________________________
+		
+	case "_lib_HELP":
+		return ("\000" _ln(_PRODUCT_NAME " v" _PRODUCT_VERSION) _ln(_PRODUCT_COPYRIGHT) _ln() _ln(" Usage:") _ln() _ln("    " _PRODUCT_FILENAME " [/key1 /key2...] [-- cmdline]") _ln() _ln(" keys:") _ln() "\001" _ln("    -v -V --version                    - output product version and (if /V) all modules") _ln("    ? -? --help                        - output this help page") _ln("    --                                 - command line string edge"))
+		#___________________________________________________________
+		
+	case "_lib_NAMEVER":
+		return _ln("_BASE 3.0")
+		#___________________________________________________________
+		
+	case "_lib_BEGIN":
+		return 
+		#___________________________________________________________
+		
+	case "_lib_END":
+		return 
 	}
+}
 
-	function _EXIT()
-	{
+#____________________________________________________________________________
+function _DS(c, t, P, a, A)
+{
+	switch (c) {
+	case "_lib_CMDLN":
+		#___________________________________________________________
+		return t
+		#_____________________________________________________
+	case "_lib_APPLY":
+		return 
+		#_____________________________________________________
+	case "_lib_HELP":
+		return (_ln() _ln(" Usage: " _PRODUCT_NAME " [/key1 /key2...] sourcefile [cmdline]") _ln())
+		#_____________________________________________________
+	case "_lib_NAMEVER":
+		return 
+		#_____________________________________________________
+	case "_lib_BEGIN":
+		return 
+		#_____________________________________________________
+	case "_lib_END":
+		return 
 	}
+}
 
-	function _EXTFN(c, t, P)
-	{
-		switch (c) {
-		case "_lib_CMDLN":
-			return t
-		case "_lib_APPLY":
-			return 
-		case "_lib_HELP":
-			return 
-		case "_lib_NAMEVER":
-			return _ln("_EXTFN 1.0")
-		case "_lib_BEGIN":
-			return 
-		case "_lib_END":
-			return 
-		}
-	}
+#______________________________________________________________________________________________
+function _END()
+{
+}
 
-	function _FILEIO(c, t, P, A)
-	{
-		switch (c) {
-		case "_lib_CMDLN":
-			if (match(t, /^[ \t]*-[Tt]([\+-])[ \t]*/, A)) {
-				t = substr(t, RLENGTH + 1)
-				if (A[1] == "+") {
-					_fileio_notdeltmpflag = 1
+########################################################
+function _ERRLOG(c, t, P, a, b, A)
+{
+	switch (c) {
+	case "_lib_CMDLN":
+		if (match(t, /^[ \t]*-L:([TtVvIiWwEeFf]*)[ \t]*/, A)) {
+			t = substr(t, RLENGTH + 1)
+			_errlog_errflkey = _errlog_errflkey A[1]
+		}
+		return t
+		#_______________________________________________________________________
+		
+	case "_lib_APPLY":
+		if (_errlog_errflkey) {
+			split(_errlog_errflkey, A, "")
+			for (a = 1; a in A; a++) {
+				if (A[a] == toupper(A[a])) {
+					b = 1
 				} else {
-					_fileio_notdeltmpflag = ""
+					b = ""
+				}
+				switch (toupper(A[a])) {
+				case "T":
+					_ERRLOG_TF = b
+					break
+				case "V":
+					_ERRLOG_VF = b
+					break
+				case "I":
+					_ERRLOG_IF = b
+					break
+				case "W":
+					_ERRLOG_WF = b
+					break
+				case "E":
+					_ERRLOG_EF = b
+					break
+				case "F":
+					_ERRLOG_FF = b
+					break
 				}
 			}
-			return t
-		case "_lib_APPLY":
-			if (_fileio_notdeltmpflag) {
-				_info("Temporary objects deletion DISABLED (inherited)")
-			}
-			return 
-		case "_lib_HELP":
-			return (_ln("    -[Tt][+-]                          - inherited: +enable\\-disable temporary files\\dirs deletion") _ln())
-		case "_lib_NAMEVER":
-			return _ln("_FILEIO 2.1")
-		case "_lib_BEGIN":
-			P["ENVIRON"]["CD"] = ENVIRON["CD"]
-			P["_FILEIO_RD"] = _FILEIO_RD
-			P["_FILEIO_R"] = _FILEIO_R
-			P["_FILEIO_D"] = _FILEIO_D
-			if (! ("_FILEIO_TMPRD" in P)) {
-				P["_FILEIO_TMPRD"] = _getmpdir(_filen(P["SOURCE"]) "." ++_egawk_subcntr _CHR["SUBDIR"])
+			if (_ERRLOG_IF) {
+				_info("Log-message types inherited acc/deny: " "TRACE " ((_ERRLOG_TF ? "ON" : "OFF")) "/" "VERBOSE " ((_ERRLOG_VF ? "ON" : "OFF")) "/" "INFO " ((_ERRLOG_IF ? "ON" : "OFF")) "/" "WARNING " ((_ERRLOG_WF ? "ON" : "OFF")) "/" "ERROR " ((_ERRLOG_EF ? "ON" : "OFF")) "/" "FATAL " ((_ERRLOG_FF ? "ON" : "OFF")))
 			}
-			return 
-		case "_lib_END":
-			return 
 		}
+		return 
+		#_______________________________________________________________________
+		
+	case "_lib_HELP":
+		return (_ln("    -L:TtVvIiWwEeFf                    - enable(upcase: TVIWEF) or disable(lowcase: tviwef) allowable type of") _ln("                                         log messages. Trace/Verbose/Informational/Warning/Error/Fatal.") _ln())
+		#_______________________________________________________________________
+		
+	case "_lib_NAMEVER":
+		return _ln("_ERRLOG 1.0")
+		#_______________________________________________________________________
+		
+	case "_lib_BEGIN":
+		P["_ERRLOG_TF"] = _ERRLOG_TF
+		P["_ERRLOG_VF"] = _ERRLOG_VF
+		P["_ERRLOG_IF"] = _ERRLOG_IF
+		P["_ERRLOG_WF"] = _ERRLOG_WF
+		P["_ERRLOG_EF"] = _ERRLOG_EF
+		P["_ERRLOG_FF"] = _ERRLOG_FF
+		P["_errlog_file"] = "/dev/stderr"
+		return 
 	}
+}
 
-	function _FILEVER(c, t, P, a, A)
-	{
-		switch (c) {
-		case "_lib_CMDLN":
-			return t
-		case "_lib_APPLY":
-			return 
-		case "_lib_HELP":
-			return 
-		case "_lib_NAMEVER":
-			return 
-		case "_lib_BEGIN":
-			return 
-		case "_lib_END":
-			return 
-		}
-	}
+#______________________________________________________________________________________________
+function _EXIT()
+{
+}
 
-	function _Foreach(A, f, p0, i)
-	{
-		for (i in A) {
-			@f(A, i, p0)
+########################################################
+function _EXTFN(c, t, P)
+{
+	switch (c) {
+	case "_lib_CMDLN":
+		return t
+		#___________________________________________________________
+		
+	case "_lib_APPLY":
+		return 
+		#___________________________________________________________
+		
+	case "_lib_HELP":
+		return 
+		#___________________________________________________________
+		
+	case "_lib_NAMEVER":
+		return _ln("_EXTFN 1.0")
+		#___________________________________________________________
+		
+	case "_lib_BEGIN":
+		return 
+		#___________________________________________________________
+		
+	case "_lib_END":
+		return 
+	}
+}
+
+#######################################################
+function _FILEIO(c, t, P, A)
+{
+	switch (c) {
+	case "_lib_CMDLN":
+		if (match(t, /^[ \t]*-[Tt]([\+-])[ \t]*/, A)) {
+			t = substr(t, RLENGTH + 1)
+			if (A[1] == "+") {
+				_fileio_notdeltmpflag = 1
+			} else {
+				_fileio_notdeltmpflag = ""
+			}
 		}
+		return t
+		#___________________________________________________________
+		
+	case "_lib_APPLY":
+		if (_fileio_notdeltmpflag) {
+			_info("Temporary objects deletion DISABLED (inherited)")
+		}
+		return 
+		#___________________________________________________________
+		
+	case "_lib_HELP":
+		return (_ln("    -[Tt][+-]                          - inherited: +enable\\-disable temporary files\\dirs deletion") _ln())
+		#___________________________________________________________
+		
+	case "_lib_NAMEVER":
+		return _ln("_FILEIO 2.1")
+		#___________________________________________________________
+		
+	case "_lib_BEGIN":
+		P["ENVIRON"]["CD"] = ENVIRON["CD"]
+		P["_FILEIO_RD"] = _FILEIO_RD
+		P["_FILEIO_R"] = _FILEIO_R
+		P["_FILEIO_D"] = _FILEIO_D
+		if (! ("_FILEIO_TMPRD" in P)) {
+			P["_FILEIO_TMPRD"] = _getmpdir(_filen(P["SOURCE"]) "." ++_egawk_subcntr _CHR["SUBDIR"])
+		}
+		return 
+		#___________________________________________________________
+		
+	case "_lib_END":
+		return 
 	}
+}
 
-	function _INIT(f)
-	{
+#_____________________________________________________________________________
+function _FILEVER(c, t, P, a, A)
+{
+	switch (c) {
+	case "_lib_CMDLN":
+		#___________________________________________________________
+		return t
+		#_____________________________________________________
+	case "_lib_APPLY":
+		return 
+		#_____________________________________________________
+	case "_lib_HELP":
+		return 
+		#_____________________________________________________
+	case "_lib_NAMEVER":
+		return 
+		#_____________________________________________________
+	case "_lib_BEGIN":
+		return 
+		#_____________________________________________________
+	case "_lib_END":
+		return 
 	}
+}
 
-	function _INITBASE()
-	{
-		_egawk_utilpath = ENVIRON["EGAWK_PATH"] "BIN\\UTIL\\"
+function _Foreach(A, f, p0, i)
+{
+	for (i in A) {
+		@f(A, i, p0)
 	}
+}
 
-	function _INSTRUC(c, t, P)
-	{
-		switch (c) {
-		case "_lib_CMDLN":
-			return t
-		case "_lib_APPLY":
-			return 
-		case "_lib_HELP":
-			return 
-		case "_lib_NAMEVER":
-			return _ln("_INSTRUC 1.0")
-		case "_lib_BEGIN":
-			return 
-		case "_lib_END":
-			return 
-		}
-	}
+function _INIT(f)
+{
+}
 
-	function _N(F, v, p)
-	{
-		for (p in _UIDS) {
-			delete _UIDS[p]
-			return _nN_i0(p, F, v)
-		}
-		return _nN_i0(_tgenuid(), F, v)
+#___________________________________________________________________________________
+function _INITBASE()
+{
+	_egawk_utilpath = ENVIRON["EGAWK_PATH"] "BIN\\UTIL\\"
+}
+
+######################################################
+function _INSTRUC(c, t, P)
+{
+	switch (c) {
+	case "_lib_CMDLN":
+		return t
+		#___________________________________________________________
+		
+	case "_lib_APPLY":
+		return 
+		#___________________________________________________________
+		
+	case "_lib_HELP":
+		return 
+		#___________________________________________________________
+		
+	case "_lib_NAMEVER":
+		return _ln("_INSTRUC 1.0")
+		#___________________________________________________________
+		
+	case "_lib_BEGIN":
+		return 
+		#___________________________________________________________
+		
+	case "_lib_END":
+		return 
 	}
+}
 
-	function _SHORTCUT(c, t, P)
-	{
-		switch (c) {
-		case "_lib_CMDLN":
-			return t
-		case "_lib_APPLY":
-			return 
-		case "_lib_HELP":
-			return 
-		case "_lib_NAMEVER":
-			return _ln("_shortcut 1.0")
-		case "_lib_BEGIN":
-			return 
-		case "_lib_END":
-			return 
-		}
+#___________________________________________________________________________________
+
+
+####################################################################################
+
+
+#_____________________________________________________________________________
+function _N(F, v, p)
+{
+	for (p in _UIDS) {
+		delete _UIDS[p]
+		return _nN_i0(p, F, v)
 	}
+	return _nN_i0(_tgenuid(), F, v)
+}
 
-	function _START(t, i, A)
-	{
-		_torexp_init()
-		test_uid()
+#####################################################
+function _SHORTCUT(c, t, P)
+{
+	switch (c) {
+	case "_lib_CMDLN":
+		return t
+		#___________________________________________________________
+		
+	case "_lib_APPLY":
 		return 
-		_conl(patsplit("a,b,c", A, /[^,]/, B))
-		test_splitstr()
+		#___________________________________________________________
+		
+	case "_lib_HELP":
 		return 
-		A[""]
-		_CLASSPTR["ptr"]
-		ALTARR["ptra"]
-		_conl(_dumparr(SYMTAB))
-		BB[1] = _NOP
-		zorr(1, 2, 3, 4, 5, 6)
-		zorr(BB, 1)
-		_rtn()
-		_rtn("")
-		_rtn(0)
-		_rtn("0")
-		_rtn(1)
-		_rtn("1")
-		_rtn(-1)
-		_rtn("-1")
-		_rtn("huj")
-		_rtn("ptr")
-		_rtn("ptra", ALTARR)
-		_rtn(ALTARR)
-		_rtn(ALTARR, ALTARR)
+		#___________________________________________________________
+		
+	case "_lib_NAMEVER":
+		return _ln("_shortcut 1.0")
+		#___________________________________________________________
+		
+	case "_lib_BEGIN":
 		return 
-		_tstini()
+		#___________________________________________________________
+		
+	case "_lib_END":
 		return 
-		_splitpath_test()
+	}
+}
+
+#______________________________________________________________________________________________
+function _START(t, i, A)
+{
+	_torexp_init()
+	test_uid()
+	return 
+	_conl(patsplit("a,b,c", A, /[^,]/, B))
+	test_splitstr()
+	return 
+	A[""]
+	_CLASSPTR["ptr"]
+	ALTARR["ptra"]
+	_conl(_dumparr(SYMTAB))
+	BB[1] = _NOP
+	zorr(1, 2, 3, 4, 5, 6)
+	zorr(BB, 1)
+	_rtn()
+	_rtn("")
+	_rtn(0)
+	_rtn("0")
+	_rtn(1)
+	_rtn("1")
+	_rtn(-1)
+	_rtn("-1")
+	_rtn("huj")
+	_rtn("ptr")
+	_rtn("ptra", ALTARR)
+	_rtn(ALTARR)
+	_rtn(ALTARR, ALTARR)
+	return 
+	_tstini()
+	return 
+	_splitpath_test()
+	#	_split_regpath()
+	return 
+	hh = "CPU"
+	_conl("go1!")
+	_conl(_var(_sharepath(hh, "gdfsgdsgsd sdgsdighjui teretiewrotrewut 345345345 rtjtireutireu huj")))
+	_conl("go2!")
+	_conl(_var(_sharelist(AAA, hh), _dumparr(AAA)))
+	_conline()
+	A[1] = "h"
+	A[3] = "j"
+	t = "pizda"
+	if (match(t, /^pi(Z)da/, A)) {
+		_conl("match")
+	} else {
+		_conl("not match")
+	}
+	_conl(_dumparr(A))
+	return 
+	_pathSMA = "C:\\Program Files\\Altiris\\Altiris Agent\\"
+	DSPlugInPath = _pathSMA "Agents\\Deployment\\Agent\\"
+	DSAutoPath = _pathSMA
+	if (! _sysinfo(_SYS, _hostname)) {
+		_fatal("_sysinfo: unknown error")
+	}
+	_REG[""]
+	delete _REG[""]
+	_servoutput = _CHR["EOL"] _cmd("sc query state= all")
+	_dsbasepath = "\\\\CPU\\CPU\\DEV\\PROJECT\\_DS\\"
+	_rdreg(_REG, "HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris")
+	_wrfile("rego.txt", _dumparr(_REG))
+	_conl("fF")
+	#_______________________________________________________________________
+	
+	c = _getreg_i1(DDD, "HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris\\Altiris Agent\\Plugin Objects\\\204~.*\224Install path", _REG)
+	#_________________________________________________________________________________________
+	pp = _n("NAME", "NS")
+	#pp=_n()
+	#___________________________________________________________________________________
+	p = _defsolution(pp, "DS Plug-in", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris\\Altiris Agent\\Plugin Objects\\Agents\\")
+	ClientConfiguration = _defdll(p, "Client Configuration", "ClientConfiguration")
+	ClientImagingPrep = _defdll(p, "Client Inaging Preparation", "ClientImagingPrep")
+	ClientImaging = _defdll(p, "Client Imaging", "ClientImaging")
+	ClientPCT = _defdll(p, "Client PCT", "ClientPCT")
+	ClientRebootTo = _defdll(p, "Client Reboot To", "ClientRebootTo")
+	DeploymentAgent = _defdll(p, "Deployment Agent", "Deployment Agent")
+	DeploymentSolutionBaseAgent = _defdll(p, "Deployment Solution Base Agent", "Deployment Solution Base Agent")
+	ClientBCDEdit = _defile(p, "Client BCD Edit", "ClientBCDEdit.dll")
+	ClientCopyFile = _defile(p, "Client Copy File", "ClientCopyFile.dll")
+	ClientPreImage = _defile(p, "Client Pre Image", "ClientPreImage.dll")
+	ClientRebootTo = _defile(p, "Client Reboot To", "ClientRebootTo.dll")
+	_defile(p, "ConfigService.exe", "ConfigService.exe", "")
+	_defile(p, "config.dll", "config.dll", "")
+	_defsrv(p, "DS Plug-in Service", "Altiris Deployment Solution - System Configuration")
+	_defreg(p, "Deployment Agent Path", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris\\Deployment\\AgentInstallPath.STR")
+	_defile(p, "Altiris_DeploymentSolutionAgent_7_1_x86.msi", (_SYS["OSArchitecture"] == "64-bit" ? "C:\\Program Files\\Altiris\\Altiris Agent\\Agents\\SoftwareManagement\\Software Delivery\\{9D76E4CA-377A-472D-A82E-EDAD77E7E4ED}\\cache\\Altiris_DeploymentSolutionAgent_7_1_x64.msi" : "C:\\Program Files\\Altiris\\Altiris Agent\\Agents\\SoftwareManagement\\Software Delivery\\{4B747D25-612F-48FC-B6B5-9916D1BB755C}\\cache\\Altiris_DeploymentSolutionAgent_7_1_x86.msi"), "")
+	_defdir(p, "Deployment Folder", a = gensub(/[^\\]*$/, "", 1, _rdsafe(_REG, "HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris\\Deployment\\AgentInstallPath.STR", "C:\\Program Files\\Altiris\\Altiris Agent\\Agents\\Deployment\\Agent\\")))
+	#___________________________________________________________________________________
+	p = _defsolution(pp, "DS Auto", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris\\Altiris Agent\\Plugin Objects\\Agents\\")
+	_defdir(p, "C:\\Boot\\Altiris\\iso\\boot\\fonts\\", "C:\\Boot\\Altiris\\iso\\boot\\fonts\\")
+	_defdir(p, "C:\\Boot\\Altiris\\iso\\sources\\", "C:\\Boot\\Altiris\\iso\\sources\\")
+	_defile(p, "C:\\Boot\\Altiris\\iso\\autoinst.exe", "C:\\Boot\\Altiris\\iso\\autoinst.exe", "")
+	_defile(p, "C:\\Boot\\Altiris\\iso\\autoinst.ini", "C:\\Boot\\Altiris\\iso\\autoinst.ini", "")
+	_defile(p, "C:\\Boot\\Altiris\\iso\\autoutil.exe", "C:\\Boot\\Altiris\\iso\\autoutil.exe", "")
+	_defile(p, "C:\\Boot\\Altiris\\iso\\autoutil.ini", "C:\\Boot\\Altiris\\iso\\autoutil.ini", "")
+	_defile(p, "C:\\Boot\\Altiris\\iso\\bcdedit.exe", "C:\\Boot\\Altiris\\iso\\bcdedit.exe", "")
+	_defile(p, "C:\\Boot\\Altiris\\iso\\bootmgr", "C:\\Boot\\Altiris\\iso\\bootmgr", "")
+	_defile(p, "C:\\Boot\\Altiris\\iso\\bootsect.exe", "C:\\Boot\\Altiris\\iso\\bootsect.exe", "")
+	_defreg(p, "Deployment Automation reg.File", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris\\AutoUtil\\File.XSZ", "autoutil.exe")
+	_defreg(p, "Deployment Automation reg.Path", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris\\AutoUtil\\Path.XSZ", "%systemdrive%\\boot\\altiris\\iso")
+	#_________________________________________________________________________________________
+	
+	_check(pp)
+	#_________________________________________________________________________________________
+	
+	_conl(_report(pp))
+	_wrfile("report.txt", _report(pp))
+}
+
+#########################################################
+function _SYSIO(c, t, P)
+{
+	switch (c) {
+	case "_lib_CMDLN":
+		return t
+		#___________________________________________________________
+		
+	case "_lib_APPLY":
 		return 
-		hh = "CPU"
-		_conl("go1!")
-		_conl(_var(_sharepath(hh, "gdfsgdsgsd sdgsdighjui teretiewrotrewut 345345345 rtjtireutireu huj")))
-		_conl("go2!")
-		_conl(_var(_sharelist(AAA, hh), _dumparr(AAA)))
-		_conline()
-		A[1] = "h"
-		A[3] = "j"
-		t = "pizda"
-		if (match(t, /^pi(Z)da/, A)) {
-			_conl("match")
-		} else {
-			_conl("not match")
-		}
-		_conl(_dumparr(A))
+		#___________________________________________________________
+		
+	case "_lib_HELP":
+		return 
+		#___________________________________________________________
+		
+	case "_lib_NAMEVER":
+		return _ln("_SYSIO 1.0")
+		#___________________________________________________________
+		
+	case "_lib_BEGIN":
+		return 
+		#___________________________________________________________
+		
+	case "_lib_END":
 		return 
-		_pathSMA = "C:\\Program Files\\Altiris\\Altiris Agent\\"
-		DSPlugInPath = _pathSMA "Agents\\Deployment\\Agent\\"
-		DSAutoPath = _pathSMA
-		if (! _sysinfo(_SYS, _hostname)) {
-			_fatal("_sysinfo: unknown error")
-		}
-		_REG[""]
-		delete _REG[""]
-		_servoutput = _CHR["EOL"] _cmd("sc query state= all")
-		_dsbasepath = "\\\\CPU\\CPU\\DEV\\PROJECT\\_DS\\"
-		_rdreg(_REG, "HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris")
-		_wrfile("rego.txt", _dumparr(_REG))
-		_conl("fF")
-		c = _getreg_i1(DDD, "HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris\\Altiris Agent\\Plugin Objects\\\204~.*\224Install path", _REG)
-		pp = _n("NAME", "NS")
-		p = _defsolution(pp, "DS Plug-in", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris\\Altiris Agent\\Plugin Objects\\Agents\\")
-		ClientConfiguration = _defdll(p, "Client Configuration", "ClientConfiguration")
-		ClientImagingPrep = _defdll(p, "Client Inaging Preparation", "ClientImagingPrep")
-		ClientImaging = _defdll(p, "Client Imaging", "ClientImaging")
-		ClientPCT = _defdll(p, "Client PCT", "ClientPCT")
-		ClientRebootTo = _defdll(p, "Client Reboot To", "ClientRebootTo")
-		DeploymentAgent = _defdll(p, "Deployment Agent", "Deployment Agent")
-		DeploymentSolutionBaseAgent = _defdll(p, "Deployment Solution Base Agent", "Deployment Solution Base Agent")
-		ClientBCDEdit = _defile(p, "Client BCD Edit", "ClientBCDEdit.dll")
-		ClientCopyFile = _defile(p, "Client Copy File", "ClientCopyFile.dll")
-		ClientPreImage = _defile(p, "Client Pre Image", "ClientPreImage.dll")
-		ClientRebootTo = _defile(p, "Client Reboot To", "ClientRebootTo.dll")
-		_defile(p, "ConfigService.exe", "ConfigService.exe", "")
-		_defile(p, "config.dll", "config.dll", "")
-		_defsrv(p, "DS Plug-in Service", "Altiris Deployment Solution - System Configuration")
-		_defreg(p, "Deployment Agent Path", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris\\Deployment\\AgentInstallPath.STR")
-		_defile(p, "Altiris_DeploymentSolutionAgent_7_1_x86.msi", (_SYS["OSArchitecture"] == "64-bit" ? "C:\\Program Files\\Altiris\\Altiris Agent\\Agents\\SoftwareManagement\\Software Delivery\\{9D76E4CA-377A-472D-A82E-EDAD77E7E4ED}\\cache\\Altiris_DeploymentSolutionAgent_7_1_x64.msi" : "C:\\Program Files\\Altiris\\Altiris Agent\\Agents\\SoftwareManagement\\Software Delivery\\{4B747D25-612F-48FC-B6B5-9916D1BB755C}\\cache\\Altiris_DeploymentSolutionAgent_7_1_x86.msi"), "")
-		_defdir(p, "Deployment Folder", a = gensub(/[^\\]*$/, "", 1, _rdsafe(_REG, "HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris\\Deployment\\AgentInstallPath.STR", "C:\\Program Files\\Altiris\\Altiris Agent\\Agents\\Deployment\\Agent\\")))
-		p = _defsolution(pp, "DS Auto", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris\\Altiris Agent\\Plugin Objects\\Agents\\")
-		_defdir(p, "C:\\Boot\\Altiris\\iso\\boot\\fonts\\", "C:\\Boot\\Altiris\\iso\\boot\\fonts\\")
-		_defdir(p, "C:\\Boot\\Altiris\\iso\\sources\\", "C:\\Boot\\Altiris\\iso\\sources\\")
-		_defile(p, "C:\\Boot\\Altiris\\iso\\autoinst.exe", "C:\\Boot\\Altiris\\iso\\autoinst.exe", "")
-		_defile(p, "C:\\Boot\\Altiris\\iso\\autoinst.ini", "C:\\Boot\\Altiris\\iso\\autoinst.ini", "")
-		_defile(p, "C:\\Boot\\Altiris\\iso\\autoutil.exe", "C:\\Boot\\Altiris\\iso\\autoutil.exe", "")
-		_defile(p, "C:\\Boot\\Altiris\\iso\\autoutil.ini", "C:\\Boot\\Altiris\\iso\\autoutil.ini", "")
-		_defile(p, "C:\\Boot\\Altiris\\iso\\bcdedit.exe", "C:\\Boot\\Altiris\\iso\\bcdedit.exe", "")
-		_defile(p, "C:\\Boot\\Altiris\\iso\\bootmgr", "C:\\Boot\\Altiris\\iso\\bootmgr", "")
-		_defile(p, "C:\\Boot\\Altiris\\iso\\bootsect.exe", "C:\\Boot\\Altiris\\iso\\bootsect.exe", "")
-		_defreg(p, "Deployment Automation reg.File", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris\\AutoUtil\\File.XSZ", "autoutil.exe")
-		_defreg(p, "Deployment Automation reg.Path", "HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris\\AutoUtil\\Path.XSZ", "%systemdrive%\\boot\\altiris\\iso")
-		_check(pp)
-		_conl(_report(pp))
-		_wrfile("report.txt", _report(pp))
-	}
-
-	function _SYSIO(c, t, P)
-	{
-		switch (c) {
-		case "_lib_CMDLN":
-			return t
-		case "_lib_APPLY":
-			return 
-		case "_lib_HELP":
-			return 
-		case "_lib_NAMEVER":
-			return _ln("_SYSIO 1.0")
-		case "_lib_BEGIN":
-			return 
-		case "_lib_END":
-			return 
-		}
 	}
+}
 
-	function _W(p, A, v)
-	{
-		if (isarray(v)) {
-			if (p) {
-				delete A[p]
-				A[p][""]
-				delete A[p][""]
-				_movarr(A[p], v)
-			}
-			return p
-		}
+#_______________________________________________________________________
+########################################################################
+
+
+function _W(p, A, v)
+{
+	if (isarray(v)) {
 		if (p) {
 			delete A[p]
-			return (A[p] = v)
+			A[p][""]
+			delete A[p][""]
+			_movarr(A[p], v)
 		}
-		return v
+		return p
 	}
-
-	function _Zexparr(S, s, t, i)
-	{
-		t = ""
-		if (isarray(S)) {
-			for (i in S) {
-				t = t ((isarray(S[i]) ? _Zexparr_i1(i) "\020" _Zexparr_i0(S[i]) "\021\021\020" : _Zexparr_i2(_Zexparr_i3(i) "\021" _Zexparr_i3(S[i])) "\020"))
-			}
-		}
-		if (s != "") {
-			gsub(/\x1B/, "\033;", s)
-			gsub(/\x10/, "\0330", s)
-			t = t "\021\021\020" s
-		}
-		gsub(/\x0A/, "\033:", t)
-		return t
+	if (p) {
+		delete A[p]
+		return (A[p] = v)
 	}
+	return v
+}
 
-	function _Zexparr_i0(S, t, i)
-	{
+#_______________________________________________________________________
+function _Zexparr(S, s, t, i)
+{
+	t = ""
+	if (isarray(S)) {
 		for (i in S) {
 			t = t ((isarray(S[i]) ? _Zexparr_i1(i) "\020" _Zexparr_i0(S[i]) "\021\021\020" : _Zexparr_i2(_Zexparr_i3(i) "\021" _Zexparr_i3(S[i])) "\020"))
 		}
-		return t
-	}
-
-	function _Zexparr_i1(t)
-	{
-		gsub(/\x1B/, "\033;", t)
-		gsub(/\x11/, "\0331", t)
-		gsub(/\x10/, "\0330", t)
-		return t
 	}
-
-	function _Zexparr_i2(t)
-	{
-		gsub(/\x10/, "\0330", t)
+	if (s != "") {
+		gsub(/\x1B/, "\033;", s)
+		gsub(/\x10/, "\0330", s)
+		t = t "\021\021\020" s
+	}
+	gsub(/\x0A/, "\033:", t)
+	return t
+}
+
+#_________________________________________________________________
+function _Zexparr_i0(S, t, i)
+{
+	for (i in S) {
+		t = t ((isarray(S[i]) ? _Zexparr_i1(i) "\020" _Zexparr_i0(S[i]) "\021\021\020" : _Zexparr_i2(_Zexparr_i3(i) "\021" _Zexparr_i3(S[i])) "\020"))
+	}
+	return t
+}
+
+#_________________________________________________________________
+function _Zexparr_i1(t)
+{
+	gsub(/\x1B/, "\033;", t)
+	gsub(/\x11/, "\0331", t)
+	gsub(/\x10/, "\0330", t)
+	return t
+}
+
+#_________________________________________________________________
+function _Zexparr_i2(t)
+{
+	gsub(/\x10/, "\0330", t)
+	return t
+}
+
+#_________________________________________________________________
+function _Zexparr_i3(t)
+{
+	gsub(/\x1B/, "\033;", t)
+	gsub(/\x11/, "\0331", t)
+	return t
+}
+
+#_______________________________________________________________________
+function _Zimparr(D, t, A, B)
+{
+	if (isarray(D)) {
+		split(t, A, /\x10/, B)
+		t = _Zimparr_i0(A, B, _Zimparr_i1(D, A, B, 1))
+		gsub(/\x1B\x30/, "\020", t)
+		gsub(/\x1B\x3B/, "\033", t)
 		return t
 	}
+}
 
-	function _Zexparr_i3(t)
-	{
-		gsub(/\x1B/, "\033;", t)
-		gsub(/\x11/, "\0331", t)
-		return t
-	}
+#_________________________________________________________________
+function _Zimparr_i0(A, B, i)
+{
+	return ((i in A ? A[i] B[i] _Zimparr_i0(A, B, i + 1) : ""))
+}
 
-	function _Zimparr(D, t, A, B)
-	{
-		if (isarray(D)) {
-			split(t, A, /\x10/, B)
-			t = _Zimparr_i0(A, B, _Zimparr_i1(D, A, B, 1))
-			gsub(/\x1B\x30/, "\020", t)
-			gsub(/\x1B\x3B/, "\033", t)
-			return t
+#_________________________________________________________________
+function _Zimparr_i1(D, A, B, i, t, a, n)
+{
+	while (i in B) {
+		if ((t = A[i++]) == "\021\021") {
+			return i
 		}
-	}
-
-	function _Zimparr_i0(A, B, i)
-	{
-		return ((i in A ? A[i] B[i] _Zimparr_i0(A, B, i + 1) : ""))
-	}
-
-	function _Zimparr_i1(D, A, B, i, t, a, n)
-	{
-		while (i in B) {
-			if ((t = A[i++]) == "\021\021") {
-				return i
+		gsub(/\x1B\x30/, "\020", t)
+		if ((a = index(t, "\021")) > 0) {
+			if (isarray(D[n = _Zimparr_i2(substr(t, 1, a - 1))])) {
+				delete D[n]
 			}
-			gsub(/\x1B\x30/, "\020", t)
-			if ((a = index(t, "\021")) > 0) {
-				if (isarray(D[n = _Zimparr_i2(substr(t, 1, a - 1))])) {
-					delete D[n]
-				}
-				D[n] = _Zimparr_i2(substr(t, a + 1))
-			} else {
-				if (! isarray(D[t = _Zimparr_i2(t)])) {
-					delete D[t]
-					D[t][""]
-					delete D[t][""]
-				}
-				i = _Zimparr_i1(D[t], A, B, i)
+			D[n] = _Zimparr_i2(substr(t, a + 1))
+		} else {
+			if (! isarray(D[t = _Zimparr_i2(t)])) {
+				delete D[t]
+				D[t][""]
+				delete D[t][""]
 			}
+			i = _Zimparr_i1(D[t], A, B, i)
 		}
 	}
+}
 
-	function _Zimparr_i2(t)
-	{
-		gsub(/\x1B\x31/, "\021", t)
-		gsub(/\x1B\x3B/, "\033", t)
-		return t
-	}
+#_________________________________________________________________
+function _Zimparr_i2(t)
+{
+	gsub(/\x1B\x31/, "\021", t)
+	gsub(/\x1B\x3B/, "\033", t)
+	return t
+}
 
-	function _Zimport(t, p, A, c, i, n, B)
-	{
-		if (p) {
-			c = split(t, B, /\x0A/)
-			for (i = 1; i <= c; i++) {
-				if ((t = B[i]) == "") {
-					continue
-				}
-				gsub(/\x1B\x3A/, "\n", t)
-				if (match(t, /^_ERRLOG: /)) {
-					_tLOG[n = _wLCHLD(p, _N())][""]
-					delete _tLOG[n][""]
-					_Zimparr(_tLOG[n], substr(t, 10))
-				} else {
-					if ((t = _pass(_IMPORT, t, p, A)) != "") {
-						gsub(/\x1B\x3B/, "\033", t)
-						_wLCHLD(p, _N(_tSTR, t))
-					}
+#_____________________________________________________________________________
+function _Zimport(t, p, A, c, i, n, B)
+{
+	if (p) {
+		c = split(t, B, /\x0A/)
+		for (i = 1; i <= c; i++) {
+			if ((t = B[i]) == "") {
+				continue
+			}
+			gsub(/\x1B\x3A/, "\n", t)
+			if (match(t, /^_ERRLOG: /)) {
+				_tLOG[n = _wLCHLD(p, _N())][""]
+				delete _tLOG[n][""]
+				_Zimparr(_tLOG[n], substr(t, 10))
+			} else {
+				if ((t = _pass(_IMPORT, t, p, A)) != "") {
+					gsub(/\x1B\x3B/, "\033", t)
+					_wLCHLD(p, _N(_tSTR, t))
 				}
 			}
-			return p
-		} else {
-			_expout(t)
 		}
-	}
-
-	function _acc(A, a, t)
-	{
-		if (t) {
-			if (_VLDMAXSTRING < length(t) + length(a)) {
-				if (a) {
-					if (_VLDMAXSTRING < length(t)) {
-						A[--A[_ARRPTR]] = a
-						A[--A[_ARRPTR]] = t
-					} else {
-						A[--A[_ARRPTR]] = a t
-					}
+		return p
+	} else {
+		_expout(t)
+	}
+}
+
+function _acc(A, a, t)
+{
+	if (t) {
+		if (_VLDMAXSTRING < length(t) + length(a)) {
+			if (a) {
+				if (_VLDMAXSTRING < length(t)) {
+					A[--A[_ARRPTR]] = a
+					A[--A[_ARRPTR]] = t
 				} else {
-					A[++A[_ARRLEN]] = t
+					A[--A[_ARRPTR]] = a t
 				}
-				return ""
+			} else {
+				A[++A[_ARRLEN]] = t
 			}
-			return (a t)
+			return ""
 		}
-		return a
+		return (a t)
 	}
+	return a
+}
 
-	function _accmpu(A, a, n)
-	{
-		if (n) {
-			return (_mpufn0 = n)
-		}
-		if (_mpuacc) {
-			if (_VLDMAXSTRING < length(_mpuacc) + length(a)) {
-				if (a) {
-					if (_VLDMAXSTRING < length(_mpuacc)) {
-						A[--A[_ARRLEN]] = a
-						A[--A[_ARRLEN]] = _mpuacc
-					} else {
-						A[--A[_ARRLEN]] = a _mpuacc
-					}
-				} else {
+function _accmpu(A, a, n)
+{
+	if (n) {
+		return (_mpufn0 = n)
+	}
+	if (_mpuacc) {
+		if (_VLDMAXSTRING < length(_mpuacc) + length(a)) {
+			if (a) {
+				if (_VLDMAXSTRING < length(_mpuacc)) {
+					A[--A[_ARRLEN]] = a
 					A[--A[_ARRLEN]] = _mpuacc
+				} else {
+					A[--A[_ARRLEN]] = a _mpuacc
 				}
-				_mpuacc = ""
 			} else {
-				_mpuacc = a _mpuacc
+				A[--A[_ARRLEN]] = _mpuacc
 			}
+			_mpuacc = ""
 		} else {
-			_mpuacc = a
+			_mpuacc = a _mpuacc
 		}
+	} else {
+		_mpuacc = a
 	}
+}
 
-	function _add(S, sf, D, df)
-	{
-		if (sf in S) {
-			if (isarray(S[sf])) {
-				if (df in D) {
-					if (isarray(D[df])) {
-						return _extarr(D[df], S[sf])
-					}
-					delete D[df]
-				}
-				D[df][""]
-				delete D[df][""]
-				return _extarr(D[df], S[sf])
-			} else {
+#_______________________________________________________________________
+function _add(S, sf, D, df)
+{
+	if (sf in S) {
+		if (isarray(S[sf])) {
+			if (df in D) {
 				if (isarray(D[df])) {
-					delete D[df]
+					return _extarr(D[df], S[sf])
 				}
-				D[df] = D[df] S[sf]
+				delete D[df]
 			}
+			D[df][""]
+			delete D[df][""]
+			return _extarr(D[df], S[sf])
+		} else {
+			if (isarray(D[df])) {
+				delete D[df]
+			}
+			D[df] = D[df] S[sf]
 		}
 	}
+}
 
-	function _addarr(D, S)
-	{
-		if (isarray(S)) {
-			_addarr_i0(D, S)
-		}
-	}
-
-	function _addarr_i0(D, S, i)
-	{
-		for (i in S) {
-			if (isarray(S[i])) {
-				delete D[i]
-				D[i][""]
-				delete D[i][""]
-				_addarr_i0(D[i], S[i])
-			} else {
-				delete D[i]
-				D[i] = S[i]
-			}
-		}
+#_________________________________________________________________
+function _addarr(D, S)
+{
+	if (isarray(S)) {
+		_addarr_i0(D, S)
 	}
+}
 
-	function _addarrmask(D, S, M)
-	{
-		for (_addarrmaski0 in M) {
-			if (_addarrmaski0 in S) {
-				if (isarray(S[_addarrmaski0])) {
-					if (! isarray(D[_addarrmaski0])) {
-						delete D[_addarrmaski0]
-						D[_addarrmaski0][""]
-						delete D[_addarrmaski0][""]
-					}
-					if (isarray(M[_addarrmaski0])) {
-						_addarrmask(D[_addarrmaski0], S[_addarrmaski0], M[_addarrmaski0])
-					} else {
-						_extarr_i0(D[_addarrmaski0], S[_addarrmaski0])
-					}
+#_____________________________________________________
+function _addarr_i0(D, S, i)
+{
+	for (i in S) {
+		if (isarray(S[i])) {
+			delete D[i]
+			D[i][""]
+			delete D[i][""]
+			_addarr_i0(D[i], S[i])
+		} else {
+			delete D[i]
+			D[i] = S[i]
+		}
+	}
+}
+
+#_______________________________________________________________________
+function _addarrmask(D, S, M)
+{
+	for (_addarrmaski0 in M) {
+		if (_addarrmaski0 in S) {
+			if (isarray(S[_addarrmaski0])) {
+				if (! isarray(D[_addarrmaski0])) {
+					delete D[_addarrmaski0]
+					D[_addarrmaski0][""]
+					delete D[_addarrmaski0][""]
+				}
+				if (isarray(M[_addarrmaski0])) {
+					_addarrmask(D[_addarrmaski0], S[_addarrmaski0], M[_addarrmaski0])
 				} else {
-					if (isarray(D[_addarrmaski0])) {
-						delete D[_addarrmaski0]
-					}
-					D[_addarrmaski0] = S[_addarrmaski0]
+					_extarr_i0(D[_addarrmaski0], S[_addarrmaski0])
 				}
 			} else {
-				delete D[_addarrmaski0]
+				if (isarray(D[_addarrmaski0])) {
+					delete D[_addarrmaski0]
+				}
+				D[_addarrmaski0] = S[_addarrmaski0]
 			}
+		} else {
+			delete D[_addarrmaski0]
 		}
 	}
+}
 
-	function _addf(A, f)
-	{
-		A["B"][""] = A["F"][A["B"][f] = A["B"][""]] = f
-	}
+#___________________________________________________________________________________
+####################################################################################
 
-	function _addfile(f, d, a, b)
-	{
-		if ((f = _wfilerdnehnd(f)) == "" || _filene(f) == "") {
-			ERRNO = "Filename error"
-			return 
-		}
-		a = BINMODE
-		BINMODE = "rw"
-		b = ORS
-		ORS = ""
-		ERRNO = ""
-		print(d) >> f
-		if (ERRNO) {
-			return ""
-		}
-		close(f)
-		BINMODE = a
-		ORS = b
-		if (ERRNO) {
-			return ""
-		}
-		return d
-	}
 
-	function _addlib(f)
-	{
-		_addf(_LIBAPI, f)
-	}
+#_______________________________________________________________________
+function _addf(A, f)
+{
+	A["B"][""] = A["F"][A["B"][f] = A["B"][""]] = f
+}
 
-	function _addlist(A, v)
-	{
-		A[++A[0]] = v
+#___________________________________________________________
+function _addfile(f, d, a, b)
+{
+	if ((f = _wfilerdnehnd(f)) == "" || _filene(f) == "") {
+		ERRNO = "Filename error"
+		return 
 	}
-
-	function _bearray(A)
-	{
-		if (isarray(A) || A == 0 && A == "") {
-			return 1
-		}
+	a = BINMODE
+	BINMODE = "rw"
+	b = ORS
+	ORS = ""
+	ERRNO = ""
+	print(d) >> f
+	if (ERRNO) {
+		return ""
 	}
-
-	function _bframe(A, t, p)
-	{
-		return _bframe_i0(A, t, p, A[""])
+	close(f)
+	BINMODE = a
+	ORS = b
+	if (ERRNO) {
+		return ""
 	}
+	return d
+}
 
-	function _bframe_i0(A, t, p, f)
-	{
-		return ((f ? _bframe_i0(A, t, p, A[f]) (@f(t, p)) : ""))
-	}
+#_____________________________________________________________________________
+function _addlib(f)
+{
+	_addf(_LIBAPI, f)
+}
 
-	function _cfguid(p, optr, pfx, sfx, hstrcnt, lstrchr)
-	{
-		delete _UIDOBL[p]
-		if (_isptr(optr)) {
-			if (optr == p) {
-				delete _UIDOBLV[p]
-				delete _UIDOBLV[_UIDOBLV[_UIDOBL[p] = p][""] = p][""]
-			} else {
-				if (optr in _UIDOBL) {
-					_UIDOBL[p] = _UIDOBL[optr]
-				}
-			}
-		}
-		_UIDPFX[p] = (_istr(pfx) ? pfx : "")
-		_UIDSFX[p] = (_istr(sfx) ? sfx : "")
-		if (_isptr(hstrcnt)) {
-			if (hstrcnt != p) {
-				_UIDCHR[p] = _UIDCHR[_UIDCNT[p] = _UIDCNT[hstrcnt]]
-				return p
-			}
-			hstrcnt = _NOP
-		}
-		_UIDCNTL[_UIDCNT[p] = p] = _cfguidchr(p, hstrcnt, lstrchr)
-		return p
-	}
+#___________________________________________________________________________________
+####################################################################################
 
-	function _cfguidchr(p, h, l, H, L)
-	{
-		if (_isptr(l)) {
-			if (l != p) {
-				return (_UIDCHR[p] = _UIDCHR[l])
-			}
-			_UIDCHR[p] = p
-			l = _NOP
-		}
-		_UIDCHR[p] = p
-		_splitstr(H, h, _UIDCHRH[_classys])
-		_splitstr(L, l, H)
-		delete _UIDCHRH[_UIDCHRH[p][""] = p][""]
-		delete _UIDCHRL[_UIDCHRL[p][""] = p][""]
-		_cfguidh(p, H, L)
-		return _cfguidl(p, L, L)
-	}
-
-	function _cfguidh(p, H, L, hi, h, li)
-	{
-		for (hi = 1; hi in H; hi++) {
-			h = H[hi]
-			for (li = 1; li in L; li++) {
-				_UIDCHRH[p][h L[li]]
-			}
-		}
-	}
 
-	function _cfguidl(p, H, L, hi, h, hl, li)
-	{
-		for (hi = 1; hi in H; hi++) {
-			h = H[hi]
-			for (li = 1; li in L; li++) {
-				hl = _UIDCHRL[p][hl] = h L[li]
-			}
-		}
-		return hl
-	}
+#_______________________________________________________________________
+function _addlist(A, v)
+{
+	A[++A[0]] = v
+}
 
-	function _check(p)
-	{
-		_dll_check(p)
-		_file_check(p)
-		_serv_check(p)
-		_reg_check(p)
+#_______________________________________________________________________
+function _bearray(A)
+{
+	if (isarray(A) || A == 0 && A == "") {
+		return 1
 	}
+}
 
-	function _chrline(t, ts, w, s)
-	{
-		return ((t = " " _tabtospc(t, ts) ((t ? (t ~ /[ \t]$/ ? "" : " ") : ""))) _getchrln((s ? s : "_"), ((w ? w : _CON_WIDTH - 1)) - length(t)) _CHR["EOL"])
-	}
+#_________________________________________________________________
+function _bframe(A, t, p)
+{
+	return _bframe_i0(A, t, p, A[""])
+}
 
-	function _cmd(c, i, A)
-	{
-		_fio_cmda = RS
-		RS = ".{1,}"
-		_fio_cmdb = BINMODE
-		BINMODE = "rw"
-		ERRNO = RT = _NUL
-		c | getline RS
-		BINMODE = _fio_cmdb
-		RS = _fio_cmda
-		if (ERRNO || 0 > (_exitcode = close(c))) {
-			return (RT = _NOP)
-		}
-		return RT
-	}
+#___________________________________________________________
+function _bframe_i0(A, t, p, f)
+{
+	return ((f ? _bframe_i0(A, t, p, A[f]) (@f(t, p)) : ""))
+}
 
-	function _cmparr(A0, A1, R, a, i)
-	{
-		a = 0
-		delete R
-		for (i in A0) {
-			if (! (i in A1)) {
-				a++
-				R[i] = 0
-			} else {
-				if (A0[i] != A1[i]) {
-					a++
-					R[i] = 2
-				}
-			}
-		}
-		for (i in A1) {
-			if (! (i in A0)) {
-				a++
-				R[i] = 1
-			}
-		}
-		return a
-	}
+# add to _dumparr: checking that if element is undefined
 
-	function _con(t, ts, a, b, c, d, i, r, A, B)
-	{
-		d = RLENGTH
-		if ((c = split(r = t, A, /\x0D?\x0A/, B)) > 0) {
-			a = BINMODE
-			b = ORS
-			BINMODE = "rw"
-			ORS = ""
-			if (c > 1) {
-				if ((i = length(t = _tabtospc(A[1], ts, _conlastrln))) < _constatstrln) {
-					t = t _getchrln(" ", _constatstrln - i)
-				}
-				print(t B[1]) > _SYS_STDCON
-				for (i = 2; i < c; i++) {
-					print(_tabtospc(A[i], ts) B[i]) > _SYS_STDCON
-				}
-				print(_conlastr = _tabtospc(A[c], ts)) > _SYS_STDCON
-				fflush(_SYS_STDCON)
-			} else {
-				print(t = _tabtospc(t, ts, _conlastrln)) > _SYS_STDCON
-				fflush(_SYS_STDCON)
-				_conlastr = _conlastr t
-			}
-			if ((i = length(_conlastr)) >= _CON_WIDTH) {
-				_conlastr = substr(_conlastr, 1 + int(i / _CON_WIDTH) * _CON_WIDTH)
-			}
-			_conlastrln = length(_conlastr)
-			if (_constatstr) {
-				print((t = _constatgtstr(_constatstr, _CON_WIDTH - 1 - _conlastrln)) _CHR["CR"] _conlastr) > _SYS_STDCON
-				fflush(_SYS_STDCON)
-				_constatstrln = length(t)
-			}
-			BINMODE = a
-			ORS = b
-			RLENGTH = d
-			return r
-		}
-		RLENGTH = d
-	}
 
-	function _conin(t, a, b)
-	{
-		_constatpush()
-		_constat()
-		a = BINMODE
-		b = RS
-		BINMODE = "rw"
-		RS = "\n"
-		_con(t)
-		getline t < "CON"
-		close("CON")
-		_conlastrln = 0
-		_conlastr = ""
-		gsub(/[\x0D\x0A]+/, "", t)
-		BINMODE = a
-		RS = b
-		_constatpop()
-		return t
-	}
 
-	function _conl(t, ts)
-	{
-		return _con(t ((t ~ /\x0A$/ ? "" : _CHR["EOL"])), ts)
-	}
 
-	function _conline(t, ts)
-	{
-		return _con(_chrline(t, ts))
-	}
 
-	function _conlq(t, ts)
-	{
-		return _conl("`" t "'", ts)
-	}
 
-	function _constat(t, ts, ln, a)
-	{
-		if (_constatstrln > (ln = length(t = _constatgtstr(_constatstr = _tabtospc(t, ts), _CON_WIDTH - 1 - _conlastrln)))) {
-			t = t _getchrln(" ", _constatstrln - ln)
-		}
-		_constatstrln = ln
-		ln = ORS
-		a = BINMODE
-		BINMODE = "rw"
-		ORS = ""
-		print(t _CHR["CR"] _conlastr) > _SYS_STDCON
-		fflush(_SYS_STDCON)
-		ORS = ln
-		BINMODE = a
-		return _constatstr
-	}
 
-	function _constatgtstr(t, ln, a, b)
-	{
-		if (ln < 1) {
-			return ""
-		}
-		if ((a = length(t)) <= ln) {
-			return t
-		}
-		if (ln < 11) {
-			return substr(t, a - ln + 1)
-		}
-		if (ln < 19) {
-			return ("..." substr(t, a - ln + 4))
-		}
-		return (substr(t, 1, b = int((ln - 3) / 2)) "..." substr(t, a - ln + b + 4))
-	}
 
-	function _constatpop()
-	{
-		if (_CONSTATPUSH[0] > 0) {
-			return _constat(_CONSTATPUSH[_CONSTATPUSH[0]--])
-		}
-		return _constat("")
-	}
 
-	function _constatpush(t, ts)
-	{
-		_CONSTATPUSH[++_CONSTATPUSH[0]] = _constatstr
-		if (t) {
-			_constat(t, ts)
-		}
-		return _constatstr
-	}
 
-	function _creport(p, t, f, z)
-	{
-		_[p]["REPORT"] = _[p]["REPORT"] _ln(t ((f == "" ? "" : ": " f)))
-	}
 
-	function _defdir(pp, n, f, v, p)
-	{
-		_[p = _wLCHLD(pp, _n("TYPE", "defdir"))]["NAME"] = n
-		_[p]["DIR"] = f
-		return p
-	}
 
-	function _defdll(pp, n, rn, p)
-	{
-		_[p = _wLCHLD(pp, _n("TYPE", "defdll"))]["NAME"] = n
-		_[p]["REGPATH"] = _[pp]["REGPATH"] rn
-		_[p]["ERRHOST"] = pp
-		return p
-	}
 
-	function _defescarr(D, r, S, i, c, t)
-	{
-		if (isarray(S)) {
-			for (i = 0; i < 256; i++) {
-				if ((c = _CHR[i]) ~ r) {
-					D[c] = "\\" S[c]
-					t = t c
-				} else {
-					if (D[c] == "") {
-						D[c] = c
-					}
-				}
-			}
+
+
+
+
+
+#_______________________________________________________________________
+function _cfguid(p, optr, pfx, sfx, hstrcnt, lstrchr)
+{
+	delete _UIDOBL[p]
+	if (_isptr(optr)) {
+		if (optr == p) {
+			delete _UIDOBLV[p]
+			delete _UIDOBLV[_UIDOBLV[_UIDOBL[p] = p][""] = p][""]
 		} else {
-			for (i = 0; i < 256; i++) {
-				if ((c = _CHR[i]) ~ r) {
-					D[c] = S c
-					if (S != "") {
-						t = t c
-					}
-				} else {
-					if (D[c] == "") {
-						D[c] = c
-					}
-				}
+			if (optr in _UIDOBL) {
+				_UIDOBL[p] = _UIDOBL[optr]
 			}
 		}
-		return t
 	}
-
-	function _defile(pp, n, f, v, p)
-	{
-		_[p = _wLCHLD(pp, _n("TYPE", "defile"))]["NAME"] = n
-		_[p]["FILE"] = f
-		if (! (v == 0 && v == "")) {
-			_[p]["RQVERSION"] = v
+	_UIDPFX[p] = (_istr(pfx) ? pfx : "")
+	_UIDSFX[p] = (_istr(sfx) ? sfx : "")
+	if (_isptr(hstrcnt)) {
+		if (hstrcnt != p) {
+			_UIDCHR[p] = _UIDCHR[_UIDCNT[p] = _UIDCNT[hstrcnt]]
+			return p
 		}
-		return p
+		hstrcnt = _NOP
 	}
+	_UIDCNTL[_UIDCNT[p] = p] = _cfguidchr(p, hstrcnt, lstrchr)
+	return p
+}
 
-	function _defn(f, c, v)
-	{
-		FUNCTAB[c f] = v
+#_____________________________________________________
+function _cfguidchr(p, h, l, H, L)
+{
+	if (_isptr(l)) {
+		if (l != p) {
+			return (_UIDCHR[p] = _UIDCHR[l])
+		}
+		_UIDCHR[p] = p
+		l = _NOP
+	}
+	_UIDCHR[p] = p
+	_splitstr(H, h, _UIDCHRH[_classys])
+	_splitstr(L, l, H)
+	delete _UIDCHRH[_UIDCHRH[p][""] = p][""]
+	delete _UIDCHRL[_UIDCHRL[p][""] = p][""]
+	_cfguidh(p, H, L)
+	return _cfguidl(p, L, L)
+}
+
+#_______________________________________________
+function _cfguidh(p, H, L, hi, h, li)
+{
+	for (hi = 1; hi in H; hi++) {
+		h = H[hi]
+		for (li = 1; li in L; li++) {
+			_UIDCHRH[p][h L[li]]
+		}
+	}
+}
+
+function _cfguidl(p, H, L, hi, h, hl, li)
+{
+	for (hi = 1; hi in H; hi++) {
+		h = H[hi]
+		for (li = 1; li in L; li++) {
+			hl = _UIDCHRL[p][hl] = h L[li]
+		}
+	}
+	return hl
+}
+
+#____________________________________________________________________________________________________
+function _check(p)
+{
+	_dll_check(p)
+	_file_check(p)
+	_serv_check(p)
+	_reg_check(p)
+}
+
+#_______________________________________________________________________
+function _chrline(t, ts, w, s)
+{
+	return ((t = " " _tabtospc(t, ts) ((t ? (t ~ /[ \t]$/ ? "" : " ") : ""))) _getchrln((s ? s : "_"), ((w ? w : _CON_WIDTH - 1)) - length(t)) _CHR["EOL"])
+}
+
+#_____________________________________________________________________________
+function _cmd(c, i, A)
+{
+	_fio_cmda = RS
+	RS = ".{1,}"
+	_fio_cmdb = BINMODE
+	BINMODE = "rw"
+	ERRNO = RT = _NUL
+	c | getline RS
+	BINMODE = _fio_cmdb
+	RS = _fio_cmda
+	if (ERRNO || 0 > (_exitcode = close(c))) {
+		return (RT = _NOP)
 	}
-
-	function _defreg(pp, n, f, v, p)
-	{
-		_[p = _wLCHLD(pp, _n("TYPE", "defreg"))]["NAME"] = n
-		_[p]["REGPATH"] = f
-		if (! (v == 0 && v == "")) {
-			_[p]["VALUE"] = v
+	return RT
+}
+
+#_______________________________________________________________________
+function _cmparr(A0, A1, R, a, i)
+{
+	a = 0
+	delete R
+	for (i in A0) {
+		if (! (i in A1)) {
+			a++
+			R[i] = 0
+		} else {
+			if (A0[i] != A1[i]) {
+				a++
+				R[i] = 2
+			}
 		}
 	}
-
-	function _defsolution(pp, n, rn, p)
-	{
-		_[p = _wLCHLD(pp, _n("TYPE", "solution"))]["NAME"] = n
-		_[p]["REGPATH"] = rn
-		_[p]["ERRHOST"] = pp
-		return p
+	for (i in A1) {
+		if (! (i in A0)) {
+			a++
+			R[i] = 1
+		}
 	}
+	return a
+}
 
-	function _defsrv(pp, n, f, v, p)
-	{
-		_[p = _wLCHLD(pp, _n("TYPE", "defsrv"))]["NAME"] = n
-		_[p]["SERVNAME"] = f
-		return p
+#_____________________________________________________________________________
+function _con(t, ts, a, b, c, d, i, r, A, B)
+{
+	d = RLENGTH
+	if ((c = split(r = t, A, /\x0D?\x0A/, B)) > 0) {
+		a = BINMODE
+		b = ORS
+		BINMODE = "rw"
+		ORS = ""
+		if (c > 1) {
+			if ((i = length(t = _tabtospc(A[1], ts, _conlastrln))) < _constatstrln) {
+				t = t _getchrln(" ", _constatstrln - i)
+			}
+			print(t B[1]) > _SYS_STDCON
+			for (i = 2; i < c; i++) {
+				print(_tabtospc(A[i], ts) B[i]) > _SYS_STDCON
+			}
+			print(_conlastr = _tabtospc(A[c], ts)) > _SYS_STDCON
+			fflush(_SYS_STDCON)
+		} else {
+			print(t = _tabtospc(t, ts, _conlastrln)) > _SYS_STDCON
+			fflush(_SYS_STDCON)
+			_conlastr = _conlastr t
+		}
+		if ((i = length(_conlastr)) >= _CON_WIDTH) {
+			_conlastr = substr(_conlastr, 1 + int(i / _CON_WIDTH) * _CON_WIDTH)
+		}
+		_conlastrln = length(_conlastr)
+		if (_constatstr) {
+			print((t = _constatgtstr(_constatstr, _CON_WIDTH - 1 - _conlastrln)) _CHR["CR"] _conlastr) > _SYS_STDCON
+			fflush(_SYS_STDCON)
+			_constatstrln = length(t)
+		}
+		BINMODE = a
+		ORS = b
+		RLENGTH = d
+		return r
 	}
-
-	function _del(f, c, a, A)
-	{
-		if (match(f, /\\[ \t]*$/)) {
-			if ((c = toupper(_filerd(f))) && length(f) == FLENGTH) {
-				_cmd("rd " c " /S /Q 2>NUL")
-				_deletepfx(_WFILEROOTDIR, c)
-				_deletepfx(_FILEIO_RDTMP, c)
-				_deletepfx(_FILEIO_RDNETMP, c)
+	RLENGTH = d
+}
+
+#_______________________________________________________________________
+function _conin(t, a, b)
+{
+	_constatpush()
+	_constat()
+	a = BINMODE
+	b = RS
+	BINMODE = "rw"
+	RS = "\n"
+	_con(t)
+	getline t < "CON"
+	close("CON")
+	_conlastrln = 0
+	_conlastr = ""
+	gsub(/[\x0D\x0A]+/, "", t)
+	BINMODE = a
+	RS = b
+	_constatpop()
+	return t
+}
+
+#_______________________________________________________________________
+function _conl(t, ts)
+{
+	return _con(t ((t ~ /\x0A$/ ? "" : _CHR["EOL"])), ts)
+}
+
+#_______________________________________________________________________
+function _conline(t, ts)
+{
+	return _con(_chrline(t, ts))
+}
+
+#___________________________________________________________________________________
+####################################################################################
+
+
+
+function _conlq(t, ts)
+{
+	return _conl("`" t "'", ts)
+}
+
+#_______________________________________________________________________
+function _constat(t, ts, ln, a)
+{
+	if (_constatstrln > (ln = length(t = _constatgtstr(_constatstr = _tabtospc(t, ts), _CON_WIDTH - 1 - _conlastrln)))) {
+		t = t _getchrln(" ", _constatstrln - ln)
+	}
+	_constatstrln = ln
+	ln = ORS
+	a = BINMODE
+	BINMODE = "rw"
+	ORS = ""
+	print(t _CHR["CR"] _conlastr) > _SYS_STDCON
+	fflush(_SYS_STDCON)
+	ORS = ln
+	BINMODE = a
+	return _constatstr
+}
+
+#_________________________________________________________________
+function _constatgtstr(t, ln, a, b)
+{
+	if (ln < 1) {
+		return ""
+	}
+	if ((a = length(t)) <= ln) {
+		return t
+	}
+	if (ln < 11) {
+		return substr(t, a - ln + 1)
+	}
+	if (ln < 19) {
+		return ("..." substr(t, a - ln + 4))
+	}
+	return (substr(t, 1, b = int((ln - 3) / 2)) "..." substr(t, a - ln + b + 4))
+}
+
+#_______________________________________________________________________
+function _constatpop()
+{
+	if (_CONSTATPUSH[0] > 0) {
+		return _constat(_CONSTATPUSH[_CONSTATPUSH[0]--])
+	}
+	return _constat("")
+}
+
+#_______________________________________________________________________
+function _constatpush(t, ts)
+{
+	_CONSTATPUSH[++_CONSTATPUSH[0]] = _constatstr
+	if (t) {
+		_constat(t, ts)
+	}
+	return _constatstr
+}
+
+#___________________________________________________________________________________
+function _creport(p, t, f, z)
+{
+	_[p]["REPORT"] = _[p]["REPORT"] _ln(t ((f == "" ? "" : ": " f)))
+}
+
+#_________________________________________________________________________________________
+function _defdir(pp, n, f, v, p)
+{
+	_[p = _wLCHLD(pp, _n("TYPE", "defdir"))]["NAME"] = n
+	_[p]["DIR"] = f
+	return p
+}
+
+#_________________________________________________________________________________________
+function _defdll(pp, n, rn, p)
+{
+	_[p = _wLCHLD(pp, _n("TYPE", "defdll"))]["NAME"] = n
+	_[p]["REGPATH"] = _[pp]["REGPATH"] rn
+	_[p]["ERRHOST"] = pp
+	return p
+}
+
+#___________________________________________________________
+function _defescarr(D, r, S, i, c, t)
+{
+	if (isarray(S)) {
+		for (i = 0; i < 256; i++) {
+			if ((c = _CHR[i]) ~ r) {
+				D[c] = "\\" S[c]
+				t = t c
 			} else {
-				_conl("HUJ TEBE!")
-				return ""
+				if (D[c] == "") {
+					D[c] = c
+				}
 			}
-		} else {
-			a = _dir(A, f)
-			_cmd("del " f " /Q 2>NUL")
-			for (c in A) {
-				if (c ~ /\\$/) {
-					_cmd("rd " c " /S /Q 2>NUL")
-					_deletepfx(_WFILEROOTDIR, c)
-					_deletepfx(_FILEIO_RDTMP, c)
+		}
+	} else {
+		for (i = 0; i < 256; i++) {
+			if ((c = _CHR[i]) ~ r) {
+				D[c] = S c
+				if (S != "") {
+					t = t c
+				}
+			} else {
+				if (D[c] == "") {
+					D[c] = c
 				}
-				_deletepfx(_FILEIO_RDNETMP, c)
 			}
 		}
-		return a
 	}
-
-	function _delay(t, a)
-	{
-		for (a = 1; a <= t; a++) {
-			_delayms()
+	return t
+}
+
+#_________________________________________________________________________________________
+function _defile(pp, n, f, v, p)
+{
+	_[p = _wLCHLD(pp, _n("TYPE", "defile"))]["NAME"] = n
+	_[p]["FILE"] = f
+	if (! (v == 0 && v == "")) {
+		_[p]["RQVERSION"] = v
+	}
+	return p
+}
+
+#_______________________________________________________________________
+function _defn(f, c, v)
+{
+	FUNCTAB[c f] = v
+}
+
+#_________________________________________________________________________________________
+function _defreg(pp, n, f, v, p)
+{
+	_[p = _wLCHLD(pp, _n("TYPE", "defreg"))]["NAME"] = n
+	_[p]["REGPATH"] = f
+	if (! (v == 0 && v == "")) {
+		_[p]["VALUE"] = v
+	}
+}
+
+#_______________________________________________________________________________________________
+function _defsolution(pp, n, rn, p)
+{
+	_[p = _wLCHLD(pp, _n("TYPE", "solution"))]["NAME"] = n
+	_[p]["REGPATH"] = rn
+	_[p]["ERRHOST"] = pp
+	return p
+}
+
+#_________________________________________________________________________________________
+function _defsrv(pp, n, f, v, p)
+{
+	_[p = _wLCHLD(pp, _n("TYPE", "defsrv"))]["NAME"] = n
+	_[p]["SERVNAME"] = f
+	return p
+}
+
+#_______________________________________________________________________
+function _del(f, c, a, A)
+{
+	if (match(f, /\\[ \t]*$/)) {
+		if ((c = toupper(_filerd(f))) && length(f) == FLENGTH) {
+			_cmd("rd " c " /S /Q 2>NUL")
+			_deletepfx(_WFILEROOTDIR, c)
+			_deletepfx(_FILEIO_RDTMP, c)
+			_deletepfx(_FILEIO_RDNETMP, c)
+		} else {
+			_conl("HUJ TEBE!")
+			return ""
 		}
-	}
-
-	function _delayms(a)
-	{
-		for (a = 1; a <= _delay_perfmsdelay; a++) {
+	} else {
+		a = _dir(A, f)
+		_cmd("del " f " /Q 2>NUL")
+		for (c in A) {
+			if (c ~ /\\$/) {
+				_cmd("rd " c " /S /Q 2>NUL")
+				_deletepfx(_WFILEROOTDIR, c)
+				_deletepfx(_FILEIO_RDTMP, c)
+			}
+			_deletepfx(_FILEIO_RDNETMP, c)
 		}
 	}
+	return a
+}
 
-	function _deletepfx(A, f, B, le, i)
-	{
-		le = length(f)
-		for (i in A) {
-			if (substr(toupper(i), 1, le) == f) {
-				B[i] = A[i]
-				delete A[i]
-			}
-		}
+#_______________________________________________________________________
+function _delay(t, a)
+{
+	for (a = 1; a <= t; a++) {
+		_delayms()
 	}
+}
 
-	function _delf(A, f)
-	{
-		A["B"][A["F"][A["B"][f]] = A["F"][f]] = A["B"][f]
-		delete A["F"][f]
-		delete A["B"][f]
+#_________________________________________________________________
+function _delayms(a)
+{
+	for (a = 1; a <= _delay_perfmsdelay; a++) {
 	}
+}
 
-	function _deluid(p)
-	{
-		if (p in _CLASSPTR) {
-			_deluida0 = _CLASSPTR[p]
-			if (_deluida0 in _UIDOBL) {
-				_UIDOBLV[_UIDOBL[_deluida0]][p]
-			}
+#_______________________________________________________________________
+function _deletepfx(A, f, B, le, i)
+{
+	le = length(f)
+	for (i in A) {
+		if (substr(toupper(i), 1, le) == f) {
+			B[i] = A[i]
+			delete A[i]
 		}
-		delete _CLASSPTR[p]
-		return _deluida0
 	}
+}
 
-	function _dir(A, rd, i, r, f, ds, pf, B, C)
-	{
-		delete A
-		gsub(/(^[ \t]*)|([ \t]*$)/, "", rd)
-		if (rd == "") {
-			return ""
-		}
-		i = split(_cmd("dir \"" rd "\" 2>NUL"), B, /\x0D?\x0A/) - 3
-		pf = (match(B[4], /Directory of ([^\x00-\x1F]+)/, C) ? C[1] ((C[1] ~ /\\$/ ? "" : "\\")) : "")
-		for (r = 0; i > 5; i--) {
-			if (match(B[i], /^([^ \t]*)[ \t]+([^ \t]*)[ \t]+((<DIR>)|([0-9\,]+))[ \t]+([^\x00-\x1F]+)$/, C)) {
-				if (C[6] !~ /^\.\.?$/) {
-					if (C[4]) {
-						ds = "D "
-					} else {
-						ds = C[5] " "
-						gsub(/\,/, "", ds)
-					}
-					if ((f = _filepath(pf C[6] ((C[4] ? "\\" : "")))) != "") {
-						A[f] = ds C[1] " " C[2]
-						r++
-					}
-				}
-			}
+#_________________________________________________________________
+function _delf(A, f)
+{
+	A["B"][A["F"][A["B"][f]] = A["F"][f]] = A["B"][f]
+	delete A["F"][f]
+	delete A["B"][f]
+}
+
+#_______________________________________________________________________
+function _deluid(p)
+{
+	if (p in _CLASSPTR) {
+		_deluida0 = _CLASSPTR[p]
+		if (_deluida0 in _UIDOBL) {
+			_UIDOBLV[_UIDOBL[_deluida0]][p]
 		}
-		return r
 	}
+	delete _CLASSPTR[p]
+	return _deluida0
+}
 
-	function _dirtree(A, f, B)
-	{
-		gsub(/(^[ \t]*)|([ \t]*$)/, "", f)
-		delete A
-		A[""]
-		delete A[""]
-		_dirtree_i0(B, 8, split(_cmd("dir \"" f "\" /-C /S 2>NUL"), B, /\x0D?\x0A/), A, f = _filerd(f))
-		return f
+#_______________________________________________________________________
+function _dir(A, rd, i, r, f, ds, pf, B, C)
+{
+	delete A
+	gsub(/(^[ \t]*)|([ \t]*$)/, "", rd)
+	if (rd == "") {
+		return ""
 	}
-
-	function _dirtree_i0(B, i, c, A, f, lf, a, C)
-	{
-		delete A[f]
-		A[f][0]
-		delete A[f][0]
-		lf = length(f)
-		for (; i <= c; ) {
-			if (match(B[i], /^[ \t]*Directory of (.+)/, C)) {
-				if (substr(a = _filerd(C[1] "\\"), 1, lf) == f) {
-					i = _dirtree_i0(B, i + 4, c, A[f], a)
+	i = split(_cmd("dir \"" rd "\" 2>NUL"), B, /\x0D?\x0A/) - 3
+	pf = (match(B[4], /Directory of ([^\x00-\x1F]+)/, C) ? C[1] ((C[1] ~ /\\$/ ? "" : "\\")) : "")
+	for (r = 0; i > 5; i--) {
+		if (match(B[i], /^([^ \t]*)[ \t]+([^ \t]*)[ \t]+((<DIR>)|([0-9\,]+))[ \t]+([^\x00-\x1F]+)$/, C)) {
+			if (C[6] !~ /^\.\.?$/) {
+				if (C[4]) {
+					ds = "D "
 				} else {
-					return i
+					ds = C[5] " "
+					gsub(/\,/, "", ds)
 				}
-			} else {
-				if (match(B[i++], /^([^ \t\-]+)\-([^ \t\-]+)\-([^ \t]+)[ \t]+([^ \t]+)[ \t]+([0-9]+)[ \t]+(.+)$/, C)) {
-					A[f][f C[6]] = C[5] " " C[1] "/" _CHR["MONTH"][C[2]] "/" C[3] " " C[4]
+				if ((f = _filepath(pf C[6] ((C[4] ? "\\" : "")))) != "") {
+					A[f] = ds C[1] " " C[2]
+					r++
 				}
 			}
 		}
-		return i
 	}
-
-	function _dll_check(pp)
-	{
-		_dllchktv = ""
-		_missfl = 1
-		_tframe("_dll_check_i0", pp, _REG, pp)
-		if (1 || "AGENT" in _[pp]) {
-			if (_dllchktv != _[pp][".Product Version"]) {
-				_dllerr(_[pp]["AGENT"], "agent version (" _[pp][".Product Version"] ") do not match all lib versions: " _dllchktv "'")
+	return r
+}
+
+#_________________________________________________________________
+function _dirtree(A, f, B)
+{
+	gsub(/(^[ \t]*)|([ \t]*$)/, "", f)
+	delete A
+	A[""]
+	delete A[""]
+	_dirtree_i0(B, 8, split(_cmd("dir \"" f "\" /-C /S 2>NUL"), B, /\x0D?\x0A/), A, f = _filerd(f))
+	return f
+}
+
+#___________________________________________________________
+function _dirtree_i0(B, i, c, A, f, lf, a, C)
+{
+	delete A[f]
+	A[f][0]
+	delete A[f][0]
+	lf = length(f)
+	for (; i <= c; ) {
+		if (match(B[i], /^[ \t]*Directory of (.+)/, C)) {
+			if (substr(a = _filerd(C[1] "\\"), 1, lf) == f) {
+				i = _dirtree_i0(B, i + 4, c, A[f], a)
+			} else {
+				return i
 			}
 		} else {
-			if (! _missfl) {
-				_creport(pp, "agent not detected in registry")
-			} else {
-				_dllerr(pp, "agent not detected in registry but some registry entries exist:")
-				_tframe("_dll_check_i1", pp, pp)
+			if (match(B[i++], /^([^ \t\-]+)\-([^ \t\-]+)\-([^ \t]+)[ \t]+([^ \t]+)[ \t]+([0-9]+)[ \t]+(.+)$/, C)) {
+				A[f][f C[6]] = C[5] " " C[1] "/" _CHR["MONTH"][C[2]] "/" C[3] " " C[4]
 			}
 		}
 	}
+	return i
+}
 
-	function _dll_check_i0(p, R, pp, p2, i, i2, r, f, v, rs, d, tv, tf)
-	{
-		if (_[p]["TYPE"] == "defdll") {
-			r = toupper(_[p]["REGPATH"])
-			rs = 0
-			tf = 0
-			tv = ""
-			for (i in R) {
-				if (toupper(substr(i, 1, length(r))) == r) {
-					if ((_chka0 = substr(i, 1 + length(r), 1)) == "" || _chka0 == "\\") {
+#_______________________________________________________________________
+function _dll_check(pp)
+{
+	_dllchktv = ""
+	_missfl = 1
+	_tframe("_dll_check_i0", pp, _REG, pp)	#also check that all dll have same version; also check that all dlls have success and then report that DS plug-in version n - installed
+	if (1 || "AGENT" in _[pp]) {
+		if (_dllchktv != _[pp][".Product Version"]) {
+			_dllerr(_[pp]["AGENT"], "agent version (" _[pp][".Product Version"] ") do not match all lib versions: " _dllchktv "'")
+		}
+	} else {
+		if (! _missfl) {
+			_creport(pp, "agent not detected in registry")
+		} else {
+			_dllerr(pp, "agent not detected in registry but some registry entries exist:")
+			_tframe("_dll_check_i1", pp, pp)
+		}
+	}
+}
+
+#_______________________________________________
+function _dll_check_i0(p, R, pp, p2, i, i2, r, f, v, rs, d, tv, tf)
+{
+	if (_[p]["TYPE"] == "defdll") {
+		r = toupper(_[p]["REGPATH"])
+		rs = 0
+		tf = 0
+		tv = ""
+		for (i in R) {
+			if (toupper(substr(i, 1, length(r))) == r) {
+				if ((_chka0 = substr(i, 1 + length(r), 1)) == "" || _chka0 == "\\") {
+					rs = 1
+					_missfl = 1
+					_[p]["." substr(gensub(/\....$/, "", 1, i), i2 = 2 + length(r), length(i) - i2 + 1)] = R[i]
+					if (chka0 != "") {
 						rs = 1
-						_missfl = 1
-						_[p]["." substr(gensub(/\....$/, "", 1, i), i2 = 2 + length(r), length(i) - i2 + 1)] = R[i]
-						if (chka0 != "") {
-							rs = 1
-						}
 					}
 				}
 			}
-			if (rs) {
-				if ((i = ".Install Path") in _[p] && (i = ".Product Version") in _[p]) {
-					_[p]["STATUS"] = "PRESENT"
-					f = _[p][".Install Path"]
-					v = _[p][".Product Version"]
-					if (! (".Module" in _[p])) {
-						_[pp][".Product Version"] = v
-						_VAR["HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris\\Deployment\\AgentInstallPath.STR"] = f
-						_[pp]["AGENT"] = p
-						_creport("OK:  DLL DETECTED(" v "): " substr(_[p]["NAME"], 1, 112))
+		}
+		if (rs) {
+			if ((i = ".Install Path") in _[p] && (i = ".Product Version") in _[p]) {
+				_[p]["STATUS"] = "PRESENT"
+				f = _[p][".Install Path"]
+				v = _[p][".Product Version"]
+				if (! (".Module" in _[p])) {
+					_[pp][".Product Version"] = v
+					_VAR["HKEY_LOCAL_MACHINE\\SOFTWARE\\Altiris\\Deployment\\AgentInstallPath.STR"] = f
+					_[pp]["AGENT"] = p
+					_creport("OK:  DLL DETECTED(" v "): " substr(_[p]["NAME"], 1, 112))
+				} else {
+					if (_dllchktv == "") {
+						_dllchktv = v
 					} else {
-						if (_dllchktv == "") {
-							_dllchktv = v
-						} else {
-							if (v != _dllchktv) {
-								return _dllerr(p, "different versions detected: " _dllchktv "!=" v "'")
-							}
+						if (v != _dllchktv) {
+							return _dllerr(p, "different versions detected: " _dllchktv "!=" v "'")
 						}
-						ERRNO = ""
-						if (_th1(_[p]["DATA"] = _rdfile(f), ERRNO)) {
-							delete _[p]["DATA"]
-							return _dllerr(p, "read lib: " ERRNO, f)
-						}
-						if (v != (_[p]["VERSION"] = _getfilever(f))) {
-							return _dllerr(p, "library file version mismatch: ==`" _[p]["VERSION"] "'; !=`" v "'", f)
-						}
-						_creport(p, "OK:    LIBRARY DETECTED(" v "): " substr(f, 1, 100))
 					}
-				} else {
-					tf = 1
-					_dllerr(p, "registry corrupt: `" i "' not present")
+					ERRNO = ""
+					if (_th1(_[p]["DATA"] = _rdfile(f), ERRNO)) {
+						delete _[p]["DATA"]
+						return _dllerr(p, "read lib: " ERRNO, f)
+					}
+					if (v != (_[p]["VERSION"] = _getfilever(f))) {
+						return _dllerr(p, "library file version mismatch: ==`" _[p]["VERSION"] "'; !=`" v "'", f)
+					}
+					_creport(p, "OK:    LIBRARY DETECTED(" v "): " substr(f, 1, 100))
 				}
 			} else {
-				_[p]["STATUS"] = "MISSED"
+				tf = 1
+				_dllerr(p, "registry corrupt: `" i "' not present")
 			}
+		} else {
+			_[p]["STATUS"] = "MISSED"
 		}
 	}
+}
 
-	function _dll_check_i1(p, pp, p1, p2, p3, i)
-	{
-		if (_[p]["TYPE"] == "defdll") {
-			for (i in _[p]) {
-				if (i ~ /^\./) {
-					_dllerr(pp, "          " _[p]["REGPATH"] "\\" substr(i, 2))
-				}
+#_______________________________________________
+function _dll_check_i1(p, pp, p1, p2, p3, i)
+{
+	if (_[p]["TYPE"] == "defdll") {
+		for (i in _[p]) {
+			if (i ~ /^\./) {
+				_dllerr(pp, "          " _[p]["REGPATH"] "\\" substr(i, 2))
 			}
 		}
 	}
+}
 
-	function _dllerr(p, t, f)
-	{
-		if (t !~ /\x00/) {
-			t = "ERROR: \000" t
-		}
-		_errfl = 1
-		_[p]["ERROR"] = _[p]["ERROR"] _ln(t ((f == "" ? "" : ": " f)))
+#___________________________________________________________________________________
+function _dllerr(p, t, f)
+{
+	if (t !~ /\x00/) {
+		t = "ERROR: \000" t
 	}
+	_errfl = 1
+	_[p]["ERROR"] = _[p]["ERROR"] _ln(t ((f == "" ? "" : ": " f)))
+}
 
-	function _drawuid(p, cn, ch, o)
-	{
-		_conl("uid: " p)
-		_conl("\toblptr: " ((p in _UIDOBL ? _UIDOBL[p] "'" : "-")))
-		if (p in _UIDOBL) {
-			if (! _isptr(o = _UIDOBL[p])) {
-				_conl(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> oblptr not pointer")
-			}
-			if (! isarray(_UIDOBLV[o])) {
-				_conl(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> no OBLV array at ptr")
-			}
+function _drawuid(p, cn, ch, o)
+{
+	_conl("uid: " p)
+	_conl("\toblptr: " ((p in _UIDOBL ? _UIDOBL[p] "'" : "-")))
+	if (p in _UIDOBL) {
+		if (! _isptr(o = _UIDOBL[p])) {
+			_conl(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> oblptr not pointer")
 		}
-		_conl("\tprefix:   " ((p in _UIDPFX ? _UIDPFX[p] "'" : "-")))
-		_conl("\tsuffix:   " ((p in _UIDSFX ? _UIDSFX[p] "'" : "-")))
-		_conl("\tcounters: " (cn = (p in _UIDCNT ? _UIDCNT[p] "'" : "-")))
-		if (cn != "-") {
-			_conl("\t\tcntrL:   " _UIDCNTL[_UIDCNT[p]] "'")
-			_conl("\t\tcntrH:   " _UIDCNTH[_UIDCNT[p]] "'")
-		}
-		_conl("\tcharset:  " (ch = (p in _UIDCHR ? _UIDCHR[p] "'" : "-")))
-		if (ch != "-") {
-			_conl("chrH:    ")
-			_conl(_dumparr(_UIDCHRH[_UIDCHR[p]]))
-			_conl()
-			_conl("chrL:    ")
-			_conl(_dumparr(_UIDCHRL[_UIDCHR[p]]))
-			_conl()
-		}
-	}
-
-	function _dumparr(A, t, lv, a)
-	{
-		b = PROCINFO["sorted_in"]
-		PROCINFO["sorted_in"] = "_lengthsort"
-		if (isarray(A)) {
-			delete _DUMPARR
-			_dumparrc = _dumparrd = ""
-			_dumparr_i1(A, lv = ((lv == "" ? 16 : (lv == 0 || lv + 0 != 0 ? lv : (lv == "-*" ? -3 : (lv ~ /^\+?\*$/ ? 3 : 16))))) + 0, (lv < 0 ? -1 : 1), 0, _tabtospc(t))
-			PROCINFO["sorted_in"] = a
-			return _retarrd(_DUMPARR, _dumparrd, _dumparrd = "")
-		}
-	}
-
-	function _dumparr_i1(A, lv, ls, ln, t, t2, i, a, f)
-	{
-		t2 = _getchrln(" ", length(t))
-		if (ln == lv) {
-			if (ls > 0) {
-				for (i in A) {
-					++a
-				}
-			} else {
-				for (i in A) {
-					(isarray(A[i]) ? ++a : "")
-				}
-			}
-			if (length(_dumparrd = _dumparrd t ((a > 0 ? " ... (x" a ")" : "")) _CHR["EOL"]) > 262144) {
-				_DUMPARR[++_dumparrc] = _dumparrd
-				_dumparrd = ""
-			}
-			return 
+		if (! isarray(_UIDOBLV[o])) {
+			_conl(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> no OBLV array at ptr")
 		}
-		if (ls >= 0) {
+	}
+	_conl("\tprefix:   " ((p in _UIDPFX ? _UIDPFX[p] "'" : "-")))
+	_conl("\tsuffix:   " ((p in _UIDSFX ? _UIDSFX[p] "'" : "-")))
+	_conl("\tcounters: " (cn = (p in _UIDCNT ? _UIDCNT[p] "'" : "-")))
+	if (cn != "-") {
+		_conl("\t\tcntrL:   " _UIDCNTL[_UIDCNT[p]] "'")
+		_conl("\t\tcntrH:   " _UIDCNTH[_UIDCNT[p]] "'")
+	}
+	_conl("\tcharset:  " (ch = (p in _UIDCHR ? _UIDCHR[p] "'" : "-")))
+	if (ch != "-") {
+		_conl("chrH:    ")
+		_conl(_dumparr(_UIDCHRH[_UIDCHR[p]]))
+		_conl()
+		_conl("chrL:    ")
+		_conl(_dumparr(_UIDCHRL[_UIDCHR[p]]))
+		_conl()
+	}
+}
+
+#_______________________________________________________________________
+function _dumparr(A, t, lv, a)
+{
+	b = PROCINFO["sorted_in"]
+	PROCINFO["sorted_in"] = "_lengthsort"
+	if (isarray(A)) {
+		delete _DUMPARR
+		_dumparrc = _dumparrd = ""
+		_dumparr_i1(A, lv = ((lv == "" ? 16 : (lv == 0 || lv + 0 != 0 ? lv : (lv == "-*" ? -3 : (lv ~ /^\+?\*$/ ? 3 : 16))))) + 0, (lv < 0 ? -1 : 1), 0, _tabtospc(t))
+		PROCINFO["sorted_in"] = a
+		return _retarrd(_DUMPARR, _dumparrd, _dumparrd = "")
+	}
+}
+
+#___________________________________________________________
+function _dumparr_i1(A, lv, ls, ln, t, t2, i, a, f)
+{
+	t2 = _getchrln(" ", length(t))
+	if (ln == lv) {
+		if (ls > 0) {
 			for (i in A) {
-				if (! isarray(A[i])) {
-					if (length(_dumparrd = _dumparrd ((f ? t2 : t _nop(f = 1))) "[" i "]=" A[i] "'" _CHR["EOL"]) > 262144) {
-						_DUMPARR[++_dumparrc] = _dumparrd
-						_dumparrd = ""
-					}
-				}
+				++a
 			}
-		}
-		for (i in A) {
-			if (isarray(A[i])) {
-				_dumparr_i1(A[i], lv, ls, ln + ls, _th0((f ? t2 : t), f = 1) "[" i "]")
+		} else {
+			for (i in A) {
+				(isarray(A[i]) ? ++a : "")
 			}
 		}
-		if (! f) {
-			if (length(_dumparrd = _dumparrd t _CHR["EOL"]) > 262144) {
-				_DUMPARR[++_dumparrc] = _dumparrd
-				_dumparrd = ""
-			}
+		if (length(_dumparrd = _dumparrd t ((a > 0 ? " ... (x" a ")" : "")) _CHR["EOL"]) > 262144) {
+			_DUMPARR[++_dumparrc] = _dumparrd
+			_dumparrd = ""
 		}
+		return 
 	}
-
-	function _dumpobj(p, f, t, s)
-	{
-		s = _dumpobj_i0(p, f, t = t "." p "{")
-		if (p = _rFCHLD(p)) {
-			return (s = s _dumpobjm(p, f, (s ? _getchrln(" ", length(t) - 1) : t " ")))
+	if (ls >= 0) {
+		for (i in A) {
+			if (! isarray(A[i])) {
+				if (length(_dumparrd = _dumparrd ((f ? t2 : t _nop(f = 1))) "[" i "]=" A[i] "'" _CHR["EOL"]) > 262144) {
+					_DUMPARR[++_dumparrc] = _dumparrd
+					_dumparrd = ""
+				}
+			}
 		}
-		return s
 	}
-
-	function _dumpobj_i0(p, f, t)
-	{
-		if (f == "") {
-			return _dumpobj_i2(p, t)
+	for (i in A) {
+		if (isarray(A[i])) {
+			_dumparr_i1(A[i], lv, ls, ln + ls, _th0((f ? t2 : t), f = 1) "[" i "]")
 		}
-		if (f == 0) {
-			return _dumpobj_i1(p, t " ")
+	}
+	if (! f) {
+		if (length(_dumparrd = _dumparrd t _CHR["EOL"]) > 262144) {
+			_DUMPARR[++_dumparrc] = _dumparrd
+			_dumparrd = ""
 		}
-		return (_dumpobj_i1(p, t " ") _dumpobj_i2(p, _getchrln(" ", length(t))))
 	}
+}
+
+#___________________________________________________________________________________
+####################################################################################
 
-	function _dumpobj_i1(p, t)
-	{
-		return _ln(t substr(((p in _tPREV ? "\253" _tPREV[p] : "")) "       ", 1, 7) " " substr(((p in _tPARENT ? "\210" _tPARENT[p] : "")) "       ", 1, 7) " " substr(((p in _tFCHLD ? _tFCHLD[p] : "")) "\205" ((p in _tQCHLD ? " (" _tQCHLD[p] ") " : "\205")) "\205" ((p in _tLCHLD ? _tLCHLD[p] : "")) "                      ", 1, 22) substr(((p in _tNEXT ? "\273" _tNEXT[p] : "")) "        ", 1, 8))
+
+#___________________________________________________________________________________
+# OTHER tFUNCTIONs #################################################################
+
+#_____________________________________________________________________________
+function _dumpobj(p, f, t, s)
+{
+	s = _dumpobj_i0(p, f, t = t "." p "{")
+	if (p = _rFCHLD(p)) {
+		return (s = s _dumpobjm(p, f, (s ? _getchrln(" ", length(t) - 1) : t " ")))
 	}
+	return s
+}
 
-	function _dumpobj_i2(p, t)
-	{
-		return (_dumpobj_i3(_[p], t " ") _dumpobj_i3(_ptr[p], _getchrln(" ", length(t)) "`", "`"))
+#___________________________________________________________
+function _dumpobj_i0(p, f, t)
+{
+	if (f == "") {
+		return _dumpobj_i2(p, t)
+	}
+	if (f == 0) {
+		return _dumpobj_i1(p, t " ")
 	}
+	return (_dumpobj_i1(p, t " ") _dumpobj_i2(p, _getchrln(" ", length(t))))
+}
+
+#___________________________________________________________
+function _dumpobj_i1(p, t)
+{
+	return _ln(t substr(((p in _tPREV ? "\253" _tPREV[p] : "")) "       ", 1, 7) " " substr(((p in _tPARENT ? "\210" _tPARENT[p] : "")) "       ", 1, 7) " " substr(((p in _tFCHLD ? _tFCHLD[p] : "")) "\205" ((p in _tQCHLD ? " (" _tQCHLD[p] ") " : "\205")) "\205" ((p in _tLCHLD ? _tLCHLD[p] : "")) "                      ", 1, 22) substr(((p in _tNEXT ? "\273" _tNEXT[p] : "")) "        ", 1, 8))
+}
+
+#___________________________________________________________
+function _dumpobj_i2(p, t)
+{
+	return (_dumpobj_i3(_[p], t " ") _dumpobj_i3(_ptr[p], _getchrln(" ", length(t)) "`", "`"))
+}
 
-	function _dumpobj_i3(A, t, p, e, s, i, t2)
-	{
-		if (isarray(A)) {
+#___________________________________________________________
+function _dumpobj_i3(A, t, p, e, s, i, t2)
+{
+	if (isarray(A)) {
+		for (i in A) {
+			t2 = _getchrln(" ", length(t))
 			for (i in A) {
-				t2 = _getchrln(" ", length(t))
-				for (i in A) {
-					if (isarray(A[i])) {
-						s = s _dumpobj_i3(A[i], t "[" _dumpobj_i4(i) "]", p, _ln())
-					} else {
-						s = s _ln(t "[" _dumpobj_i4(i) "]=" p _dumpobj_i4(A[i]) "'")
-					}
-					t = t2
+				if (isarray(A[i])) {
+					s = s _dumpobj_i3(A[i], t "[" _dumpobj_i4(i) "]", p, _ln())
+				} else {
+					s = s _ln(t "[" _dumpobj_i4(i) "]=" p _dumpobj_i4(A[i]) "'")
 				}
-				return s
+				t = t2
 			}
-			return ((e == "" ? "" : t e))
-		}
-		if (A == 0 && A == "") {
-			return 
+			return s
 		}
-		return _ln(t "=" _dumpobj_i4(p A) "'")
+		return ((e == "" ? "" : t e))
 	}
-
-	function _dumpobj_i4(t)
-	{
-		if (length(t) > 64) {
-			return (substr(t, 1, 28) " ... " substr(t, length(t) - 28))
-		}
-		return t
+	if (A == 0 && A == "") {
+		return 
 	}
-
-	function _dumpobj_nc(p, f, t)
-	{
-		return _dumpobj_i0(p, f, t "." p "{ ")
+	return _ln(t "=" _dumpobj_i4(p A) "'")
+}
+
+#___________________________________________________________
+function _dumpobj_i4(t)
+{
+	if (length(t) > 64) {
+		return (substr(t, 1, 28) " ... " substr(t, length(t) - 28))
+	}
+	return t
+}
+
+#_________________________________________________________________
+function _dumpobj_nc(p, f, t)
+{
+	return _dumpobj_i0(p, f, t "." p "{ ")
+}
+
+#_________________________________________________________________
+function _dumpobjm(p, f, t, s, t2)
+{
+	t2 = _getchrln(" ", length(t))
+	do {
+		s = s _dumpobj(p, f, t)
+		t = t2
+	} while (p = _rNEXT(p))
+	return s
+}
+
+#_________________________________________________________________
+function _dumpobjm_nc(p, f, t, s, t2)
+{
+	t2 = _getchrln(" ", length(t))
+	do {
+		s = s _dumpobj_nc(p, f, t)
+		t = t2
+	} while (p = _rNEXT(p))
+	return s
+}
+
+function _dumpuidgen(p, pd, pc, ps)
+{
+	_conline("#" ++cntdm ": " p "'")
+	_conl()
+	if (p in _tuidel) {
+		_conl("DEL:   " _var(pd = _tuidel[p]))
+		_conl(_dumparr(_tUIDEL[pd]) _ln())
+	}
+	_conl("PFX: " _tUIDPFX[p] "'")
+	_conl("SFX: " _tUIDSFX[p] "'")
+	_conl("COUNT: " ((p in _tuidcnt ? (pc = _tuidcnt[p]) "'" : _th0("-", pc = -2))))
+	_con("CHARS: ")
+	if (p in _tuidchr) {
+		_conl((ps = _tuidchr[p]) "'")
+		_conl("HCHR: " ((pc == -2 ? "-" : _tUIDCNTH[pc] "'")))
+		_conl(_dumparr(_tUIDCHRH[ps]) _ln())
+		_conl("LCHR: " ((pc == -2 ? "-" : _tUIDCNTL[pc] "'")))
+		_conl(_dumparr(_tUIDCHRL[ps]) _ln())
+	} else {
+		_conl("-")
+	}
+}
+
+#_____________________________________________________________________________
+function _dumpval(v, n)
+{
+	_dumpstr = _dumpstr (v = _ln(((n == 0 && n == "" ? "RET" : n)) ": " ((v == 0 && v == "" ? "-" : v "'"))))
+	return v
+}
+
+########################################################
+function _eXTFN(c, t, P)
+{
+	switch (c) {
+	case "_lib_CMDLN":
+		return t
+		#___________________________________________________________
+		
+	case "_lib_APPLY":
+		return 
+		#___________________________________________________________
+		
+	case "_lib_HELP":
+		return 
+		#___________________________________________________________
+		
+	case "_lib_NAMEVER":
+		return _ln("_extfn 1.0")
+		#___________________________________________________________
+		
+	case "_lib_BEGIN":
+		return 
+		#___________________________________________________________
+		
+	case "_lib_END":
+		return 
 	}
+}
+
+#_________________________________________________________________
+function _endpass(t)
+{
+	_endpass_v0 = t
+}
+
+#_______________________________________________________________________
+function _err(t, a, b)
+{
+	a = BINMODE
+	b = ORS
+	BINMODE = "rw"
+	ORS = ""
+	print(t) > _SYS_STDERR
+	fflush(_SYS_STDERR)
+	BINMODE = a
+	ORS = b
+	return t
+}
+
+#_________________________________________________________________
+function _errnl(t)
+{
+	return _err(t ((t ~ /\x0A$/ ? "" : _CHR["EOL"])))
+}
+
+#_______________________________________________________________________
+function _error(t, d, A)
+{
+	if (_ERRLOG_EF) {
+		A["TYPE"] = "ERROR"
+		A["TEXT"] = t
+		_log(A, d)
+	}
+}
+
+#_______________________________________________________________________
+function _exit(c)
+{
+	exit c
+}
+
+#_____________________________________________________________________________
+function _export_data(t, i, A)
+{
+	A["DATA"] = t
+	A["ID"] = i
+	_expout("_DATA: " _Zexparr(A) "\n")
+}
+
+#___________________________________________________________________________________
+####################################################################################
+
+#_____________________________________________________________________________
+function _expout(t, d, a, b)
+{
+	a = BINMODE
+	b = ORS
+	BINMODE = "rw"
+	ORS = ""
+	print(t) > ((d ? d : d = _errlog_file))
+	fflush(d)
+	BINMODE = a
+	ORS = b
+}
+
+#_________________________________________________________________________________________
+##########################################################################################
+
+
+
+
+
+
+
+
+function _extfn_init()
+{
+	_formatstrs_init()
+	_formatstrd_init()
+	_formatrexp_init()
+	_unformatstr_init()
+	_mac_init()
+}
+
+function _faccl_i0(A, t, p, P, f, r)
+{
+	f = r = ""
+	if (isarray(A)) {
+		while (f = A[f]) {
+			r = (@f(t, p, P)) r
+		}
+	}
+	return r
+}
+
+function _faccr_i0(A, t, p, P, f, r)
+{
+	f = r = ""
+	if (isarray(A)) {
+		while (f = A[f]) {
+			r = r @f(t, p, P)
+		}
+	}
+	return r
+}
+
+#_______________________________________________________________________
+function _fatal(t, d, A)
+{
+	if (_ERRLOG_FF) {
+		A["TYPE"] = "FATAL"
+		A["TEXT"] = t
+		_log(A, d)
+	}
+	if (! d) {
+		exit 
+	}
+}
+
+function _fbaccl(A, t, p, P)
+{
+	return _faccl_i0(A["B"], t, p, P)
+}
+
+function _fbaccr(A, t, p, P)
+{
+	return _faccr_i0(A["B"], t, p, P)
+}
+
+function _ffaccl(A, t, p, P)
+{
+	return _faccl_i0(A["F"], t, p, P)
+}
+
+function _ffaccr(A, t, p, P)
+{
+	return _faccr_i0(A["F"], t, p, P)
+}
+
+#_______________________________________________________________________
+function _fframe(A, t, p)
+{
+	return _fframe_i0(A, t, p, A[""])
+}
 
-	function _dumpobjm(p, f, t, s, t2)
-	{
-		t2 = _getchrln(" ", length(t))
-		do {
-			s = s _dumpobj(p, f, t)
-			t = t2
-		} while (p = _rNEXT(p))
-		return s
-	}
+#___________________________________________________________
+function _fframe_i0(A, t, p, f)
+{
+	return ((f ? (@f(t, p)) _fframe_i0(A, t, p, A[f]) : ""))
+}
 
-	function _dumpobjm_nc(p, f, t, s, t2)
-	{
-		t2 = _getchrln(" ", length(t))
-		do {
-			s = s _dumpobj_nc(p, f, t)
-			t = t2
-		} while (p = _rNEXT(p))
-		return s
+#_________________________________________________________________
+function _file(f)
+{
+	if ((f = _filerdnehnd(f)) == "") {
+		return ""
 	}
-
-	function _dumpuidgen(p, pd, pc, ps)
-	{
-		_conline("#" ++cntdm ": " p "'")
-		_conl()
-		if (p in _tuidel) {
-			_conl("DEL:   " _var(pd = _tuidel[p]))
-			_conl(_dumparr(_tUIDEL[pd]) _ln())
-		}
-		_conl("PFX: " _tUIDPFX[p] "'")
-		_conl("SFX: " _tUIDSFX[p] "'")
-		_conl("COUNT: " ((p in _tuidcnt ? (pc = _tuidcnt[p]) "'" : _th0("-", pc = -2))))
-		_con("CHARS: ")
-		if (p in _tuidchr) {
-			_conl((ps = _tuidchr[p]) "'")
-			_conl("HCHR: " ((pc == -2 ? "-" : _tUIDCNTH[pc] "'")))
-			_conl(_dumparr(_tUIDCHRH[ps]) _ln())
-			_conl("LCHR: " ((pc == -2 ? "-" : _tUIDCNTL[pc] "'")))
-			_conl(_dumparr(_tUIDCHRL[ps]) _ln())
+	return ((f in _FILEXT ? _FILEXT[f] : ""))
+}
+
+#_______________________________________________________________________
+function _file_check(p)
+{
+	if (1 || "AGENT" in _[p]) {
+		_tframe("_file_check_i0", p, p)
+	}
+}
+
+#_______________________________________________
+function _file_check_i0(p, pp, p1, p2, f, v)
+{
+	if (_[p]["TYPE"] == "defile") {
+		f = _[p]["FILE"]
+		f = ((match(f, /^.:/) ? "" : _[_[pp]["AGENT"]][".Install Path"] "\\")) _[p]["FILE"]
+		if ("RQVERSION" in _[p]) {
+			v = _[p]["RQVERSION"]
 		} else {
-			_conl("-")
+			v = _[pp][".Product Version"]
 		}
-	}
-
-	function _dumpval(v, n)
-	{
-		_dumpstr = _dumpstr (v = _ln(((n == 0 && n == "" ? "RET" : n)) ": " ((v == 0 && v == "" ? "-" : v "'"))))
-		return v
-	}
-
-	function _eXTFN(c, t, P)
-	{
-		switch (c) {
-		case "_lib_CMDLN":
-			return t
-		case "_lib_APPLY":
-			return 
-		case "_lib_HELP":
-			return 
-		case "_lib_NAMEVER":
-			return _ln("_extfn 1.0")
-		case "_lib_BEGIN":
-			return 
-		case "_lib_END":
-			return 
+		ERRNO = ""
+		if (_th1(_[p]["DATA"] = _rdfile(f), ERRNO)) {
+			delete _[p]["DATA"]
+			return _dllerr(p, "read file: " ERRNO, f)
+		}
+		if (v != "" && v != (_[p]["VERSION"] = _getfilever(f))) {
+			return _dllerr(p, " file version mismatch: ==`" _[p]["VERSION"] "'; !=`" v "'", f)
+		}
+		_creport(p, substr("OK:    FILE DETECTED" ((v == "" ? "" : "(" v ")")) ": " f, 1, 122))
+	} else {
+		if (_[p]["TYPE"] == "defdir") {
+			if (_filexist(f = _[p]["DIR"])) {
+				_creport(p, substr("OK:    DIR DETECTED: " f, 1, 112))
+			} else {
+				_dllerr(p, "directory " f " is not detected")
+			}
 		}
 	}
+}
 
-	function _endpass(t)
-	{
-		_endpass_v0 = t
-	}
-
-	function _err(t, a, b)
-	{
-		a = BINMODE
-		b = ORS
-		BINMODE = "rw"
-		ORS = ""
-		print(t) > _SYS_STDERR
-		fflush(_SYS_STDERR)
-		BINMODE = a
-		ORS = b
-		return t
+#_________________________________________________________________
+function _filed(f, dd, d)
+{
+	if ((f = _filerdnehnd(f)) == "") {
+		return ""
 	}
-
-	function _errnl(t)
-	{
-		return _err(t ((t ~ /\x0A$/ ? "" : _CHR["EOL"])))
+	if (f in _FILEDIRFL) {
+		return _FILEDIR[f]
 	}
-
-	function _error(t, d, A)
-	{
-		if (_ERRLOG_EF) {
-			A["TYPE"] = "ERROR"
-			A["TEXT"] = t
-			_log(A, d)
+	if (f in _FILEROOT) {
+		if (d = filegetdrvdir(_FILEROOT[f])) {
+			_FILEDIRFL[f]
 		}
+		return (_FILEDIR[f] = d _FILEDIR[f])
 	}
-
-	function _exit(c)
-	{
-		exit c
+	if ((dd = (dd ? dd : _FILEIO_RD), f) in _FILEDIR) {
+		return _FILEDIR[dd, f]
 	}
-
-	function _export_data(t, i, A)
-	{
-		A["DATA"] = t
-		A["ID"] = i
-		_expout("_DATA: " _Zexparr(A) "\n")
+	if ((d = filedi(dd) _FILEDIR[f]) ~ /^\\/) {
+		return (_FILEDIR[dd, f] = d)
 	}
+	return d
+}
 
-	function _expout(t, d, a, b)
-	{
-		a = BINMODE
-		b = ORS
-		BINMODE = "rw"
-		ORS = ""
-		print(t) > ((d ? d : d = _errlog_file))
-		fflush(d)
-		BINMODE = a
-		ORS = b
+#_________________________________________________________________
+function _filen(f)
+{
+	if ((f = _filerdnehnd(f)) == "") {
+		return ""
 	}
+	return ((f in _FILENAM ? _FILENAM[f] : ""))
+}
 
-	function _extfn_init()
-	{
-		_formatstrs_init()
-		_formatstrd_init()
-		_formatrexp_init()
-		_unformatstr_init()
-		_mac_init()
+#_________________________________________________________________
+function _filene(f)
+{
+	if ((f = _filerdnehnd(f)) == "") {
+		return ""
 	}
+	return (((f in _FILENAM ? _FILENAM[f] : "")) ((f in _FILEXT ? _FILEXT[f] : "")))
+}
 
-	function _faccl_i0(A, t, p, P, f, r)
-	{
-		f = r = ""
-		if (isarray(A)) {
-			while (f = A[f]) {
-				r = (@f(t, p, P)) r
-			}
-		}
-		return r
+#_________________________________________________________________
+function _filenotexist(f, a)
+{
+	if (f == "") {
+		return ""
 	}
-
-	function _faccr_i0(A, t, p, P, f, r)
-	{
-		f = r = ""
-		if (isarray(A)) {
-			while (f = A[f]) {
-				r = r @f(t, p, P)
-			}
-		}
-		return r
+	if ((a = _filepath(f)) == "") {
+		ERRNO = "Filepath error `" f "'"
+		return ""
 	}
-
-	function _fatal(t, d, A)
-	{
-		if (_ERRLOG_FF) {
-			A["TYPE"] = "FATAL"
-			A["TEXT"] = t
-			_log(A, d)
-		}
-		if (! d) {
-			exit 
-		}
+	_cmd("if exist \"" a "\" exit 1 2>NUL")
+	if (_exitcode == 1) {
+		return (ERRNO = _NOP)
 	}
+	return a
+}
 
-	function _fbaccl(A, t, p, P)
-	{
-		return _faccl_i0(A["B"], t, p, P)
+#_______________________________________________________________________
+function _filepath(f, dd)
+{
+	if ((f = _filerdnehnd(f)) == "") {
+		return ""
 	}
+	return (filegetrootdir(f, dd) ((f in _FILENAM ? _FILENAM[f] : "")) ((f in _FILEXT ? _FILEXT[f] : "")))
+}
 
-	function _fbaccr(A, t, p, P)
-	{
-		return _faccr_i0(A["B"], t, p, P)
+#_________________________________________________________________
+function _filer(f, dd)
+{
+	if ((f = _filerdnehnd(f)) == "") {
+		return ""
 	}
-
-	function _ffaccl(A, t, p, P)
-	{
-		return _faccl_i0(A["F"], t, p, P)
+	if (f in _FILEROOT) {
+		return _FILEROOT[f]
 	}
-
-	function _ffaccr(A, t, p, P)
-	{
-		return _faccr_i0(A["F"], t, p, P)
+	if ((dd = (dd ? dd : _FILEIO_RD), f) in _FILEROOT) {
+		return _FILEROOT[dd, f]
 	}
+	return (_FILEROOT[dd, f] = fileri(dd))
+}
 
-	function _fframe(A, t, p)
-	{
-		return _fframe_i0(A, t, p, A[""])
+#_________________________________________________________________
+function _filerd(f, dd)
+{
+	if ((f = _filerdnehnd(f)) == "") {
+		return ""
 	}
+	return filegetrootdir(f, dd)
+}
 
-	function _fframe_i0(A, t, p, f)
-	{
-		return ((f ? (@f(t, p)) _fframe_i0(A, t, p, A[f]) : ""))
+#_________________________________________________________________
+function _filerdn(f, dd)
+{
+	if ((f = _filerdnehnd(f)) == "") {
+		return ""
 	}
+	return ((f in _FILENAM ? filegetrootdir(f, dd) _FILENAM[f] : ""))
+}
 
-	function _file(f)
-	{
-		if ((f = _filerdnehnd(f)) == "") {
-			return ""
-		}
-		return ((f in _FILEXT ? _FILEXT[f] : ""))
+#_________________________________________________________________
+function _filerdne(f, dd)
+{
+	if ((f = _filerdnehnd(f)) == "") {
+		return ""
 	}
-
-	function _file_check(p)
-	{
-		if (1 || "AGENT" in _[p]) {
-			_tframe("_file_check_i0", p, p)
-		}
+	if (f in _FILENAM) {
+		return (filegetrootdir(f, dd) _FILENAM[f] ((f in _FILEXT ? _FILEXT[f] : "")))
+	}
+	if (f in _FILEXT) {
+		return (filegetrootdir(f, dd) _FILEXT[f])
 	}
+	return ""
+}
 
-	function _file_check_i0(p, pp, p1, p2, f, v)
-	{
-		if (_[p]["TYPE"] == "defile") {
-			f = _[p]["FILE"]
-			f = ((match(f, /^.:/) ? "" : _[_[pp]["AGENT"]][".Install Path"] "\\")) _[p]["FILE"]
-			if ("RQVERSION" in _[p]) {
-				v = _[p]["RQVERSION"]
+#___________________________________________________________
+function _filerdnehnd(st, c, r, d, n, A)
+{
+	if (st) {
+		if ((c = toupper(st)) in _FILECACHE) {
+			FLENGTH = length(st)
+			return _FILECACHE[c]
+		}
+		if (match(st, /^[ \t]*\\[ \t]*\\/)) {
+			if (match(substr(st, (FLENGTH = RLENGTH) + 1), /^[ \t]*([0-9A-Za-z\-]+)[ \t]*(\\[ \t]*([A-Za-z])[ \t]*\$[ \t]*)?(\\[ \t]*([0-9A-Za-z_\!\+\-\[\]\(\)\{\}\~\.]+( +[0-9A-Za-z_\!\+\-\[\]\(\)\{\}\~\.]+)*[ \t]*\\)+[ \t]*)?(([0-9A-Za-z_\!\+\.\~\-\[\]\{\}\(\)]+( +[0-9A-Za-z_\!\+\.\~\-\[\]\{\}\(\)]+)*)[ \t]*)?/, A)) {
+				FLENGTH = FLENGTH + RLENGTH
+				d = ((A[3] ? "\\" A[3] "$" : "")) A[4]
+				gsub(/[ \t]*\\[ \t]*/, "\\", d)
+				if ((st = toupper((r = "\\\\" A[1]) d (n = A[8]))) in _FILECACHE) {
+					return (_FILECACHE[substr(c, 1, FLENGTH)] = _FILECACHE[st])
+				}
+				_FILEDIR[c = _FILECACHE[substr(c, 1, FLENGTH)] = _FILECACHE[st] = ++_file_rootcntr] = d
+				_FILEDIRFL[c]
+				_FILEROOT[c] = r
 			} else {
-				v = _[pp][".Product Version"]
+				FLENGTH = 0
+				_filepath_err = "UNC"
+				return ""
 			}
-			ERRNO = ""
-			if (_th1(_[p]["DATA"] = _rdfile(f), ERRNO)) {
-				delete _[p]["DATA"]
-				return _dllerr(p, "read file: " ERRNO, f)
+		} else {
+			match(st, /^(([ \t]*\.[ \t]*\\[ \t]*)|(([ \t]*([A-Za-z])[ \t]*(\:)[ \t]*)?([ \t]*(\\)[ \t]*)?))([ \t]*(([ \t]*[0-9A-Za-z_\!\+\-\[\]\(\)\{\}\~\.]+( +[0-9A-Za-z_\!\+\-\[\]\(\)\{\}\~\.]+)*[ \t]*\\)+)[ \t]*)?([ \t]*([0-9A-Za-z_\!\+\.\~\-\[\]\{\}\(\)]+( +[0-9A-Za-z_\!\+\.\~\-\[\]\{\}\(\)]+)*)[ \t]*)?/, A)
+			if (! (FLENGTH = RLENGTH)) {
+				return ""
 			}
-			if (v != "" && v != (_[p]["VERSION"] = _getfilever(f))) {
-				return _dllerr(p, " file version mismatch: ==`" _[p]["VERSION"] "'; !=`" v "'", f)
+			d = A[8] A[10]
+			gsub(/[ \t]*\\[ \t]*/, "\\", d)
+			if ((st = toupper((r = A[5] A[6]) d (n = A[14]))) in _FILECACHE) {
+				return (_FILECACHE[substr(c, 1, FLENGTH)] = _FILECACHE[st])
 			}
-			_creport(p, substr("OK:    FILE DETECTED" ((v == "" ? "" : "(" v ")")) ": " f, 1, 122))
-		} else {
-			if (_[p]["TYPE"] == "defdir") {
-				if (_filexist(f = _[p]["DIR"])) {
-					_creport(p, substr("OK:    DIR DETECTED: " f, 1, 112))
-				} else {
-					_dllerr(p, "directory " f " is not detected")
-				}
+			_FILEDIR[c = _FILECACHE[substr(c, 1, FLENGTH)] = _FILECACHE[st] = ++_file_rootcntr] = d
+			if (A[8]) {
+				_FILEDIRFL[c]
 			}
-		}
-	}
-
-	function _filed(f, dd, d)
-	{
-		if ((f = _filerdnehnd(f)) == "") {
-			return ""
-		}
-		if (f in _FILEDIRFL) {
-			return _FILEDIR[f]
-		}
-		if (f in _FILEROOT) {
-			if (d = filegetdrvdir(_FILEROOT[f])) {
-				_FILEDIRFL[f]
+			if (r) {
+				_FILEROOT[c] = r
 			}
-			return (_FILEDIR[f] = d _FILEDIR[f])
 		}
-		if ((dd = (dd ? dd : _FILEIO_RD), f) in _FILEDIR) {
-			return _FILEDIR[dd, f]
-		}
-		if ((d = filedi(dd) _FILEDIR[f]) ~ /^\\/) {
-			return (_FILEDIR[dd, f] = d)
+		if (n) {
+			if (match(n, /\.[^\.]*$/)) {
+				_FILEXT[c] = substr(n, RSTART)
+				_FILENAM[c] = substr(n, 1, RSTART - 1)
+			} else {
+				_FILENAM[c] = n
+			}
 		}
-		return d
+		return c
 	}
+	return ""
+}
 
-	function _filen(f)
-	{
-		if ((f = _filerdnehnd(f)) == "") {
-			return ""
-		}
-		return ((f in _FILENAM ? _FILENAM[f] : ""))
+#_______________________________________________________________________
+function _filexist(f, a)
+{
+	if (f == "") {
+		return ""
 	}
-
-	function _filene(f)
-	{
-		if ((f = _filerdnehnd(f)) == "") {
-			return ""
-		}
-		return (((f in _FILENAM ? _FILENAM[f] : "")) ((f in _FILEXT ? _FILEXT[f] : "")))
+	if ((a = _filepath(f)) == "") {
+		ERRNO = "Filepath error `" f "'"
+		return ""
 	}
-
-	function _filenotexist(f, a)
-	{
-		if (f == "") {
-			return ""
-		}
-		if ((a = _filepath(f)) == "") {
-			ERRNO = "Filepath error `" f "'"
-			return ""
-		}
-		_cmd("if exist \"" a "\" exit 1 2>NUL")
-		if (_exitcode == 1) {
-			return (ERRNO = _NOP)
-		}
+	_cmd("if exist \"" a "\" exit 1 2>NUL")
+	if (_exitcode == 1) {
 		return a
 	}
-
-	function _filepath(f, dd)
-	{
-		if ((f = _filerdnehnd(f)) == "") {
-			return ""
+	ERRNO = "File not found `" f "'"
+	return _NOP
+}
+
+#_______________________________________________________________________
+function _fn(f, p0, p1, p2)
+{
+	if (f in FUNCTAB) {
+		return @f(p0, p1, p2)
+	}
+}
+
+#_______________________________________________________________________
+function _foreach(A, f, r, p0, p1, p2, i, p)
+{
+	if (isarray(A)) {
+		_TMP0[p = _n()]["."] = 1
+		_foreach_i0(A, f, _TMP0[p], p0, p1, p2)
+		return _th0(_retarr(_TMP0[p]), _tdel(p))
+	}
+	if (_isptr(A)) {
+		_TMP0[p = _n()][_ARRLEN] = 1
+		_tframe4("_foreach_i1" ((r ? "~" r : "")), A, f, _TMP0[p], p0, p1)
+		return _th0(_retarr(_TMP0[p]), _tdel(p))
+	}
+}
+
+#_____________________________________________________
+function _foreach_i0(A, f, D, p0, p1, p2)
+{
+	for (i in A) {
+		if (isarray(A[i])) {
+			_foreach_i0(A[i], f, D, p0, p1, p2)
+		} else {
+			_gen(D, @f(A[i], p0, p1, p2))
 		}
-		return (filegetrootdir(f, dd) ((f in _FILENAM ? _FILENAM[f] : "")) ((f in _FILEXT ? _FILEXT[f] : "")))
 	}
+}
 
-	function _filer(f, dd)
-	{
-		if ((f = _filerdnehnd(f)) == "") {
-			return ""
-		}
-		if (f in _FILEROOT) {
-			return _FILEROOT[f]
-		}
-		if ((dd = (dd ? dd : _FILEIO_RD), f) in _FILEROOT) {
-			return _FILEROOT[dd, f]
-		}
-		return (_FILEROOT[dd, f] = fileri(dd))
-	}
+#_____________________________________________________
+function _foreach_i1(p, f, D, p0, p1, p2)
+{
+	_gen(D, @f(p, p0, p1, p2))
+}
 
-	function _filerd(f, dd)
-	{
-		if ((f = _filerdnehnd(f)) == "") {
-			return ""
-		}
-		return filegetrootdir(f, dd)
+#_____________________________________________________________________________
+function _formatrexp(t)
+{
+	_formatstrq0 = split(t, _FORMATSTRA, /[\/\x00-\x1F\x80-\xFF]/, _FORMATSTRB)
+	_formatstrs0 = ""
+	for (t = 1; t < _formatstrq0; t++) {
+		_formatstrs0 = _formatstrs0 _FORMATSTRA[t] _FORMATREXPESC[_FORMATSTRB[t]]
 	}
+	return (_formatstrs0 _FORMATSTRA[t])
+}
 
-	function _filerdn(f, dd)
-	{
-		if ((f = _filerdnehnd(f)) == "") {
-			return ""
-		}
-		return ((f in _FILENAM ? filegetrootdir(f, dd) _FILENAM[f] : ""))
+#___________________________________________________________
+function _formatrexp_init()
+{
+	_defescarr(_FORMATREXPESC, "[\\x00-\\x1F\\x80-\\xFF]", _QASC)
+	_defescarr(_FORMATREXPESC, "\\/", "\\")
+	_FORMATREXPESC["\t"] = "\\t"
+}
+
+#_____________________________________________________________________________
+function _formatstrd(t)
+{
+	_formatstrq0 = split(t, _FORMATSTRA, /["\x00-\x1F\x80-\xFF]/, _FORMATSTRB)
+	_formatstrs0 = ""
+	for (t = 1; t < _formatstrq0; t++) {
+		_formatstrs0 = _formatstrs0 _FORMATSTRA[t] _FORMATSTRDESC[_FORMATSTRB[t]]
 	}
+	return (_formatstrs0 _FORMATSTRA[t])
+}
 
-	function _filerdne(f, dd)
-	{
-		if ((f = _filerdnehnd(f)) == "") {
-			return ""
-		}
-		if (f in _FILENAM) {
-			return (filegetrootdir(f, dd) _FILENAM[f] ((f in _FILEXT ? _FILEXT[f] : "")))
-		}
-		if (f in _FILEXT) {
-			return (filegetrootdir(f, dd) _FILEXT[f])
-		}
-		return ""
+#___________________________________________________________
+function _formatstrd_init()
+{
+	_defescarr(_FORMATSTRDESC, "[\\x00-\\x1F\\x80-\\xFF]", _QASC)
+	_defescarr(_FORMATSTRDESC, "[\\\\\"]", "\\")
+	_FORMATSTRDESC["\t"] = "\\t"
+}
+
+####################################################################################
+
+
+
+
+#___________________________________________________________________________________
+function _formatstrs(t)
+{
+	_formatstrq0 = split(t, _FORMATSTRA, /['\x00-\x1F\x80-\xFF]/, _FORMATSTRB)
+	_formatstrs0 = ""
+	for (t = 1; t < _formatstrq0; t++) {
+		_formatstrs0 = _formatstrs0 _FORMATSTRA[t] _FORMATSTRSESC[_FORMATSTRB[t]]
 	}
+	return (_formatstrs0 _FORMATSTRA[t])
+}
+
+#___________________________________________________________
+function _formatstrs_init()
+{
+	_defescarr(_FORMATSTRSESC, "[\\x00-\\x1F\\x80-\\xFF]", _QASC)
+	_defescarr(_FORMATSTRSESC, "[\\\\']", "\\")
+	_FORMATSTRSESC["\t"] = "\\t"
+}
+
+function _fpp(q, D, S)
+{
+	_conl()
+	_conline(q)
+	_conl()
+	q = _patharr0(S, q)
+	#_arregpath(D,S)
+	#_conl(_dumparr(D))
+	_conl(_dumparr(S))
+	_conl()
+	return q
+}
+
+#_______________________________________________________________________
+########################################################################
+
+
+
+
+
+
+
+
+
+function _fthru(A, c, p, B)
+{
+	return _fthru_i0(A, c, p, B, A[""])
+}
+
+#_________________________________________________________________
+function _fthru_i0(A, c, p, B, f)
+{
+	return ((f ? @f(c, _fthru_i0(A, c, p, B, A[f]), B) : ""))
+}
+
+function _gen(D, t)
+{
+	if (length(D[D[_ARRLEN]] = D[D["."]] t) > _datablock_length) {
+		D[++D[_ARRLEN]] = ""
+	}
+}
+
+#_____________________________________________________________________________
+function _gensubfn(t, r, f, p0, A)
+{
+	if (match(t, r, A)) {
+		return (substr(t, 1, RSTART - 1) (@f(_th0(substr(t, RSTART, RLENGTH), t = substr(t, RSTART + RLENGTH)), A, p0)) _gensubfn(t, r, f, p0))
+	}
+	return t
+}
+
+#_____________________________________________________________________________
+function _get_errout(p)
+{
+	return _tframe("_get_errout_i0", p)
+}
+
+#_______________________________________________________________________
+function _get_errout_i0(p, t, n, a)
+{
+	return ((p in _tLOG ? _get_errout_i1(p) _get_errout_i3(p) : ""))
+}
 
-	function _filerdnehnd(st, c, r, d, n, A)
-	{
-		if (st) {
-			if ((c = toupper(st)) in _FILECACHE) {
-				FLENGTH = length(st)
-				return _FILECACHE[c]
-			}
-			if (match(st, /^[ \t]*\\[ \t]*\\/)) {
-				if (match(substr(st, (FLENGTH = RLENGTH) + 1), /^[ \t]*([0-9A-Za-z\-]+)[ \t]*(\\[ \t]*([A-Za-z])[ \t]*\$[ \t]*)?(\\[ \t]*([0-9A-Za-z_\!\+\-\[\]\(\)\{\}\~\.]+( +[0-9A-Za-z_\!\+\-\[\]\(\)\{\}\~\.]+)*[ \t]*\\)+[ \t]*)?(([0-9A-Za-z_\!\+\.\~\-\[\]\{\}\(\)]+( +[0-9A-Za-z_\!\+\.\~\-\[\]\{\}\(\)]+)*)[ \t]*)?/, A)) {
-					FLENGTH = FLENGTH + RLENGTH
-					d = ((A[3] ? "\\" A[3] "$" : "")) A[4]
-					gsub(/[ \t]*\\[ \t]*/, "\\", d)
-					if ((st = toupper((r = "\\\\" A[1]) d (n = A[8]))) in _FILECACHE) {
-						return (_FILECACHE[substr(c, 1, FLENGTH)] = _FILECACHE[st])
-					}
-					_FILEDIR[c = _FILECACHE[substr(c, 1, FLENGTH)] = _FILECACHE[st] = ++_file_rootcntr] = d
-					_FILEDIRFL[c]
-					_FILEROOT[c] = r
-				} else {
-					FLENGTH = 0
-					_filepath_err = "UNC"
-					return ""
-				}
-			} else {
-				match(st, /^(([ \t]*\.[ \t]*\\[ \t]*)|(([ \t]*([A-Za-z])[ \t]*(\:)[ \t]*)?([ \t]*(\\)[ \t]*)?))([ \t]*(([ \t]*[0-9A-Za-z_\!\+\-\[\]\(\)\{\}\~\.]+( +[0-9A-Za-z_\!\+\-\[\]\(\)\{\}\~\.]+)*[ \t]*\\)+)[ \t]*)?([ \t]*([0-9A-Za-z_\!\+\.\~\-\[\]\{\}\(\)]+( +[0-9A-Za-z_\!\+\.\~\-\[\]\{\}\(\)]+)*)[ \t]*)?/, A)
-				if (! (FLENGTH = RLENGTH)) {
-					return ""
-				}
-				d = A[8] A[10]
-				gsub(/[ \t]*\\[ \t]*/, "\\", d)
-				if ((st = toupper((r = A[5] A[6]) d (n = A[14]))) in _FILECACHE) {
-					return (_FILECACHE[substr(c, 1, FLENGTH)] = _FILECACHE[st])
-				}
-				_FILEDIR[c = _FILECACHE[substr(c, 1, FLENGTH)] = _FILECACHE[st] = ++_file_rootcntr] = d
-				if (A[8]) {
-					_FILEDIRFL[c]
-				}
-				if (r) {
-					_FILEROOT[c] = r
-				}
-			}
-			if (n) {
-				if (match(n, /\.[^\.]*$/)) {
-					_FILEXT[c] = substr(n, RSTART)
-					_FILENAM[c] = substr(n, 1, RSTART - 1)
-				} else {
-					_FILENAM[c] = n
-				}
+#_________________________________________________________________
+function _get_errout_i1(p, t, n, a)
+{
+	if (p in _tLOG) {
+		n = ""
+		if (_tLOG[p]["TYPE"]) {
+			n = _tLOG[p]["TYPE"] ": " _get_errout_i2(p)
+			if (match(_tLOG[p]["TEXT"], /\x1F/)) {
+				t = n
+				gsub(/[^\t]/, " ", t)
+				return (_ln(n substr(_tLOG[p]["TEXT"], 1, RSTART - 1)) _ln(t substr(_tLOG[p]["TEXT"], RSTART + 1)))
 			}
-			return c
 		}
-		return ""
+		return _ln(n _tLOG[p]["TEXT"])
 	}
-
-	function _filexist(f, a)
-	{
-		if (f == "") {
-			return ""
-		}
-		if ((a = _filepath(f)) == "") {
-			ERRNO = "Filepath error `" f "'"
-			return ""
-		}
-		_cmd("if exist \"" a "\" exit 1 2>NUL")
-		if (_exitcode == 1) {
-			return a
+}
+
+#_______________________________________________________________________
+function _get_errout_i2(p)
+{
+	return (("FILE" in _tLOG[p] ? _tLOG[p]["FILE"] (("LINE" in _tLOG[p] ? "(" _tLOG[p]["LINE"] ")" : "")) ": " : ""))
+}
+
+#_______________________________________________________________________
+function _get_errout_i3(p, t, ts, cl, cp, cr, a, b)
+{
+	if ("LSTR" in _tLOG[p]) {
+		t = _tLOG[p]["FULLSTR"]
+		ts = _tLOG[p]["TS"]
+		cp = "^"
+		if ("CSTR" in _tLOG[p]) {
+			cr = _tLOG[p]["CSTR"]
+			cl = _tLOG[p]["CLSTR"]
+			if ("CPSTR" in _tLOG[p]) {
+				cp = _tLOG[p]["CPSTR"]
+			}
 		}
-		ERRNO = "File not found `" f "'"
-		return _NOP
+		cr = substr(cr, length(cl) + length(cp) + 1)
+		return (_ln(_tabtospc(t, ts)) _ln(_getchrln(" ", a = length(_tabtospc(_tLOG[p]["LSTR"], ts))) _getchrln("-", b = length(_tabtospc(cl, ts, a))) _getchrln("^", b = length(_tabtospc(cp, ts, a = a + b))) _getchrln("-", length(_tabtospc(cr, ts, a + b)))))
 	}
+}
 
-	function _fn(f, p0, p1, p2)
-	{
-		if (f in FUNCTAB) {
-			return @f(p0, p1, p2)
-		}
-	}
+#_____________________________________________________________________________
+function _get_logout(p)
+{
+	return _tframe("_get_logout_i0", p)
+}
 
-	function _foreach(A, f, r, p0, p1, p2, i, p)
-	{
-		if (isarray(A)) {
-			_TMP0[p = _n()]["."] = 1
-			_foreach_i0(A, f, _TMP0[p], p0, p1, p2)
-			return _th0(_retarr(_TMP0[p]), _tdel(p))
-		}
-		if (_isptr(A)) {
-			_TMP0[p = _n()][_ARRLEN] = 1
-			_tframe4("_foreach_i1" ((r ? "~" r : "")), A, f, _TMP0[p], p0, p1)
-			return _th0(_retarr(_TMP0[p]), _tdel(p))
-		}
+#_______________________________________________________________________
+function _get_logout_i0(p, t, n, a)
+{
+	if (p in _tLOG) {
+		n = (("DATE" in _tLOG[p] ? _tLOG[p]["DATE"] " " : "")) (("TIME" in _tLOG[p] ? _tLOG[p]["TIME"] " " : ""))
+		if (_tLOG[p]["TYPE"]) {
+			n = n _tLOG[p]["TYPE"] ": " (("FILE" in _tLOG[p] ? _tLOG[p]["FILE"] (("LINE" in _tLOG[p] ? "(" _tLOG[p]["LINE"] ")" : "")) ": " : ""))
+			if (match(_tLOG[p]["TEXT"], /\x1F/)) {
+				t = n
+				gsub(/[^\t]/, " ", t)
+				return (_ln(n substr(_tLOG[p]["TEXT"], 1, RSTART - 1)) _ln(t substr(_tLOG[p]["TEXT"], RSTART + 1)))
+			}
+		}
+		return _ln(n _tLOG[p]["TEXT"])
+	}
+}
+
+#_______________________________________________________________________
+function _getchrln(s, w)
+{
+	if (s == "") {
+		return 
 	}
-
-	function _foreach_i0(A, f, D, p0, p1, p2)
-	{
-		for (i in A) {
-			if (isarray(A[i])) {
-				_foreach_i0(A[i], f, D, p0, p1, p2)
-			} else {
-				_gen(D, @f(A[i], p0, p1, p2))
+	#if ( w!=w+0 || w<0 )	w=_CON_WIDTH
+	if (length(s) < w) {
+		if (s in _GETCHRLN) {
+			if (length(_getchrlnt0 = _GETCHRLN[s]) >= w) {
+				return substr(_getchrlnt0, 1, w)
 			}
-		}
+		} else {
+			_getchrlnt0 = s s
+		}
+		while (length(_getchrlnt0) < w) {
+			_getchrlnt0 = _getchrlnt0 _getchrlnt0
+		}
+		_GETCHRLN[s] = _getchrlnt0
+		return substr(_getchrlnt0, 1, w)
+	} else {
+		return substr(s, 1, w)
+	}
+}
+
+#_______________________________________________________________________
+function _getdate()
+{
+	return strftime("%F")
+}
+
+#_____________________________________________________________________________
+function _getfilepath(t, f, al, b, A)
+{
+	ERRNO = ""
+	if (match(t, /^[ \t]*(("([^"]*)"[ \t]*)|([`']([^']*)'[ \t]*)|(([^ \t]+)[ \t]*))/, A)) {
+		al = RLENGTH
+		f = A[3] A[5] A[7]
+		_conl("_getfilepath(" f ")        (" al ")")
+		if (b = _filepath(f)) {
+			if (length(f) <= FLENGTH) {
+				FLENGTH = al
+				return b
+			}
+			ERRNO = "Filepath `" f "' error"
+		}
+	}
+	FLENGTH = 0
+}
+
+function _getfilever(f)
+{
+	split(_cmd(_fileverpath " \"" f "\""), _GETFILEVERA0, /[ \t]+/)
+	if (_GETFILEVERA0[5]) {
+		return _GETFILEVERA0[5]
+	}
+}
+
+#_________________________________________________________________
+function _getime()
+{
+	return strftime("%H:%M:%S")
+}
+
+#_________________________________________________________________
+function _getmpdir(f, dd)
+{
+	if (! dd || ! (dd = _filerd(dd))) {
+		dd = _FILEIO_TMPRD
+	}
+	if (f = (f ? _filerd(f, dd) : _filerd("_" ++_FILEIO_TMPCNTR "\\", dd))) {
+		_FILEIO_RDTMP[toupper(f)]
+	}
+	return f
+}
+
+#_________________________________________________________________
+function _getmpfile(f, dd)
+{
+	if (! dd || ! (dd = _filerd(dd))) {
+		dd = _FILEIO_TMPRD
+	}
+	if (f = _filerdne((_filene(f) ? f : f "_" ++_FILEIO_TMPCNTR), dd)) {
+		_FILEIO_RDNETMP[toupper(f)]
+	}
+	return f
+}
+
+#_______________________________________________________________________
+function _getperf(o, t, a)
+{
+	(o == "" ? ++_getperf_opcurr : _getperf_opcurr = o)
+	if ((a = _getsecond()) != _getperf_last) {
+		_getperf_opsec = (_getperf_opcurr - _getperf_opstart) / ((_getperf_last = a) - _getperf_start)
+		return @_getperf_fn(o, t, a)
+	}
+	return 1
+}
+
+#___________________________________________________________
+function _getperf_(o, t, a)
+{
+	if (a >= _getperf_end) {
+		return 0
 	}
-
-	function _foreach_i1(p, f, D, p0, p1, p2)
-	{
-		_gen(D, @f(p, p0, p1, p2))
+	if (_getperf_opsecp != _getperf_opsec) {
+		_constat(((_constatstr == _getperf_stat ? _getperf_statstr : _getperf_statstr = _constatstr)) t " [TIME=" (a - _getperf_start) " sec(" (_getperf_opsecp = _getperf_opsec) " ops/sec)]")
+		_getperf_stat = _constatstr
+	}
+	return 1
+}
+
+#___________________________________________________________
+function _getperf_noe(o, t, a)
+{
+	if (_getperf_opsecp != _getperf_opsec) {
+		_constat(((_constatstr == _getperf_stat ? _getperf_statstr : _getperf_statstr = _constatstr)) t " [TIME=" (a - _getperf_start) " sec(" (_getperf_opsecp = _getperf_opsec) " ops/sec)]")
+		_getperf_stat = _constatstr
+	}
+	return 1
+}
+
+#___________________________________________________________
+function _getperf_noenot(o, t, a)
+{
+	return 1
+}
+
+#___________________________________________________________
+function _getperf_not(o, t, a)
+{
+	if (a < _getperf_end) {
+		return 1
 	}
+}
 
-	function _formatrexp(t)
-	{
-		_formatstrq0 = split(t, _FORMATSTRA, /[\/\x00-\x1F\x80-\xFF]/, _FORMATSTRB)
-		_formatstrs0 = ""
-		for (t = 1; t < _formatstrq0; t++) {
-			_formatstrs0 = _formatstrs0 _FORMATSTRA[t] _FORMATREXPESC[_FORMATSTRB[t]]
-		}
-		return (_formatstrs0 _FORMATSTRA[t])
-	}
+#_________________________________________________________________________________________
+##########################################################################################
 
-	function _formatrexp_init()
-	{
-		_defescarr(_FORMATREXPESC, "[\\x00-\\x1F\\x80-\\xFF]", _QASC)
-		_defescarr(_FORMATREXPESC, "\\/", "\\")
-		_FORMATREXPESC["\t"] = "\\t"
-	}
 
-	function _formatstrd(t)
-	{
-		_formatstrq0 = split(t, _FORMATSTRA, /["\x00-\x1F\x80-\xFF]/, _FORMATSTRB)
-		_formatstrs0 = ""
-		for (t = 1; t < _formatstrq0; t++) {
-			_formatstrs0 = _formatstrs0 _FORMATSTRA[t] _FORMATSTRDESC[_FORMATSTRB[t]]
-		}
-		return (_formatstrs0 _FORMATSTRA[t])
-	}
 
-	function _formatstrd_init()
-	{
-		_defescarr(_FORMATSTRDESC, "[\\x00-\\x1F\\x80-\\xFF]", _QASC)
-		_defescarr(_FORMATSTRDESC, "[\\\\\"]", "\\")
-		_FORMATSTRDESC["\t"] = "\\t"
-	}
 
-	function _formatstrs(t)
-	{
-		_formatstrq0 = split(t, _FORMATSTRA, /['\x00-\x1F\x80-\xFF]/, _FORMATSTRB)
-		_formatstrs0 = ""
-		for (t = 1; t < _formatstrq0; t++) {
-			_formatstrs0 = _formatstrs0 _FORMATSTRA[t] _FORMATSTRSESC[_FORMATSTRB[t]]
-		}
-		return (_formatstrs0 _FORMATSTRA[t])
-	}
 
-	function _formatstrs_init()
-	{
-		_defescarr(_FORMATSTRSESC, "[\\x00-\\x1F\\x80-\\xFF]", _QASC)
-		_defescarr(_FORMATSTRSESC, "[\\\\']", "\\")
-		_FORMATSTRSESC["\t"] = "\\t"
-	}
 
-	function _fpp(q, D, S)
-	{
-		_conl()
-		_conline(q)
-		_conl()
-		q = _patharr0(S, q)
-		_conl(_dumparr(S))
-		_conl()
-		return q
-	}
 
-	function _fthru(A, c, p, B)
-	{
-		return _fthru_i0(A, c, p, B, A[""])
-	}
 
-	function _fthru_i0(A, c, p, B, f)
-	{
-		return ((f ? @f(c, _fthru_i0(A, c, p, B, A[f]), B) : ""))
-	}
 
-	function _gen(D, t)
-	{
-		if (length(D[D[_ARRLEN]] = D[D["."]] t) > _datablock_length) {
-			D[++D[_ARRLEN]] = ""
-		}
-	}
 
-	function _gensubfn(t, r, f, p0, A)
-	{
-		if (match(t, r, A)) {
-			return (substr(t, 1, RSTART - 1) (@f(_th0(substr(t, RSTART, RLENGTH), t = substr(t, RSTART + RLENGTH)), A, p0)) _gensubfn(t, r, f, p0))
-		}
-		return t
-	}
 
-	function _get_errout(p)
-	{
-		return _tframe("_get_errout_i0", p)
-	}
 
-	function _get_errout_i0(p, t, n, a)
-	{
-		return ((p in _tLOG ? _get_errout_i1(p) _get_errout_i3(p) : ""))
-	}
 
-	function _get_errout_i1(p, t, n, a)
-	{
-		if (p in _tLOG) {
-			n = ""
-			if (_tLOG[p]["TYPE"]) {
-				n = _tLOG[p]["TYPE"] ": " _get_errout_i2(p)
-				if (match(_tLOG[p]["TEXT"], /\x1F/)) {
-					t = n
-					gsub(/[^\t]/, " ", t)
-					return (_ln(n substr(_tLOG[p]["TEXT"], 1, RSTART - 1)) _ln(t substr(_tLOG[p]["TEXT"], RSTART + 1)))
-				}
-			}
-			return _ln(n _tLOG[p]["TEXT"])
-		}
-	}
 
-	function _get_errout_i2(p)
-	{
-		return (("FILE" in _tLOG[p] ? _tLOG[p]["FILE"] (("LINE" in _tLOG[p] ? "(" _tLOG[p]["LINE"] ")" : "")) ": " : ""))
-	}
 
-	function _get_errout_i3(p, t, ts, cl, cp, cr, a, b)
-	{
-		if ("LSTR" in _tLOG[p]) {
-			t = _tLOG[p]["FULLSTR"]
-			ts = _tLOG[p]["TS"]
-			cp = "^"
-			if ("CSTR" in _tLOG[p]) {
-				cr = _tLOG[p]["CSTR"]
-				cl = _tLOG[p]["CLSTR"]
-				if ("CPSTR" in _tLOG[p]) {
-					cp = _tLOG[p]["CPSTR"]
-				}
-			}
-			cr = substr(cr, length(cl) + length(cp) + 1)
-			return (_ln(_tabtospc(t, ts)) _ln(_getchrln(" ", a = length(_tabtospc(_tLOG[p]["LSTR"], ts))) _getchrln("-", b = length(_tabtospc(cl, ts, a))) _getchrln("^", b = length(_tabtospc(cp, ts, a = a + b))) _getchrln("-", length(_tabtospc(cr, ts, a + b)))))
-		}
-	}
 
-	function _get_logout(p)
-	{
-		return _tframe("_get_logout_i0", p)
-	}
 
-	function _get_logout_i0(p, t, n, a)
-	{
-		if (p in _tLOG) {
-			n = (("DATE" in _tLOG[p] ? _tLOG[p]["DATE"] " " : "")) (("TIME" in _tLOG[p] ? _tLOG[p]["TIME"] " " : ""))
-			if (_tLOG[p]["TYPE"]) {
-				n = n _tLOG[p]["TYPE"] ": " (("FILE" in _tLOG[p] ? _tLOG[p]["FILE"] (("LINE" in _tLOG[p] ? "(" _tLOG[p]["LINE"] ")" : "")) ": " : ""))
-				if (match(_tLOG[p]["TEXT"], /\x1F/)) {
-					t = n
-					gsub(/[^\t]/, " ", t)
-					return (_ln(n substr(_tLOG[p]["TEXT"], 1, RSTART - 1)) _ln(t substr(_tLOG[p]["TEXT"], RSTART + 1)))
-				}
-			}
-			return _ln(n _tLOG[p]["TEXT"])
-		}
-	}
 
-	function _getchrln(s, w)
-	{
-		if (s == "") {
-			return 
-		}
-		if (length(s) < w) {
-			if (s in _GETCHRLN) {
-				if (length(_getchrlnt0 = _GETCHRLN[s]) >= w) {
-					return substr(_getchrlnt0, 1, w)
-				}
-			} else {
-				_getchrlnt0 = s s
-			}
-			while (length(_getchrlnt0) < w) {
-				_getchrlnt0 = _getchrlnt0 _getchrlnt0
-			}
-			_GETCHRLN[s] = _getchrlnt0
-			return substr(_getchrlnt0, 1, w)
-		} else {
-			return substr(s, 1, w)
-		}
-	}
 
-	function _getdate()
-	{
-		return strftime("%F")
-	}
 
-	function _getfilepath(t, f, al, b, A)
-	{
-		ERRNO = ""
-		if (match(t, /^[ \t]*(("([^"]*)"[ \t]*)|([`']([^']*)'[ \t]*)|(([^ \t]+)[ \t]*))/, A)) {
-			al = RLENGTH
-			f = A[3] A[5] A[7]
-			_conl("_getfilepath(" f ")        (" al ")")
-			if (b = _filepath(f)) {
-				if (length(f) <= FLENGTH) {
-					FLENGTH = al
-					return b
-				}
-				ERRNO = "Filepath `" f "' error"
+
+function _getreg_i1(D, r, R, a, i, il, ir, rc, B)
+{
+	a = IGNORECASE
+	IGNORECASE = 1
+	r = "^" _torexp(r)
+	rc = 0
+	zs = ""
+	for (i in R) {
+		if (match(i, r, B)) {
+			il = B[_torexp_pfxcntr]
+			ir = gensub(/....$/, "", 1, substr(i, 1 + B[_torexp_pfxcntr, "length"]))
+			if (! gsub(/^\\/, "", ir) && match(il, /[^\\]+$/)) {
+				ir = substr(il, RSTART) ir
 			}
+			D[ir] = R[i]
+			rc++
 		}
-		FLENGTH = 0
 	}
-
-	function _getfilever(f)
-	{
-		split(_cmd(_fileverpath " \"" f "\""), _GETFILEVERA0, /[ \t]+/)
-		if (_GETFILEVERA0[5]) {
-			return _GETFILEVERA0[5]
-		}
+	IGNORECASE = a
+	if (rc > 0) {
+		return rc
 	}
+}
 
-	function _getime()
-	{
-		return strftime("%H:%M:%S")
-	}
+#_________________________________________________________________
+function _getsecond()
+{
+	return systime()
+}
 
-	function _getmpdir(f, dd)
-	{
-		if (! dd || ! (dd = _filerd(dd))) {
-			dd = _FILEIO_TMPRD
-		}
-		if (f = (f ? _filerd(f, dd) : _filerd("_" ++_FILEIO_TMPCNTR "\\", dd))) {
-			_FILEIO_RDTMP[toupper(f)]
-		}
-		return f
+#___________________________________________________________
+function _getsecondsync(a, c, b, c2)
+{
+	a = systime()
+	while (a == systime()) {
+		++c
 	}
+	return (a + 1)
+}
 
-	function _getmpfile(f, dd)
-	{
-		if (! dd || ! (dd = _filerd(dd))) {
-			dd = _FILEIO_TMPRD
+#_______________________________________________________________________
+function _getuid(p)
+{
+	if (p in _UIDOBL) {
+		for (_tptr in _UIDOBLV[_getuida0 = _UIDOBL[p]]) {
+			delete _UIDOBLV[_getuida0][_tptr]
+			_CLASSPTR[_tptr] = p
+			return _tptr
 		}
-		if (f = _filerdne((_filene(f) ? f : f "_" ++_FILEIO_TMPCNTR), dd)) {
-			_FILEIO_RDNETMP[toupper(f)]
-		}
-		return f
 	}
+	_CLASSPTR[_tptr = _UIDPFX[p] _getuid_i0(_UIDCNT[p], _UIDCHRL[_tptr = _UIDCHR[p]], _UIDCHRH[_tptr]) _UIDSFX[p]] = p
+	return _tptr
+}
 
-	function _getperf(o, t, a)
-	{
-		(o == "" ? ++_getperf_opcurr : _getperf_opcurr = o)
-		if ((a = _getsecond()) != _getperf_last) {
-			_getperf_opsec = (_getperf_opcurr - _getperf_opstart) / ((_getperf_last = a) - _getperf_start)
-			return @_getperf_fn(o, t, a)
+#_____________________________________________________
+function _getuid_i0(p, UL, UH)
+{
+	if ("" == (_tptr = UL[_UIDCNTL[p]])) {
+		for (_tptr in UH) {
+			delete UH[_tptr]
+			return ((_UIDCNTH[p] = _tptr) (_UIDCNTL[p] = UL[""]))
 		}
-		return 1
+		_fatal("out of UID")
 	}
+	return (_UIDCNTH[p] (_UIDCNTL[p] = _tptr))
+}
 
-	function _getperf_(o, t, a)
-	{
-		if (a >= _getperf_end) {
-			return 0
-		}
-		if (_getperf_opsecp != _getperf_opsec) {
-			_constat(((_constatstr == _getperf_stat ? _getperf_statstr : _getperf_statstr = _constatstr)) t " [TIME=" (a - _getperf_start) " sec(" (_getperf_opsecp = _getperf_opsec) " ops/sec)]")
-			_getperf_stat = _constatstr
-		}
-		return 1
-	}
+function _handle8494(t)
+{
+	return gensub(/(.)/, ".\\1", "G", t)
+}
 
-	function _getperf_noe(o, t, a)
-	{
-		if (_getperf_opsecp != _getperf_opsec) {
-			_constat(((_constatstr == _getperf_stat ? _getperf_statstr : _getperf_statstr = _constatstr)) t " [TIME=" (a - _getperf_start) " sec(" (_getperf_opsecp = _getperf_opsec) " ops/sec)]")
-			_getperf_stat = _constatstr
-		}
-		return 1
+#_____________________________________________________________________________
+function _hexnum(n, l)
+{
+	if (l + 0 < 1) {
+		l = 2
 	}
+	return sprintf("%." ((l + 0 < 1 ? 2 : l)) "X", n)
+}
 
-	function _getperf_noenot(o, t, a)
-	{
-		return 1
+#_________________________________________________________________
+function _igetperf(t, s, o)
+{
+	if (t == 0 && t == "" && s == 0 && s == "" && o == 0 && o == "") {
+		if (_getperf_fn !~ /not$/ && _constatstr == _getperf_stat) {
+			_constat(_getperf_statstr)
+		}
+		_getperf_fn = "_nop"
+		return ("[TIME=" (_getperf_last - _getperf_start) " sec(" _getperf_opsec " ops/sec)]")
+	}
+	_conl("initiate _getperf")
+	_getperf_opstart = _getperf_opcurr = o + 0
+	_getperf_opsec = _getperf_opsecp = _getperf_stat = _getperf_statstr = ""
+	_getperf_end = t + (_getperf_start = _getperf_last = _getsecondsync())
+	_getperf_fn = ((t + 0 > 0 ? "_getperf_" : "_getperf_noe")) ((s ? "" : "not"))
+	return _getperf_start
+}
+
+function _import_data(t, p, p2, a)
+{
+	if (match(t, /^_DATA: /)) {
+		_tDATA[a = _wLCHLD(p, _N())][""]
+		delete _tDATA[a][""]
+		_Zimparr(_tDATA[a], substr(t, 8))
+		_conl("DATA: `" _tDATA[a]["ID"] "':`" _tDATA[a]["DATA"] "'")
+		return ""
 	}
-
-	function _getperf_not(o, t, a)
-	{
-		if (a < _getperf_end) {
-			return 1
+	return t
+}
+
+#_______________________________________________________________________
+function _info(t, d, A)
+{
+	if (_ERRLOG_IF) {
+		A["TYPE"] = "INFO"
+		A["TEXT"] = t
+		_log(A, d)
+	}
+}
+
+# test with the different path types
+#	_conl(_ln("SRC:") _dumparr(S)); _conl();
+
+function _ini(p, cs, dptr, pfx, sfx, hstr, lstr)
+{
+	return _inituid(p, cs, dptr, pfx, sfx, hstr, lstr, A)
+}
+
+function _initfilever()
+{
+	_fileverpath = "\\\\CPU\\eGAWK\\LIB\\_filever\\_filever.exe"
+}
+
+function _initrdreg()
+{
+	_RDREGTYPE["SZ"] = "STR"
+	_RDREGTYPE["DWORD"] = "W32"
+	_RDREGTYPE["QWORD"] = "W64"
+	_RDREGTYPE["BINARY"] = "BIN"
+	_RDREGTYPE["EXPAND_SZ"] = "XSZ"
+	_RDREGTYPE["MULTI_SZ"] = "MSZ"
+	_RDrdregfld = _rdregkey = 0
+}
+
+function _initregpath0()
+{
+	_REGPATH0REGDIR[""] = "HKEY_LOCAL_MACHINE"
+	_REGPATH0REGDIR["HKLM"] = "HKEY_LOCAL_MACHINE"
+	_REGPATH0REGDIR["HKEY_LOCAL_MACHINE"] = "HKEY_LOCAL_MACHINE"
+	_REGPATH0REGDIR["HKCR"] = "HKEY_CLASSES_ROOT"
+	_REGPATH0REGDIR["HKEY_CLASSES_ROOT"] = "HKEY_CLASSES_ROOT"
+	_REGPATH0REGDIR["HKCU"] = "HKEY_CURRENT_USER"
+	_REGPATH0REGDIR["HKEY_CURRENT_USER"] = "HKEY_CURRENT_USER"
+	_REGPATH0REGDIR["HKU"] = "HKEY_USERS"
+	_REGPATH0REGDIR["HKEY_USERS"] = "HKEY_USERS"
+	_REGPATH0REGDIR["HKCC"] = "HKEY_CURRENT_CONFIG"
+	_REGPATH0REGDIR["HKEY_CURRENT_CONFIG"] = "HKEY_CURRENT_CONFIG"
+	_REGPATH0REGDIR["HKPD"] = "HKEY_PERFORMANCE_DATA"
+	_REGPATH0REGDIR["HKEY_PERFORMANCE_DATA"] = "HKEY_PERFORMANCE_DATA"
+}
+
+function _initshare()
+{
+	_sharextool = "\\\\CPU\\eGAWK\\LIB\\_share\\_share.exe"
+}
+
+#_________________________________________
+function _initspecialuid()
+{
+	_NOINDEX = _getuid()
+	_LEN = _getuid()
+	_PTR = _getuid()
+	_NAME = _getuid()
+	_TYPE = _getuid()
+	_FORMAT = _getuid()
+}
+
+function _initsys()
+{
+}
+
+#_______________________________________________________________________
+function _inituid(p, cs, dptr, pfx, sfx, hstr, lstr, A)
+{
+	if (cs == 0 && cs == "") {
+		cs = p
+		p = _getuid()
+	}
+	_conl()
+	_conl()
+	_conl(cs)
+	if (match(cs, /^(([^:]*):)?(([^'\xB4]*\xB4.)*[^'\xB4]*)[']/, A)) {
+		pfx = A[3]
+		dptr = A[2]
+	}
+	if (match(cs = substr(cs, 1 + RLENGTH), /'(([^'\xB4]*\xB4.)*[^'\xB4]*)$/, A)) {
+		sfx = A[1]
+		cs = substr(cs, 1, RSTART - 1)
+	}
+	if (match(cs, /^(([`\^])(.*))/, A)) {
+		if (A[2] == "`") {
+			hstr = A[3] "~"
+			lstr = ""
+		} else {
+			lstr = A[3] "+"
+			hstr = ""
+		}
+	} else {
+		if (match(cs, /^(([^'\xB4\|]*\xB4.)*[^'\xB4\|]*)(\|(.*))?/, A)) {
+			hstr = A[1]
+			lstr = A[4]
+		} else {
+			ERRNO = "_inituid(): bad parameters"
+			return 
 		}
 	}
-
-	function _getreg_i1(D, r, R, a, i, il, ir, rc, B)
-	{
-		a = IGNORECASE
-		IGNORECASE = 1
-		r = "^" _torexp(r)
-		rc = 0
-		zs = ""
-		for (i in R) {
-			if (match(i, r, B)) {
-				il = B[_torexp_pfxcntr]
-				ir = gensub(/....$/, "", 1, substr(i, 1 + B[_torexp_pfxcntr, "length"]))
-				if (! gsub(/^\\/, "", ir) && match(il, /[^\\]+$/)) {
-					ir = substr(il, RSTART) ir
+	_conl(dptr ":" pfx "'" hstr "|" lstr "'" sfx)
+	return _cfguid(p, dptr, pfx, sfx, hstr, lstr)
+}
+
+function _inituidefault(h, l, H, L)
+{
+	_classys = ""
+	delete _UIDOBLV[_UIDOBLV[_UIDOBL[_classys] = _classys][""] = _classys][""]
+	_UIDPFX[_classys]
+	_UIDSFX[_classys]
+	_UIDCNT[_classys] = _UIDCHR[_classys] = _CLASSPTR[_classys] = _classys
+	h = "AB"
+	l = h "01"
+	_splitstr(H, h)
+	_splitstr(L, l)
+	delete _UIDCHRH[_UIDCHRH[_classys][""] = _classys][""]
+	delete _UIDCHRL[_UIDCHRL[_classys][""] = _classys][""]
+	_UIDCNTH[_classys]
+	_cfguidh(_classys, H, L)
+	_UIDCNTL[_classys] = _cfguidl(_classys, L, L)
+	_CLASSFN[_classys]["del"] = "_tobjDEL"
+	_CLASSFN[_classys]["new"] = "_tobjNEW"
+	_drawuid(_classys)
+	_initspecialuid()
+}
+
+#_______________________________________________________________________
+function _ins(S, sf, D, df)
+{
+	if (sf in S) {
+		if (isarray(S[sf])) {
+			if (df in D) {
+				if (isarray(D[df])) {
+					return _extarr(D[df], S[sf])
 				}
-				D[ir] = R[i]
-				rc++
+				delete D[df]
 			}
-		}
-		IGNORECASE = a
-		if (rc > 0) {
-			return rc
-		}
+			D[df][""]
+			delete D[df][""]
+			return _extarr(D[df], S[sf])
+		} else {
+			if (isarray(D[df])) {
+				delete D[df]
+			}
+			D[df] = S[sf] D[df]
+		}
+	}
+}
+
+#_________________________________________________________________
+function _insf(A, f)
+{
+	A["F"][""] = A["B"][A["F"][f] = A["F"][""]] = f
+}
+
+#_________________________________________________________________
+function _insframe(A, f)
+{
+	A[f] = A[""]
+	A[""] = f
+}
+
+#_________________________________________________________________
+function _inspass(A, f)
+{
+	A[f] = A[""]
+	A[""] = f
+}
+
+# there is problem with string's format: i can;t easilly merge 2 charsets: comma-divided and every-char-divided strings
+
+#_______________________________________________________________________
+function _isptr(p)
+{
+	if (isarray(p)) {
+		is = _NOP
+		it = "A"
+		return 0
 	}
-
-	function _getsecond()
-	{
-		return systime()
+	is = p
+	if (p == 0 && p == "") {
+		it = "-"
+		return 0
 	}
-
-	function _getsecondsync(a, c, b, c2)
-	{
-		a = systime()
-		while (a == systime()) {
-			++c
-		}
-		return (a + 1)
+	if (p in _CLASSPTR) {
+		return (it = "P")
 	}
+	it = "S"
+	return 0
+}
 
-	function _getuid(p)
-	{
-		if (p in _UIDOBL) {
-			for (_tptr in _UIDOBLV[_getuida0 = _UIDOBL[p]]) {
-				delete _UIDOBLV[_getuida0][_tptr]
-				_CLASSPTR[_tptr] = p
-				return _tptr
-			}
+#_______________________________________________________________________
+function _istr(p)
+{
+	if (isarray(p)) {
+		is = _NOP
+		it = "A"
+		return 0
+	}
+	is = p
+	if (p == 0 && p == "") {
+		it = "-"
+		return 0
+	}
+	return (it = (p == "" ? "s" : "S"))
+}
+
+#_________________________________________________________________
+function _lengthsort(i1, v1, i2, v2)
+{
+	return ((length(i1) < length(i2) ? -1 : (length(i1) > length(i2) ? 1 : (i1 < i2 ? -1 : 1))))
+}
+
+#_________________________________________________________________
+function _lib_APPLY()
+{
+	return _ffaccr(_LIBAPI, "_lib_APPLY")
+}
+
+#_________________________________________________________________
+function _lib_BEGIN(A)
+{
+	return _ffaccr(_LIBAPI, "_lib_BEGIN", "", A)
+}
+
+#_______________________________________________________________________
+function _lib_CMDLN(t)
+{
+	return _pass(_LIBAPI["F"], "_lib_CMDLN", t)
+}
+
+#_________________________________________________________________
+function _lib_END(A)
+{
+	return _ffaccr(_LIBAPI, "_lib_END", "", A)
+}
+
+#_________________________________________________________________
+function _lib_HELP()
+{
+	return _fbaccr(_LIBAPI, "_lib_HELP")
+}
+
+#_________________________________________________________________
+function _lib_NAMEVER()
+{
+	return _fbaccr(_LIBAPI, "_lib_NAMEVER")
+}
+
+#_____________________________________________________________________________
+function _ln(t)
+{
+	return ((t ~ /\x0A$/ ? t : t _CHR["EOL"]))
+}
+
+#_________________________________________________________________
+function _log(A, p, a, B)
+{
+	if (isarray(A)) {
+		A["TIME"] = _getime()
+		A["DATE"] = _getdate()
+		if (p) {
+			_tLOG[p = _wLCHLD(p, _N())][""]
+			delete _tLOG[p][""]
+			_movarr(_tLOG[p], A)
+			return p
 		}
-		_CLASSPTR[_tptr = _UIDPFX[p] _getuid_i0(_UIDCNT[p], _UIDCHRL[_tptr = _UIDCHR[p]], _UIDCHRH[_tptr]) _UIDSFX[p]] = p
-		return _tptr
+		_expout("_ERRLOG: " _Zexparr(A) "\n")
+	} else {
+		B["TEXT"] = A
+		B["TYPE"] = ""
+		return _log(B, p)
 	}
+}
 
-	function _getuid_i0(p, UL, UH)
-	{
-		if ("" == (_tptr = UL[_UIDCNTL[p]])) {
-			for (_tptr in UH) {
-				delete UH[_tptr]
-				return ((_UIDCNTH[p] = _tptr) (_UIDCNTL[p] = UL[""]))
+#_________________________________________________________________
+function _lspctab(t, ts, l, l1, l2, A)
+{
+	while (match(t, /^(\t*)( *)((\t*)(.*))$/, A)) {
+		if (A[1, "length"] >= l) {
+			return substr(t, l + 1)
+		}
+		if (A[2]) {
+			if ((l1 = int(A[2, "length"] / ts)) >= (l2 = l - A[1, "length"])) {
+				return (substr(A[2], l2 * ts + 1) A[3])
 			}
-			_fatal("out of UID")
+			if (! A[4]) {
+				return A[5]
+			}
+			t = A[1] _getchrln("\t", l1) A[3]
+		} else {
+			return t
 		}
-		return (_UIDCNTH[p] (_UIDCNTL[p] = _tptr))
 	}
-
-	function _handle8494(t)
-	{
-		return gensub(/(.)/, ".\\1", "G", t)
+}
+
+function _mac_init()
+{
+	_MACPFX["\204"] = "_macpfx84"
+	_MACPFX[""] = "_mpupfxsubret"
+	_MACPFX84SFX["\204"] = "_macpfx84"
+	_MACPFX84SFX["\224"] = "_macsfx94"
+	_MACPFX84SFX[""] = "_mpusfxsubret"
+	_VLDMAXSTRING = 1e+06
+}
+
+function _macpfx84(F, D, C, p1, p2, p3)
+{
+	return _mpusub(_MACPFX84SFX, D, C, D[_mpuptr++], p1, p2, p3)
+}
+
+function _macsfx94(F, D, C, p1, p2, p3)
+{
+	return _mpuretsub(D, _handle8494(_mpuacc))
+}
+
+#_______________________________________________________________________
+function _movarr(D, S)
+{
+	delete D
+	D[""]
+	delete D[""]
+	_addarr(D, S)
+}
+
+function _mpu(t, F, p1, p2, p3, D, C)
+{
+	if (patsplit(t, C, /[\x84\x93\x94]/, D) > 0) {
+		_conline("CODE")
+		_conl()
+		_conl(_dumparr(C))
+		_conline("DATA")
+		_conl()
+		_conl(_dumparr(D))
+		_mpuptr = 0
+		_mpucc0 = ""
+		_mpusub(F, D, C, D[_mpuptr++], p1, p2, p3)
+		return _mpuacc
 	}
+	return t
+}
 
-	function _hexnum(n, l)
-	{
-		if (l + 0 < 1) {
-			l = 2
-		}
-		return sprintf("%." ((l + 0 < 1 ? 2 : l)) "X", n)
-	}
+#
+#	/rexpstr/	->	datastr
+#	(\x00\t\+)*	->	28 00 09 5B 2B 29
+#
+# unesc all non-rexp characters: replace unesc of rexp-characters but do not remove it: \* -> \*, \x2A -> \*, \052 -> \*, \\ -> \#
 
-	function _igetperf(t, s, o)
-	{
-		if (t == 0 && t == "" && s == 0 && s == "" && o == 0 && o == "") {
-			if (_getperf_fn !~ /not$/ && _constatstr == _getperf_stat) {
-				_constat(_getperf_statstr)
-			}
-			_getperf_fn = "_nop"
-			return ("[TIME=" (_getperf_last - _getperf_start) " sec(" _getperf_opsec " ops/sec)]")
-		}
-		_conl("initiate _getperf")
-		_getperf_opstart = _getperf_opcurr = o + 0
-		_getperf_opsec = _getperf_opsecp = _getperf_stat = _getperf_statstr = ""
-		_getperf_end = t + (_getperf_start = _getperf_last = _getsecondsync())
-		_getperf_fn = ((t + 0 > 0 ? "_getperf_" : "_getperf_noe")) ((s ? "" : "not"))
-		return _getperf_start
-	}
-
-	function _import_data(t, p, p2, a)
-	{
-		if (match(t, /^_DATA: /)) {
-			_tDATA[a = _wLCHLD(p, _N())][""]
-			delete _tDATA[a][""]
-			_Zimparr(_tDATA[a], substr(t, 8))
-			_conl("DATA: `" _tDATA[a]["ID"] "':`" _tDATA[a]["DATA"] "'")
-			return ""
-		}
-		return t
-	}
 
-	function _info(t, d, A)
-	{
-		if (_ERRLOG_IF) {
-			A["TYPE"] = "INFO"
-			A["TEXT"] = t
-			_log(A, d)
-		}
-	}
 
-	function _ini(p, cs, dptr, pfx, sfx, hstr, lstr)
-	{
-		return _inituid(p, cs, dptr, pfx, sfx, hstr, lstr, A)
-	}
 
-	function _initfilever()
-	{
-		_fileverpath = "\\\\CPU\\eGAWK\\LIB\\_filever\\_filever.exe"
-	}
 
-	function _initrdreg()
-	{
-		_RDREGTYPE["SZ"] = "STR"
-		_RDREGTYPE["DWORD"] = "W32"
-		_RDREGTYPE["QWORD"] = "W64"
-		_RDREGTYPE["BINARY"] = "BIN"
-		_RDREGTYPE["EXPAND_SZ"] = "XSZ"
-		_RDREGTYPE["MULTI_SZ"] = "MSZ"
-		_RDrdregfld = _rdregkey = 0
-	}
 
-	function _initregpath0()
-	{
-		_REGPATH0REGDIR[""] = "HKEY_LOCAL_MACHINE"
-		_REGPATH0REGDIR["HKLM"] = "HKEY_LOCAL_MACHINE"
-		_REGPATH0REGDIR["HKEY_LOCAL_MACHINE"] = "HKEY_LOCAL_MACHINE"
-		_REGPATH0REGDIR["HKCR"] = "HKEY_CLASSES_ROOT"
-		_REGPATH0REGDIR["HKEY_CLASSES_ROOT"] = "HKEY_CLASSES_ROOT"
-		_REGPATH0REGDIR["HKCU"] = "HKEY_CURRENT_USER"
-		_REGPATH0REGDIR["HKEY_CURRENT_USER"] = "HKEY_CURRENT_USER"
-		_REGPATH0REGDIR["HKU"] = "HKEY_USERS"
-		_REGPATH0REGDIR["HKEY_USERS"] = "HKEY_USERS"
-		_REGPATH0REGDIR["HKCC"] = "HKEY_CURRENT_CONFIG"
-		_REGPATH0REGDIR["HKEY_CURRENT_CONFIG"] = "HKEY_CURRENT_CONFIG"
-		_REGPATH0REGDIR["HKPD"] = "HKEY_PERFORMANCE_DATA"
-		_REGPATH0REGDIR["HKEY_PERFORMANCE_DATA"] = "HKEY_PERFORMANCE_DATA"
-	}
 
-	function _initshare()
-	{
-		_sharextool = "\\\\CPU\\eGAWK\\LIB\\_share\\_share.exe"
-	}
 
-	function _initspecialuid()
-	{
-		_NOINDEX = _getuid()
-		_LEN = _getuid()
-		_PTR = _getuid()
-		_NAME = _getuid()
-		_TYPE = _getuid()
-		_FORMAT = _getuid()
-	}
 
-	function _initsys()
-	{
-	}
 
-	function _inituid(p, cs, dptr, pfx, sfx, hstr, lstr, A)
-	{
-		if (cs == 0 && cs == "") {
-			cs = p
-			p = _getuid()
-		}
-		_conl()
-		_conl()
-		_conl(cs)
-		if (match(cs, /^(([^:]*):)?(([^'\xB4]*\xB4.)*[^'\xB4]*)[']/, A)) {
-			pfx = A[3]
-			dptr = A[2]
-		}
-		if (match(cs = substr(cs, 1 + RLENGTH), /'(([^'\xB4]*\xB4.)*[^'\xB4]*)$/, A)) {
-			sfx = A[1]
-			cs = substr(cs, 1, RSTART - 1)
-		}
-		if (match(cs, /^(([`\^])(.*))/, A)) {
-			if (A[2] == "`") {
-				hstr = A[3] "~"
-				lstr = ""
-			} else {
-				lstr = A[3] "+"
-				hstr = ""
-			}
-		} else {
-			if (match(cs, /^(([^'\xB4\|]*\xB4.)*[^'\xB4\|]*)(\|(.*))?/, A)) {
-				hstr = A[1]
-				lstr = A[4]
-			} else {
-				ERRNO = "_inituid(): bad parameters"
-				return 
-			}
-		}
-		_conl(dptr ":" pfx "'" hstr "|" lstr "'" sfx)
-		return _cfguid(p, dptr, pfx, sfx, hstr, lstr)
-	}
-
-	function _inituidefault(h, l, H, L)
-	{
-		_classys = ""
-		delete _UIDOBLV[_UIDOBLV[_UIDOBL[_classys] = _classys][""] = _classys][""]
-		_UIDPFX[_classys]
-		_UIDSFX[_classys]
-		_UIDCNT[_classys] = _UIDCHR[_classys] = _CLASSPTR[_classys] = _classys
-		h = "AB"
-		l = h "01"
-		_splitstr(H, h)
-		_splitstr(L, l)
-		delete _UIDCHRH[_UIDCHRH[_classys][""] = _classys][""]
-		delete _UIDCHRL[_UIDCHRL[_classys][""] = _classys][""]
-		_UIDCNTH[_classys]
-		_cfguidh(_classys, H, L)
-		_UIDCNTL[_classys] = _cfguidl(_classys, L, L)
-		_CLASSFN[_classys]["del"] = "_tobjDEL"
-		_CLASSFN[_classys]["new"] = "_tobjNEW"
-		_drawuid(_classys)
-		_initspecialuid()
-	}
-
-	function _ins(S, sf, D, df)
-	{
-		if (sf in S) {
-			if (isarray(S[sf])) {
-				if (df in D) {
-					if (isarray(D[df])) {
-						return _extarr(D[df], S[sf])
-					}
-					delete D[df]
-				}
-				D[df][""]
-				delete D[df][""]
-				return _extarr(D[df], S[sf])
-			} else {
-				if (isarray(D[df])) {
-					delete D[df]
-				}
-				D[df] = S[sf] D[df]
-			}
-		}
-	}
 
-	function _insf(A, f)
-	{
-		A["F"][""] = A["B"][A["F"][f] = A["F"][""]] = f
-	}
 
-	function _insframe(A, f)
-	{
-		A[f] = A[""]
-		A[""] = f
-	}
 
-	function _inspass(A, f)
-	{
-		A[f] = A[""]
-		A[""] = f
-	}
 
-	function _isptr(p)
-	{
-		if (isarray(p)) {
-			is = _NOP
-			it = "A"
-			return 0
-		}
-		is = p
-		if (p == 0 && p == "") {
-			it = "-"
-			return 0
-		}
-		if (p in _CLASSPTR) {
-			return (it = "P")
-		}
-		it = "S"
-		return 0
-	}
 
-	function _istr(p)
-	{
-		if (isarray(p)) {
-			is = _NOP
-			it = "A"
-			return 0
-		}
-		is = p
-		if (p == 0 && p == "") {
-			it = "-"
-			return 0
-		}
-		return (it = (p == "" ? "s" : "S"))
-	}
 
-	function _lengthsort(i1, v1, i2, v2)
-	{
-		return ((length(i1) < length(i2) ? -1 : (length(i1) > length(i2) ? 1 : (i1 < i2 ? -1 : 1))))
-	}
 
-	function _lib_APPLY()
-	{
-		return _ffaccr(_LIBAPI, "_lib_APPLY")
-	}
 
-	function _lib_BEGIN(A)
-	{
-		return _ffaccr(_LIBAPI, "_lib_BEGIN", "", A)
-	}
 
-	function _lib_CMDLN(t)
-	{
-		return _pass(_LIBAPI["F"], "_lib_CMDLN", t)
-	}
 
-	function _lib_END(A)
-	{
-		return _ffaccr(_LIBAPI, "_lib_END", "", A)
-	}
 
-	function _lib_HELP()
-	{
-		return _fbaccr(_LIBAPI, "_lib_HELP")
-	}
 
-	function _lib_NAMEVER()
-	{
-		return _fbaccr(_LIBAPI, "_lib_NAMEVER")
-	}
 
-	function _ln(t)
-	{
-		return ((t ~ /\x0A$/ ? t : t _CHR["EOL"]))
-	}
 
-	function _log(A, p, a, B)
-	{
-		if (isarray(A)) {
-			A["TIME"] = _getime()
-			A["DATE"] = _getdate()
-			if (p) {
-				_tLOG[p = _wLCHLD(p, _N())][""]
-				delete _tLOG[p][""]
-				_movarr(_tLOG[p], A)
-				return p
-			}
-			_expout("_ERRLOG: " _Zexparr(A) "\n")
-		} else {
-			B["TEXT"] = A
-			B["TYPE"] = ""
-			return _log(B, p)
-		}
-	}
 
-	function _lspctab(t, ts, l, l1, l2, A)
-	{
-		while (match(t, /^(\t*)( *)((\t*)(.*))$/, A)) {
-			if (A[1, "length"] >= l) {
-				return substr(t, l + 1)
-			}
-			if (A[2]) {
-				if ((l1 = int(A[2, "length"] / ts)) >= (l2 = l - A[1, "length"])) {
-					return (substr(A[2], l2 * ts + 1) A[3])
-				}
-				if (! A[4]) {
-					return A[5]
-				}
-				t = A[1] _getchrln("\t", l1) A[3]
-			} else {
-				return t
-			}
-		}
-	}
 
-	function _mac_init()
-	{
-		_MACPFX["\204"] = "_macpfx84"
-		_MACPFX[""] = "_mpupfxsubret"
-		_MACPFX84SFX["\204"] = "_macpfx84"
-		_MACPFX84SFX["\224"] = "_macsfx94"
-		_MACPFX84SFX[""] = "_mpusfxsubret"
-		_VLDMAXSTRING = 1e+06
-	}
 
-	function _macpfx84(F, D, C, p1, p2, p3)
-	{
-		return _mpusub(_MACPFX84SFX, D, C, D[_mpuptr++], p1, p2, p3)
-	}
 
-	function _macsfx94(F, D, C, p1, p2, p3)
-	{
-		return _mpuretsub(D, _handle8494(_mpuacc))
-	}
 
-	function _movarr(D, S)
-	{
-		delete D
-		D[""]
-		delete D[""]
-		_addarr(D, S)
-	}
 
-	function _mpu(t, F, p1, p2, p3, D, C)
-	{
-		if (patsplit(t, C, /[\x84\x93\x94]/, D) > 0) {
-			_conline("CODE")
-			_conl()
-			_conl(_dumparr(C))
-			_conline("DATA")
-			_conl()
-			_conl(_dumparr(D))
-			_mpuptr = 0
-			_mpucc0 = ""
-			_mpusub(F, D, C, D[_mpuptr++], p1, p2, p3)
-			return _mpuacc
-		}
-		return t
-	}
 
-	function _mpudefaulthnd(F, D, C, p1, p2, p3)
-	{
-		_mpuretsub(D, _mpucc0)
-	}
 
-	function _mpupfxsubret(F, D, C, p1, p2, p3)
-	{
-		return 1
-	}
 
-	function _mpuretsub(D, t)
-	{
-		_mpuacc = D[_mpuptr++]
-		_accmpu(D, t)
-		return 1
-	}
 
-	function _mpusfxsubret(F, D, C, p1, p2, p3)
-	{
-		return -1
-	}
+function _mpudefaulthnd(F, D, C, p1, p2, p3)
+{
+	_mpuretsub(D, _mpucc0)
+}
 
-	function _mpusub(F, D, C, d, p1, p2, p3, q)
-	{
-		q = D[_ARRLEN]
-		if (_VLDMAXSTRING < length(d)) {
-			D[--D[_ARRLEN]] = d
-			_mpuacc = ""
+function _mpupfxsubret(F, D, C, p1, p2, p3)
+{
+	return 1
+}
+
+function _mpuretsub(D, t)
+{
+	_mpuacc = D[_mpuptr++]
+	_accmpu(D, t)
+	return 1
+}
+
+function _mpusfxsubret(F, D, C, p1, p2, p3)
+{
+	return -1
+}
+
+function _mpusub(F, D, C, d, p1, p2, p3, q)
+{
+	q = D[_ARRLEN]
+	if (_VLDMAXSTRING < length(d)) {
+		D[--D[_ARRLEN]] = d
+		_mpuacc = ""
+	} else {
+		_mpuacc = d
+	}
+	d = _mpucc0
+	_conl("_mpusub enter: in `" _mpuacc "' / _mpuptr=" _mpuptr "'")
+	do {
+		if ((_mpucc0 = C[_mpuptr]) in F) {
+			if (isarray(F[_mpucc0])) {
+				_mpufn0 = F[_mpucc0]
+			}
+			_conl("FN: `" _mpucc0 "' > CALL: `" _mpufn0 "' : _mpuacc=" _mpuacc "'")
 		} else {
-			_mpuacc = d
-		}
-		d = _mpucc0
-		_conl("_mpusub enter: in `" _mpuacc "' / _mpuptr=" _mpuptr "'")
-		do {
-			if ((_mpucc0 = C[_mpuptr]) in F) {
-				if (isarray(F[_mpucc0])) {
-					_mpufn0 = F[_mpucc0]
-				}
-				_conl("FN: `" _mpucc0 "' > CALL: `" _mpufn0 "' : _mpuacc=" _mpuacc "'")
-			} else {
-				_mpufn0 = "_mpudefaulthnd"
+			_mpufn0 = "_mpudefaulthnd"
+		}
+	} while (! _accmpu(D, _mpuacc, @_mpufn0(F, D, C, p1, p2, p3)))
+	if (_mpufn0 == -1) {
+		_conl("WARNING: unclosed expression: `" d _mpuacc "'")
+		_mpuacc = d _mpuacc
+	}
+	_retarrm(D, q, "", (_mpufn0 == -1 ? _th0(d, _mpusubwrng("WARNING: unclosed expression", d _mpuacc)) : ""))
+	# collect: _mpuacc=_retarr(D) _mpuacc
+	_conl("mpusub exit: _mpuacc: `" _mpuacc "'")
+}
+
+#_______________________________________________________________________
+function _n(F, v, p)
+{
+	for (p in _UIDSDEL) {
+		delete _UIDSDEL[p]
+		delete _ptr[p]
+		delete _tPREV[p]
+		delete _tPARENT[p]
+		delete _tNEXT[p]
+		delete _tFCHLD[p]
+		delete _tQCHLD[p]
+		delete _tLCHLD[p]
+		delete _TMP0[p]
+		delete _TMP1[p]
+		delete _tLINK[p]
+		delete _tCLASS[p]
+		return _nN_i0(p, F, v)
+	}
+	for (p in _UIDS) {
+		delete _UIDS[p]
+		return _nN_i0(p, F, v)
+	}
+	return _nN_i0(_tgenuid(), F, v)
+}
+
+#_____________________________________________________
+function _nN_i0(p, F, v)
+{
+	_[p][""]
+	delete _[p][""]
+	_ptr[p][""]
+	delete _ptr[p][""]
+	_TMP0[p][_ARRLEN] = _TMP1[p][_ARRLEN] = 0
+	if (isarray(F)) {
+		delete F[p]
+		if (isarray(v)) {
+			F[p][""]
+			delete F[p][""]
+			_copyarr(F[p], v)
+		} else {
+			if (! (v == 0 && v == "")) {
+				F[p] = v
 			}
-		} while (! _accmpu(D, _mpuacc, @_mpufn0(F, D, C, p1, p2, p3)))
-		if (_mpufn0 == -1) {
-			_conl("WARNING: unclosed expression: `" d _mpuacc "'")
-			_mpuacc = d _mpuacc
 		}
-		_retarrm(D, q, "", (_mpufn0 == -1 ? _th0(d, _mpusubwrng("WARNING: unclosed expression", d _mpuacc)) : ""))
-		_conl("mpusub exit: _mpuacc: `" _mpuacc "'")
-	}
-
-	function _n(F, v, p)
-	{
-		for (p in _UIDSDEL) {
-			delete _UIDSDEL[p]
-			delete _ptr[p]
-			delete _tPREV[p]
-			delete _tPARENT[p]
-			delete _tNEXT[p]
-			delete _tFCHLD[p]
-			delete _tQCHLD[p]
-			delete _tLCHLD[p]
-			delete _TMP0[p]
-			delete _TMP1[p]
-			delete _tLINK[p]
-			delete _tCLASS[p]
-			return _nN_i0(p, F, v)
-		}
-		for (p in _UIDS) {
-			delete _UIDS[p]
-			return _nN_i0(p, F, v)
-		}
-		return _nN_i0(_tgenuid(), F, v)
-	}
-
-	function _nN_i0(p, F, v)
-	{
-		_[p][""]
-		delete _[p][""]
-		_ptr[p][""]
-		delete _ptr[p][""]
-		_TMP0[p][_ARRLEN] = _TMP1[p][_ARRLEN] = 0
-		if (isarray(F)) {
-			delete F[p]
+	} else {
+		if (! (F == 0 && F == "")) {
 			if (isarray(v)) {
-				F[p][""]
-				delete F[p][""]
-				_copyarr(F[p], v)
+				_[p][F][""]
+				delete _[p][F][""]
+				_copyarr(_[p][F], v)
 			} else {
-				if (! (v == 0 && v == "")) {
-					F[p] = v
-				}
-			}
-		} else {
-			if (! (F == 0 && F == "")) {
-				if (isarray(v)) {
-					_[p][F][""]
-					delete _[p][F][""]
-					_copyarr(_[p][F], v)
+				if (v == 0 && v == "") {
+					_mpu(F, p)
 				} else {
-					if (v == 0 && v == "") {
-						_mpu(F, p)
-					} else {
-						_[p][F] = v
-					}
+					_[p][F] = v
 				}
 			}
 		}
-		return p
 	}
+	return p
+}
 
-	function _newclrdir(f)
-	{
-		if ((f = _filerd(f)) == "") {
-			return 
-		}
-		_cmd("rd " f " /S /Q 2>NUL")
+#_________________________________________________________________
+function _newclrdir(f)
+{
+	if ((f = _filerd(f)) == "") {
+		return 
+	}
+	_cmd("rd " f " /S /Q 2>NUL")
+	_cmd("md " f " 2>NUL")
+	_WFILEROOTDIR[f]
+	return f
+}
+
+#_______________________________________________________________________
+function _newdir(f)
+{
+	if ((f = _filerd(f)) == "") {
+		return 
+	}
+	if (! (f in _WFILEROOTDIR)) {
 		_cmd("md " f " 2>NUL")
 		_WFILEROOTDIR[f]
-		return f
 	}
-
-	function _newdir(f)
-	{
-		if ((f = _filerd(f)) == "") {
+	return f
+}
+
+#_______________________________________________________________________
+function _nop(p0, p1, p2, p3)
+{
+}
+
+#_____________________________________________________
+#	_retarr(ARRAY,start,prefixtr,postfixtr)
+#		Return string collected from elements of ARRAY.
+#		The data elements in ARRAY have numeric indexes. By default it starts from element with index 1, but it is possible to locate elements starting from
+#		0,-1,-.... The last data element in the ARRAY have the highest numeric index that is stored in ARRAY[_ARRLEN].
+#		Optimized for very large data size.
+#
+#			IN:		ARRAY			- source data array(is ARRAY is not array then return undefined)
+#					start			- (optional) start index in ARRAY; if missed or have non-numeric value then start array index will be 1.
+#					prefixst		- the string that will be inserted in the begin of generated return string
+#					postfix		- the string that will be added at the end of generated return string
+#			MOD:		-
+#			OUT:		-
+#			RETURN:	undefined		- if ARRAY is not array; if ARRAY is empty; if start is higher than ARRAY last element index
+#					string		- collected string: prefixtr-arraydata-postfixtr
+#_________________________________________________________________
+function _nretarr(A, i, v, r, q)
+{
+	if ((i = (i == "" ? 1 : i + 0)) <= (q = A[_ARRLEN])) {
+		if (i <= (r = q - 16)) {
+			_ARRSTR = A[i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i]
+			while (i < r) {
+				_ARRSTR = _ARRSTR A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i]
+			}
+			_ARRSTR = _ARRSTR A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] v _retarr_i0(A, q, i)
 			return 
 		}
-		if (! (f in _WFILEROOTDIR)) {
-			_cmd("md " f " 2>NUL")
-			_WFILEROOTDIR[f]
-		}
-		return f
-	}
-
-	function _nop(p0, p1, p2, p3)
-	{
+		_ARRSTR = A[i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] v _retarr_i0(A, q, i)
+		return 
 	}
+	_ARRSTR = v
+	return 
+}
 
-	function _nretarr(A, i, v, r, q)
-	{
-		if ((i = (i == "" ? 1 : i + 0)) <= (q = A[_ARRLEN])) {
-			if (i <= (r = q - 16)) {
-				_ARRSTR = A[i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i]
-				while (i < r) {
-					_ARRSTR = _ARRSTR A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i]
-				}
-				_ARRSTR = _ARRSTR A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] v _retarr_i0(A, q, i)
-				return 
+#___________________________________________________________
+function _nretarrd(A, i, v, r, q)
+{
+	if ((i = (i == "" ? 1 : i + 0)) <= (q = A[_ARRLEN])) {
+		if (i <= (r = q - 16)) {
+			_ARRSTR = A[i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i]
+			while (i < r) {
+				_ARRSTR = _ARRSTR A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i]
 			}
+			_ARRSTR = _ARRSTR A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] v _retarr_i0(A, q, i)
+		} else {
 			_ARRSTR = A[i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] v _retarr_i0(A, q, i)
-			return 
 		}
+	} else {
 		_ARRSTR = v
-		return 
 	}
-
-	function _nretarrd(A, i, v, r, q)
-	{
-		if ((i = (i == "" ? 1 : i + 0)) <= (q = A[_ARRLEN])) {
-			if (i <= (r = q - 16)) {
-				_ARRSTR = A[i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i]
-				while (i < r) {
-					_ARRSTR = _ARRSTR A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i]
+	delete A
+	A[""]
+	delete A[""]
+}
+
+#___________________________________________________________________________________
+####################################################################################
+
+#___________________________________________________________________________________
+function _out(t, a, b)
+{
+	a = BINMODE
+	b = ORS
+	BINMODE = "rw"
+	ORS = ""
+	print(t) > _SYS_STDOUT
+	fflush(_SYS_STDOUT)
+	BINMODE = a
+	ORS = b
+	return t
+}
+
+#_________________________________________________________________
+function _outnl(t)
+{
+	return _out(t ((t ~ /\x0A$/ ? "" : _CHR["EOL"])))
+}
+
+function _p1(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
+{
+	_qparamf0 = "_p" _QMAP[_qparamc1--]
+	return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8, s1, p1, p2, p3, p4, p5, p6, p7)
+}
+
+function _p2(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
+{
+	_qparamf0 = "_p" _QMAP[_qparamc1--]
+	return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8, s2, p1, p2, p3, p4, p5, p6, p7)
+}
+
+function _p3(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
+{
+	_qparamf0 = "_p" _QMAP[_qparamc1--]
+	return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8, s3, p1, p2, p3, p4, p5, p6, p7)
+}
+
+function _p4(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
+{
+	_qparamf0 = "_p" _QMAP[_qparamc1--]
+	return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8, s4, p1, p2, p3, p4, p5, p6, p7)
+}
+
+function _p5(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
+{
+	_qparamf0 = "_p" _QMAP[_qparamc1--]
+	return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8, s5, p1, p2, p3, p4, p5, p6, p7)
+}
+
+function _p6(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
+{
+	_qparamf0 = "_p" _QMAP[_qparamc1--]
+	return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8, s6, p1, p2, p3, p4, p5, p6, p7)
+}
+
+function _p7(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
+{
+	_qparamf0 = "_p" _QMAP[_qparamc1--]
+	return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8, s7, p1, p2, p3, p4, p5, p6, p7)
+}
+
+function _p8(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
+{
+	_qparamf0 = "_p" _QMAP[_qparamc1--]
+	return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8, s8, p1, p2, p3, p4, p5, p6, p7)
+}
+
+#_______________________________________________________________________
+function _pass(A, f, t, p2, i, a)
+{
+	a = _endpass_v0
+	_endpass_v0 = ""
+	i = 1
+	while (t && i) {
+		i = ""
+		while ((i = A[i]) && t == (t = @i(f, t, p2))) {
+		}
+	}
+	if (i && _endpass_v0) {
+		A["!"] = 1
+		t = _endpass_v0
+	} else {
+		delete A["!"]
+	}
+	_endpass_v0 = a
+	return t
+}
+
+# this is somnitelno: that   / / . / / com 56 / / - is the DEV...; what is DEV ??? this already PROBLEM
+#_____________________________________________________________________________
+function _patharr0(D, q, i, h, A, B)
+{
+	delete D
+	if (0 < (q = split(gensub(/\\/, "/", "G", gensub(/ *([:$\\\/]) */, "\\1", "G", gensub(/(^[ \t]+)|([ \t]+$)/, "", "G", q))), A, /\/+/, B))) {
+		if (2 > (h = length(B[1]))) {
+			D["type"] = "FILE"
+			A[1] = _patharr0_i0(A[1], D, "drive")
+			return _patharr0_i1(D, A, 1, q)
+		}
+		i = gensub(/ *([\.\?]) */, "\\1", "G", A[2])
+		IGNORECASE = 1
+		match(A[1], /^((https?)|(ftp)):$/)
+		IGNORECASE = 0
+		if (RLENGTH > 0) {
+			D["type"] = toupper(substr(A[1], 1, RLENGTH - 1))
+			_patharr0_i0(i, D, "site", "port")
+		} else {
+			if (A[1] == "") {
+				D["type"] = "UNC"
+				if (h > 2) {
+					D["host"]
+					A[2] = _patharr0_i0(A[2], D, "drive", "", "FILE")
+					return _patharr0_i1(D, A, 2, q)
+				}
+				if (i == "") {
+					return 1
 				}
-				_ARRSTR = _ARRSTR A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] v _retarr_i0(A, q, i)
+				D["host"] = i
+				A[3] = _patharr0_i0(A[3], D, "drive", "", "FILE")
 			} else {
-				_ARRSTR = A[i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] v _retarr_i0(A, q, i)
+				D["type"] = "FILE"
+				A[1] = _patharr0_i0(A[1], D, "drive")
+				return _patharr0_i1(D, A, 1, q)
 			}
-		} else {
-			_ARRSTR = v
 		}
-		delete A
-		A[""]
-		delete A[""]
+		return _patharr0_i1(D, A, 3, q)
 	}
+}
 
-	function _out(t, a, b)
-	{
-		a = BINMODE
-		b = ORS
-		BINMODE = "rw"
-		ORS = ""
-		print(t) > _SYS_STDOUT
-		fflush(_SYS_STDOUT)
-		BINMODE = a
-		ORS = b
+#_____________________________________________________
+function _patharr0_i0(t, D, l, r, d, i)
+{
+	if (i = index(t, ":")) {
+		if (d) {
+			D["type"] = d
+		}
+		if (i > 1) {
+			D[l] = substr(t, 1, i - 1)
+		}
+		if ((t = substr(t, i + 1)) && r) {
+			D[r] = t
+		}
 		return t
+	} else {
+		if (t && r) {
+			D[l] = t
+		}
 	}
+	return t
+}
 
-	function _outnl(t)
-	{
-		return _out(t ((t ~ /\x0A$/ ? "" : _CHR["EOL"])))
-	}
-
-	function _p1(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
-	{
-		_qparamf0 = "_p" _QMAP[_qparamc1--]
-		return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8, s1, p1, p2, p3, p4, p5, p6, p7)
-	}
-
-	function _p2(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
-	{
-		_qparamf0 = "_p" _QMAP[_qparamc1--]
-		return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8, s2, p1, p2, p3, p4, p5, p6, p7)
-	}
-
-	function _p3(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
-	{
-		_qparamf0 = "_p" _QMAP[_qparamc1--]
-		return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8, s3, p1, p2, p3, p4, p5, p6, p7)
-	}
-
-	function _p4(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
-	{
-		_qparamf0 = "_p" _QMAP[_qparamc1--]
-		return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8, s4, p1, p2, p3, p4, p5, p6, p7)
-	}
-
-	function _p5(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
-	{
-		_qparamf0 = "_p" _QMAP[_qparamc1--]
-		return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8, s5, p1, p2, p3, p4, p5, p6, p7)
+#_____________________________________________________
+function _patharr0_i1(D, A, i, q, t, c)
+{
+	if (D["type"] == "UNC") {
+		if (t = A[i++]) {
+			D[0] = (D["share"] = D[++c] = t) "/"
+		} else {
+			return 1
+		}
 	}
-
-	function _p6(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
-	{
-		_qparamf0 = "_p" _QMAP[_qparamc1--]
-		return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8, s6, p1, p2, p3, p4, p5, p6, p7)
+	while (i < q) {
+		D[0] = D[0] (D[++c] = A[i++]) "/"
 	}
-
-	function _p7(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
-	{
-		_qparamf0 = "_p" _QMAP[_qparamc1--]
-		return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8, s7, p1, p2, p3, p4, p5, p6, p7)
+	if (i == q) {
+		if (match(t = A[i], /\.[^\.]*$/)) {
+			if (RSTART > 1) {
+				D["name"] = substr(t, 1, RSTART - 1)
+			}
+			D["ext"] = substr(t, RSTART, RLENGTH)
+		} else {
+			if (t != "") {
+				D["name"] = t
+			}
+		}
 	}
+	return 1
+}
 
-	function _p8(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
-	{
+#############################################################################
+function _pmap(m, s1, s2, s3, s4, s5, s6, s7, s8)
+{
+	if (match(m, /^([^\(]+)\(([^\)]*)\)$/, _QMAP)) {
+		_qparamf1 = _QMAP[1]
+		_QMAP[0] = "r" (_qparamc1 = split(_QMAP[2], _QMAP, ""))
 		_qparamf0 = "_p" _QMAP[_qparamc1--]
-		return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8, s8, p1, p2, p3, p4, p5, p6, p7)
-	}
-
-	function _pass(A, f, t, p2, i, a)
-	{
-		a = _endpass_v0
-		_endpass_v0 = ""
-		i = 1
-		while (t && i) {
-			i = ""
-			while ((i = A[i]) && t == (t = @i(f, t, p2))) {
+		return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8)
+	}
+}
+
+function _pr0(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
+{
+	return @_qparamf1()
+}
+
+function _pr1(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
+{
+	return @_qparamf1(p1)
+}
+
+function _pr2(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
+{
+	return @_qparamf1(p1, p2)
+}
+
+function _pr3(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
+{
+	return @_qparamf1(p1, p2, p3)
+}
+
+function _pr4(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
+{
+	return @_qparamf1(p1, p2, p3, p4)
+}
+
+function _pr5(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
+{
+	return @_qparamf1(p1, p2, p3, p4, p5)
+}
+
+function _pr6(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
+{
+	return @_qparamf1(p1, p2, p3, p4, p5, p6)
+}
+
+function _pr7(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
+{
+	return @_qparamf1(p1, p2, p3, p4, p5, p6, p7)
+}
+
+function _pr8(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
+{
+	return @_qparamf1(p1, p2, p3, p4, p5, p6, p7, p8)
+}
+
+#_________________________________________________________________
+function _printarr(A, t, lv, r, a)
+{
+	a = PROCINFO["sorted_in"]
+	PROCINFO["sorted_in"] = "_lengthsort"
+	_printarrexp = (r ? r : "")
+	if (isarray(A)) {
+		delete _DUMPARR
+		_dumparrc = _dumparrd = ""
+		_printarr_i1(A, lv = ((lv == "" ? 16 : (lv == 0 || lv + 0 != 0 ? lv : (lv == "-*" ? -3 : (lv ~ /^\+?\*$/ ? 3 : 16))))) + 0, (lv < 0 ? -1 : 1), 0, _tabtospc(t))
+		PROCINFO["sorted_in"] = a
+		return _retarrd(_DUMPARR, _dumparrd, _dumparrd = "")
+	}
+}
+
+#___________________________________________________________
+function _printarr_i1(A, lv, ls, ln, t, t2, i, a, f)
+{
+	t2 = _getchrln(" ", length(t))
+	if (ln == lv) {
+		if (ls > 0) {
+			for (i in A) {
+				++a
 			}
-		}
-		if (i && _endpass_v0) {
-			A["!"] = 1
-			t = _endpass_v0
 		} else {
-			delete A["!"]
+			for (i in A) {
+				(isarray(A[i]) ? ++a : "")
+			}
 		}
-		_endpass_v0 = a
-		return t
+		if (length(_dumparrd = _dumparrd t ((a > 0 ? " ... (x" a ")" : "")) _CHR["EOL"]) > 262144) {
+			_conl(_dumparrd)
+			_dumparrd = ""
+		}
+		return 
 	}
-
-	function _patharr0(D, q, i, h, A, B)
-	{
-		delete D
-		if (0 < (q = split(gensub(/\\/, "/", "G", gensub(/ *([:$\\\/]) */, "\\1", "G", gensub(/(^[ \t]+)|([ \t]+$)/, "", "G", q))), A, /\/+/, B))) {
-			if (2 > (h = length(B[1]))) {
-				D["type"] = "FILE"
-				A[1] = _patharr0_i0(A[1], D, "drive")
-				return _patharr0_i1(D, A, 1, q)
-			}
-			i = gensub(/ *([\.\?]) */, "\\1", "G", A[2])
-			IGNORECASE = 1
-			match(A[1], /^((https?)|(ftp)):$/)
-			IGNORECASE = 0
-			if (RLENGTH > 0) {
-				D["type"] = toupper(substr(A[1], 1, RLENGTH - 1))
-				_patharr0_i0(i, D, "site", "port")
-			} else {
-				if (A[1] == "") {
-					D["type"] = "UNC"
-					if (h > 2) {
-						D["host"]
-						A[2] = _patharr0_i0(A[2], D, "drive", "", "FILE")
-						return _patharr0_i1(D, A, 2, q)
-					}
-					if (i == "") {
-						return 1
+	if (ls >= 0) {
+		for (i in A) {
+			if (! _printarrexp || i ~ _printarrexp) {
+				if (! isarray(A[i])) {
+					if (length(_dumparrd = _dumparrd ((f ? t2 : t _nop(f = 1))) "[" i "]=" A[i] "'" _CHR["EOL"]) > 262144) {
+						_conl(_dumparrd)
+						_dumparrd = ""
 					}
-					D["host"] = i
-					A[3] = _patharr0_i0(A[3], D, "drive", "", "FILE")
-				} else {
-					D["type"] = "FILE"
-					A[1] = _patharr0_i0(A[1], D, "drive")
-					return _patharr0_i1(D, A, 1, q)
 				}
 			}
-			return _patharr0_i1(D, A, 3, q)
 		}
 	}
-
-	function _patharr0_i0(t, D, l, r, d, i)
-	{
-		if (i = index(t, ":")) {
-			if (d) {
-				D["type"] = d
-			}
-			if (i > 1) {
-				D[l] = substr(t, 1, i - 1)
-			}
-			if ((t = substr(t, i + 1)) && r) {
-				D[r] = t
-			}
-			return t
-		} else {
-			if (t && r) {
-				D[l] = t
+	for (i in A) {
+		if (isarray(A[i])) {
+			if (! _printarrexp || i ~ _printarrexp) {
+				_printarr_i1(A[i], lv, ls, ln + ls, _th0((f ? t2 : t), f = 1) "[" i "]")
 			}
 		}
-		return t
 	}
-
-	function _patharr0_i1(D, A, i, q, t, c)
-	{
-		if (D["type"] == "UNC") {
-			if (t = A[i++]) {
-				D[0] = (D["share"] = D[++c] = t) "/"
-			} else {
-				return 1
-			}
+	if (! f) {
+		if (length(_dumparrd = _dumparrd t _CHR["EOL"]) > 262144) {
+			_conl(_dumparrd)
+			_dumparrd = ""
 		}
-		while (i < q) {
-			D[0] = D[0] (D[++c] = A[i++]) "/"
-		}
-		if (i == q) {
-			if (match(t = A[i], /\.[^\.]*$/)) {
-				if (RSTART > 1) {
-					D["name"] = substr(t, 1, RSTART - 1)
-				}
-				D["ext"] = substr(t, RSTART, RLENGTH)
+	}
+}
+
+function _qparam(qm, p0, p1, p2, p3, p4, p5, p6, p7)
+{
+	if (qm == qm + 0 && qm > 0) {
+		_qparamim = substr("        ", 1, qm)
+	} else {
+		if (qm != "") {
+			_qparamim = qm
+		} else {
+			_qparamim = "        "
+		}
+	}
+	_qparamask = ""
+	return _qparam_i0(p0, p1, p2, p3, p4, p5, p6, p7)
+}
+
+function _qparam_i0(p0, p1, p2, p3, p4, p5, p6, p7)
+{
+	_qparama0 = substr(_qparamim, 1, 1)
+	_qparamim = substr(_qparamim, 2)
+	switch (_qparama0) {
+	case "":
+		gsub(/ +$/, "", _qparamask)
+		return length(_qparamask)
+	default:
+		if (isarray(p0)) {
+			_qparama0 = "A"
+		} else {
+			if (p0 == "" && p0 == 0) {
+				_qparama0 = " "
 			} else {
-				if (t != "") {
-					D["name"] = t
+				if (_isptr(p0)) {
+					_qparama0 = "P"
+				} else {
+					_qparama0 = "S"
 				}
 			}
 		}
-		return 1
+	case ".":
+		_qparamask = _qparamask _qparama0
+		return _qparam_i0(p1, p2, p3, p4, p5, p6, p7)
+	}
+}
+
+#_______________________________________________________________________
+function _qstr(t, c, A, B)
+{
+	c = ""
+	for (t = split(t, A, /[\x00-\x1F\\"]/, B); t >= 0; t--) {
+		c = _QSTR[B[t]] A[t + 1] c
+	}
+	return c
+}
+
+#_________________________________________________________________
+function _qstrq(t)
+{
+	gsub(/\\/, "\\\\", t)
+	gsub(/"/, "\\\"", t)
+	return t
+}
+
+#_____________________________________________________________________________
+function _rEG(c, t, P, a, A)
+{
+	switch (c) {
+	case "_lib_CMDLN":
+		#___________________________________________________________
+		return t
+		#_____________________________________________________
+	case "_lib_APPLY":
+		return 
+		#_____________________________________________________
+	case "_lib_HELP":
+		return 
+		#_____________________________________________________
+	case "_lib_NAMEVER":
+		return _ln("_reg 0.001")
+		#_____________________________________________________
+	case "_lib_BEGIN":
+		return 
+		#_____________________________________________________
+	case "_lib_END":
+		return 
 	}
+}
 
-	function _pmap(m, s1, s2, s3, s4, s5, s6, s7, s8)
-	{
-		if (match(m, /^([^\(]+)\(([^\)]*)\)$/, _QMAP)) {
-			_qparamf1 = _QMAP[1]
-			_QMAP[0] = "r" (_qparamc1 = split(_QMAP[2], _QMAP, ""))
-			_qparamf0 = "_p" _QMAP[_qparamc1--]
-			return @_qparamf0(s1, s2, s3, s4, s5, s6, s7, s8)
+#_______________________________________________________________________
+function _rFBRO(p)
+{
+	if (p) {
+		if (p in _tPARENT) {
+			return _tFCHLD[_tPARENT[p]]
 		}
+		while (p in _tPREV) {
+			p = _tPREV[p]
+		}
+		return p
 	}
+	return p
+}
 
-	function _pr0(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
-	{
-		return @_qparamf1()
-	}
-
-	function _pr1(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
-	{
-		return @_qparamf1(p1)
+#_______________________________________________________________________
+function _rFCHLD(p)
+{
+	if (p && p in _tFCHLD) {
+		return _tFCHLD[p]
 	}
+	return ""
+}
 
-	function _pr2(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
-	{
-		return @_qparamf1(p1, p2)
+#_______________________________________________________________________
+function _rLBRO(p)
+{
+	if (p) {
+		if (p in _tPARENT) {
+			return _tLCHLD[_tPARENT[p]]
+		}
+		while (p in _tNEXT) {
+			p = _tNEXT[p]
+		}
+		return p
 	}
-
-	function _pr3(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
-	{
-		return @_qparamf1(p1, p2, p3)
+	return p
+}
+
+#_______________________________________________________________________
+function _rLCHLD(p)
+{
+	if (p && p in _tLCHLD) {
+		return _tLCHLD[p]
+	}
+	return ""
+}
+
+#_______________________________________________________________________
+function _rLINK(p)
+{
+	return ((p in _tLINK ? _tLINK[p] : ""))
+}
+
+#_______________________________________________________________________
+function _rNEXT(p)
+{
+	if (p && p in _tNEXT) {
+		return _tNEXT[p]
+	}
+	return ""
+}
+
+#_______________________________________________________________________
+function _rPARENT(p)
+{
+	if (p && p in _tPARENT) {
+		return _tPARENT[p]
+	}
+	return ""
+}
+
+#_______________________________________________________________________
+function _rPREV(p)
+{
+	if (p && p in _tPREV) {
+		return _tPREV[p]
+	}
+	return ""
+}
+
+#_______________________________________________________________________
+function _rQBRO(p, c, p1)
+{
+	if (p) {
+		if (p in _tPARENT) {
+			return _tQCHLD[_tPARENT[p]]
+		}
+		c = 1
+		p1 = p
+		while (p1 in _tPREV) {
+			c++
+			p1 = _tPREV[p1]
+		}
+		while (p in _tNEXT) {
+			c++
+			p = _tNEXT[p]
+		}
+		return c
 	}
-
-	function _pr4(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
-	{
-		return @_qparamf1(p1, p2, p3, p4)
+	return p
+}
+
+#_______________________________________________________________________
+function _rQCHLD(p)
+{
+	if (p && p in _tQCHLD) {
+		return _tQCHLD[p]
+	}
+	return ""
+}
+
+#___________________________________________________________________________________
+# EMMULATED FUNCTIONAL FIELDS ######################################################
+
+#_____________________________________________________________________________
+function _rSQFIRST(g, p, A)
+{
+	if (isarray(A)) {
+		return _rSQFIRSTA(g, p, A)
+	}
+	_SQTOPTR[g] = p
+	_SQSTACK[g][0] = 0
+	return _rsqgetptr(g, p)
+}
+
+#_________________________________________________________________
+function _rSQFIRSTA(g, p, A)
+{
+	_SQTOPTR[g] = p
+	_SQSTACK[g][0] = 0
+	if ((p = _rsqgetptr(g, p)) in A) {
+		return p
 	}
+	return _rSQNEXTA(g, p, A)
+}
 
-	function _pr5(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
-	{
-		return @_qparamf1(p1, p2, p3, p4, p5)
+#_______________________________________________________________________
+function _rSQNEXT(g, p, A)
+{
+	if (isarray(A)) {
+		return _rSQNEXTA(g, p, A)
 	}
+	return _rsqnext_i0(g, p)
+}
 
-	function _pr6(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
-	{
-		return @_qparamf1(p1, p2, p3, p4, p5, p6)
+#_________________________________________________________________
+function _rSQNEXTA(g, p, A)
+{
+	if (p == _SQTOPTR[g]) {
+		if (_SQSTACK[g][0] > 0) {
+			_SQTOPTR[g] = _SQSTACK[g][_SQSTACK[g][0]--]
+			return _rSQNEXTA(g, _SQSTACK[g][_SQSTACK[g][0]--], A)
+		}
+		return 
 	}
-
-	function _pr7(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
-	{
-		return @_qparamf1(p1, p2, p3, p4, p5, p6, p7)
+	while (p in _tNEXT) {
+		if ((p = _rsqgetptr(g, _tNEXT[p])) in A) {
+			return p
+		}
 	}
+	return ((p in _tPARENT ? _rSQNEXTA(g, _tPARENT[p], A) : ""))
+}
 
-	function _pr8(s1, s2, s3, s4, s5, s6, s7, s8, p1, p2, p3, p4, p5, p6, p7, p8)
-	{
-		return @_qparamf1(p1, p2, p3, p4, p5, p6, p7, p8)
-	}
+function _rconl(t)
+{
+	_rprt = _rprt _ln(t)
+}
 
-	function _printarr(A, t, lv, r, a)
-	{
-		a = PROCINFO["sorted_in"]
-		PROCINFO["sorted_in"] = "_lengthsort"
-		_printarrexp = (r ? r : "")
-		if (isarray(A)) {
-			delete _DUMPARR
-			_dumparrc = _dumparrd = ""
-			_printarr_i1(A, lv = ((lv == "" ? 16 : (lv == 0 || lv + 0 != 0 ? lv : (lv == "-*" ? -3 : (lv ~ /^\+?\*$/ ? 3 : 16))))) + 0, (lv < 0 ? -1 : 1), 0, _tabtospc(t))
-			PROCINFO["sorted_in"] = a
-			return _retarrd(_DUMPARR, _dumparrd, _dumparrd = "")
-		}
-	}
+function _rconline(t)
+{
+	_rprt = _rprt _ln((t = " " t " ") _getchrln("_", _CON_WIDTH - length(t) - 1))
+}
 
-	function _printarr_i1(A, lv, ls, ln, t, t2, i, a, f)
-	{
-		t2 = _getchrln(" ", length(t))
-		if (ln == lv) {
-			if (ls > 0) {
-				for (i in A) {
-					++a
-				}
-			} else {
-				for (i in A) {
-					(isarray(A[i]) ? ++a : "")
-				}
-			}
-			if (length(_dumparrd = _dumparrd t ((a > 0 ? " ... (x" a ")" : "")) _CHR["EOL"]) > 262144) {
-				_conl(_dumparrd)
-				_dumparrd = ""
-			}
-			return 
-		}
-		if (ls >= 0) {
-			for (i in A) {
-				if (! _printarrexp || i ~ _printarrexp) {
-					if (! isarray(A[i])) {
-						if (length(_dumparrd = _dumparrd ((f ? t2 : t _nop(f = 1))) "[" i "]=" A[i] "'" _CHR["EOL"]) > 262144) {
-							_conl(_dumparrd)
-							_dumparrd = ""
-						}
-					}
-				}
-			}
-		}
-		for (i in A) {
-			if (isarray(A[i])) {
-				if (! _printarrexp || i ~ _printarrexp) {
-					_printarr_i1(A[i], lv, ls, ln + ls, _th0((f ? t2 : t), f = 1) "[" i "]")
+#___________________________________________________________
+function _rd_shortcut(D, f)
+{
+	if ((_shrtcutf0 = _filepath(f)) && _shortcut_nerr(_shrtcuta0 = _cmd(_shortcut_fpath " /A:Q /F:\"" _shrtcutf0 "\" 2>&1"), _shrtcutf0)) {
+		ERRNO = ""
+		split(_shrtcuta0, _SHRTCUTA0, /\x0D?\x0A/)
+		for (_shrtcuta0 in _SHRTCUTA0) {
+			for (f in _SHORTCUTRSTRUC) {
+				if (match(_SHRTCUTA0[_shrtcuta0], "^" f)) {
+					D[_SHORTCUTRSTRUC[f]] = substr(_SHRTCUTA0[_shrtcuta0], 1 + RLENGTH)
 				}
 			}
 		}
-		if (! f) {
-			if (length(_dumparrd = _dumparrd t _CHR["EOL"]) > 262144) {
-				_conl(_dumparrd)
-				_dumparrd = ""
-			}
-		}
 	}
+	return ((ERRNO ? ERRNO = "read shortcut: " ERRNO : _NOP))
+}
 
-	function _qparam(qm, p0, p1, p2, p3, p4, p5, p6, p7)
-	{
-		if (qm == qm + 0 && qm > 0) {
-			_qparamim = substr("        ", 1, qm)
-		} else {
-			if (qm != "") {
-				_qparamim = qm
+#_______________________________________________________________________
+function _rdfile(f, i, A)
+{
+	if ((f = _filerdne(f)) == "" || _filene(f) == "") {
+		ERRNO = "Filename error"
+		return 
+	}
+	_fio_cmda = RS
+	RS = ".{1,}"
+	_fio_cmdb = BINMODE
+	BINMODE = "rw"
+	ERRNO = RT = _NUL
+	getline RS < f
+	BINMODE = _fio_cmdb
+	RS = _fio_cmda
+	if (ERRNO == "") {
+		close(f)
+	}
+	if (ERRNO == "") {
+		return RT
+	}
+	return (RT = _NOP)
+}
+
+####################################################################################
+# PUBLIC:
+#_____________________________________________________________________________
+#	fn	_th0,_th1,_th2,_th3
+#		USAGE:
+#			_th0(p1,p2,p3,p4)
+#
+#			Each of this functions can have up to 4 parameters.
+#				_th0(p1,p2,p3,p4) return 1st parameter (p1)
+#				_th1(p1,p2,p3,p4) return 2nd parameter (p2)
+#				_th2(p1,p2,p3,p4) return 3rd parameter (p3)
+#				_th3(p1,p2,p3,p4) return 4th parameter (p4)
+#_____________________________________________________________________________
+#	fn	_nop(p1,p2,p3,p4,p5,p6,p7,p8)
+#		USAGE:
+#			_nop()
+#
+#			Does not do any action. No result returned. Up to 8 parameters.
+#_____________________________________________________________________________
+#	fn	_exit(c)
+#		USAGE:
+#			_exit(code)
+#
+#			This function do the same as GAWK-operator `exit code'.
+#_____________________________________________________________________________
+#	fn	_getdate()
+#	fn	_getime()
+#	fn	_getsecond()
+#	fn	_getsecondsync()
+function _rdreg(D, p)
+{
+	_rdregp0 = "reg query \"" p "\" /S /reg:64 2>NUL"
+	_rdregfld = _rdregkey = 0
+	_rdregq0 = split(gensub(/[\x0D?\x0A]{2,}/, _CHR["EOL"], "G", _cmd(_rdregp0)), _RDREGA0, /\x0D?\x0A/)
+	while (_rdregq0 > 0) {
+		_rdreg_i0(D)
+	}
+	return (_rdregfld + _rdregkey)
+}
+
+#___________________________________________________________
+function _rdreg_i0(D, A)
+{
+	while (_rdregq0 > 0) {
+		if (match(_rdregp0 = _RDREGA0[_rdregq0--], /    (.*)    REG_((SZ)|(DWORD)|(QWORD)|(BINARY)|(EXPAND_SZ)|(MULTI_SZ))    (.*)$/, A)) {
+			if (! _rdreg_i0(D)) {
+				++_rdregfld
+				D[_rdregp0 A[1] "." _RDREGTYPE[A[2]]] = A[9]
+				return 
 			} else {
-				_qparamim = "        "
+				break
 			}
-		}
-		_qparamask = ""
-		return _qparam_i0(p0, p1, p2, p3, p4, p5, p6, p7)
-	}
-
-	function _qparam_i0(p0, p1, p2, p3, p4, p5, p6, p7)
-	{
-		_qparama0 = substr(_qparamim, 1, 1)
-		_qparamim = substr(_qparamim, 2)
-		switch (_qparama0) {
-		case "":
-			gsub(/ +$/, "", _qparamask)
-			return length(_qparamask)
-		default:
-			if (isarray(p0)) {
-				_qparama0 = "A"
-			} else {
-				if (p0 == "" && p0 == 0) {
-					_qparama0 = " "
-				} else {
-					if (_isptr(p0)) {
-						_qparama0 = "P"
-					} else {
-						_qparama0 = "S"
-					}
-				}
+		} else {
+			if (_rdregp0 ~ /^HK/) {
+				++_rdregkey
+				return D[_rdregp0 = _rdregp0 "\\"]
 			}
-		case ".":
-			_qparamask = _qparamask _qparama0
-			return _qparam_i0(p1, p2, p3, p4, p5, p6, p7)
 		}
 	}
+	return 1
+}
 
-	function _qstr(t, c, A, B)
-	{
-		c = ""
-		for (t = split(t, A, /[\x00-\x1F\\"]/, B); t >= 0; t--) {
-			c = _QSTR[B[t]] A[t + 1] c
-		}
-		return c
-	}
+#_____________________________________________________________________________________________________
+######################################################################################################
 
-	function _qstrq(t)
-	{
-		gsub(/\\/, "\\\\", t)
-		gsub(/"/, "\\\"", t)
-		return t
-	}
 
-	function _rEG(c, t, P, a, A)
-	{
-		switch (c) {
-		case "_lib_CMDLN":
-			return t
-		case "_lib_APPLY":
-			return 
-		case "_lib_HELP":
-			return 
-		case "_lib_NAMEVER":
-			return _ln("_reg 0.001")
-		case "_lib_BEGIN":
-			return 
-		case "_lib_END":
-			return 
-		}
-	}
 
-	function _rFBRO(p)
-	{
-		if (p) {
-			if (p in _tPARENT) {
-				return _tFCHLD[_tPARENT[p]]
-			}
-			while (p in _tPREV) {
-				p = _tPREV[p]
-			}
-			return p
-		}
-		return p
-	}
 
-	function _rFCHLD(p)
-	{
-		if (p && p in _tFCHLD) {
-			return _tFCHLD[p]
-		}
-		return ""
-	}
 
-	function _rLBRO(p)
-	{
-		if (p) {
-			if (p in _tPARENT) {
-				return _tLCHLD[_tPARENT[p]]
-			}
-			while (p in _tNEXT) {
-				p = _tNEXT[p]
-			}
-			return p
-		}
-		return p
-	}
 
-	function _rLCHLD(p)
-	{
-		if (p && p in _tLCHLD) {
-			return _tLCHLD[p]
-		}
-		return ""
-	}
 
-	function _rLINK(p)
-	{
-		return ((p in _tLINK ? _tLINK[p] : ""))
-	}
 
-	function _rNEXT(p)
-	{
-		if (p && p in _tNEXT) {
-			return _tNEXT[p]
-		}
-		return ""
-	}
 
-	function _rPARENT(p)
-	{
-		if (p && p in _tPARENT) {
-			return _tPARENT[p]
-		}
-		return ""
-	}
 
-	function _rPREV(p)
-	{
-		if (p && p in _tPREV) {
-			return _tPREV[p]
-		}
-		return ""
-	}
 
-	function _rQBRO(p, c, p1)
-	{
-		if (p) {
-			if (p in _tPARENT) {
-				return _tQCHLD[_tPARENT[p]]
-			}
-			c = 1
-			p1 = p
-			while (p1 in _tPREV) {
-				c++
-				p1 = _tPREV[p1]
-			}
-			while (p in _tNEXT) {
-				c++
-				p = _tNEXT[p]
-			}
-			return c
-		}
-		return p
-	}
 
-	function _rQCHLD(p)
-	{
-		if (p && p in _tQCHLD) {
-			return _tQCHLD[p]
-		}
-		return ""
-	}
 
-	function _rSQFIRST(g, p, A)
-	{
-		if (isarray(A)) {
-			return _rSQFIRSTA(g, p, A)
-		}
-		_SQTOPTR[g] = p
-		_SQSTACK[g][0] = 0
-		return _rsqgetptr(g, p)
-	}
 
-	function _rSQFIRSTA(g, p, A)
-	{
-		_SQTOPTR[g] = p
-		_SQSTACK[g][0] = 0
-		if ((p = _rsqgetptr(g, p)) in A) {
-			return p
-		}
-		return _rSQNEXTA(g, p, A)
-	}
 
-	function _rSQNEXT(g, p, A)
-	{
-		if (isarray(A)) {
-			return _rSQNEXTA(g, p, A)
-		}
-		return _rsqnext_i0(g, p)
-	}
 
-	function _rSQNEXTA(g, p, A)
-	{
-		if (p == _SQTOPTR[g]) {
-			if (_SQSTACK[g][0] > 0) {
-				_SQTOPTR[g] = _SQSTACK[g][_SQSTACK[g][0]--]
-				return _rSQNEXTA(g, _SQSTACK[g][_SQSTACK[g][0]--], A)
-			}
-			return 
-		}
-		while (p in _tNEXT) {
-			if ((p = _rsqgetptr(g, _tNEXT[p])) in A) {
-				return p
-			}
-		}
-		return ((p in _tPARENT ? _rSQNEXTA(g, _tPARENT[p], A) : ""))
-	}
 
-	function _rconl(t)
-	{
-		_rprt = _rprt _ln(t)
-	}
 
-	function _rconline(t)
-	{
-		_rprt = _rprt _ln((t = " " t " ") _getchrln("_", _CON_WIDTH - length(t) - 1))
-	}
 
-	function _rd_shortcut(D, f)
-	{
-		if ((_shrtcutf0 = _filepath(f)) && _shortcut_nerr(_shrtcuta0 = _cmd(_shortcut_fpath " /A:Q /F:\"" _shrtcutf0 "\" 2>&1"), _shrtcutf0)) {
-			ERRNO = ""
-			split(_shrtcuta0, _SHRTCUTA0, /\x0D?\x0A/)
-			for (_shrtcuta0 in _SHRTCUTA0) {
-				for (f in _SHORTCUTRSTRUC) {
-					if (match(_SHRTCUTA0[_shrtcuta0], "^" f)) {
-						D[_SHORTCUTRSTRUC[f]] = substr(_SHRTCUTA0[_shrtcuta0], 1 + RLENGTH)
-					}
-				}
-			}
-		}
-		return ((ERRNO ? ERRNO = "read shortcut: " ERRNO : _NOP))
-	}
 
-	function _rdfile(f, i, A)
-	{
-		if ((f = _filerdne(f)) == "" || _filene(f) == "") {
-			ERRNO = "Filename error"
-			return 
-		}
-		_fio_cmda = RS
-		RS = ".{1,}"
-		_fio_cmdb = BINMODE
-		BINMODE = "rw"
-		ERRNO = RT = _NUL
-		getline RS < f
-		BINMODE = _fio_cmdb
-		RS = _fio_cmda
-		if (ERRNO == "") {
-			close(f)
-		}
-		if (ERRNO == "") {
-			return RT
-		}
-		return (RT = _NOP)
-	}
 
-	function _rdreg(D, p)
-	{
-		_rdregp0 = "reg query \"" p "\" /S /reg:64 2>NUL"
-		_rdregfld = _rdregkey = 0
-		_rdregq0 = split(gensub(/[\x0D?\x0A]{2,}/, _CHR["EOL"], "G", _cmd(_rdregp0)), _RDREGA0, /\x0D?\x0A/)
-		while (_rdregq0 > 0) {
-			_rdreg_i0(D)
-		}
-		return (_rdregfld + _rdregkey)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+function _rdsafe(A, i, d)
+{
+	if (i in A) {
+		return A[i]
 	}
+	return d
+}
 
-	function _rdreg_i0(D, A)
-	{
-		while (_rdregq0 > 0) {
-			if (match(_rdregp0 = _RDREGA0[_rdregq0--], /    (.*)    REG_((SZ)|(DWORD)|(QWORD)|(BINARY)|(EXPAND_SZ)|(MULTI_SZ))    (.*)$/, A)) {
-				if (! _rdreg_i0(D)) {
-					++_rdregfld
-					D[_rdregp0 A[1] "." _RDREGTYPE[A[2]]] = A[9]
-					return 
+#_______________________________________________________________________
+function _reg_check(p)
+{
+	_tframe("_reg_check_i0", p, p)
+}
+
+#_______________________________________________
+function _reg_check_i0(p, pp, p1, p2)
+{
+	if (_[p]["TYPE"] == "defreg") {
+		if (_[p]["REGPATH"] in _REG) {
+			if ("VALUE" in _[p]) {
+				if (_[p]["VALUE"] == _REG[_[p]["REGPATH"]]) {
+					_creport(p, substr("OK:    REGENTRY MATCH(==" _[p]["VALUE"] "): " _[p]["REGPATH"], 1, 126))
 				} else {
-					break
+					_dllerr(p, substr("REGENTRY NOT MATCH(!=" _[p]["VALUE"] "): " _[p]["REGPATH"], 1, 126))
 				}
 			} else {
-				if (_rdregp0 ~ /^HK/) {
-					++_rdregkey
-					return D[_rdregp0 = _rdregp0 "\\"]
+				if (_VAR[_[p]["REGPATH"]] == _REG[_[p]["REGPATH"]]) {
+					_creport(p, substr("OK:    REGPATH MATCH(==" _VAR[_[p]["REGPATH"]] "): " _[p]["REGPATH"], 1, 126))
+				} else {
+					_dllerr(p, substr("REGPATH NOT MATCH(!=" _VAR[_[p]["REGPATH"]] "): " _[p]["REGPATH"], 1, 126))
 				}
 			}
+		} else {
+			_dllerr(p, substr("REGPATH NOT FOUND: " _[p]["REGPATH"], 1, 126))
 		}
-		return 1
-	}
-
-	function _rdsafe(A, i, d)
-	{
-		if (i in A) {
-			return A[i]
-		}
-		return d
 	}
+}
 
-	function _reg_check(p)
-	{
-		_tframe("_reg_check_i0", p, p)
-	}
+#_____________________________________________________
+function _registryinit()
+{
+	_registrytmpfile = _getmpfile()
+}
 
-	function _reg_check_i0(p, pp, p1, p2)
-	{
-		if (_[p]["TYPE"] == "defreg") {
-			if (_[p]["REGPATH"] in _REG) {
-				if ("VALUE" in _[p]) {
-					if (_[p]["VALUE"] == _REG[_[p]["REGPATH"]]) {
-						_creport(p, substr("OK:    REGENTRY MATCH(==" _[p]["VALUE"] "): " _[p]["REGPATH"], 1, 126))
-					} else {
-						_dllerr(p, substr("REGENTRY NOT MATCH(!=" _[p]["VALUE"] "): " _[p]["REGPATH"], 1, 126))
-					}
+# _rdregfld		: gvar	- number of readed registry fields by _rdreg()
+# _rdregkey		: gvar	- number of readed registry keys by _rdreg()
+#_____________________________________________________________________________
+function _regpath0(D, i, s, q, S)
+{
+	if (i = _patharr0(S, i)) {
+		if ("name" in S) {
+			D["name"] = S["name"]
+		}
+		if ("ext" in S) {
+			D["ext"] = S["ext"]
+		}
+		s = ((toupper(s = (i in S ? S[i] : "")) in _REGPATH0REGDIR ? D[++q] = _REGPATH0REGDIR[toupper(s)] : (D[++q] = _REGPATH0REGDIR[""]) "\\" (D[++q] = s))) "\\"
+		while (++i in S) {
+			s = s (D[++q] = S[i]) "\\"
+		}
+		if (s != "") {
+			D[0] = s
+		}
+		IGNORECASE = 1
+		D["hostdir"] = "\\\\" (D["host"] = ("host" in S && ("" == (i = S["host"]) || "." == i || "?" == i || "localhost" == i) ? ENVIRON["COMPUTERNAME"] : i)) "\\" s
+		IGNORECASE = 0
+	}
+}
+
+#_________________________________________________________________________________________
+function _report(p)
+{
+	_report_t0 = _reportparnt = ""
+	_report_i0(p)
+	_tframe("_report_i0", p)
+	return _report_t0
+}
+
+function _report_i0(p, p0, p1, p2)
+{
+	if (p in _tPARENT) {
+		if (_reportparnt != (_reportparnt = _tPARENT[p])) {
+			_report_t0 = _report_t0 _ln() _ln((z = "_ " _[_tPARENT[p]]["NAME"] " ") _getchrln("_", _CON_WIDTH - length(z) - 2)) _ln(_getchrln("#", _CON_WIDTH - 2)) _ln()
+		}
+	}
+	if ("ERROR" in _[p]) {
+		_report_t0 = _report_t0 _reporterr(p, _[p]["ERROR"])
+	}
+	if ("REPORT" in _[p]) {
+		_report_t0 = _report_t0 _ln(_[p]["REPORT"])
+	}
+}
+
+#___________________________________________________________________________________
+function _reporterr(p, t3, pp, t, t2)
+{
+	t = ""
+	pp = p
+	do {
+		("NAME" in _[pp] ? t = _[pp]["NAME"] ": " t : "")
+	} while (pp = _rPARENT(pp))
+	if (match(t3, /\x00/)) {
+		return (substr(t3, 1, RSTART - 1) t substr(t3, RSTART + 1))
+	}
+	return (t t3)
+}
+
+#___________________________________________________________________________________
+####################################################################################
+
+
+
+
+#_______________________________________________________________________
+# _CHR array
+#
+#	_CHR[ASC-code decimal number]=="char"
+#
+#		Contains 256 elements. The index is the decimal number from 0-255.
+#		The value is the single character with ASC-code equivalent to index number:
+#
+#			_CHR[97]		=="a"			- character with ASC-code 97 is `a'
+#
+#		This array is useful if you want to get character using it's ASC-code
+#_________________________________________________________________
+# _ASC array
+#
+#	_ASC[char]==number: ASC-code of char
+#
+#		Contains 256 elements. The index is the any single character with ASC-code \x00-\xFF.
+#		The value is the number equivalent of character's ASC-code:
+#
+#			_ASC["A"]		==65			- ASC-code of character `A' is 65
+#
+#		This array is useful if you want to get ASC-code of the character.
+#_________________________________________________________________
+# _QASC array
+#
+#	_QASC[char]=="string: octal ASC-code of char in 3-digit octal format"
+#
+#		Contains 256 elements. The index is the any single charcter with ASC-code \x00-\xFF.
+#		The value is the octal number equivalent of character's ASC-code in fixed-length - 3-digit - string:
+#
+#			_QASC["!"]		=="041"		- ASC-code of character `!' is 33(decimal) == 41(in octal)
+#			_QASC["\x0D"]	=="015"
+#
+#		This array is useful when some type of string escape conversion is performed. It allows quickly get
+#		replace string for the characters that can be specified only by character code in result string:
+#
+#			"\x0D"	->	"\\015"
+#_______________________________________________________________________
+
+
+
+
+
+
+
+####################################################################################
+# PUBLIC:
+#_____________________________________________________________________________
+#	fn	_getchrln(ptt,len)
+#_____________________________________________________________________________
+#	fn	_tabtospc(src,tabstep,xcoord)
+####################################################################################
+
+#_____________________________________________________________________________
+function _retarr(A, i, p, a, q)
+{
+	if (isarray(A)) {
+		i = (i == "" ? 0 : i + 0)
+		q = A[_ARRLEN] + 0
+		if (i < q) {
+			return (p A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] _retarr_i0(A, q, i, a))
+		}
+	}
+}
+
+function _retarr_i0(A, q, i, a)
+{
+	if (i < q) {
+		return (A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] _retarr_i0(A, q, i, a))
+	}
+	while (q < i) {
+		delete A[++q]
+	}
+	return a
+}
+
+#_________________________________________________________________
+function _retarrd(A, v, i)
+{
+	if (1 in A) {
+		return (A[1] A[2] A[3] A[4] A[5] A[6] A[7] A[8] A[9] A[10] A[11] A[12] A[13] A[14] A[15] A[16] (((i = 17) in A ? _retarrd_i0(A, i) v : v)))
+	}
+	delete A
+	return v
+}
+
+#_____________________________________________________
+function _retarrd_i0(A, i)
+{
+	if (i in A) {
+		return (A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] ((i in A ? _retarrd_i0(A, i) : "")))
+	}
+	delete A
+}
+
+#_______________________________________________________________________
+########################################################################
+#EXPERIMENTAL
+
+function _rexpfn(R, t, p)
+{
+	_REXPFN[""] = ""
+	while (t) {
+		t = _rxpfn(R, t, p)
+	}
+	return _REXPFN[""]
+}
+
+function _rexpfnend(t)
+{
+	_REXPFN[""] = t
+}
+
+#_____________________________________________________________________________
+function _rexpstr(r, i, c, A)
+{
+	c = split(r, A, "")
+	r = ""
+	for (i = 1; i <= c; i++) {
+		r = r _REXPSTR[A[i]]
+	}
+	return r
+}
+
+#_____________________________________________________________________________
+function _rexpstr_i0(t, A, p0)
+{
+	return (_REXPSTR[t] = "\\" t)
+}
+
+#___________________________________________________________
+function _rmtsharerr(h, t)
+{
+	gsub(/[\x0D\x0A]+/, "", t)
+	if (t ~ /^The command failed: 53/) {
+		ERRNO = "host not found: \\\\" h
+	} else {
+		ERRNO = t ": \\\\" h
+	}
+}
+
+function _rpp(q, D, S)
+{
+	_conl()
+	_conline(q)
+	_conl()
+	_regpath0(D, q)
+	#_conl(_dumparr(D))
+	
+	_conl(_ln("DEST:") _dumparr(D))
+	_conl()
+	return q
+}
+
+#_________________________________________________________________________________________
+function _rrdreg(DD, p, k, t, v, c, i, q, tT, A, B, C, D)
+{
+	if (! _registrytmpfile) {
+		_registryinit()
+	}
+	_cmd("regedit /E \"" _registrytmpfile "\" \"" p "\" 2>&1")
+	q = patsplit(gensub(/[\x00\xFF\xFE]+/, "", "G", _rdfile(_registrytmpfile)), A, /\x0D?\x0A\[[^\]]+\]\x0D?\x0A/, B)
+	for (i = 1; i <= q; i++) {
+		p = gensub(/(^[ \t\x0D\x0A]*\[)|((\\)\\+)|(\][ \t\x0D\x0A]*$)/, "\\3", "G", A[i])
+		DD[p "\\"]
+		delete C[split(B[i], C, /[\x0D\x0A]+/)]
+		for (c = 1; c in C; c++) {
+			tt = tt C[c]
+			if (gsub(/\\$/, "", tt)) {
+				continue
+			}
+			if (tt == "") {
+				continue
+			}
+			if (match(_th0(tt, tt = ""), /((^"(([^\\"]|\\.)*)")|(@))=(("(([^\\"]|\\.)*)")|(dword:([[:xdigit:]]{8}))|(hex(\(([27b])\))?:(.*)))$/, D)) {
+				if (D[7]) {
+					t = "STR"
+					v = _unstr(D[8])
 				} else {
-					if (_VAR[_[p]["REGPATH"]] == _REG[_[p]["REGPATH"]]) {
-						_creport(p, substr("OK:    REGPATH MATCH(==" _VAR[_[p]["REGPATH"]] "): " _[p]["REGPATH"], 1, 126))
+					if (D[10]) {
+						t = "W32"
+						v = D[11]
 					} else {
-						_dllerr(p, substr("REGPATH NOT MATCH(!=" _VAR[_[p]["REGPATH"]] "): " _[p]["REGPATH"], 1, 126))
+						v = D[15]
+						if (D[13]) {
+							switch (D[14]) {
+							case "2":
+								t = "XSZ"
+								break
+							case "7":
+								t = "MSZ"
+								break
+							default:
+								t = "W64"
+							}
+						} else {
+							t = "BIN"
+						}
 					}
 				}
+				DD[gensub(/(\\)\\+/, "\\1", "G", p "\\" _unstr(D[3] ((D[5] ? "(Default)" : ""))) "." t)] = v
 			} else {
-				_dllerr(p, substr("REGPATH NOT FOUND: " _[p]["REGPATH"], 1, 126))
+				_fatal("regedit: unknown output format(" c "): `" C[c] "'")
 			}
 		}
 	}
+}
 
-	function _registryinit()
-	{
-		_registrytmpfile = _getmpfile()
-	}
-
-	function _regpath0(D, i, s, q, S)
-	{
-		if (i = _patharr0(S, i)) {
-			if ("name" in S) {
-				D["name"] = S["name"]
-			}
-			if ("ext" in S) {
-				D["ext"] = S["ext"]
-			}
-			s = ((toupper(s = (i in S ? S[i] : "")) in _REGPATH0REGDIR ? D[++q] = _REGPATH0REGDIR[toupper(s)] : (D[++q] = _REGPATH0REGDIR[""]) "\\" (D[++q] = s))) "\\"
-			while (++i in S) {
-				s = s (D[++q] = S[i]) "\\"
-			}
-			if (s != "") {
-				D[0] = s
-			}
-			IGNORECASE = 1
-			D["hostdir"] = "\\\\" (D["host"] = ("host" in S && ("" == (i = S["host"]) || "." == i || "?" == i || "localhost" == i) ? ENVIRON["COMPUTERNAME"] : i)) "\\" s
-			IGNORECASE = 0
+#_________________________________________________________________
+function _rsqgetptr(g, p, A)
+{
+	if (p in _tLINK) {
+		_SQSTACK[g][++_SQSTACK[g][0]] = p
+		_SQSTACK[g][++_SQSTACK[g][0]] = _SQTOPTR[g]
+		while ((p = _tLINK[p]) in _tLINK) {
+			_con(".")
 		}
+		_SQTOPTR[g] = p
 	}
-
-	function _report(p)
-	{
-		_report_t0 = _reportparnt = ""
-		_report_i0(p)
-		_tframe("_report_i0", p)
-		return _report_t0
-	}
-
-	function _report_i0(p, p0, p1, p2)
-	{
-		if (p in _tPARENT) {
-			if (_reportparnt != (_reportparnt = _tPARENT[p])) {
-				_report_t0 = _report_t0 _ln() _ln((z = "_ " _[_tPARENT[p]]["NAME"] " ") _getchrln("_", _CON_WIDTH - length(z) - 2)) _ln(_getchrln("#", _CON_WIDTH - 2)) _ln()
-			}
-		}
-		if ("ERROR" in _[p]) {
-			_report_t0 = _report_t0 _reporterr(p, _[p]["ERROR"])
-		}
-		if ("REPORT" in _[p]) {
-			_report_t0 = _report_t0 _ln(_[p]["REPORT"])
-		}
+	if (p in _tFCHLD) {
+		return _rsqgetptr(g, _tFCHLD[p])
 	}
+	return p
+}
 
-	function _reporterr(p, t3, pp, t, t2)
-	{
-		t = ""
-		pp = p
-		do {
-			("NAME" in _[pp] ? t = _[pp]["NAME"] ": " t : "")
-		} while (pp = _rPARENT(pp))
-		if (match(t3, /\x00/)) {
-			return (substr(t3, 1, RSTART - 1) t substr(t3, RSTART + 1))
+#___________________________________________________________
+function _rsqnext_i0(g, p)
+{
+	if (p == _SQTOPTR[g]) {
+		if (_SQSTACK[g][0] > 0) {
+			_SQTOPTR[g] = _SQSTACK[g][_SQSTACK[g][0]--]
+			return _rsqnext_i0(g, _SQSTACK[g][_SQSTACK[g][0]--])
 		}
-		return (t t3)
+		return 
 	}
-
-	function _retarr(A, i, p, a, q)
-	{
-		if (isarray(A)) {
-			i = (i == "" ? 0 : i + 0)
-			q = A[_ARRLEN] + 0
-			if (i < q) {
-				return (p A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] _retarr_i0(A, q, i, a))
+	if (p in _tNEXT) {
+		return _rsqgetptr(g, _tNEXT[p])
+	}
+	return _rsqnext_i0(g, _tPARENT[p])
+}
+
+function _rtn(v, A)
+{
+	_conl()
+	_conline(_val(v) " : " _val(A))
+	_conl()
+	_rtn2(v, A)
+	_conl()
+}
+
+function _rtn2(v, A, r, t)
+{
+	r = (isarray(A) ? _typa(v, A) : _typ(v))
+	if ("`" > _t0 && _t0) {
+		_conl("ggggg")
+	}
+	t = ((r ? "TRUE" : "FALSE")) " / " ((r > 0 ? r ">0" : r "!>0")) " / " ((r + 0 > 0 ? r "+0>0" : r "+0!>0")) " / " ((r + 0 != r ? r "+0!=" r : r "+0==" r)) " / " ((r && "`" > r ? "'`'>" r " && " r : "!('`'>" r " && " r ")"))
+	_conl("`" r "' : " t)
+	return r
+}
+
+function _rxpfn(R, t, p, i, f, A)
+{
+	for (i in R) {
+		if (match(t, i, A)) {
+			f = R[i]
+			if (t != (t = @f(A, substr(t, RLENGTH + 1), p))) {
+				return t
 			}
 		}
 	}
+	return _rexpfnend(t)
+}
 
-	function _retarr_i0(A, q, i, a)
-	{
-		if (i < q) {
-			return (A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] A[++i] _retarr_i0(A, q, i, a))
-		}
-		while (q < i) {
-			delete A[++q]
-		}
-		return a
+#_____________________________________________________________________________
+function _sHARE(c, t, P, a, A)
+{
+	switch (c) {
+	case "_lib_CMDLN":
+		#___________________________________________________________
+		return t
+		#_____________________________________________________
+	case "_lib_APPLY":
+		return 
+		#_____________________________________________________
+	case "_lib_HELP":
+		return 
+		#_____________________________________________________
+	case "_lib_NAMEVER":
+		return _ln("_share 1.000")
+		#_____________________________________________________
+	case "_lib_BEGIN":
+		return 
+		#_____________________________________________________
+	case "_lib_END":
+		return 
 	}
+}
 
-	function _retarrd(A, v, i)
-	{
-		if (1 in A) {
-			return (A[1] A[2] A[3] A[4] A[5] A[6] A[7] A[8] A[9] A[10] A[11] A[12] A[13] A[14] A[15] A[16] (((i = 17) in A ? _retarrd_i0(A, i) v : v)))
-		}
-		delete A
-		return v
+#_____________________________________________________________________________
+function _sYS(c, t, P, a, A)
+{
+	switch (c) {
+	case "_lib_CMDLN":
+		#___________________________________________________________
+		return t
+		#_____________________________________________________
+	case "_lib_APPLY":
+		return 
+		#_____________________________________________________
+	case "_lib_HELP":
+		return 
+		#_____________________________________________________
+	case "_lib_NAMEVER":
+		return 
+		#_____________________________________________________
+	case "_lib_BEGIN":
+		return 
+		#_____________________________________________________
+	case "_lib_END":
+		return 
 	}
+}
 
-	function _retarrd_i0(A, i)
-	{
-		if (i in A) {
-			return (A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] A[i++] ((i in A ? _retarrd_i0(A, i) : "")))
-		}
-		delete A
-	}
+#_______________________________________________________________________
+function _serv_check(p)
+{
+	_tframe("_serv_check_i0", p, p)
+}
 
-	function _rexpfn(R, t, p)
-	{
-		_REXPFN[""] = ""
-		while (t) {
-			t = _rxpfn(R, t, p)
+#_______________________________________________
+function _serv_check_i0(p, p0, p1, p2, p3, i, q, c)
+{
+	if (_[p]["TYPE"] == "defsrv") {
+		i = IGNORECASE
+		IGNORECASE = 1
+		if (match(_servoutput, roi = "\\012DISPLAY_NAME: " _torexp(_[p]["SERVNAME"]))) {
+			_creport(p, "OK:    SERVICE DETECTED: " substr(_[p]["SERVNAME"], 1, 112))
+		} else {
+			_dllerr(p, "service " _[p]["SERVNAME"] " not detected")
 		}
-		return _REXPFN[""]
 	}
+	IGNORECASE = i
+}
 
-	function _rexpfnend(t)
-	{
-		_REXPFN[""] = t
+#_______________________________________________________________________
+function _setarrsort(f, a)
+{
+	a = PROCINFO["sorted_in"]
+	if (! f) {
+		delete PROCINFO["sorted_in"]
+	} else {
+		PROCINFO["sorted_in"] = f
 	}
+	return a
+}
 
-	function _rexpstr(r, i, c, A)
-	{
-		c = split(r, A, "")
-		r = ""
-		for (i = 1; i <= c; i++) {
-			r = r _REXPSTR[A[i]]
+#_______________________________________________________________________
+function _setmpath(p, a)
+{
+	ERRNO = ""
+	if (p && (a = _filerd(p))) {
+		if (_FILEIO_TMPRD) {
+			_FILEIO_TMPATHS[_FILEIO_TMPRD]
 		}
-		return r
+		#if ( _filexist(a) ) _del(a)
+		#_cmd("rd " a " /S /Q 2>NUL"); _cmd("del " a " /Q 2>NUL")
+		return (_FILEIO_TMPRD = a)
+	} else {
+		return _warning("`" p "': cannot set temporary folder" ((ERRNO ? ": " ERRNO : "")))
 	}
+}
 
-	function _rexpstr_i0(t, A, p0)
-	{
-		return (_REXPSTR[t] = "\\" t)
-	}
+#_________________________________________________________________________________________
+##########################################################################################
 
-	function _rmtsharerr(h, t)
-	{
-		gsub(/[\x0D\x0A]+/, "", t)
-		if (t ~ /^The command failed: 53/) {
-			ERRNO = "host not found: \\\\" h
-		} else {
-			ERRNO = t ": \\\\" h
-		}
-	}
 
-	function _rpp(q, D, S)
-	{
-		_conl()
-		_conline(q)
-		_conl()
-		_regpath0(D, q)
-		_conl(_ln("DEST:") _dumparr(D))
-		_conl()
-		return q
-	}
 
-	function _rrdreg(DD, p, k, t, v, c, i, q, tT, A, B, C, D)
-	{
-		if (! _registrytmpfile) {
-			_registryinit()
-		}
-		_cmd("regedit /E \"" _registrytmpfile "\" \"" p "\" 2>&1")
-		q = patsplit(gensub(/[\x00\xFF\xFE]+/, "", "G", _rdfile(_registrytmpfile)), A, /\x0D?\x0A\[[^\]]+\]\x0D?\x0A/, B)
-		for (i = 1; i <= q; i++) {
-			p = gensub(/(^[ \t\x0D\x0A]*\[)|((\\)\\+)|(\][ \t\x0D\x0A]*$)/, "\\3", "G", A[i])
-			DD[p "\\"]
-			delete C[split(B[i], C, /[\x0D\x0A]+/)]
-			for (c = 1; c in C; c++) {
-				tt = tt C[c]
-				if (gsub(/\\$/, "", tt)) {
-					continue
-				}
-				if (tt == "") {
-					continue
-				}
-				if (match(_th0(tt, tt = ""), /((^"(([^\\"]|\\.)*)")|(@))=(("(([^\\"]|\\.)*)")|(dword:([[:xdigit:]]{8}))|(hex(\(([27b])\))?:(.*)))$/, D)) {
-					if (D[7]) {
-						t = "STR"
-						v = _unstr(D[8])
-					} else {
-						if (D[10]) {
-							t = "W32"
-							v = D[11]
-						} else {
-							v = D[15]
-							if (D[13]) {
-								switch (D[14]) {
-								case "2":
-									t = "XSZ"
-									break
-								case "7":
-									t = "MSZ"
-									break
-								default:
-									t = "W64"
-								}
-							} else {
-								t = "BIN"
-							}
-						}
-					}
-					DD[gensub(/(\\)\\+/, "\\1", "G", p "\\" _unstr(D[3] ((D[5] ? "(Default)" : ""))) "." t)] = v
-				} else {
-					_fatal("regedit: unknown output format(" c "): `" C[c] "'")
-				}
-			}
-		}
-	}
 
-	function _rsqgetptr(g, p, A)
-	{
-		if (p in _tLINK) {
-			_SQSTACK[g][++_SQSTACK[g][0]] = p
-			_SQSTACK[g][++_SQSTACK[g][0]] = _SQTOPTR[g]
-			while ((p = _tLINK[p]) in _tLINK) {
-				_con(".")
-			}
-			_SQTOPTR[g] = p
-		}
-		if (p in _tFCHLD) {
-			return _rsqgetptr(g, _tFCHLD[p])
-		}
-		return p
-	}
 
-	function _rsqnext_i0(g, p)
-	{
-		if (p == _SQTOPTR[g]) {
-			if (_SQSTACK[g][0] > 0) {
-				_SQTOPTR[g] = _SQSTACK[g][_SQSTACK[g][0]--]
-				return _rsqnext_i0(g, _SQSTACK[g][_SQSTACK[g][0]--])
-			}
-			return 
-		}
-		if (p in _tNEXT) {
-			return _rsqgetptr(g, _tNEXT[p])
-		}
-		return _rsqnext_i0(g, _tPARENT[p])
-	}
 
-	function _rtn(v, A)
-	{
-		_conl()
-		_conline(_val(v) " : " _val(A))
-		_conl()
-		_rtn2(v, A)
-		_conl()
-	}
 
-	function _rtn2(v, A, r, t)
-	{
-		r = (isarray(A) ? _typa(v, A) : _typ(v))
-		if ("`" > _t0 && _t0) {
-			_conl("ggggg")
-		}
-		t = ((r ? "TRUE" : "FALSE")) " / " ((r > 0 ? r ">0" : r "!>0")) " / " ((r + 0 > 0 ? r "+0>0" : r "+0!>0")) " / " ((r + 0 != r ? r "+0!=" r : r "+0==" r)) " / " ((r && "`" > r ? "'`'>" r " && " r : "!('`'>" r " && " r ")"))
-		_conl("`" r "' : " t)
-		return r
-	}
 
-	function _rxpfn(R, t, p, i, f, A)
-	{
-		for (i in R) {
-			if (match(t, i, A)) {
-				f = R[i]
-				if (t != (t = @f(A, substr(t, RLENGTH + 1), p))) {
-					return t
-				}
-			}
-		}
-		return _rexpfnend(t)
-	}
 
-	function _sHARE(c, t, P, a, A)
-	{
-		switch (c) {
-		case "_lib_CMDLN":
-			return t
-		case "_lib_APPLY":
-			return 
-		case "_lib_HELP":
-			return 
-		case "_lib_NAMEVER":
-			return _ln("_share 1.000")
-		case "_lib_BEGIN":
-			return 
-		case "_lib_END":
-			return 
-		}
-	}
 
-	function _sYS(c, t, P, a, A)
-	{
-		switch (c) {
-		case "_lib_CMDLN":
-			return t
-		case "_lib_APPLY":
-			return 
-		case "_lib_HELP":
-			return 
-		case "_lib_NAMEVER":
-			return 
-		case "_lib_BEGIN":
-			return 
-		case "_lib_END":
-			return 
-		}
-	}
 
-	function _serv_check(p)
-	{
-		_tframe("_serv_check_i0", p, p)
-	}
 
-	function _serv_check_i0(p, p0, p1, p2, p3, i, q, c)
-	{
-		if (_[p]["TYPE"] == "defsrv") {
-			i = IGNORECASE
-			IGNORECASE = 1
-			if (match(_servoutput, roi = "\\012DISPLAY_NAME: " _torexp(_[p]["SERVNAME"]))) {
-				_creport(p, "OK:    SERVICE DETECTED: " substr(_[p]["SERVNAME"], 1, 112))
-			} else {
-				_dllerr(p, "service " _[p]["SERVNAME"] " not detected")
-			}
-		}
-		IGNORECASE = i
-	}
 
-	function _setarrsort(f, a)
-	{
-		a = PROCINFO["sorted_in"]
-		if (! f) {
-			delete PROCINFO["sorted_in"]
-		} else {
-			PROCINFO["sorted_in"] = f
-		}
-		return a
-	}
 
-	function _setmpath(p, a)
-	{
-		ERRNO = ""
-		if (p && (a = _filerd(p))) {
-			if (_FILEIO_TMPRD) {
-				_FILEIO_TMPATHS[_FILEIO_TMPRD]
-			}
-			return (_FILEIO_TMPRD = a)
-		} else {
-			return _warning("`" p "': cannot set temporary folder" ((ERRNO ? ": " ERRNO : "")))
-		}
-	}
 
-	function _sharelist(D, h, q, c, l, A, B)
-	{
-		delete D
-		c = _sharextool " \\\\" ((h == "" ? h = ENVIRON["COMPUTERNAME"] : h)) " 2>&1"
-		if (match(c = _cmd(c), /\x0AShare[^\x0A]*Remark/)) {
-			gsub(/(^[^-]*\x0D?\x0A-+\x0D?\x0A[ \t]*)|(\x0D?\x0AThe command completed successfully.*$)/, "", c)
-			l = RLENGTH - 7
-			split(c, A, /([ \t]*\x0D?\x0A)+[ \t]*/)
-			for (c in A) {
-				if (match(A[c], /((([^ \t:]+[ \t]+)*[^ \t:]+)[ \t]+)([A-Za-z])[ \t]*:/, B) && ++q) {
-					D[B[2]] = (A[c] ~ /\.\.\.$/ ? _sharepath(h, B[2]) : gensub(/[ \t\\\/]*$/, "\\\\", 1, substr(A[c], 1 + B[1, "length"], l - B[1, "length"])))
-				}
+
+
+
+
+
+function _sharelist(D, h, q, c, l, A, B)
+{
+	delete D
+	c = _sharextool " \\\\" ((h == "" ? h = ENVIRON["COMPUTERNAME"] : h)) " 2>&1"
+	if (match(c = _cmd(c), /\x0AShare[^\x0A]*Remark/)) {
+		gsub(/(^[^-]*\x0D?\x0A-+\x0D?\x0A[ \t]*)|(\x0D?\x0AThe command completed successfully.*$)/, "", c)
+		l = RLENGTH - 7
+		split(c, A, /([ \t]*\x0D?\x0A)+[ \t]*/)
+		for (c in A) {
+			if (match(A[c], /((([^ \t:]+[ \t]+)*[^ \t:]+)[ \t]+)([A-Za-z])[ \t]*:/, B) && ++q) {
+				D[B[2]] = (A[c] ~ /\.\.\.$/ ? _sharepath(h, B[2]) : gensub(/[ \t\\\/]*$/, "\\\\", 1, substr(A[c], 1 + B[1, "length"], l - B[1, "length"])))
 			}
-			return q
 		}
-		return _rmtsharerr(h, c)
+		return q
 	}
+	return _rmtsharerr(h, c)
+}
 
-	function _sharepath(h, s, A)
-	{
-		s = _sharextool " \\\\" ((h == "" ? h = ENVIRON["COMPUTERNAME"] : h)) "\\\"" s "\" 2>&1"
-		if (match(s = _cmd(s), /\x0APath[ \t]+([^\x0D\x0A]+)/, _SHAREPATHA0)) {
-			return gensub(/[ \t\\\/]*$/, "\\\\", 1, _SHAREPATHA0[1])
-		}
-		return _rmtsharerr(h, s)
+#_____________________________________________________________________________
+function _sharepath(h, s, A)
+{
+	s = _sharextool " \\\\" ((h == "" ? h = ENVIRON["COMPUTERNAME"] : h)) "\\\"" s "\" 2>&1"
+	if (match(s = _cmd(s), /\x0APath[ \t]+([^\x0D\x0A]+)/, _SHAREPATHA0)) {
+		return gensub(/[ \t\\\/]*$/, "\\\\", 1, _SHAREPATHA0[1])
 	}
+	return _rmtsharerr(h, s)
+}
 
-	function _shortcut(D, S)
-	{
-		if (isarray(D)) {
-			if (isarray(S)) {
-				_addarrmask(D, S, _SHORTCUTWSTRUC)
+function _shortcut(D, S)
+{
+	if (isarray(D)) {
+		if (isarray(S)) {
+			_addarrmask(D, S, _SHORTCUTWSTRUC)
+		} else {
+			if (S == 0 && S == "") {
+				_addarrmask(D, _SHORTCUTDEFAULT, _SHORTCUTWSTRUC)
 			} else {
-				if (S == 0 && S == "") {
-					_addarrmask(D, _SHORTCUTDEFAULT, _SHORTCUTWSTRUC)
+				if (_isnotfileptr(S)) {
+					_addarrmask(D, _[S], _SHORTCUTWSTRUC)
 				} else {
-					if (_isnotfileptr(S)) {
-						_addarrmask(D, _[S], _SHORTCUTWSTRUC)
-					} else {
-						if (_rd_shortcut(D, S)) {
-							return 
-						}
+					if (_rd_shortcut(D, S)) {
+						return 
 					}
 				}
 			}
+		}
+	} else {
+		if (D == 0 && D == "") {
+			return _NOP
 		} else {
-			if (D == 0 && D == "") {
-				return _NOP
-			} else {
-				if (_isnotfileptr(D)) {
-					if (isarray(S)) {
-						_addarrmask(_[D], S, _SHORTCUTWSTRUC)
+			if (_isnotfileptr(D)) {
+				if (isarray(S)) {
+					_addarrmask(_[D], S, _SHORTCUTWSTRUC)
+				} else {
+					if (S == 0 && S == "") {
+						_addarrmask(_[D], _SHORTCUTDEFAULT, _SHORTCUTWSTRUC)
 					} else {
-						if (S == 0 && S == "") {
-							_addarrmask(_[D], _SHORTCUTDEFAULT, _SHORTCUTWSTRUC)
+						if (_isnotfileptr(S)) {
+							_addarrmask(_[D], _[S], _SHORTCUTWSTRUC)
 						} else {
-							if (_isnotfileptr(S)) {
-								_addarrmask(_[D], _[S], _SHORTCUTWSTRUC)
-							} else {
-								if (_rd_shortcut(_[D], S)) {
-									return 
-								}
+							if (_rd_shortcut(_[D], S)) {
+								return 
 							}
 						}
 					}
+				}
+			} else {
+				if (isarray(S) && _wr_shortcut(D, S)) {
+					return 
 				} else {
-					if (isarray(S) && _wr_shortcut(D, S)) {
+					if (S == 0 && S == "" && _wr_shortcut(D, _SHORTCUTDEFAULT)) {
 						return 
 					} else {
-						if (S == 0 && S == "" && _wr_shortcut(D, _SHORTCUTDEFAULT)) {
+						if (_isnotfileptr(S) && _wr_shortcut(D, _[S])) {
 							return 
 						} else {
-							if (_isnotfileptr(S) && _wr_shortcut(D, _[S])) {
+							if (_rd_shortcut(_SHRTCUTA1, S) || _wr_shortcut(D, _SHRTCUTA1)) {
 								return 
-							} else {
-								if (_rd_shortcut(_SHRTCUTA1, S) || _wr_shortcut(D, _SHRTCUTA1)) {
-									return 
-								}
 							}
 						}
 					}
 				}
 			}
 		}
-		return 1
 	}
-
-	function _shortcut_init(A, B, q)
-	{
-		_SHORTCUTERR[2] = "file not found"
-		_SHORTCUTERR[3] = "no such filepath"
-		_SHORTCUTERR["The system cannot find the file specified."] = "no such filepath"
-		_SHORTCUTERR[5] = "file is folder"
-		_SHORTCUTERR["Access is denied."] = "file is folder"
-		_SHORTCUTERR[123] = "filepath syntax error"
-		_SHORTCUTERR["The filename, directory name, or volume label syntax is incorrect."] = "filepath syntax error"
-		q = "target\t\t\t/T:\t\t\t\tTargetPath=\t\t\t\t\ttarget?\t\t\t;\t\t\t_target\t\t\t\t\t\t\tTargetPathExpanded=\t\t\t\t\t\t\t;\t\t\tparameters\t\t\t/P:\t\t\t\tArguments=\t\t\t\t\tparaneters?\t\t\t;\t\t\t_parameters\t\t\t\t\t\t\tArgumentsExpanded=\t\t\t\t\t\t\t;\t\t\tstartdir\t\t\t/W:\t\t\t\tWorkingDirectory=\t\t\t\tstartdir?\t\t\t;\t\t\t_startdir\t\t\t\t\t\t\tWorkingDirectoryExpanded=\t\t\t\t\t\t;\t\t\trunstyle\t\t\t/R:\t\t\t\tRunStyle=\t\t\t\t\t1\t\t\t\t;\t\t\ticon,index\t\t\t/I:\t\t\t\tIconLocation=\t\t\t\ticon,index?\t\t\t;\t\t\txicon,index\t\t\t\t\t\t\tIconLocationExpanded=\t\t\t\t\t\t\t;\t\t\tshortcut key\t\t/H:\t\t\t\tHotKey=\t\t\t\t\t0\t\t\t\t;\t\t\tdescription\t\t\t/D:\t\t\t\tDescription=\t\t\t\t_env4: default shortcut\t"
-		split(q, _SHRTCUTA0, /[ \t]*;[ \t]*/)
-		for (q in _SHRTCUTA0) {
-			if (match(_SHRTCUTA0[q], /^([^\t]+)\t+([^\t]+)(\t+([^\t]+)(\t+([^\t]+))?)?/, B)) {
-				if (B[3] == "") {
-					_SHORTCUTRSTRUC[B[2]] = B[1]
+	return 1
+}
+
+#________________________________________________
+function _shortcut_init(A, B, q)
+{
+	_SHORTCUTERR[2] = "file not found"
+	_SHORTCUTERR[3] = "no such filepath"
+	_SHORTCUTERR["The system cannot find the file specified."] = "no such filepath"
+	_SHORTCUTERR[5] = "file is folder"
+	_SHORTCUTERR["Access is denied."] = "file is folder"
+	_SHORTCUTERR[123] = "filepath syntax error"
+	_SHORTCUTERR["The filename, directory name, or volume label syntax is incorrect."] = "filepath syntax error"
+	q = "target\t\t\t/T:\t\t\t\tTargetPath=\t\t\t\t\ttarget?\t\t\t;\t\t\t_target\t\t\t\t\t\t\tTargetPathExpanded=\t\t\t\t\t\t\t;\t\t\tparameters\t\t\t/P:\t\t\t\tArguments=\t\t\t\t\tparaneters?\t\t\t;\t\t\t_parameters\t\t\t\t\t\t\tArgumentsExpanded=\t\t\t\t\t\t\t;\t\t\tstartdir\t\t\t/W:\t\t\t\tWorkingDirectory=\t\t\t\tstartdir?\t\t\t;\t\t\t_startdir\t\t\t\t\t\t\tWorkingDirectoryExpanded=\t\t\t\t\t\t;\t\t\trunstyle\t\t\t/R:\t\t\t\tRunStyle=\t\t\t\t\t1\t\t\t\t;\t\t\ticon,index\t\t\t/I:\t\t\t\tIconLocation=\t\t\t\ticon,index?\t\t\t;\t\t\txicon,index\t\t\t\t\t\t\tIconLocationExpanded=\t\t\t\t\t\t\t;\t\t\tshortcut key\t\t/H:\t\t\t\tHotKey=\t\t\t\t\t0\t\t\t\t;\t\t\tdescription\t\t\t/D:\t\t\t\tDescription=\t\t\t\t_env4: default shortcut\t"
+	split(q, _SHRTCUTA0, /[ \t]*;[ \t]*/)
+	for (q in _SHRTCUTA0) {
+		if (match(_SHRTCUTA0[q], /^([^\t]+)\t+([^\t]+)(\t+([^\t]+)(\t+([^\t]+))?)?/, B)) {
+			if (B[3] == "") {
+				_SHORTCUTRSTRUC[B[2]] = B[1]
+			} else {
+				if (B[5] == "") {
+					_SHORTCUTWSTRUC[_SHORTCUTRSTRUC[B[4]] = B[1]] = B[2]
+					delete _SHORTCUTDEFAULT[B[1]]
 				} else {
-					if (B[5] == "") {
-						_SHORTCUTWSTRUC[_SHORTCUTRSTRUC[B[4]] = B[1]] = B[2]
-						delete _SHORTCUTDEFAULT[B[1]]
-					} else {
-						_SHORTCUTWSTRUC[_SHORTCUTRSTRUC[B[4]] = B[1]] = B[2]
-						_SHORTCUTDEFAULT[B[1]] = B[6]
-					}
+					_SHORTCUTWSTRUC[_SHORTCUTRSTRUC[B[4]] = B[1]] = B[2]
+					_SHORTCUTDEFAULT[B[1]] = B[6]
 				}
-			} else {
-				_fatal("_shortcut.init: _shortcut_struc: syntax error: `" _SHRTCUTA0[q] "'")
 			}
-		}
-		_SHRTCUTA1[""]
-		delete _SHRTCUTA1[""]
-		_shortcut_fpath = "\\\\localhost\\eGAWK\\LIB\\_shortcut\\_shortcut.exe"
-	}
-
-	function _shortcut_nerr(t, s, A)
-	{
-		if (match(t, /\x0ASystem error (-?[0-9]+)[^\x0D\x0A]*[\x0D\x0A]+([^\x0D\x0A]+)/, A)) {
-			ERRNO = ((A[1] in _SHORTCUTERR ? _SHORTCUTERR[A[1]] : (A[2] in _SHORTCUTERR ? _SHORTCUTERR[A[2]] : tolower(gensub(/^(The )?(((.*)\.$)|(.*[^\.]$))/, "\\4\\5", "G", A[2])) "(" A[1] ")"))) ((s ? ": `" s "'" : ""))
 		} else {
-			return 1
+			_fatal("_shortcut.init: _shortcut_struc: syntax error: `" _SHRTCUTA0[q] "'")
 		}
 	}
+	_SHRTCUTA1[""]
+	delete _SHRTCUTA1[""]
+	_shortcut_fpath = "\\\\localhost\\eGAWK\\LIB\\_shortcut\\_shortcut.exe"
+}
 
-	function _split_regpath()
-	{
-		_rpp(" / /  / /   ")
-		_rpp(" / /  / / huj  ")
-		_rpp(" / /  / / huj /  ")
-		_rpp(" / /  / / huj / pizda.TSR  ")
-		_rpp(" / /  / / hklm  ")
-		_rpp(" / /  / / hklm /  ")
-		_rpp(" / /  / / hklm / huj ")
-		_rpp(" / /  / / hklm / huj / ")
-		_rpp(" / /  / / hklm / huj / \tpizda.TSR  ")
-		_conl()
-		_conl("########################################################################################")
-		_conl()
-		_rpp(" / /  / / hklm / software / altiris /  fi le . ex t ")
-		_rpp(" / / . / / hkcr / software / altiris /  fi le . ex t ")
-		_rpp(" / / ? / / hKcU / software / altiris /  fi le . ex t ")
-		_rpp(" / / lOcAlHoSt / / hKu / software / altiris /  fi le . ex t ")
-		_rpp(" / / ho st / / hKcc / software / altiris /  fi le . ex t ")
-		_rpp(" / / ho st / / hKPd / software / altiris /  fi le . ex t ")
-		_conl()
-		_conl("########################################################################################")
-		_conl()
-	}
-
-	function _splitpath_test()
-	{
-		_conl()
-		_conl("########################################################################################")
-		_conl()
-		_fpp("  ")
-		_fpp(" fi le . ex t ")
-		_fpp(" di r0 / / ")
-		_fpp(" di r0 / / fi le . ex t ")
-		_fpp(" / ")
-		_fpp(" / fi le . ex t ")
-		_fpp(" / di r0 / /  ")
-		_fpp(" / di r0 / / fi le . ex t ")
-		_conl()
-		_conl("########################################################################################")
-		_conl()
-		_fpp(" c : ")
-		_fpp(" c : fi le . ex t ")
-		_fpp(" c : di r0 / / ")
-		_fpp(" c : di r0 / / fi le . ex t ")
-		_fpp(" c : / / ")
-		_fpp(" c : / / fi le . ex t ")
-		_fpp(" c : / / di r0 / /  ")
-		_fpp(" c : / / di r0 / / fi le . ex t ")
-		_conl()
-		_conl("########################################################################################")
-		_conl()
-		_fpp(" / /  ")
-		_fpp(" / / ho st . hs t ")
-		_fpp(" / / ho st / /  ")
-		_fpp(" / / ho st / / fi le . ex t ")
-		_fpp(" / / ho st / / di r0 / / ")
-		_fpp(" / / ho st / / di r0 / / fi le . ex t ")
-		_conl()
-		_conl("########################################################################################")
-		_conl()
-		_fpp(" / / ho st / / c : ")
-		_fpp(" / / ho st / / c : fi le . ex t ")
-		_fpp(" / / ho st / / c : di r0 / / ")
-		_fpp(" / / ho st / / c : di r0 / / fi le . ex t ")
-		_fpp(" / / ho st / / c : / / ")
-		_fpp(" / / ho st / / c : / / fi le . ex t ")
-		_fpp(" / / ho st / / c : / / di r0 / / ")
-		_fpp(" / / ho st / / c : / / di r0 / / fi le . ex t ")
-		_conl()
-		_conl("########################################################################################")
-		_conl()
-		_fpp(" http : / / / ")
-		_fpp(" http : / / / si te . ex t ")
-		_fpp(" http : / / / si te / /  ")
-		_fpp(" http : / / / si te / / fi le . ex t ")
-		_fpp(" http : / / / si te / / di r0 / / ")
-		_fpp(" http : / / / si te / / di r0 / / fi le . ex t ")
-		_conl()
-		_conl("########################################################################################")
-		_conl()
-		_fpp(" ftp : / / / : po rt ")
-		_fpp(" ftp : / / / si te . ex t : po rt ")
-		_fpp(" ftp : / / / si te : po rt / /  ")
-		_fpp(" ftp : / / / si te : po rt / / fi le . ex t ")
-		_fpp(" ftp : / / / si te : po rt / / di r0 / / ")
-		_fpp(" ftp : / / / si te : po rt / / di r0 / / fi le . ex t ")
-		_conl()
-		_conl("##  //.  ######################################################################################")
-		_conl()
-		_fpp(" / / . ")
-		_fpp(" / / . / / ")
-		_fpp(" / / . / / com 56 ")
-		_fpp(" / / . / / com 56 / / ")
-		_fpp(" / / . / / c : ")
-		_fpp(" / / . / / c : / / ")
-		_fpp(" / / . / / c :  com 56 ")
-		_fpp(" / / . / / c :  com 56 / / ")
-		_fpp(" / / . / / c : / / com 56 ")
-		_fpp(" / / . / / c : / / com 56 / / ")
-		_conl()
-		_conl("##  //?  ######################################################################################")
-		_conl()
-		_fpp(" / / ? ")
-		_fpp(" / / ? / / ")
-		_fpp(" / / ? / / com 56 ")
-		_fpp(" / / ? / / com 56 / / ")
-		_fpp(" / / ? / / c : ")
-		_fpp(" / / ? / / c : / / ")
-		_fpp(" / / ? / / c :  com 56 ")
-		_fpp(" / / ? / / c :  com 56 / / ")
-		_fpp(" / / ? / / c : / / com 56 ")
-		_fpp(" / / ? / / c : / / com 56 / / ")
-		_conl()
-		_conl("########################################################################################")
-		_conl()
-		_fpp(" / /  /  ")
-		_fpp(" / /  / . hs t ")
-		_fpp(" / /  / / fi le . ex t ")
-		_fpp(" / /  / / di r0 / / ")
-		_fpp(" / /  / / di r0 / / di r1 / fi le . ex t ")
-		_fpp(" / /  / / c : ")
-		_fpp(" / /  / / c : fi le . ex t ")
-		_fpp(" / /  / / c : di r0 / / ")
-		_fpp(" / /  / / c : di r0 / / fi le . ex t ")
-		_fpp(" / /  / / c : / / ")
-		_fpp(" / /  / / c : / / fi le . ex t ")
-		_fpp(" / /  / / c : / / di r0 / / ")
-		_fpp(" / /  / / c : / / di r0 / / fi le . ex t ")
-		_conl()
-		_conl("########################################################################################")
-		_conl()
-		return 
+#_____________________________________________________
+function _shortcut_nerr(t, s, A)
+{
+	if (match(t, /\x0ASystem error (-?[0-9]+)[^\x0D\x0A]*[\x0D\x0A]+([^\x0D\x0A]+)/, A)) {
+		ERRNO = ((A[1] in _SHORTCUTERR ? _SHORTCUTERR[A[1]] : (A[2] in _SHORTCUTERR ? _SHORTCUTERR[A[2]] : tolower(gensub(/^(The )?(((.*)\.$)|(.*[^\.]$))/, "\\4\\5", "G", A[2])) "(" A[1] ")"))) ((s ? ": `" s "'" : ""))
+	} else {
+		return 1
 	}
-
-	function _splitstr(A, t, r)
-	{
-		if (_istr(t)) {
-			if (_splitstr_i0(A, t) > 0) {
-				return _splitstrp0
-			}
-			if (_istr(r)) {
-				return _splitstr_i0(A, r)
-			}
-		} else {
-			if (it == "A") {
-				if (length(t) > 0) {
-					_movarr(A, t)
-					return (0 - length(A))
-				}
-			}
-			_istr(r)
-		}
+}
+
+function _split_regpath()
+{
+	_rpp(" / /  / /   ")
+	_rpp(" / /  / / huj  ")
+	_rpp(" / /  / / huj /  ")
+	_rpp(" / /  / / huj / pizda.TSR  ")
+	_rpp(" / /  / / hklm  ")
+	_rpp(" / /  / / hklm /  ")
+	_rpp(" / /  / / hklm / huj ")
+	_rpp(" / /  / / hklm / huj / ")
+	_rpp(" / /  / / hklm / huj / \tpizda.TSR  ")
+	_conl()
+	_conl("########################################################################################")
+	_conl()
+	_rpp(" / /  / / hklm / software / altiris /  fi le . ex t ")
+	_rpp(" / / . / / hkcr / software / altiris /  fi le . ex t ")
+	_rpp(" / / ? / / hKcU / software / altiris /  fi le . ex t ")
+	_rpp(" / / lOcAlHoSt / / hKu / software / altiris /  fi le . ex t ")
+	_rpp(" / / ho st / / hKcc / software / altiris /  fi le . ex t ")
+	_rpp(" / / ho st / / hKPd / software / altiris /  fi le . ex t ")
+	_conl()
+	_conl("########################################################################################")
+	_conl()
+}
+
+function _splitpath_test()
+{
+	_conl()
+	_conl("########################################################################################")
+	_conl()
+	_fpp("  ")
+	_fpp(" fi le . ex t ")
+	_fpp(" di r0 / / ")
+	_fpp(" di r0 / / fi le . ex t ")
+	_fpp(" / ")
+	_fpp(" / fi le . ex t ")
+	_fpp(" / di r0 / /  ")
+	_fpp(" / di r0 / / fi le . ex t ")
+	_conl()
+	_conl("########################################################################################")
+	_conl()
+	_fpp(" c : ")
+	_fpp(" c : fi le . ex t ")
+	_fpp(" c : di r0 / / ")
+	_fpp(" c : di r0 / / fi le . ex t ")
+	_fpp(" c : / / ")
+	_fpp(" c : / / fi le . ex t ")
+	_fpp(" c : / / di r0 / /  ")
+	_fpp(" c : / / di r0 / / fi le . ex t ")
+	_conl()
+	_conl("########################################################################################")
+	_conl()
+	_fpp(" / /  ")
+	_fpp(" / / ho st . hs t ")
+	_fpp(" / / ho st / /  ")
+	_fpp(" / / ho st / / fi le . ex t ")
+	_fpp(" / / ho st / / di r0 / / ")
+	_fpp(" / / ho st / / di r0 / / fi le . ex t ")
+	_conl()
+	_conl("########################################################################################")
+	_conl()
+	_fpp(" / / ho st / / c : ")
+	_fpp(" / / ho st / / c : fi le . ex t ")
+	_fpp(" / / ho st / / c : di r0 / / ")
+	_fpp(" / / ho st / / c : di r0 / / fi le . ex t ")
+	_fpp(" / / ho st / / c : / / ")
+	_fpp(" / / ho st / / c : / / fi le . ex t ")
+	_fpp(" / / ho st / / c : / / di r0 / / ")
+	_fpp(" / / ho st / / c : / / di r0 / / fi le . ex t ")
+	_conl()
+	_conl("########################################################################################")
+	_conl()
+	_fpp(" http : / / / ")
+	_fpp(" http : / / / si te . ex t ")
+	_fpp(" http : / / / si te / /  ")
+	_fpp(" http : / / / si te / / fi le . ex t ")
+	_fpp(" http : / / / si te / / di r0 / / ")
+	_fpp(" http : / / / si te / / di r0 / / fi le . ex t ")
+	_conl()
+	_conl("########################################################################################")
+	_conl()
+	_fpp(" ftp : / / / : po rt ")
+	_fpp(" ftp : / / / si te . ex t : po rt ")
+	_fpp(" ftp : / / / si te : po rt / /  ")
+	_fpp(" ftp : / / / si te : po rt / / fi le . ex t ")
+	_fpp(" ftp : / / / si te : po rt / / di r0 / / ")
+	_fpp(" ftp : / / / si te : po rt / / di r0 / / fi le . ex t ")
+	_conl()
+	_conl("##  //.  ######################################################################################")
+	_conl()
+	_fpp(" / / . ")
+	_fpp(" / / . / / ")
+	_fpp(" / / . / / com 56 ")
+	_fpp(" / / . / / com 56 / / ")
+	_fpp(" / / . / / c : ")
+	_fpp(" / / . / / c : / / ")
+	_fpp(" / / . / / c :  com 56 ")
+	_fpp(" / / . / / c :  com 56 / / ")
+	_fpp(" / / . / / c : / / com 56 ")
+	_fpp(" / / . / / c : / / com 56 / / ")
+	_conl()
+	_conl("##  //?  ######################################################################################")
+	_conl()
+	_fpp(" / / ? ")
+	_fpp(" / / ? / / ")
+	_fpp(" / / ? / / com 56 ")
+	_fpp(" / / ? / / com 56 / / ")
+	_fpp(" / / ? / / c : ")
+	_fpp(" / / ? / / c : / / ")
+	_fpp(" / / ? / / c :  com 56 ")
+	_fpp(" / / ? / / c :  com 56 / / ")
+	_fpp(" / / ? / / c : / / com 56 ")
+	_fpp(" / / ? / / c : / / com 56 / / ")
+	_conl()
+	_conl("########################################################################################")
+	_conl()
+	_fpp(" / /  /  ")
+	_fpp(" / /  / . hs t ")
+	_fpp(" / /  / / fi le . ex t ")
+	_fpp(" / /  / / di r0 / / ")
+	_fpp(" / /  / / di r0 / / di r1 / fi le . ex t ")
+	_fpp(" / /  / / c : ")
+	_fpp(" / /  / / c : fi le . ex t ")
+	_fpp(" / /  / / c : di r0 / / ")
+	_fpp(" / /  / / c : di r0 / / fi le . ex t ")
+	_fpp(" / /  / / c : / / ")
+	_fpp(" / /  / / c : / / fi le . ex t ")
+	_fpp(" / /  / / c : / / di r0 / / ")
+	_fpp(" / /  / / c : / / di r0 / / fi le . ex t ")
+	_conl()
+	_conl("########################################################################################")
+	_conl()
+	return 
+}
+
+#_______________________________________________________________________
+function _splitstr(A, t, r)
+{
+	if (_istr(t)) {
+		if (_splitstr_i0(A, t) > 0) {
+			return _splitstrp0
+		}
+		if (_istr(r)) {
+			return _splitstr_i0(A, r)
+		}
+	} else {
 		if (it == "A") {
-			if (length(r) > 0) {
-				_movarr(A, r)
+			if (length(t) > 0) {
+				_movarr(A, t)
 				return (0 - length(A))
 			}
 		}
+		_istr(r)
 	}
-
-	function _splitstr_i0(A, t, C)
-	{
-		if (2 > (_splitstrq0 = patsplit(t, _SPLITSTRA0, /([^,\xB4]*\xB4.)*[^,\xB4]*/))) {
-			_splitstrq0 = split(gensub(/\xB4(.)/, "\\1", "G", t), _SPLITSTRA0, "")
+	if (it == "A") {
+		if (length(r) > 0) {
+			_movarr(A, r)
+			return (0 - length(A))
 		}
-		delete A
-		_splitstri0 = _splitstrp0 = 0
-		while (_splitstri0++ < _splitstrq0) {
-			if ((t = gensub(/\xB4(.)/, "\\1", "G", _SPLITSTRA0[_splitstri0])) in C || t == "") {
-				continue
-			}
-			C[A[++_splitstrp0] = t]
-		}
-		return _splitstrp0
 	}
+}
 
-	function _strtorexp(t)
-	{
-		gsub(/[\\\.\?\*\+\-\(\)\{\}\[\]\^\$\/\|]/, "\\\\&", t)
-		t = split(t, _TOREXP_STRA, /[\x00-\x1F]/, _TOREXP_STRB)
-		_torexp_strt0 = ""
-		for (_torexp_stri0 = 1; _torexp_stri0 < t; _torexp_stri0++) {
-			_torexp_strt0 = _torexp_strt0 _TOREXP_STRA[_torexp_stri0] "\\" _QASC[_TOREXP_STRB[_torexp_stri0]]
+#_____________________________________________________
+function _splitstr_i0(A, t, C)
+{
+	if (2 > (_splitstrq0 = patsplit(t, _SPLITSTRA0, /([^,\xB4]*\xB4.)*[^,\xB4]*/))) {
+		_splitstrq0 = split(gensub(/\xB4(.)/, "\\1", "G", t), _SPLITSTRA0, "")
+	}
+	delete A
+	_splitstri0 = _splitstrp0 = 0
+	while (_splitstri0++ < _splitstrq0) {
+		if ((t = gensub(/\xB4(.)/, "\\1", "G", _SPLITSTRA0[_splitstri0])) in C || t == "") {
+			continue
 		}
-		return (_torexp_strt0 _TOREXP_STRA[_torexp_stri0])
+		C[A[++_splitstrp0] = t]
 	}
+	return _splitstrp0
+}
 
-	function _subseqoff(r, B)
-	{
-		patsplit(r, B, /\x84[^\x94]*\x94/)
-		return gensub(/\x84[^\x94]*\x94/, "\204", "G", r)
+#_______________________________________________
+function _strtorexp(t)
+{
+	gsub(/[\\\.\?\*\+\-\(\)\{\}\[\]\^\$\/\|]/, "\\\\&", t)
+	t = split(t, _TOREXP_STRA, /[\x00-\x1F]/, _TOREXP_STRB)
+	_torexp_strt0 = ""
+	for (_torexp_stri0 = 1; _torexp_stri0 < t; _torexp_stri0++) {
+		_torexp_strt0 = _torexp_strt0 _TOREXP_STRA[_torexp_stri0] "\\" _QASC[_TOREXP_STRB[_torexp_stri0]]
 	}
+	return (_torexp_strt0 _TOREXP_STRA[_torexp_stri0])
+}
 
-	function _subseqon(B, r, F, f, s, e, q, i, A)
-	{
-		q = split(r, A, /\x84/)
-		r = ""
-		f = F[""]
-		for (i = 1; i < q; i++) {
-			s = substr(e = B[i], 2, 1)
-			s = (s in F ? F[s] : F[""])
-			r = r (@f(A[i])) (@s(substr(e, 3, length(e) - 3)))
-		}
-		return (r (@f(A[i])))
-	}
+function _subseqoff(r, B)
+{
+	patsplit(r, B, /\x84[^\x94]*\x94/)
+	return gensub(/\x84[^\x94]*\x94/, "\204", "G", r)
+}
 
-	function _sysinfo(D, h)
-	{
-		h = "wmic /NODE: \"" h "\" OS 2>NUL"
-		if (split(_cmd(h), _SYSINFOA0, /[\x0D\x0A]+/) == 3) {
-			_sysinfol0 = length(h = _SYSINFOA0[2]) + 1
-			_sysinfoq0 = _sysinfoq1 = split(_SYSINFOA0[1], _SYSINFOA0, / +/, _SYSINFOB0)
-			while (--_sysinfoq0 > 0) {
-				D[_sysinfof0] = gensub(/^ +| +$/, "", "G", substr(h, _sysinfol0 = _sysinfol0 - (_sysinfol1 = length(_sysinfof0 = _SYSINFOA0[_sysinfoq0]) + length(_SYSINFOB0[_sysinfoq0])), _sysinfol1))
-			}
-			return (_sysinfoq1 - 1)
-		}
+function _subseqon(B, r, F, f, s, e, q, i, A)
+{
+	q = split(r, A, /\x84/)
+	r = ""
+	f = F[""]
+	for (i = 1; i < q; i++) {
+		s = substr(e = B[i], 2, 1)
+		#_conl("curr r==`" r "': A[" i "]=`" A[i] "'")
+		#s=s in F ? _th0(F[s],_conl("handler `" F[s] "' for `" s "' ost=`" substr(e,3,length(e)-3) "'")) : _th0(F[""],_conl("default handler for `" s "'"))
+		s = (s in F ? F[s] : F[""])
+		#_conl("`" f "'")
+		r = r (@f(A[i])) (@s(substr(e, 3, length(e) - 3)))
 	}
+	return (r (@f(A[i])))
+}
 
-	function _tOBJ(c, t, P)
-	{
-		switch (c) {
-		case "_lib_CMDLN":
-			return t
-		case "_lib_APPLY":
-			return 
-		case "_lib_HELP":
-			return 
-		case "_lib_NAMEVER":
-			return _ln("_tOBJ 3.0")
-		case "_lib_BEGIN":
-			return 
-		case "_lib_END":
-			return 
-		case "_lib_CLEANUP":
-			return _tOBJ_CLEANUP()
-		}
-	}
+#_____________________________________________________________________________
+# _rdreg(ARRAY,reg_path)
+#		Import into ARRAY the content of the whole registree tree with the higher point specified by reg_path.
+#		ARRAY will be filled by the strings with following format:
+#
+# HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\GnuWin32\CoreUtils\5.3.0\pck\InstallPath.STR=C:\Program Files (x86)\GnuWin32
+#	where:
+# HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\GnuWin32\CoreUtils\5.3.0\pck									<- REG KEY PATH
+#											     InstallPath							<- DATA FIELD
+#													     STR						<- TYPE
+#														   C:\Program Files (x86)\GnuWin32	<- VALUE
+# TYPE:
+#	STR		- REG_SZ		(String Value)
+#	W32		- REG_DWORD		(DWORD (32-bit) Value)
+#	W64		- REG_QWORD		(QWORD (64-bit) Value)
+#	BIN		- REG_BINARY	(Binary Value)
+#	XSZ		- REG_EXPAND_SZ	(Expandable String Value)
+#	MSZ		- REG_MULTI_SZ	(Multi-String Value)
+#_________________________________________________________________________________________
 
-	function _tOBJ_CLEANUP(p)
-	{
-		for (p in UIDSDEL) {
-			delete _ptr[p]
-			delete _tPREV[p]
-			delete _tPARENT[p]
-			delete _tNEXT[p]
-			delete _tFCHLD[p]
-			delete _tQCHLD[p]
-			delete _tLCHLD[p]
-			delete _TMP0[p]
-			delete _TMP1[p]
-			delete _tLINK[p]
-			delete _tCLASS[p]
-		}
-	}
 
-	function _tabtospc(t, ts, xc, a, c, n, A, B)
-	{
-		if (! ts) {
-			ts = _TAB_STEP_DEFAULT
-		}
-		c = split("." t, A, /\t+/, B)
-		A[1] = substr(A[1], 2)
-		t = ""
-		for (n = 1; n <= c; n++) {
-			t = t A[n] _getchrln(" ", (xc = length(B[n]) * ts + int((a = xc + length(A[n])) / ts) * ts) - a)
-		}
-		return t
-	}
 
-	function _tapi(p, f, p0, p1, p2, p3, c)
-	{
-		c = p
-		do {
-			if (f in _[c]["API"]) {
-				f = _[c]["API"][f]
-				return @f(p, p0, p1, p2, p3)
-			}
-			c = _[c]["CLASS"]
-		} while ("CLASS" in _[c])
-	}
 
-	function _tbframe(f, p, p0, p1)
-	{
-		delete _t_ENDF[++_t_ENDF[0]]
-		f = (p ? _tbframe_i0(f, p, p0, p1) : "")
-		--_t_ENDF[0]
-		return f
-	}
+# HKCR		HKEY_CLASSES_ROOT
+# HKCU		HKEY_CURRENT_USER
+# HKLM		HKEY_LOCAL_MACHINE
+# HKU			HKEY_USERS
+# HKCC		HKEY_CURRENT_CONFIG
+# HKPD		HKEY_PERFORMANCE_DATA
 
-	function _tbframe_i0(f, p, p0, p1, a)
-	{
-		while (p in _tLINK) {
-			p = _tLINK[p]
-		}
-		return ((p in _tLCHLD ? _tmbframe(f, _tLCHLD[p], p0, p1) : @f(p, p0, p1)))
-	}
 
-	function _tbframex(f, p, p0, p1)
-	{
-		delete _t_ENDF[++_t_ENDF[0]]
-		f = (p ? _tbframex_i0(f, p, p0, p1) : "")
-		--_t_ENDF[0]
-		return f
-	}
 
-	function _tbframex_i0(f, p, p0, p1)
-	{
-		while (p in _tLINK) {
-			p = _tLINK[p]
-		}
-		return ((p in _tLCHLD ? _tmbframex(f, _tLCHLD[p], p0, p1) : @f(p, p0, p1)))
-	}
 
-	function _tbpass(f, p, p0, p1)
-	{
-		delete _t_ENDF[++_t_ENDF[0]]
-		f = (p ? _tbpass_i0(f, p, p0, p1) : "")
-		--_t_ENDF[0]
-		return f
-	}
 
-	function _tbpass_i0(f, p, p0, p1, a)
-	{
-		while (p in _tLINK) {
-			p = _tLINK[p]
-		}
-		return ((p in _tLCHLD ? _tmbpass(f, _tLCHLD[p], p0, p1) : @f(p, p0, p1)))
-	}
 
-	function _tbpassx(f, p, p0, p1)
-	{
-		delete _t_ENDF[++_t_ENDF[0]]
-		f = (p ? _tbpassx_i0(f, p, p0, p1) : "")
-		--_t_ENDF[0]
-		return f
-	}
 
-	function _tbpassx_i0(f, p, p0, p1)
-	{
-		while (p in _tLINK) {
-			p = _tLINK[p]
-		}
-		return ((p in _tLCHLD ? _tmbpassx(f, _tLCHLD[p], p0, p1) : @f(p, p0, p1)))
-	}
 
-	function _tbrochld(p, f, pp)
-	{
-		if (p) {
-			if (p in _tFCHLD) {
-				f = _tFCHLD[p]
-				delete _tFCHLD[p]
-				delete _tLCHLD[p]
-				if (p in _tPARENT) {
-					pp = _tPARENT[p]
-					delete _tPARENT[p]
-					if (p in _tPREV) {
-						_tNEXT[_tPREV[f] = _tPREV[p]] = f
-						delete _tPREV[p]
-					} else {
-						_tFCHLD[pp] = f
-					}
-					for (; f in _tNEXT; f = _tNEXT[f]) {
-						_tPARENT[f] = pp
-					}
-					_tPARENT[f] = pp
-					if (p in _tNEXT) {
-						_tPREV[_tNEXT[f] = _tNEXT[p]] = f
-						delete _tNEXT[p]
-					} else {
-						_tLCHLD[pp] = f
-					}
-					_tQCHLD[pp] = _tQCHLD[pp] + _tQCHLD[p] - 1
-					delete _tQCHLD[p]
-					return f
-				} else {
-					delete _tQCHLD[p]
-					if (p in _tPREV) {
-						_tNEXT[_tPREV[f] = _tPREV[p]] = f
-						delete _tPREV[p]
-					}
-					for (; f in _tNEXT; f = _tNEXT[f]) {
-						delete _tPARENT[f]
-					}
-					delete _tPARENT[f]
-					if (p in _tNEXT) {
-						_tPREV[_tNEXT[f] = _tNEXT[p]] = f
-						delete _tNEXT[p]
-					}
-					return f
-				}
-			} else {
-				if (p in _tPARENT) {
-					pp = _tPARENT[p]
-					delete _tPARENT[p]
-					if (p in _tPREV) {
-						if (p in _tNEXT) {
-							_tNEXT[_tPREV[f] = _tPREV[p]] = f = _tNEXT[p]
-							delete _tNEXT[p]
-						} else {
-							delete _tNEXT[_tLCHLD[pp] = _tPREV[p]]
-						}
-						delete _tPREV[p]
-						_tQCHLD[pp]--
-					} else {
-						if (p in _tNEXT) {
-							delete _tPREV[_tFCHLD[pp] = _tNEXT[p]]
-							delete _tNEXT[p]
-							_tQCHLD[pp]--
-						} else {
-							delete _tFCHLD[pp]
-							delete _tLCHLD[pp]
-							delete _tQCHLD[pp]
-						}
-					}
-				} else {
-					if (p in _tPREV) {
-						if (p in _tNEXT) {
-							_tNEXT[_tPREV[f] = _tPREV[p]] = f = _tNEXT[p]
-							delete _tNEXT[p]
-						} else {
-							delete _tNEXT[_tPREV[p]]
-						}
-						delete _tPREV[p]
-					} else {
-						if (p in _tNEXT) {
-							delete _tPREV[_tNEXT[p]]
-							delete _tNEXT[p]
-						}
-					}
-				}
-			}
-		}
-		return p
-	}
 
-	function _tbrunframe(f, p, p0, p1)
-	{
-		return _tbframe((f ? f : "_trunframe_i0"), p, p0, p1)
-	}
 
-	function _tbrunframex(f, p, p0, p1)
-	{
-		return _tbframex((f ? f : "_trunframe_i0"), p, p0, p1)
-	}
 
-	function _tbrunpass(f, p, p0, p1)
-	{
-		return _tbpass((f ? f : "_trunframe_i0"), p, p0, p1)
-	}
 
-	function _tbrunpassx(f, p, p0, p1)
-	{
-		return _tbpassx((f ? f : "_trunframe_i0"), p, p0, p1)
-	}
 
-	function _tdel(p, i)
-	{
-		if (p in _) {
-			_texclude(p)
-			for (i in _ptr[p]) {
-				if (isarray(_ptr[p][i])) {
-					_tdel_i1(_ptr[p][i])
-				} else {
-					if (i = _ptr[p][i]) {
-						_tdel(i)
-					}
-				}
-			}
-			if (p in _tFCHLD) {
-				i = _tFCHLD[p]
-				do {
-					i = ((i in _tNEXT ? _tNEXT[i] : "")) _tdel_i0(i)
-				} while (i)
-			}
-			delete _[p]
-			_UIDSDEL[p]
-		}
-	}
 
-	function _tdel_i0(p, i)
-	{
-		for (i in _ptr[p]) {
-			if (isarray(_ptr[p][i])) {
-				_tdel_i1(_ptr[p][i])
-			} else {
-				if (i = _ptr[p][i]) {
-					_tdel(i)
-				}
-			}
-		}
-		if (p in _tFCHLD) {
-			i = _tFCHLD[p]
-			do {
-				i = ((i in _tNEXT ? _tNEXT[i] : "")) _tdel_i0(i)
-			} while (i)
-		}
-		delete _[p]
-		_UIDSDEL[p]
-	}
 
-	function _tdel_i1(A, i)
-	{
-		for (i in A) {
-			if (isarray(A[i])) {
-				_tdel_i1(A[i])
-			} else {
-				if (i = A[i]) {
-					_tdel(i)
-				}
-			}
-		}
-	}
 
-	function _tdelete(p, v)
-	{
-		if (p) {
-			_wLCHLD(_tDELPTR, p)
-		}
-		return v
-	}
 
-	function _tdelitem(p)
-	{
-		if (p) {
-			if ("HOST" in _PTR[p] && "ITEMNAME" in _[p]) {
-				return _wLCHLD(_PTR[_PTR[p]["HOST"]]["ITEM"][_[p]["ITEMNAME"]], p)
-			}
-			_tdelete(p)
-			return p
-		}
-	}
 
-	function _tend(a, b)
-	{
-		if (b == "") {
-			return (_t_ENDF[_t_ENDF[0]] = a)
-		} else {
-			return (_t_ENDF[_t_ENDF[0] + a] = b)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#___________________________________________________________________________________
+####################################################################################
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+function _sysinfo(D, h)
+{
+	h = "wmic /NODE: \"" h "\" OS 2>NUL"
+	if (split(_cmd(h), _SYSINFOA0, /[\x0D\x0A]+/) == 3) {
+		_sysinfol0 = length(h = _SYSINFOA0[2]) + 1
+		_sysinfoq0 = _sysinfoq1 = split(_SYSINFOA0[1], _SYSINFOA0, / +/, _SYSINFOB0)
+		while (--_sysinfoq0 > 0) {
+			D[_sysinfof0] = gensub(/^ +| +$/, "", "G", substr(h, _sysinfol0 = _sysinfol0 - (_sysinfol1 = length(_sysinfof0 = _SYSINFOA0[_sysinfoq0]) + length(_SYSINFOB0[_sysinfoq0])), _sysinfol1))
 		}
+		return (_sysinfoq1 - 1)
 	}
+}
 
-	function _texclude(p, v, pp)
-	{
-		if (p in _) {
+#########################################################
+function _tOBJ(c, t, P)
+{
+	switch (c) {
+	case "_lib_CMDLN":
+		#___________________________________________________________
+		return t
+		#___________________________________________________________
+	case "_lib_APPLY":
+		return 
+		#___________________________________________________________
+	case "_lib_HELP":
+		return 
+		#___________________________________________________________
+	case "_lib_NAMEVER":
+		return _ln("_tOBJ 3.0")
+		#___________________________________________________________
+	case "_lib_BEGIN":
+		return 
+		#___________________________________________________________
+	case "_lib_END":
+		return 
+		#___________________________________________________________
+	case "_lib_CLEANUP":
+		return _tOBJ_CLEANUP()
+	}
+}
+
+#_______________________________________________________________________
+function _tOBJ_CLEANUP(p)
+{
+	for (p in UIDSDEL) {
+		delete _ptr[p]
+		delete _tPREV[p]
+		delete _tPARENT[p]
+		delete _tNEXT[p]
+		delete _tFCHLD[p]
+		delete _tQCHLD[p]
+		delete _tLCHLD[p]
+		delete _TMP0[p]
+		delete _TMP1[p]
+		delete _tLINK[p]
+		delete _tCLASS[p]
+	}
+}
+
+#_______________________________________________________________________
+function _tabtospc(t, ts, xc, a, c, n, A, B)
+{
+	if (! ts) {
+		ts = _TAB_STEP_DEFAULT
+	}
+	c = split("." t, A, /\t+/, B)
+	A[1] = substr(A[1], 2)
+	t = ""
+	for (n = 1; n <= c; n++) {
+		t = t A[n] _getchrln(" ", (xc = length(B[n]) * ts + int((a = xc + length(A[n])) / ts) * ts) - a)
+	}
+	return t
+}
+
+#___________________________________________________________________________________
+####################################################################################
+
+
+
+
+
+
+
+function _tapi(p, f, p0, p1, p2, p3, c)
+{
+	c = p
+	do {
+		if (f in _[c]["API"]) {
+			f = _[c]["API"][f]
+			return @f(p, p0, p1, p2, p3)
+		}
+		c = _[c]["CLASS"]
+	} while ("CLASS" in _[c])
+}
+
+#_____________________________________________________________________________
+function _tbframe(f, p, p0, p1)
+{
+	delete _t_ENDF[++_t_ENDF[0]]
+	f = (p ? _tbframe_i0(f, p, p0, p1) : "")
+	--_t_ENDF[0]
+	return f
+}
+
+#___________________________________________________________
+function _tbframe_i0(f, p, p0, p1, a)
+{
+	while (p in _tLINK) {
+		p = _tLINK[p]
+	}
+	return ((p in _tLCHLD ? _tmbframe(f, _tLCHLD[p], p0, p1) : @f(p, p0, p1)))
+}
+
+#_______________________________________________________________________
+function _tbframex(f, p, p0, p1)
+{
+	delete _t_ENDF[++_t_ENDF[0]]
+	f = (p ? _tbframex_i0(f, p, p0, p1) : "")
+	--_t_ENDF[0]
+	return f
+}
+
+#___________________________________________________________
+function _tbframex_i0(f, p, p0, p1)
+{
+	while (p in _tLINK) {
+		p = _tLINK[p]
+	}
+	return ((p in _tLCHLD ? _tmbframex(f, _tLCHLD[p], p0, p1) : @f(p, p0, p1)))
+}
+
+#_____________________________________________________________________________
+function _tbpass(f, p, p0, p1)
+{
+	delete _t_ENDF[++_t_ENDF[0]]
+	f = (p ? _tbpass_i0(f, p, p0, p1) : "")
+	--_t_ENDF[0]
+	return f
+}
+
+#___________________________________________________________
+function _tbpass_i0(f, p, p0, p1, a)
+{
+	while (p in _tLINK) {
+		p = _tLINK[p]
+	}
+	return ((p in _tLCHLD ? _tmbpass(f, _tLCHLD[p], p0, p1) : @f(p, p0, p1)))
+}
+
+#_____________________________________________________________________________
+function _tbpassx(f, p, p0, p1)
+{
+	delete _t_ENDF[++_t_ENDF[0]]
+	f = (p ? _tbpassx_i0(f, p, p0, p1) : "")
+	--_t_ENDF[0]
+	return f
+}
+
+#___________________________________________________________
+function _tbpassx_i0(f, p, p0, p1)
+{
+	while (p in _tLINK) {
+		p = _tLINK[p]
+	}
+	return ((p in _tLCHLD ? _tmbpassx(f, _tLCHLD[p], p0, p1) : @f(p, p0, p1)))
+}
+
+#_____________________________________________________________________________
+function _tbrochld(p, f, pp)
+{
+	if (p) {
+		if (p in _tFCHLD) {
+			f = _tFCHLD[p]
+			delete _tFCHLD[p]
+			delete _tLCHLD[p]
+			if (p in _tPARENT) {
+				pp = _tPARENT[p]
+				delete _tPARENT[p]
+				if (p in _tPREV) {
+					_tNEXT[_tPREV[f] = _tPREV[p]] = f
+					delete _tPREV[p]
+				} else {
+					_tFCHLD[pp] = f
+				}
+				for (; f in _tNEXT; f = _tNEXT[f]) {
+					_tPARENT[f] = pp
+				}
+				_tPARENT[f] = pp
+				if (p in _tNEXT) {
+					_tPREV[_tNEXT[f] = _tNEXT[p]] = f
+					delete _tNEXT[p]
+				} else {
+					_tLCHLD[pp] = f
+				}
+				_tQCHLD[pp] = _tQCHLD[pp] + _tQCHLD[p] - 1
+				delete _tQCHLD[p]
+				return f
+			} else {
+				delete _tQCHLD[p]
+				if (p in _tPREV) {
+					_tNEXT[_tPREV[f] = _tPREV[p]] = f
+					delete _tPREV[p]
+				}
+				for (; f in _tNEXT; f = _tNEXT[f]) {
+					delete _tPARENT[f]
+				}
+				delete _tPARENT[f]
+				if (p in _tNEXT) {
+					_tPREV[_tNEXT[f] = _tNEXT[p]] = f
+					delete _tNEXT[p]
+				}
+				return f
+			}
+		} else {
 			if (p in _tPARENT) {
 				pp = _tPARENT[p]
 				delete _tPARENT[p]
 				if (p in _tPREV) {
 					if (p in _tNEXT) {
-						_tPREV[_tNEXT[v] = _tNEXT[p]] = v = _tPREV[p]
+						_tNEXT[_tPREV[f] = _tPREV[p]] = f = _tNEXT[p]
 						delete _tNEXT[p]
 					} else {
 						delete _tNEXT[_tLCHLD[pp] = _tPREV[p]]
 					}
 					delete _tPREV[p]
+					_tQCHLD[pp]--
 				} else {
 					if (p in _tNEXT) {
 						delete _tPREV[_tFCHLD[pp] = _tNEXT[p]]
 						delete _tNEXT[p]
+						_tQCHLD[pp]--
 					} else {
 						delete _tFCHLD[pp]
 						delete _tLCHLD[pp]
 						delete _tQCHLD[pp]
-						return p
 					}
 				}
-				--_tQCHLD[pp]
 			} else {
 				if (p in _tPREV) {
 					if (p in _tNEXT) {
-						_tPREV[_tNEXT[v] = _tNEXT[p]] = v = _tPREV[p]
+						_tNEXT[_tPREV[f] = _tPREV[p]] = f = _tNEXT[p]
 						delete _tNEXT[p]
 					} else {
 						delete _tNEXT[_tPREV[p]]
@@ -4777,1133 +5865,1475 @@
 					}
 				}
 			}
-			return p
 		}
 	}
+	return p
+}
 
-	function _tframe(fF, p, p0, p1, p2)
-	{
-		delete _t_ENDF[++_t_ENDF[0]]
-		p = (_isptr(p) ? (isarray(fF) ? _tframe_i1(fF, p, p0, p1, p2) : _tframe_i0(fF, p, p0, p1, p2)) : "")
-		--_t_ENDF[0]
-		return p
-	}
+#_________________________________________________________________
+function _tbrunframe(f, p, p0, p1)
+{
+	return _tbframe((f ? f : "_trunframe_i0"), p, p0, p1)
+}
 
-	function _tframe0(f, p, p0, p1, p2, p3, A)
-	{
-		if (_isptr(p)) {
-			if (isarray(f)) {
-				return _tframe0_i0(f, p)
-			}
-			_tframex_p0(A, f, 0)
-			return _th0(_tframe0_i0(A, p), --_TEND[_ARRLEN])
-		}
-	}
+#_________________________________________________________________
+function _tbrunframex(f, p, p0, p1)
+{
+	return _tbframex((f ? f : "_trunframe_i0"), p, p0, p1)
+}
 
-	function _tframe0_i0(A, p, f)
-	{
-		if (p in _tLINK) {
-			_tframe_link = p
-			if ("`" in A) {
-				f = A["`"]
-				while (p in _tLINK) {
-					@f(p = _tLINK[p])
-				}
+#_________________________________________________________________
+function _tbrunpass(f, p, p0, p1)
+{
+	return _tbpass((f ? f : "_trunframe_i0"), p, p0, p1)
+}
+
+#_________________________________________________________________
+function _tbrunpassx(f, p, p0, p1)
+{
+	return _tbpassx((f ? f : "_trunframe_i0"), p, p0, p1)
+}
+
+#_____________________________________________________________________________
+function _tdel(p, i)
+{
+	if (p in _) {
+		_texclude(p)
+		for (i in _ptr[p]) {
+			if (isarray(_ptr[p][i])) {
+				_tdel_i1(_ptr[p][i])
 			} else {
-				while (p in _tLINK) {
-					p = _tLINK[p]
+				if (i = _ptr[p][i]) {
+					_tdel(i)
 				}
 			}
-		} else {
-			_tframe_link = ""
 		}
 		if (p in _tFCHLD) {
-			return (_tframe0_i2(A, "^", p) _tframe0_i1(A, _tFCHLD[p]))
+			i = _tFCHLD[p]
+			do {
+				i = ((i in _tNEXT ? _tNEXT[i] : "")) _tdel_i0(i)
+			} while (i)
 		}
-		return _tframe0_i2(A, ".", p)
+		delete _[p]
+		_UIDSDEL[p]
 	}
+}
 
-	function _tframe0_i1(A, p)
-	{
-		if (_TEND[_ARRLEN] in _TEND) {
-			return 
-		}
-		if (p in _tNEXT) {
-			return (_tframe0_i0(A, p) _tframe0_i1(A, _tNEXT[p]))
+#_____________________________________________________
+function _tdel_i0(p, i)
+{
+	for (i in _ptr[p]) {
+		if (isarray(_ptr[p][i])) {
+			_tdel_i1(_ptr[p][i])
+		} else {
+			if (i = _ptr[p][i]) {
+				_tdel(i)
+			}
 		}
-		return _tframe0_i0(A, p)
 	}
-
-	function _tframe0_i2(A, m, p)
-	{
-		_tframe_dlink = p
-		while (p in _tDLINK) {
-			p = _tDLINK[p]
-		}
-		if (m in A) {
-			if (m "~" in A) {
-				if (! (_TYPEWORD in _[p]) || A[m "~"] !~ _[p][_TYPEWORD]) {
-					return 
-				}
+	if (p in _tFCHLD) {
+		i = _tFCHLD[p]
+		do {
+			i = ((i in _tNEXT ? _tNEXT[i] : "")) _tdel_i0(i)
+		} while (i)
+	}
+	delete _[p]
+	_UIDSDEL[p]
+}
+
+#_____________________________________________________
+function _tdel_i1(A, i)
+{
+	for (i in A) {
+		if (isarray(A[i])) {
+			_tdel_i1(A[i])
+		} else {
+			if (i = A[i]) {
+				_tdel(i)
 			}
-			m = A[m]
-			return @m(p)
 		}
 	}
+}
 
-	function _tframe1(f, p, p0, p1, p2, p3, A)
-	{
-		if (_isptr(p)) {
-			if (isarray(f)) {
-				return _tframe1_i0(f, p, p0)
-			}
-			_tframex_p0(A, f, 1)
-			return _th0(_tframe1_i0(A, p, p0), --_TEND[_ARRLEN])
-		}
+#_____________________________________________________________________________
+function _tdelete(p, v)
+{
+	if (p) {
+		_wLCHLD(_tDELPTR, p)
 	}
+	return v
+}
 
-	function _tframe1_i0(A, p, p0)
-	{
-		_tframe_link = p
-		while (p in _tLINK) {
-			p = _tLINK[p]
+#_________________________________________________________________
+function _tdelitem(p)
+{
+	if (p) {
+		if ("HOST" in _PTR[p] && "ITEMNAME" in _[p]) {
+			return _wLCHLD(_PTR[_PTR[p]["HOST"]]["ITEM"][_[p]["ITEMNAME"]], p)
 		}
-		if (p in _tFCHLD) {
-			return (_tframe1_i2(A, "^", p, p0) _tframe1_i1(A, _tFCHLD[p], p0))
-		}
-		return _tframe1_i2(A, ".", p, p0)
+		_tdelete(p)
+		return p
 	}
+}
 
-	function _tframe1_i1(A, p, p0)
-	{
-		if (_TEND[_ARRLEN] in _TEND) {
-			return 
-		}
-		if (p in _tNEXT) {
-			return (_tframe1_i0(A, p, p0) _tframe1_i1(A, _tNEXT[p], p0))
-		}
-		return _tframe1_i0(A, p, p0)
+#_______________________________________________________________________
+function _tend(a, b)
+{
+	if (b == "") {
+		return (_t_ENDF[_t_ENDF[0]] = a)
+	} else {
+		return (_t_ENDF[_t_ENDF[0] + a] = b)
 	}
+}
 
-	function _tframe1_i2(A, m, p, p0)
-	{
-		_tframe_dlink = p
-		while (p in _tDLINK) {
-			p = _tDLINK[p]
-		}
-		if (m in A) {
-			if (m "~" in A) {
-				if (! (_TYPEWORD in _[p]) || A[m "~"] !~ _[p][_TYPEWORD]) {
-					return 
+#_____________________________________________________________________________
+function _texclude(p, v, pp)
+{
+	if (p in _) {
+		if (p in _tPARENT) {
+			pp = _tPARENT[p]
+			delete _tPARENT[p]
+			if (p in _tPREV) {
+				if (p in _tNEXT) {
+					_tPREV[_tNEXT[v] = _tNEXT[p]] = v = _tPREV[p]
+					delete _tNEXT[p]
+				} else {
+					delete _tNEXT[_tLCHLD[pp] = _tPREV[p]]
+				}
+				delete _tPREV[p]
+			} else {
+				if (p in _tNEXT) {
+					delete _tPREV[_tFCHLD[pp] = _tNEXT[p]]
+					delete _tNEXT[p]
+				} else {
+					delete _tFCHLD[pp]
+					delete _tLCHLD[pp]
+					delete _tQCHLD[pp]
+					return p
 				}
 			}
-			m = A[m]
-			return @m(p, p0)
-		}
-	}
-
-	function _tframe2(f, p, p0, p1, p2, p3, A)
-	{
-		if (_isptr(p)) {
-			if (isarray(f)) {
-				return _tframe2_i0(f, p, p0, p1)
+			--_tQCHLD[pp]
+		} else {
+			if (p in _tPREV) {
+				if (p in _tNEXT) {
+					_tPREV[_tNEXT[v] = _tNEXT[p]] = v = _tPREV[p]
+					delete _tNEXT[p]
+				} else {
+					delete _tNEXT[_tPREV[p]]
+				}
+				delete _tPREV[p]
+			} else {
+				if (p in _tNEXT) {
+					delete _tPREV[_tNEXT[p]]
+					delete _tNEXT[p]
+				}
 			}
-			_tframex_p0(A, f, 2)
-			return _th0(_tframe2_i0(A, p, p0, p1), --_TEND[_ARRLEN])
 		}
+		return p
 	}
-
-	function _tframe2_i0(A, p, p0, p1)
-	{
+}
+
+# _tDLINK progressive development: concrete _tDLINK function\processing algo; all frame's families support
+#_____________________________________________________________________________
+function _tframe(fF, p, p0, p1, p2)
+{
+	delete _t_ENDF[++_t_ENDF[0]]
+	p = (_isptr(p) ? (isarray(fF) ? _tframe_i1(fF, p, p0, p1, p2) : _tframe_i0(fF, p, p0, p1, p2)) : "")
+	--_t_ENDF[0]
+	return p
+}
+
+#_____________________________________________________________________________
+function _tframe0(f, p, p0, p1, p2, p3, A)
+{
+	if (_isptr(p)) {
+		if (isarray(f)) {
+			return _tframe0_i0(f, p)
+		}
+		_tframex_p0(A, f, 0)
+		return _th0(_tframe0_i0(A, p), --_TEND[_ARRLEN])
+	}
+}
+
+#_______________________________________________
+function _tframe0_i0(A, p, f)
+{
+	if (p in _tLINK) {
 		_tframe_link = p
-		while (p in _tLINK) {
-			p = _tLINK[p]
-		}
-		if (p in _tFCHLD) {
-			return (_tframe2_i2(A, "^", p, p0, p1) _tframe2_i1(A, _tFCHLD[p], p0, p1))
+		if ("`" in A) {
+			f = A["`"]
+			while (p in _tLINK) {
+				@f(p = _tLINK[p])
+			}
+		} else {
+			while (p in _tLINK) {
+				p = _tLINK[p]
+			}
 		}
-		return _tframe2_i2(A, ".", p, p0, p1)
+	} else {
+		_tframe_link = ""
 	}
-
-	function _tframe2_i1(A, p, p0, p1)
-	{
-		if (_TEND[_ARRLEN] in _TEND) {
-			return 
-		}
-		if (p in _tNEXT) {
-			return (_tframe2_i0(A, p, p0, p1) _tframe2_i1(A, _tNEXT[p], p0, p1))
-		}
-		return _tframe2_i0(A, p, p0, p1)
+	if (p in _tFCHLD) {
+		return (_tframe0_i2(A, "^", p) _tframe0_i1(A, _tFCHLD[p]))
 	}
+	return _tframe0_i2(A, ".", p)
+}
 
-	function _tframe2_i2(A, m, p, p0, p1)
-	{
-		_tframe_dlink = p
-		while (p in _tDLINK) {
-			p = _tDLINK[p]
-		}
-		if (m in A) {
-			if (m "~" in A) {
-				if (! (_TYPEWORD in _[p]) || A[m "~"] !~ _[p][_TYPEWORD]) {
-					return 
-				}
-			}
-			m = A[m]
-			return @m(p, p0, p1)
-		}
+#_______________________________________________
+function _tframe0_i1(A, p)
+{
+	if (_TEND[_ARRLEN] in _TEND) {
+		return 
 	}
+	if (p in _tNEXT) {
+		return (_tframe0_i0(A, p) _tframe0_i1(A, _tNEXT[p]))
+	}
+	return _tframe0_i0(A, p)
+}
 
-	function _tframe3(f, p, p0, p1, p2, p3, A)
-	{
-		if (_isptr(p)) {
-			if (isarray(f)) {
-				return _tframe3_i0(f, p, p0, p1, p2)
+#_______________________________________________
+function _tframe0_i2(A, m, p)
+{
+	_tframe_dlink = p
+	while (p in _tDLINK) {
+		p = _tDLINK[p]
+	}
+	if (m in A) {
+		if (m "~" in A) {
+			if (! (_TYPEWORD in _[p]) || A[m "~"] !~ _[p][_TYPEWORD]) {
+				return 
 			}
-			_tframex_p0(A, f, 3)
-			return _th0(_tframe3_i0(A, p, p0, p1, p2), --_TEND[_ARRLEN])
 		}
+		m = A[m]
+		return @m(p)
 	}
+}
 
-	function _tframe3_i0(A, p, p0, p1, p2)
-	{
-		_tframe_link = p
-		while (p in _tLINK) {
-			p = _tLINK[p]
-		}
-		if (p in _tFCHLD) {
-			return (_tframe3_i2(A, "^", p, p0, p1, p2) _tframe3_i1(A, _tFCHLD[p], p0, p1, p2))
+#_________________________________________________________________
+function _tframe1(f, p, p0, p1, p2, p3, A)
+{
+	if (_isptr(p)) {
+		if (isarray(f)) {
+			return _tframe1_i0(f, p, p0)
 		}
-		return _tframe3_i2(A, ".", p, p0, p1, p2)
+		_tframex_p0(A, f, 1)
+		return _th0(_tframe1_i0(A, p, p0), --_TEND[_ARRLEN])
 	}
+}
 
-	function _tframe3_i1(A, p, p0, p1, p2)
-	{
-		if (_TEND[_ARRLEN] in _TEND) {
-			return 
-		}
-		if (p in _tNEXT) {
-			return (_tframe3_i0(A, p, p0, p1, p2) _tframe3_i1(A, _tNEXT[p], p0, p1, p2))
-		}
-		return _tframe3_i0(A, p, p0, p1, p2)
+#_______________________________________________
+function _tframe1_i0(A, p, p0)
+{
+	_tframe_link = p
+	while (p in _tLINK) {
+		p = _tLINK[p]
 	}
-
-	function _tframe3_i2(A, m, p, p0, p1, p2)
-	{
-		_tframe_dlink = p
-		while (p in _tDLINK) {
-			p = _tDLINK[p]
-		}
-		if (m in A) {
-			if (m "~" in A) {
-				if (! (_TYPEWORD in _[p]) || A[m "~"] !~ _[p][_TYPEWORD]) {
-					return 
-				}
-			}
-			m = A[m]
-			return @m(p, p0, p1, p2)
-		}
+	if (p in _tFCHLD) {
+		return (_tframe1_i2(A, "^", p, p0) _tframe1_i1(A, _tFCHLD[p], p0))
 	}
+	return _tframe1_i2(A, ".", p, p0)
+}
 
-	function _tframe4(f, p, p0, p1, p2, p3, A)
-	{
-		if (_isptr(p)) {
-			if (isarray(f)) {
-				return _tframe4_i0(f, p, p0, p1, p2, p3)
-			}
-			_tframex_p0(A, f, 4)
-			return _th0(_tframe4_i0(A, p, p0, p1, p2, p3), --_TEND[_ARRLEN])
-		}
+#_______________________________________________
+function _tframe1_i1(A, p, p0)
+{
+	if (_TEND[_ARRLEN] in _TEND) {
+		return 
 	}
-
-	function _tframe4_i0(A, p, p0, p1, p2, p3)
-	{
-		_tframe_link = p
-		while (p in _tLINK) {
-			p = _tLINK[p]
-		}
-		if (p in _tFCHLD) {
-			return (_tframe4_i2(A, "^", p, p0, p1, p2, p3) _tframe4_i1(A, _tFCHLD[p], p0, p1, p2, p3))
-		}
-		return _tframe4_i2(A, ".", p, p0, p1, p2, p3)
+	if (p in _tNEXT) {
+		return (_tframe1_i0(A, p, p0) _tframe1_i1(A, _tNEXT[p], p0))
 	}
+	return _tframe1_i0(A, p, p0)
+}
 
-	function _tframe4_i1(A, p, p0, p1, p2, p3)
-	{
-		if (_TEND[_ARRLEN] in _TEND) {
-			return 
-		}
-		if (p in _tNEXT) {
-			return (_tframe4_i0(A, p, p0, p1, p2, p3) _tframe4_i1(A, _tNEXT[p], p0, p1, p2, p3))
-		}
-		return _tframe4_i0(A, p, p0, p1, p2, p3)
+#_______________________________________________
+function _tframe1_i2(A, m, p, p0)
+{
+	_tframe_dlink = p
+	while (p in _tDLINK) {
+		p = _tDLINK[p]
 	}
-
-	function _tframe4_i2(A, m, p, p0, p1, p2, p3)
-	{
-		_tframe_dlink = p
-		while (p in _tDLINK) {
-			p = _tDLINK[p]
-		}
-		if (m in A) {
-			if (m "~" in A) {
-				if (! (_TYPEWORD in _[p]) || A[m "~"] !~ _[p][_TYPEWORD]) {
-					return 
-				}
+	if (m in A) {
+		if (m "~" in A) {
+			if (! (_TYPEWORD in _[p]) || A[m "~"] !~ _[p][_TYPEWORD]) {
+				return 
 			}
-			m = A[m]
-			return @m(p, p0, p1, p2, p3)
-		}
-	}
-
-	function _tframe_i0(f, p, p0, p1, p2, a)
-	{
-		while (p in _tLINK) {
-			p = _tLINK[p]
 		}
-		return ((p in _tFCHLD ? _tmframe_i0(f, _tFCHLD[p], p0, p1, p2) : (p in _tDLINK ? @f(_tDLINK[p], p0, p1, p2) : @f(p, p0, p1, p2))))
+		m = A[m]
+		return @m(p, p0)
 	}
+}
 
-	function _tframe_i1(F, p, p0, p1, p2, a)
-	{
-		while (p in _tLINK) {
-			p = _tLINK[p]
+#_________________________________________________________________
+function _tframe2(f, p, p0, p1, p2, p3, A)
+{
+	if (_isptr(p)) {
+		if (isarray(f)) {
+			return _tframe2_i0(f, p, p0, p1)
 		}
-		return ((p in _tFCHLD ? (("." in F ? _th1(a = F["."], @a(p, p0, p1, p2)) : "")) _tmframe_i1(F, _tFCHLD[p], p0, p1, p2) : (">" in F ? _th1(a = F[">"], (p in _tDLINK ? @a(_tDLINK[p], p0, p1, p2) : @a(p, p0, p1, p2))) : "")))
+		_tframex_p0(A, f, 2)
+		return _th0(_tframe2_i0(A, p, p0, p1), --_TEND[_ARRLEN])
 	}
+}
 
-	function _tframex(f, p, p0, p1)
-	{
-		delete _t_ENDF[++_t_ENDF[0]]
-		f = (p ? _tframex_i0(f, p, p0, p1) : "")
-		--_t_ENDF[0]
-		return f
+#_______________________________________________
+function _tframe2_i0(A, p, p0, p1)
+{
+	_tframe_link = p
+	while (p in _tLINK) {
+		p = _tLINK[p]
 	}
-
-	function _tframex_i0(f, p, p0, p1)
-	{
-		while (p in _tLINK) {
-			p = _tLINK[p]
-		}
-		return ((p in _tFCHLD ? _tmframex(f, _tFCHLD[p], p0, p1) : @f(p, p0, p1)))
+	if (p in _tFCHLD) {
+		return (_tframe2_i2(A, "^", p, p0, p1) _tframe2_i1(A, _tFCHLD[p], p0, p1))
 	}
+	return _tframe2_i2(A, ".", p, p0, p1)
+}
 
-	function _tframex_p0(A, f, q, i, B, C)
-	{
-		_tframe_qparam = q
-		delete _TEND[++_TEND[_ARRLEN]]
-		if (match(f, /\~(.*)$/, B)) {
-			A["^~"] = A[".~"] = B[1]
-			f = substr(f, 1, RSTART - 1)
-		}
-		A["."] = A["^"] = f
+#_______________________________________________
+function _tframe2_i1(A, p, p0, p1)
+{
+	if (_TEND[_ARRLEN] in _TEND) {
 		return 
-		q = split(f, B, /;/)
-		i = 0
-		while (i < q) {
-			_tframex_p1(A, C[i])
-			while (++i <= q) {
-				_tframex_p1(A, C[i], B[i])
-			}
-		}
 	}
-
-	function _tframex_p1(A, v, i, r, B)
-	{
-		gsub(/[ \t]+/, "", v)
-		while (match(v, /^([^~]*)~\/(([^\/\\]*\\.)*[^\/\\]*)\//, B)) {
-			v = B[1] substr(v, RSTART + RLENGTH)
-			r = B[2]
-		}
-		if (i == "") {
-			if (v != "") {
-				A["."] = v
-				delete A["`"]
-				delete A["^"]
-			}
-			if (r != "") {
-				A[".~"] = A["`~"] = A["^~"] = r
-			}
-		} else {
-			if (match(v, /!/)) {
-				delete A[i]
-			} else {
-				A[i] = v
-				if (r != "") {
-					A[i "~"] = r
-				}
-			}
-		}
+	if (p in _tNEXT) {
+		return (_tframe2_i0(A, p, p0, p1) _tframe2_i1(A, _tNEXT[p], p0, p1))
 	}
+	return _tframe2_i0(A, p, p0, p1)
+}
 
-	function _tgenuid(c)
-	{
-		for (_uidcntr in _UIDARR1) {
-			delete _UIDARR1[_uidcntr]
-			for (c in _UIDARR0) {
-				_UIDS[_uidcntr c]
-			}
-			delete _UIDS[_uidcntr c]
-			return (_uidcntr c)
-		}
-		return _fatal("_tUID: Out of UID range")
+#_______________________________________________
+function _tframe2_i2(A, m, p, p0, p1)
+{
+	_tframe_dlink = p
+	while (p in _tDLINK) {
+		p = _tDLINK[p]
 	}
-
-	function _tgenuid_init(a, b, A)
-	{
-		_ptrlength = 4
-		a = "\222\223\224\225\226\227\230\231\232" "\240\241\242\243\244\245\246\247" "\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277" "\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317" "\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337"
-		split(a, A, "")
-		for (a in A) {
-			for (b in A) {
-				_UIDARR0[A[a] A[b]] _UIDARR1[A[a] A[b]]
+	if (m in A) {
+		if (m "~" in A) {
+			if (! (_TYPEWORD in _[p]) || A[m "~"] !~ _[p][_TYPEWORD]) {
+				return 
 			}
 		}
-		_uidcntr = A[a] A[b]
+		m = A[m]
+		return @m(p, p0, p1)
 	}
+}
 
-	function _tgetitem(p, n, a, b)
-	{
-		if (p) {
-			if (isarray(_PTR[p]["ITEM"]) && n in _PTR[p]["ITEM"]) {
-				a = _PTR[p]["ITEM"][n]
-			} else {
-				a = _PTR[p]["ITEM"][n] = _N()
-			}
-			if (! (b = _rFCHLD(a))) {
-				b = _wLCHLD(a, _N())
-				_PTR[b]["HOST"] = p
-				_[b]["ITEMNAME"] = n
-			}
-			return b
+#_________________________________________________________________
+function _tframe3(f, p, p0, p1, p2, p3, A)
+{
+	if (_isptr(p)) {
+		if (isarray(f)) {
+			return _tframe3_i0(f, p, p0, p1, p2)
 		}
+		_tframex_p0(A, f, 3)
+		return _th0(_tframe3_i0(A, p, p0, p1, p2), --_TEND[_ARRLEN])
 	}
+}
 
-	function _tgetsp(p)
-	{
-		return _tSTACK[p][0]
-	}
-
-	function _th0(p, p1, p2, p3)
-	{
-		return p
-	}
-
-	function _th1(p0, p, p2, p3)
-	{
-		return p
+#_______________________________________________
+function _tframe3_i0(A, p, p0, p1, p2)
+{
+	_tframe_link = p
+	while (p in _tLINK) {
+		p = _tLINK[p]
 	}
-
-	function _th10(p0, p1)
-	{
-		return (p1 p0)
+	if (p in _tFCHLD) {
+		return (_tframe3_i2(A, "^", p, p0, p1, p2) _tframe3_i1(A, _tFCHLD[p], p0, p1, p2))
 	}
+	return _tframe3_i2(A, ".", p, p0, p1, p2)
+}
 
-	function _th2(p0, p1, r, p3)
-	{
-		return p
+#_______________________________________________
+function _tframe3_i1(A, p, p0, p1, p2)
+{
+	if (_TEND[_ARRLEN] in _TEND) {
+		return 
 	}
-
-	function _th3(p0, p1, p2, r)
-	{
-		return p
+	if (p in _tNEXT) {
+		return (_tframe3_i0(A, p, p0, p1, p2) _tframe3_i1(A, _tNEXT[p], p0, p1, p2))
 	}
+	return _tframe3_i0(A, p, p0, p1, p2)
+}
 
-	function _tifend(l)
-	{
-		return ((_t_ENDF[0] + l in _t_ENDF ? (_t_ENDF[_t_ENDF[0] + l] ? _t_ENDF[_t_ENDF[0] + l] : 1) : ""))
+#_______________________________________________
+function _tframe3_i2(A, m, p, p0, p1, p2)
+{
+	_tframe_dlink = p
+	while (p in _tDLINK) {
+		p = _tDLINK[p]
 	}
-
-	function _tinit_i0(D, S, i)
-	{
-		for (i in S) {
-			if (isarray(S[i])) {
-				if (! isarray(D[i][""])) {
-					delete D[i]
-					D[i][""]
-					delete D[i][""]
-				}
-				_N_i0(D[i], S[i])
-			} else {
-				if (isarray(D[i])) {
-					delete D[i]
-				}
-				D[i] = S[i]
+	if (m in A) {
+		if (m "~" in A) {
+			if (! (_TYPEWORD in _[p]) || A[m "~"] !~ _[p][_TYPEWORD]) {
+				return 
 			}
 		}
+		m = A[m]
+		return @m(p, p0, p1, p2)
 	}
+}
 
-	function _tlist(L, p, f)
-	{
-		_tlisti1 = _tlisti0 = L[_ARRLEN] + 0
-		if (f == 0 && f == "") {
-			_tlist_i0(L, p)
-		} else {
-			_tlistf0 = (f in _TAPI ? _TAPI[f] : f)
-			_tlist_i1(L, p)
+#_________________________________________________________________
+function _tframe4(f, p, p0, p1, p2, p3, A)
+{
+	if (_isptr(p)) {
+		if (isarray(f)) {
+			return _tframe4_i0(f, p, p0, p1, p2, p3)
 		}
-		return (_tlisti0 - _tlisti1)
+		_tframex_p0(A, f, 4)
+		return _th0(_tframe4_i0(A, p, p0, p1, p2, p3), --_TEND[_ARRLEN])
 	}
+}
 
-	function _tlist_i0(L, p, q, i)
-	{
-		if (isarray(p)) {
-			q = p[_ARRLEN]
-			i = 0
-			while (i++ < q) {
-				_tlist_i0(L, p[i])
-			}
-			return 
-		}
-		if (p in _) {
-			while (p in _tLINK) {
-				p = _tLINK[p]
-			}
-			L[++_tlisti0] = p
-			if (p in _tFCHLD) {
-				for (p = _tFCHLD[p]; p; p = (p in _tNEXT ? _tNEXT[p] : "")) {
-					_tlist_i0(L, p)
-				}
-			}
-		}
+#_______________________________________________
+function _tframe4_i0(A, p, p0, p1, p2, p3)
+{
+	_tframe_link = p
+	while (p in _tLINK) {
+		p = _tLINK[p]
+	}
+	if (p in _tFCHLD) {
+		return (_tframe4_i2(A, "^", p, p0, p1, p2, p3) _tframe4_i1(A, _tFCHLD[p], p0, p1, p2, p3))
 	}
+	return _tframe4_i2(A, ".", p, p0, p1, p2, p3)
+}
 
-	function _tlist_i1(L, p)
-	{
-		if (isarray(p)) {
-			q = p[_ARRLEN]
-			i = 0
-			while (i++ < q) {
-				_tlist_i1(L, p[i])
+#_______________________________________________
+function _tframe4_i1(A, p, p0, p1, p2, p3)
+{
+	if (_TEND[_ARRLEN] in _TEND) {
+		return 
+	}
+	if (p in _tNEXT) {
+		return (_tframe4_i0(A, p, p0, p1, p2, p3) _tframe4_i1(A, _tNEXT[p], p0, p1, p2, p3))
+	}
+	return _tframe4_i0(A, p, p0, p1, p2, p3)
+}
+
+#_______________________________________________
+function _tframe4_i2(A, m, p, p0, p1, p2, p3)
+{
+	_tframe_dlink = p
+	while (p in _tDLINK) {
+		p = _tDLINK[p]
+	}
+	if (m in A) {
+		if (m "~" in A) {
+			if (! (_TYPEWORD in _[p]) || A[m "~"] !~ _[p][_TYPEWORD]) {
+				return 
 			}
-			return 
 		}
-		if (p in _) {
-			while (p in _tLINK) {
-				p = _tLINK[p]
-			}
-			if (_tlistf0 in _[p]) {
-				L[++_tlisti0] = p
+		m = A[m]
+		return @m(p, p0, p1, p2, p3)
+	}
+}
+
+#___________________________________________________________
+function _tframe_i0(f, p, p0, p1, p2, a)
+{
+	while (p in _tLINK) {
+		p = _tLINK[p]
+	}
+	return ((p in _tFCHLD ? _tmframe_i0(f, _tFCHLD[p], p0, p1, p2) : (p in _tDLINK ? @f(_tDLINK[p], p0, p1, p2) : @f(p, p0, p1, p2))))
+}
+
+#___________________________________________________________
+function _tframe_i1(F, p, p0, p1, p2, a)
+{
+	while (p in _tLINK) {
+		p = _tLINK[p]
+	}
+	return ((p in _tFCHLD ? (("." in F ? _th1(a = F["."], @a(p, p0, p1, p2)) : "")) _tmframe_i1(F, _tFCHLD[p], p0, p1, p2) : (">" in F ? _th1(a = F[">"], (p in _tDLINK ? @a(_tDLINK[p], p0, p1, p2) : @a(p, p0, p1, p2))) : "")))
+}
+
+#_______________________________________________________________________
+function _tframex(f, p, p0, p1)
+{
+	delete _t_ENDF[++_t_ENDF[0]]
+	f = (p ? _tframex_i0(f, p, p0, p1) : "")
+	--_t_ENDF[0]
+	return f
+}
+
+#___________________________________________________________
+function _tframex_i0(f, p, p0, p1)
+{
+	while (p in _tLINK) {
+		p = _tLINK[p]
+	}
+	return ((p in _tFCHLD ? _tmframex(f, _tFCHLD[p], p0, p1) : @f(p, p0, p1)))
+}
+
+#_____________________________________________________
+function _tframex_p0(A, f, q, i, B, C)
+{
+	_tframe_qparam = q
+	delete _TEND[++_TEND[_ARRLEN]]
+	if (match(f, /\~(.*)$/, B)) {
+		A["^~"] = A[".~"] = B[1]
+		f = substr(f, 1, RSTART - 1)
+	}
+	A["."] = A["^"] = f
+	return 
+	q = split(f, B, /;/)
+	i = 0
+	while (i < q) {
+		_tframex_p1(A, C[i])
+		while (++i <= q) {
+			_tframex_p1(A, C[i], B[i])
+		}
+	}
+}
+
+#_______________________________________________
+function _tframex_p1(A, v, i, r, B)
+{
+	gsub(/[ \t]+/, "", v)
+	while (match(v, /^([^~]*)~\/(([^\/\\]*\\.)*[^\/\\]*)\//, B)) {
+		v = B[1] substr(v, RSTART + RLENGTH)
+		r = B[2]
+	}
+	if (i == "") {
+		if (v != "") {
+			A["."] = v
+			delete A["`"]
+			delete A["^"]
+		}
+		if (r != "") {
+			A[".~"] = A["`~"] = A["^~"] = r
+		}
+	} else {
+		if (match(v, /!/)) {
+			delete A[i]
+		} else {
+			A[i] = v
+			if (r != "") {
+				A[i "~"] = r
+			}
+		}
+	}
+}
+
+#_____________________________________________________
+#	F	v	action
+#-----------------------------------------------------
+#	-	*	no additional action
+#	A	B	delete A[p] and define A[p] as array; copy array B to array A[p]
+#	A	-	delete A[p]
+#	A	"*"	delete A[p]; A[p]="*"
+#	"*"	B	define _[p]["*"] as array; copy array B to array _[p]["*"]
+#	"*"	-	run _mpu program "*" for `p
+#	"*0"	"*1"	_[p]["*0"]="*1"
+#___________________________________________________________
+function _tgenuid(c)
+{
+	for (_uidcntr in _UIDARR1) {
+		delete _UIDARR1[_uidcntr]
+		for (c in _UIDARR0) {
+			_UIDS[_uidcntr c]
+		}
+		delete _UIDS[_uidcntr c]
+		return (_uidcntr c)
+	}
+	return _fatal("_tUID: Out of UID range")
+}
+
+#_____________________________________________________
+function _tgenuid_init(a, b, A)
+{
+	_ptrlength = 4
+	a = "\222\223\224\225\226\227\230\231\232" "\240\241\242\243\244\245\246\247" "\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277" "\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317" "\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337"
+	split(a, A, "")
+	for (a in A) {
+		for (b in A) {
+			_UIDARR0[A[a] A[b]] _UIDARR1[A[a] A[b]]
+		}
+	}
+	_uidcntr = A[a] A[b]
+}
+
+#	if ( F in _TCLASS )				{ _[p]["CLASS"]=_TCLASS[F]; _tapi(p); return p }
+#		# ???		_mpu(F,p)		???
+#		return p }
+#	_[p][F]=v; return p }
+
+#_______________________________________________________________________
+function _tgetitem(p, n, a, b)
+{
+	if (p) {
+		if (isarray(_PTR[p]["ITEM"]) && n in _PTR[p]["ITEM"]) {
+			a = _PTR[p]["ITEM"][n]
+		} else {
+			a = _PTR[p]["ITEM"][n] = _N()
+		}
+		if (! (b = _rFCHLD(a))) {
+			b = _wLCHLD(a, _N())
+			_PTR[b]["HOST"] = p
+			_[b]["ITEMNAME"] = n
+		}
+		return b
+	}
+}
+
+#_________________________________________________________________
+function _tgetsp(p)
+{
+	return _tSTACK[p][0]
+}
+
+####################################################################################
+
+#_____________________________________________________________________________
+function _th0(p, p1, p2, p3)
+{
+	return p
+}
+
+#_________________________________________________________________
+function _th1(p0, p, p2, p3)
+{
+	return p
+}
+
+#_________________________________________________________________
+function _th10(p0, p1)
+{
+	return (p1 p0)
+}
+
+#_________________________________________________________________
+function _th2(p0, p1, r, p3)
+{
+	return p
+}
+
+#_________________________________________________________________
+function _th3(p0, p1, p2, r)
+{
+	return p
+}
+
+#_________________________________________________________________
+function _tifend(l)
+{
+	return ((_t_ENDF[0] + l in _t_ENDF ? (_t_ENDF[_t_ENDF[0] + l] ? _t_ENDF[_t_ENDF[0] + l] : 1) : ""))
+}
+
+# 	test _tbrochld fn; develope tOBJ r\w func specification for brochld func
+
+#_________________________________________________________________
+function _tinit_i0(D, S, i)
+{
+	for (i in S) {
+		if (isarray(S[i])) {
+			if (! isarray(D[i][""])) {
+				delete D[i]
+				D[i][""]
+				delete D[i][""]
 			}
-			if (p in _tFCHLD) {
-				for (p = _tFCHLD[p]; p; p = (p in _tNEXT ? _tNEXT[p] : "")) {
-					_tlist_i1(L, p)
-				}
+			_N_i0(D[i], S[i])
+		} else {
+			if (isarray(D[i])) {
+				delete D[i]
 			}
+			D[i] = S[i]
 		}
 	}
+}
 
-	function _tmbframe(f, p, p0, p1, t)
-	{
-		while (p && ! (_t_ENDF[0] in _t_ENDF)) {
-			t = t _tbframe_i0(f, p, p0, p1, p = (p in _tPREV ? _tPREV[p] : ""))
-		}
-		return t
-	}
+#_______________________________________________________________________
+########################################################################
 
-	function _tmbframex(f, p, p0, p1, t)
-	{
-		while (p && ! (_t_ENDF[0] in _t_ENDF)) {
-			t = t _tbframex_i0(f, p, p0, p1)
-			p = (p in _tPREV ? _tPREV[p] : "")
-		}
-		return t
-	}
 
-	function _tmbpass(f, p, p0, p1)
-	{
-		while (p && ! (_t_ENDF[0] in _t_ENDF)) {
-			p0 = _tbpass_i0(f, p, p0, p1, p = (p in _tPREV ? _tPREV[p] : ""))
-		}
-		return p0
-	}
 
-	function _tmbpassx(f, p, p0, p1)
-	{
-		while (p && ! (_t_ENDF[0] in _t_ENDF)) {
-			p0 = _tbpassx_i0(f, p, p0, p1)
-			p = (p in _tPREV ? _tPREV[p] : "")
-		}
-		return p0
-	}
 
-	function _tmframe(f, p, p0, p1, p2)
-	{
-		delete _t_ENDF[++_t_ENDF[0]]
-		f = (p ? _tmframe_i0(f, p, p0, p1, p2) : "")
-		--_t_ENDF[0]
-		return f
-	}
 
-	function _tmframe_i0(f, p, p0, p1, p2, t)
-	{
-		while (p && ! (_t_ENDF[0] in _t_ENDF)) {
-			t = t _tframe_i0(f, p, p0, p1, p2, p = (p in _tNEXT ? _tNEXT[p] : ""))
-		}
-		return t
-	}
 
-	function _tmframe_i1(F, p, p0, p1, p2, t)
-	{
-		while (p && ! (_t_ENDF[0] in _t_ENDF)) {
-			t = t _tframe_i1(F, p, p0, p1, p2, p = (p in _tNEXT ? _tNEXT[p] : ""))
-		}
-		return t
-	}
 
-	function _tmframex(f, p, p0, p1, t)
-	{
-		while (p && ! (_t_ENDF[0] in _t_ENDF)) {
-			t = t _tframex_i0(f, p, p0, p1)
-			p = (p in _tNEXT ? _tNEXT[p] : "")
-		}
-		return t
-	}
 
-	function _tmpass(f, p, p0, p1)
-	{
-		while (p && ! (_t_ENDF[0] in _t_ENDF)) {
-			p0 = _tbpass_i0(f, p, p0, p1, p = (p in _tNEXT ? _tNEXT[p] : ""))
-		}
-		return p0
-	}
 
-	function _tmpassx(f, p, p0, p1)
-	{
-		while (p && ! (_t_ENDF[0] in _t_ENDF)) {
-			p0 = _tbpassx_i0(f, p, p0, p1)
-			p = (p in _tNEXT ? _tNEXT[p] : "")
-		}
-		return p0
-	}
 
-	function _torexp(r)
-	{
-		return _subseqon(_TOREXPB0, gensub(/(^[ \t]+)|(([ \t]*(\\)+)+[ \t]*)|([ \t]+$)/, "\\4", "G", _subseqoff(r, _TOREXPB0)), _TOREXPFN)
-	}
 
-	function _torexp_cmdstr(t)
-	{
-		return _strtorexp(gensub(/\^(.)/, "\\1", "G", t))
-	}
 
-	function _torexp_fmask(t)
-	{
-		return gensub(/\\\*/, ".*", "G", gensub(/\\\?/, ".?", "G", _strtorexp(t)))
-	}
 
-	function _torexp_init()
-	{
-		_TOREXPFN[""] = "_strtorexp"
-		_TOREXPFN["~"] = "_torexp_rexp"
-		_TOREXPFN["="] = "_strtorexp"
-		_TOREXPFN[">"] = "_torexp_cmdstr"
-		_TOREXPFN["#"] = "_torexp_fmask"
-		_TOREXPFN["\""] = "_torexp_dqstr"
-		_TOREXPFN["'"] = "_torexp_sqstr"
-	}
 
-	function _torexp_rexp(t)
-	{
-		return t
-	}
 
-	function _tpass(f, p, p0, p1)
-	{
-		delete _t_ENDF[++_t_ENDF[0]]
-		f = (p ? _tpass_i0(f, p, p0, p1) : "")
-		--_t_ENDF[0]
-		return f
-	}
 
-	function _tpass_i0(f, p, p0, p1, a)
-	{
-		while (p in _tLINK) {
-			p = _tLINK[p]
-		}
-		return ((p in _tFCHLD ? _tmpass(f, _tFCHLD[p], p0, p1) : @f(p, p0, p1)))
-	}
 
-	function _tpassx(f, p, p0, p1)
-	{
-		delete _t_ENDF[++_t_ENDF[0]]
-		f = (p ? _tpassx_i0(f, p, p0, p1) : "")
-		--_t_ENDF[0]
-		return f
-	}
 
-	function _tpassx_i0(f, p, p0, p1)
-	{
-		while (p in _tLINK) {
-			p = _tLINK[p]
-		}
-		return ((p in _tFCHLD ? _tmpassx(f, _tFCHLD[p], p0, p1) : @f(p, p0, p1)))
-	}
 
-	function _tpop(p, aA, a)
-	{
-		if ((a = _tSTACK[p][0]) > 0) {
-			_tSTACK[p][0]--
-			if (isarray(_tSTACK[p][a])) {
-				delete aA
-				_movarr(aA, _tSTACK[p][a])
-				return 
-			}
-			return _tSTACK[p][a]
-		}
-		_fatal("^" p ": Out of tSTACK")
-	}
 
-	function _tpush(p, aA, a)
-	{
-		if (isarray(aA)) {
-			delete _tSTACK[p][a = ++_tSTACK[p][0]]
-			_tSTACK[p][a][""]
-			delete _tSTACK[p][a][""]
-			_movarr(_tSTACK[p][a], aA)
-			return 
-		}
-		delete _tSTACK[p][a = ++_tSTACK[p][0]]
-		return (_tSTACK[p][a] = aA)
-	}
-
-	function _tr(n, cs, H)
-	{
-		_rconline(n ": " cs)
-		_rconl()
-		if (match(cs, /^((([^\xB4:\[\|\]]*\xB4.)*[^\xB4:\[\|\]]*):)?((([^\xB4\[\|\]]*\xB4.)*[^\xB4\[\|\]]*)\[)?(([^\xB4\|\]]*\xB4.)*[^\xB4\|\]]*)?(\|(\.)?(([^\xB4\]]*\xB4.)*[^\xB4\]]*))?(\](.*))?$/, H)) {
-			_rconl("delptr: " _une(H[2]) "'")
-			_rconl("pfxstr: " _une(H[5]) "'")
-			_rconl("hichr:  " _une(H[7]) "'")
-			_rconl("lochr:  " _une((H[10] ? H[7] "' and " H[11] "'" : H[11] "'")))
-			_rconl("sfxstr: " _une(H[14]) "'")
-		} else {
-			_rconl("NOT MATCH!")
-		}
-		_rconl()
-	}
 
-	function _trace(t, d, A)
-	{
-		if (_ERRLOG_TF) {
-			A["TYPE"] = "TRACE"
-			A["TEXT"] = t
-			_log(A, d)
-		}
-	}
 
-	function _trunframe(f, p, p0, p1, p2)
-	{
-		return _tframe((f ? f : "_trunframe_i0"), p, p0, p1, p2)
-	}
+#_______________________________________________________________________
+#	_N(arr\str\mpuptr,val) \ _n(arr\str\mpuptr,val)
+#		This functions create new object and return ptr.
+#		_n() - creates object from list of deleted objects or if it's empty create new one, while _N() always create new one
+#		It is strongly recommended to use _N() for the objects that have some data outside of standart object arrays. Or - make routines
+#		that will clear outsided object data in case if object deleting.
+#
+#			IN:		arr\str\mpu,val	- (both missed) just create obj and return ptr
+#					arr,val		- create object and write arr[ptr]=val
+#					str,val		- create object and write _[ptr][str]=val
+#					mpuptr		- NOT ALLOWED (val missed) create object and run MPU-code specified by mpuptr with created object ptr as primary parameter
+#			MOD:		-
+#			OUT:		-
+#			RETURN:	ptr			- pointer to newly created object
+#_________________________________________________________________
+#	_tdel(ptr)
+#		This function exclude object from it's current structure and delete it. ptr can be later used by function: _n() for creating new object
+#		Also same story will occured with all chields and subchields of object specified by ptr.
+#		??? What happened with linked py _ptr[ptr] objects ???
+#
+#			IN:		ptr			- pointer to object that will deleted
+#			MOD:		-
+#			OUT:		-
+#			RETURN:	undefined
+#_________________________________________________________________
+#	_isptr(ptr)
+#		This function checks: is ptr is the object pointer that is currently exist?
+#		Unescaped remained data will be in data of src_dst_ptr.
+#
+#			IN:		ptr			- string that will be tested
+#			MOD:		-
+#			OUT:		-
+#			RETURN:	undefined		- if ptr is not pointer to exist object
+#					ptr			- if ptr is the pointer to exist object
+#_________________________________________________________________
 
-	function _trunframe_i0(p, p0, p1, p2, f)
-	{
-		if (p in _tFN) {
-			f = _tFN[p]
-			return @f(p, p0, p1, p2)
-		}
-	}
 
-	function _trunframex(f, p, p0, p1)
-	{
-		return _tframex((f ? f : "_trunframe_i0"), p, p0, p1)
-	}
 
-	function _trunpass(f, p, p0, p1)
-	{
-		return _tpass((f ? f : "_trunframe_i0"), p, p0, p1)
-	}
+#_________________________________________________________________
+#
+# TO DESIGN:
+#
+# create basic objectapi interface support
+# modify everywhere checking ptr not by `if ( ptr )...', but by `if ( ptr in _ )...'
+# _TMP0, _TMP1 name change to something like _DATA name ???
+# think about redesigning routines for not depending if ptr is exist in tsysarrs: reason: performance\light code
 
-	function _trunpassx(f, p, p0, p1)
-	{
-		return _tpassx((f ? f : "_trunframe_i0"), p, p0, p1)
-	}
 
-	function _tsetsp(p, v)
-	{
-		return (_tSTACK[p][0] = v)
-	}
 
-	function _tstini()
-	{
-		_ini("uidel:pfx'hstr|lstr'sfx")
-		_ini("uidel:pfx'hstr|lstr'")
-		_ini("uidel:'hstr|lstr'sfx")
-		_ini("uidel:'hstr|lstr'")
-		_ini("uidel:pfx'hstr'sfx")
-		_ini("uidel:pfx'hstr'")
-		_ini("uidel:'hstr'sfx")
-		_ini("uidel:'hstr'")
-		_conl()
-		_conl("########################################################################################")
-		_conl()
-		_ini("pfx'hstr|lstr'sfx")
-		_ini("pfx'hstr|lstr'")
-		_ini("'hstr|lstr'sfx")
-		_ini("'hstr|lstr'")
-		_ini("pfx'hstr'sfx")
-		_ini("pfx'hstr'")
-		_ini("'hstr'sfx")
-		_ini("'hstr'")
-		_conl()
-		_conl("########################################################################################")
-		_conl()
-		_ini("uidel:pfx'`cntptr'sfx")
-		_ini("uidel:pfx'`cntptr'")
-		_ini("uidel:'`cntptr'sfx")
-		_ini("uidel:'`cntptr'")
-		_conl()
-		_conl("########################################################################################")
-		_conl()
-		_ini("pfx'`cntptr'sfx")
-		_ini("pfx'`cntptr'")
-		_ini("'`cntptr'sfx")
-		_ini("'`cntptr'")
-		_conl()
-		_conl("########################################################################################")
-		_conl()
-		_ini("uidel:pfx'^chrptr'sfx")
-		_ini("uidel:pfx'^chrptr'")
-		_ini("uidel:'^chrptr'sfx")
-		_ini("uidel:'^chrptr'")
-		_conl()
-		_conl("########################################################################################")
-		_conl()
-		_ini("pfx'^chrptr'sfx")
-		_ini("pfx'^chrptr'")
-		_ini("'^chrptr'sfx")
-		_ini("'^chrptr'")
-		_conl()
-		_conl("########################################################################################")
-		_conl()
-	}
 
-	function _tstv(p, A, r, f)
-	{
-		if (f == "") {
-			f = "tst_splitstr"
-		}
-		@f(_NOP, A, p)
-		@f(AA0, A, p)
-		@f(AB0, A, p)
-		@f(AC0, A, p)
-		@f("", A, p)
-		@f("a", A, p)
-		@f("\264a", A, p)
-		@f("\264", A, p)
-		@f("a\264\264\264,ba\264\264\264,", A, p)
-		@f("\264,", A, p)
-		@f(",", A, p)
-		@f("\264a,", A, p)
-		@f("ab,", A, p)
-		@f("ab,\264", A, p)
-		@f("\264a\264,,ba", A, p)
-		@f(",a,,b\264,c,,\264a,,\264,,,", A, p)
-	}
 
-	function _typ(p)
-	{
-		return (_t0 = (isarray(p) ? "#" : (p == 0 ? (p == "" ? 0 : (p in _CLASSPTR ? "`" : (p ? 3 : 4))) : (p in _CLASSPTR ? "`" : (p + 0 == p ? 5 : (p ? 3 : 2))))))
-	}
 
-	function _typa(p, A)
-	{
-		return (_t0 = (isarray(p) ? "#" : (p == 0 ? (p == "" ? 0 : (p in A ? "`" : (p ? 3 : 4))) : (p in A ? "`" : (p + 0 == p ? 5 : (p ? 3 : 2))))))
-	}
 
-	function _tzend(a, b)
-	{
-		if (b == 0 && b == "") {
-			return (_TEND[_TEND[_ARRLEN]] = a)
-		} else {
-			return (_TEND[_TEND[_ARRLEN] + a] = b)
-		}
-	}
 
-	function _uidcyc(p, i)
-	{
-		_dumpuidgen(p)
-		for (i = 1; i < 64 * 8 * 6 - 1; i++) {
-			_conl(i ":" _var(_getuid(p)))
-		}
-		_dumpuidgen(p)
-	}
 
-	function _une(t)
-	{
-		return gensub(/\xB4(.)/, "\\1", "G", t)
-	}
 
-	function _unformatrexp(t)
-	{
-		_formatstrq0 = split(t, _FORMATSTRA, /(\\[0-9]{1,3})|(\\x[[:xdigit:]]+)|(\\.)/, _FORMATSTRB)
-		_formatstrs0 = ""
-		for (t = 1; t < _formatstrq0; t++) {
-			_formatstrs0 = _formatstrs0 _FORMATSTRA[t] ((_FORMATSTRB[t] in _QESCHR ? _QESCREXP[_FORMATSTRB[t]] : _QESCREXP[toupper(substr(_FORMATSTRB[t], length(_FORMATSTRB[t]) - 1))]))
-		}
-		return (_formatstrs0 _FORMATSTRA[t])
-	}
 
-	function _unformatrexp_init(i, a)
-	{
-		_formatstrs0 = "\\^$.[]|()*+?{}-sSwW<>yB`'"
-		delete _FORMATSTRB
-		for (i = 0; i < 256; i++) {
-			_QESCREXP["\\" _CHR[i]] = (index(_formatstrs0, _CHR[i]) ? "\\" _CHR[i] : _CHR[i])
-		}
-		for (i = 0; i < 256; i++) {
-			a = (index(_formatstrs0, _CHR[i]) ? "\\" : "")
-			_QESCREXP[sprintf("%.2X", i)] = a _CHR[i]
-			_QESCREXP["\\" sprintf("%.3o", i)] = a _CHR[i]
-			if (i < 8) {
-				_QESCREXP["\\" sprintf("%.1o", i)] = a _CHR[i]
-			}
-			if (i < 64) {
-				_QESCREXP["\\" sprintf("%.2o", i)] = a _CHR[i]
-			}
-			if (i < 16) {
-				_QESCREXP["\\x" sprintf("%.1X", i)] = _QESCREXP["\\x" sprintf("%.1x", i)] = a _CHR[i]
-			}
-		}
-		patsplit("a" 7 "b" 8 "f" 12 "n" 10 "r" 13 "t" 9 "v" 11, _FORMATSTRA, /[^0-9]/, _FORMATSTRB)
-		for (i in _FORMATSTRA) {
-			_QESCREXP["\\" _FORMATSTRA[i]] = _CHR[_FORMATSTRB[i] + 0]
-		}
+function _tlist(L, p, f)
+{
+	_tlisti1 = _tlisti0 = L[_ARRLEN] + 0
+	if (f == 0 && f == "") {
+		_tlist_i0(L, p)
+	} else {
+		_tlistf0 = (f in _TAPI ? _TAPI[f] : f)
+		_tlist_i1(L, p)
 	}
+	return (_tlisti0 - _tlisti1)
+}
 
-	function _unformatstr(t)
-	{
-		_formatstrq0 = split(t, _FORMATSTRA, /(\\[0-9]{1,3})|(\\x[[:xdigit:]]+)|(\\.)/, _FORMATSTRB)
-		_formatstrs0 = ""
-		for (t = 1; t < _formatstrq0; t++) {
-			_formatstrs0 = _formatstrs0 _FORMATSTRA[t] ((_FORMATSTRB[t] in _QESCHR ? _QESCHR[_FORMATSTRB[t]] : _QESCHR[toupper(substr(_FORMATSTRB[t], length(_FORMATSTRB[t]) - 1))]))
+function _tlist_i0(L, p, q, i)
+{
+	if (isarray(p)) {
+		q = p[_ARRLEN]
+		i = 0
+		while (i++ < q) {
+			_tlist_i0(L, p[i])
 		}
-		return (_formatstrs0 _FORMATSTRA[t])
+		return 
 	}
-
-	function _unformatstr_init(i)
-	{
-		for (i = 0; i < 256; i++) {
-			_QESCHR["\\" _CHR[i]] = _CHR[i]
-		}
-		for (i = 0; i < 256; i++) {
-			_QESCHR[sprintf("%.2X", i)] = _CHR[i]
-			_QESCHR["\\" sprintf("%.3o", i)] = _CHR[i]
-			if (i < 8) {
-				_QESCHR["\\" sprintf("%.1o", i)] = _CHR[i]
-			}
-			if (i < 64) {
-				_QESCHR["\\" sprintf("%.2o", i)] = _CHR[i]
-			}
-			if (i < 16) {
-				_QESCHR["\\x" sprintf("%.1X", i)] = _QESCHR["\\x" sprintf("%.1x", i)] = _CHR[i]
-			}
-		}
-		i = "a" 7 "b" 8 "f" 12 "n" 10 "r" 13 "t" 9 "v" 11
-		patsplit(i, _FORMATSTRA, /[^0-9]/, _FORMATSTRB)
-		for (i in _FORMATSTRA) {
-			_QESCHR["\\" _FORMATSTRA[i]] = _CHR[_FORMATSTRB[i] + 0]
+	if (p in _) {
+		while (p in _tLINK) {
+			p = _tLINK[p]
 		}
-	}
-
-	function _uninit_del(A, i, p0)
-	{
-		_del(i)
-	}
-
-	function _unstr(t)
-	{
-		return gensub(/\\(.)/, "\\1", "G", t)
-	}
-
-	function _untmp(f, a)
-	{
-		if (f = filepath(f)) {
-			if (match(f, /\\$/)) {
-				_deletepfx(_FILEIO_RDTMP, a = toupper(f))
-				_deletepfx(_FILEIO_RDNETMP, a)
-			} else {
-				delete _FILEIO_RDNETMP[toupper(f)]
+		L[++_tlisti0] = p
+		if (p in _tFCHLD) {
+			for (p = _tFCHLD[p]; p; p = (p in _tNEXT ? _tNEXT[p] : "")) {
+				_tlist_i0(L, p)
 			}
-			return f
 		}
-		return ""
 	}
+}
 
-	function _val(v, t)
-	{
-		if (isarray(v)) {
-			return (_dumparr(v) _ln(t))
-		}
-		if (v == 0 && v == "") {
-			return (_ln("- (ERRNO=" ERRNO ")") _ln(t))
+function _tlist_i1(L, p)
+{
+	if (isarray(p)) {
+		q = p[_ARRLEN]
+		i = 0
+		while (i++ < q) {
+			_tlist_i1(L, p[i])
 		}
-		return (_ln(v "'") _ln(t))
+		return 
 	}
-
-	function _val0(v)
-	{
-		if (isarray(v)) {
-			return _dumparr(v)
-		}
-		if (v == 0 && v == "") {
-			return "-"
+	if (p in _) {
+		while (p in _tLINK) {
+			p = _tLINK[p]
 		}
-		return ("\"" v "\"")
-	}
-
-	function _var(v, t)
-	{
-		if (isarray(v)) {
-			return (_dumparr(v) _ln(t))
+		if (_tlistf0 in _[p]) {
+			L[++_tlisti0] = p
 		}
-		if (v == 0 && v == "") {
-			return (_ln("- (ERRNO=" ERRNO ")") _ln(t))
+		if (p in _tFCHLD) {
+			for (p = _tFCHLD[p]; p; p = (p in _tNEXT ? _tNEXT[p] : "")) {
+				_tlist_i1(L, p)
+			}
+		}
+	}
+}
+
+#_________________________________________________________________
+function _tmbframe(f, p, p0, p1, t)
+{
+	while (p && ! (_t_ENDF[0] in _t_ENDF)) {
+		t = t _tbframe_i0(f, p, p0, p1, p = (p in _tPREV ? _tPREV[p] : ""))
+	}
+	return t
+}
+
+#_________________________________________________________________
+function _tmbframex(f, p, p0, p1, t)
+{
+	while (p && ! (_t_ENDF[0] in _t_ENDF)) {
+		t = t _tbframex_i0(f, p, p0, p1)
+		p = (p in _tPREV ? _tPREV[p] : "")
+	}
+	return t
+}
+
+#_________________________________________________________________
+function _tmbpass(f, p, p0, p1)
+{
+	while (p && ! (_t_ENDF[0] in _t_ENDF)) {
+		p0 = _tbpass_i0(f, p, p0, p1, p = (p in _tPREV ? _tPREV[p] : ""))
+	}
+	return p0
+}
+
+#_________________________________________________________________
+function _tmbpassx(f, p, p0, p1)
+{
+	while (p && ! (_t_ENDF[0] in _t_ENDF)) {
+		p0 = _tbpassx_i0(f, p, p0, p1)
+		p = (p in _tPREV ? _tPREV[p] : "")
+	}
+	return p0
+}
+
+#_________________________________________________________________
+function _tmframe(f, p, p0, p1, p2)
+{
+	delete _t_ENDF[++_t_ENDF[0]]
+	f = (p ? _tmframe_i0(f, p, p0, p1, p2) : "")
+	--_t_ENDF[0]
+	return f
+}
+
+#___________________________________________________________
+function _tmframe_i0(f, p, p0, p1, p2, t)
+{
+	while (p && ! (_t_ENDF[0] in _t_ENDF)) {
+		t = t _tframe_i0(f, p, p0, p1, p2, p = (p in _tNEXT ? _tNEXT[p] : ""))
+	}
+	return t
+}
+
+#___________________________________________________________
+function _tmframe_i1(F, p, p0, p1, p2, t)
+{
+	while (p && ! (_t_ENDF[0] in _t_ENDF)) {
+		t = t _tframe_i1(F, p, p0, p1, p2, p = (p in _tNEXT ? _tNEXT[p] : ""))
+	}
+	return t
+}
+
+#_________________________________________________________________
+function _tmframex(f, p, p0, p1, t)
+{
+	while (p && ! (_t_ENDF[0] in _t_ENDF)) {
+		t = t _tframex_i0(f, p, p0, p1)
+		p = (p in _tNEXT ? _tNEXT[p] : "")
+	}
+	return t
+}
+
+#_________________________________________________________________
+function _tmpass(f, p, p0, p1)
+{
+	while (p && ! (_t_ENDF[0] in _t_ENDF)) {
+		p0 = _tbpass_i0(f, p, p0, p1, p = (p in _tNEXT ? _tNEXT[p] : ""))
+	}
+	return p0
+}
+
+#_________________________________________________________________
+function _tmpassx(f, p, p0, p1)
+{
+	while (p && ! (_t_ENDF[0] in _t_ENDF)) {
+		p0 = _tbpassx_i0(f, p, p0, p1)
+		p = (p in _tNEXT ? _tNEXT[p] : "")
+	}
+	return p0
+}
+
+function _torexp(r)
+{
+	return _subseqon(_TOREXPB0, gensub(/(^[ \t]+)|(([ \t]*(\\)+)+[ \t]*)|([ \t]+$)/, "\\4", "G", _subseqoff(r, _TOREXPB0)), _TOREXPFN)
+}
+
+function _torexp_cmdstr(t)
+{
+	return _strtorexp(gensub(/\^(.)/, "\\1", "G", t))
+}
+
+function _torexp_fmask(t)
+{
+	return gensub(/\\\*/, ".*", "G", gensub(/\\\?/, ".?", "G", _strtorexp(t)))
+}
+
+#_______________________________________________
+function _torexp_init()
+{
+	_TOREXPFN[""] = "_strtorexp"
+	_TOREXPFN["~"] = "_torexp_rexp"
+	_TOREXPFN["="] = "_strtorexp"
+	_TOREXPFN[">"] = "_torexp_cmdstr"
+	_TOREXPFN["#"] = "_torexp_fmask"
+	_TOREXPFN["\""] = "_torexp_dqstr"
+	_TOREXPFN["'"] = "_torexp_sqstr"
+}
+
+#_______________________________________________
+function _torexp_rexp(t)
+{
+	return t
+}
+
+#_____________________________________________________________________________
+function _tpass(f, p, p0, p1)
+{
+	delete _t_ENDF[++_t_ENDF[0]]
+	f = (p ? _tpass_i0(f, p, p0, p1) : "")
+	--_t_ENDF[0]
+	return f
+}
+
+#___________________________________________________________
+function _tpass_i0(f, p, p0, p1, a)
+{
+	while (p in _tLINK) {
+		p = _tLINK[p]
+	}
+	return ((p in _tFCHLD ? _tmpass(f, _tFCHLD[p], p0, p1) : @f(p, p0, p1)))
+}
+
+#_____________________________________________________________________________
+function _tpassx(f, p, p0, p1)
+{
+	delete _t_ENDF[++_t_ENDF[0]]
+	f = (p ? _tpassx_i0(f, p, p0, p1) : "")
+	--_t_ENDF[0]
+	return f
+}
+
+#___________________________________________________________
+function _tpassx_i0(f, p, p0, p1)
+{
+	while (p in _tLINK) {
+		p = _tLINK[p]
+	}
+	return ((p in _tFCHLD ? _tmpassx(f, _tFCHLD[p], p0, p1) : @f(p, p0, p1)))
+}
+
+#_________________________________________________________________
+function _tpop(p, aA, a)
+{
+	if ((a = _tSTACK[p][0]) > 0) {
+		_tSTACK[p][0]--
+		if (isarray(_tSTACK[p][a])) {
+			delete aA
+			_movarr(aA, _tSTACK[p][a])
+			return 
 		}
-		return (_ln(v "'") _ln(t))
+		return _tSTACK[p][a]
 	}
+	_fatal("^" p ": Out of tSTACK")
+}
 
-	function _verb(t, d, A)
-	{
-		if (_ERRLOG_VF) {
-			A["TYPE"] = "VERB"
-			A["TEXT"] = t
-			_log(A, d)
-		}
+#_____________________________________________________________________________
+function _tpush(p, aA, a)
+{
+	if (isarray(aA)) {
+		delete _tSTACK[p][a = ++_tSTACK[p][0]]
+		_tSTACK[p][a][""]
+		delete _tSTACK[p][a][""]
+		_movarr(_tSTACK[p][a], aA)
+		return 
 	}
-
-	function _wFBRO(p, v, a)
-	{
-		if (p) {
-			if (v) {
-				for (a = p; a in _tPARENT; ) {
-					if ((a = _tPARENT[a]) == v) {
-						return v
-					}
-				}
-				if (p in _tPARENT) {
-					p = _tPARENT[p]
-					if (v in _tNEXT) {
-						if (v in _tPREV) {
-							_tPREV[_tNEXT[a] = _tNEXT[v]] = a = _tPREV[v]
-							delete _tPREV[v]
-							if (v in _tPARENT) {
-								if (p == (a = _tPARENT[v])) {
-									return (_tFCHLD[p] = _tPREV[_tNEXT[v] = _tFCHLD[p]] = v)
-								}
-								--_tQCHLD[a]
-							}
-						} else {
-							if (v in _tPARENT) {
-								if (p == (a = _tPARENT[v])) {
-									return v
-								}
-								delete _tPREV[_tFCHLD[a] = _tNEXT[v]]
-								--_tQCHLD[a]
-							} else {
-								delete _tPREV[_tNEXT[v]]
-							}
-						}
-						++_tQCHLD[p]
-						return (_tFCHLD[p] = _tPREV[_tNEXT[v] = _tFCHLD[_tPARENT[v] = p]] = v)
-					} else {
-						if (v in _tPREV) {
-							if (v in _tPARENT) {
-								delete _tNEXT[_tLCHLD[a = _tPARENT[v]] = _tPREV[v]]
-								if (p == a) {
-									delete _tPREV[v]
-									return (_tFCHLD[p] = _tPREV[_tNEXT[v] = _tFCHLD[p]] = v)
-								}
-								--_tQCHLD[a]
-							} else {
-								delete _tNEXT[_tPREV[v]]
-							}
-							delete _tPREV[v]
-						} else {
-							if (v in _tPARENT) {
-								if (p == (a = _tPARENT[v])) {
-									return v
-								}
-								delete _tFCHLD[a]
-								delete _tLCHLD[a]
-								delete _tQCHLD[a]
-							}
-						}
-						++_tQCHLD[p]
-						return (_tFCHLD[p] = _tPREV[_tNEXT[v] = _tFCHLD[_tPARENT[v] = p]] = v)
-					}
-				} else {
-					while (p in _tPREV) {
-						p = _tPREV[p]
-					}
-					if (v in _tPREV) {
-						if (v in _tPARENT) {
-							--_tQCHLD[a = _tPARENT[v]]
-							delete _tPARENT[v]
-							if (v in _tNEXT) {
-								_tNEXT[_tPREV[a] = _tPREV[v]] = a = _tNEXT[v]
-							} else {
-								delete _tNEXT[_tLCHLD[a] = _tPREV[v]]
-							}
-						} else {
-							if (v in _tNEXT) {
-								_tNEXT[_tPREV[a] = _tPREV[v]] = a = _tNEXT[v]
-							} else {
-								delete _tNEXT[_tPREV[v]]
-							}
-						}
-						delete _tPREV[v]
-					} else {
-						if (p == v) {
-							return v
-						}
-						if (v in _tPARENT) {
-							if (v in _tNEXT) {
-								delete _tPREV[_tFCHLD[a = _tPARENT[v]] = _tNEXT[v]]
-								--_tQCHLD[a]
-							} else {
-								delete _tLCHLD[a = _tPARENT[v]]
-								delete _tFCHLD[a]
-								delete _tQCHLD[a]
-							}
-							delete _tPARENT[v]
-						} else {
-							if (v in _tNEXT) {
-								delete _tPREV[_tNEXT[v]]
-							}
-						}
-					}
-					return (_tPREV[_tNEXT[v] = p] = v)
-				}
-			} else {
-				if (v == 0) {
-					return v
-				}
-				return v
-			}
+	delete _tSTACK[p][a = ++_tSTACK[p][0]]
+	return (_tSTACK[p][a] = aA)
+}
+
+# prefix	-
+# prichr	- aware character `{', `^',`]'
+# sechr	- aware character `.' as the first char of sechr, and character `}'
+# suffix	- aware character `]'
+# cntptr	- aware character `]'
+
+function _tr(n, cs, H)
+{
+	#_tuidinitcs[p]=cs
+	#2 uidel, 5 pfx, 7 hichr,11(10) lochr,14 suffix
+	_rconline(n ": " cs)
+	_rconl()
+	if (match(cs, /^((([^\xB4:\[\|\]]*\xB4.)*[^\xB4:\[\|\]]*):)?((([^\xB4\[\|\]]*\xB4.)*[^\xB4\[\|\]]*)\[)?(([^\xB4\|\]]*\xB4.)*[^\xB4\|\]]*)?(\|(\.)?(([^\xB4\]]*\xB4.)*[^\xB4\]]*))?(\](.*))?$/, H)) {
+		_rconl("delptr: " _une(H[2]) "'")
+		_rconl("pfxstr: " _une(H[5]) "'")
+		_rconl("hichr:  " _une(H[7]) "'")
+		_rconl("lochr:  " _une((H[10] ? H[7] "' and " H[11] "'" : H[11] "'")))
+		_rconl("sfxstr: " _une(H[14]) "'")
+	} else {
+		_rconl("NOT MATCH!")
+	}
+	_rconl()
+}
+
+#_______________________________________________________________________
+function _trace(t, d, A)
+{
+	if (_ERRLOG_TF) {
+		A["TYPE"] = "TRACE"
+		A["TEXT"] = t
+		_log(A, d)
+	}
+}
+
+#_________________________________________________________________
+function _trunframe(f, p, p0, p1, p2)
+{
+	return _tframe((f ? f : "_trunframe_i0"), p, p0, p1, p2)
+}
+
+#_________________________________________________________________
+function _trunframe_i0(p, p0, p1, p2, f)
+{
+	if (p in _tFN) {
+		f = _tFN[p]
+		return @f(p, p0, p1, p2)
+	}
+}
+
+#_________________________________________________________________
+function _trunframex(f, p, p0, p1)
+{
+	return _tframex((f ? f : "_trunframe_i0"), p, p0, p1)
+}
+
+#_________________________________________________________________
+function _trunpass(f, p, p0, p1)
+{
+	return _tpass((f ? f : "_trunframe_i0"), p, p0, p1)
+}
+
+#_________________________________________________________________
+function _trunpassx(f, p, p0, p1)
+{
+	return _tpassx((f ? f : "_trunframe_i0"), p, p0, p1)
+}
+
+#_________________________________________________________________
+function _tsetsp(p, v)
+{
+	return (_tSTACK[p][0] = v)
+}
+
+#			dptr			- morg ptr; in case if object deleted then _CLASSPTR[ptr] will be deleted(object is death), but
+#							_tUIDEL[_CLASSPTR[ptr]] will be created that object can be resurrected from morg
+#							dptr can be any string containing any characters except `:'. It's not verified
+#			pfx,sfx		- uid prefix str, and uid suffix str; this strings specifies string that can be inserted before/after
+#							uid generated by uid generator:
+#
+#								class uid:			pfx uidgen sfx
+#
+#							Both can be any string(including ""), and can contains any character with B4-escaping feature.
+#							Note: that this strings cannot contains "'" character: it's should be escaped by B4-escaper.
+#			hstr,lstr		- this values configure uid-generator itself. ther is a 3 combinations regarding its:
+#
+#								hstr			lstr			function
+#
+#								`ptr			*			- specify pointer to external uid-generator
+#														All uids and chars will be generated by external uid-generator
+#								*			^ptr			- class will have it's own uid generator using external character set
+#								str			str			- class will have it's own uid generator with it's own character set
+#														character set inmplemented in hstr(high-charset) and in lstr(low-charset) in 2 ways:
+#							1)	"AB"			"AB01"			- this mean that high-charset contain chars: `A' and `B'
+#																low-charset contains chars: `A', `B', `0', `1'
+#
+#							2)	"Az,By"		"Ax,Bw,0v,1u"		- this mean that high-charset contain chars: `Az' and `By'
+#																low-charset contains chars:  `Ax', `Bw', `0v', `1u'
+#															Note: both: hstr and lstr cannot contain char `,' directly, but it's can uses
+#																	B4-escaper to escape any char including `,'
+
+
+
+# !!!! in case of using `,' in hstr/lstr - the escaped `,' will leads to interpretate hstr and lstr as divided by `,'
+# if parameters error then i should be more specific about what error in parameters detected
+# document _inituid(): parameters; document cs: uid initialization string format
+# test with escape char
+# adv hstr and lstr splitting?
+# chk if hstr len==0 ?
+# return _tclass & report error?
+# _tapi thru function
+
+# additional syntax checking ???
+# implement syntax and uid srv in docs
+# add _dumpuid() ????
+# make performance measurement
+# protection against badchar list
+# additional feature to specify _getuid() to not resurrect uid; and informative that uid was ressurected or not
+# build _defclass fn
+
+# _tuidinitcs ????
+# _tuidchrh[p]
+# _tuidchrl[p]
+# _tuidchr[p]
+# _tuidcnt[p]
+# _tUIDPFX[p]
+# _tUIDSFX[p]
+# _tUIDEL
+# _tUIDCNTH
+# _tUIDCNTL
+# _tUIDCHRL
+# _tUIDCHRH
+
+# create default class basic `new' and `del' functions
+
+
+
+function _tstini()
+{
+	_ini("uidel:pfx'hstr|lstr'sfx")
+	_ini("uidel:pfx'hstr|lstr'")
+	_ini("uidel:'hstr|lstr'sfx")
+	_ini("uidel:'hstr|lstr'")
+	_ini("uidel:pfx'hstr'sfx")
+	_ini("uidel:pfx'hstr'")
+	_ini("uidel:'hstr'sfx")
+	_ini("uidel:'hstr'")
+	_conl()
+	_conl("########################################################################################")
+	_conl()
+	_ini("pfx'hstr|lstr'sfx")
+	_ini("pfx'hstr|lstr'")
+	_ini("'hstr|lstr'sfx")
+	_ini("'hstr|lstr'")
+	_ini("pfx'hstr'sfx")
+	_ini("pfx'hstr'")
+	_ini("'hstr'sfx")
+	_ini("'hstr'")
+	_conl()
+	_conl("########################################################################################")
+	_conl()
+	_ini("uidel:pfx'`cntptr'sfx")
+	_ini("uidel:pfx'`cntptr'")
+	_ini("uidel:'`cntptr'sfx")
+	_ini("uidel:'`cntptr'")
+	_conl()
+	_conl("########################################################################################")
+	_conl()
+	_ini("pfx'`cntptr'sfx")
+	_ini("pfx'`cntptr'")
+	_ini("'`cntptr'sfx")
+	_ini("'`cntptr'")
+	_conl()
+	_conl("########################################################################################")
+	_conl()
+	_ini("uidel:pfx'^chrptr'sfx")
+	_ini("uidel:pfx'^chrptr'")
+	_ini("uidel:'^chrptr'sfx")
+	_ini("uidel:'^chrptr'")
+	_conl()
+	_conl("########################################################################################")
+	_conl()
+	_ini("pfx'^chrptr'sfx")
+	_ini("pfx'^chrptr'")
+	_ini("'^chrptr'sfx")
+	_ini("'^chrptr'")
+	_conl()
+	_conl("########################################################################################")
+	_conl()
+}
+
+function _tstv(p, A, r, f)
+{
+	if (f == "") {
+		f = "tst_splitstr"
+	}
+	@f(_NOP, A, p)
+	@f(AA0, A, p)
+	@f(AB0, A, p)
+	@f(AC0, A, p)
+	@f("", A, p)
+	@f("a", A, p)
+	@f("\264a", A, p)
+	@f("\264", A, p)
+	@f("a\264\264\264,ba\264\264\264,", A, p)
+	@f("\264,", A, p)
+	@f(",", A, p)
+	@f("\264a,", A, p)
+	@f("ab,", A, p)
+	@f("ab,\264", A, p)
+	@f("\264a\264,,ba", A, p)
+	@f(",a,,b\264,c,,\264a,,\264,,,", A, p)
+}
+
+function _typ(p)
+{
+	return (_t0 = (isarray(p) ? "#" : (p == 0 ? (p == "" ? 0 : (p in _CLASSPTR ? "`" : (p ? 3 : 4))) : (p in _CLASSPTR ? "`" : (p + 0 == p ? 5 : (p ? 3 : 2))))))
+}
+
+function _typa(p, A)
+{
+	return (_t0 = (isarray(p) ? "#" : (p == 0 ? (p == "" ? 0 : (p in A ? "`" : (p ? 3 : 4))) : (p in A ? "`" : (p + 0 == p ? 5 : (p ? 3 : 2))))))
+}
+
+#_____________________________________________________
+#	_tframe0(hndstr,ptr)
+#
+#
+#			IN:
+#			MOD:
+#			OUT:
+#			RETURN:
+#
+#	handler string:
+#		Handler-string divides to words. Word splitter is char ";"
+#
+#	Note that handler-string processed left to right. This mean that next word(more rightly) will overwrite fields implemented before(leftmost).
+#	Note that if word-string contains more than one rexp-field then only last rexp-field(most rightly) will be applied.
+#_______________________________________________
+# TO DESIGN:
+#
+# 0-4: complete design of tlink handler call
+# 1-4: add new tlink handler call
+# 1-4: add new run fn (changed rexp to different for each type: see _tframe0)
+#
+# hndstr:
+#	may be add rexp for each type of handler and also total rexp for all ??? ADDED (test)
+#	may be add separator char ";" ???		ADDED (test)
+#_______________________________________________________________________
+function _tzend(a, b)
+{
+	if (b == 0 && b == "") {
+		return (_TEND[_TEND[_ARRLEN]] = a)
+	} else {
+		return (_TEND[_TEND[_ARRLEN] + a] = b)
+	}
+}
+
+function _uidcyc(p, i)
+{
+	_dumpuidgen(p)
+	for (i = 1; i < 64 * 8 * 6 - 1; i++) {
+		_conl(i ":" _var(_getuid(p)))
+	}
+	_dumpuidgen(p)
+}
+
+function _une(t)
+{
+	return gensub(/\xB4(.)/, "\\1", "G", t)
+}
+
+#___________________________________________________________________________________
+function _unformatrexp(t)
+{
+	_formatstrq0 = split(t, _FORMATSTRA, /(\\[0-9]{1,3})|(\\x[[:xdigit:]]+)|(\\.)/, _FORMATSTRB)
+	_formatstrs0 = ""
+	for (t = 1; t < _formatstrq0; t++) {
+		_formatstrs0 = _formatstrs0 _FORMATSTRA[t] ((_FORMATSTRB[t] in _QESCHR ? _QESCREXP[_FORMATSTRB[t]] : _QESCREXP[toupper(substr(_FORMATSTRB[t], length(_FORMATSTRB[t]) - 1))]))
+	}
+	return (_formatstrs0 _FORMATSTRA[t])
+}
+
+#___________________________________________________________
+function _unformatrexp_init(i, a)
+{
+	_formatstrs0 = "\\^$.[]|()*+?{}-sSwW<>yB`'"
+	delete _FORMATSTRB
+	for (i = 0; i < 256; i++) {
+		_QESCREXP["\\" _CHR[i]] = (index(_formatstrs0, _CHR[i]) ? "\\" _CHR[i] : _CHR[i])
+	}
+	for (i = 0; i < 256; i++) {
+		a = (index(_formatstrs0, _CHR[i]) ? "\\" : "")
+		_QESCREXP[sprintf("%.2X", i)] = a _CHR[i]
+		_QESCREXP["\\" sprintf("%.3o", i)] = a _CHR[i]
+		if (i < 8) {
+			_QESCREXP["\\" sprintf("%.1o", i)] = a _CHR[i]
+		}
+		if (i < 64) {
+			_QESCREXP["\\" sprintf("%.2o", i)] = a _CHR[i]
+		}
+		if (i < 16) {
+			_QESCREXP["\\x" sprintf("%.1X", i)] = _QESCREXP["\\x" sprintf("%.1x", i)] = a _CHR[i]
+		}
+	}
+	patsplit("a" 7 "b" 8 "f" 12 "n" 10 "r" 13 "t" 9 "v" 11, _FORMATSTRA, /[^0-9]/, _FORMATSTRB)
+	for (i in _FORMATSTRA) {
+		_QESCREXP["\\" _FORMATSTRA[i]] = _CHR[_FORMATSTRB[i] + 0]
+	}
+}
+
+#___________________________________________________________________________________
+function _unformatstr(t)
+{
+	_formatstrq0 = split(t, _FORMATSTRA, /(\\[0-9]{1,3})|(\\x[[:xdigit:]]+)|(\\.)/, _FORMATSTRB)
+	_formatstrs0 = ""
+	for (t = 1; t < _formatstrq0; t++) {
+		_formatstrs0 = _formatstrs0 _FORMATSTRA[t] ((_FORMATSTRB[t] in _QESCHR ? _QESCHR[_FORMATSTRB[t]] : _QESCHR[toupper(substr(_FORMATSTRB[t], length(_FORMATSTRB[t]) - 1))]))
+	}
+	return (_formatstrs0 _FORMATSTRA[t])
+}
+
+#___________________________________________________________
+function _unformatstr_init(i)
+{
+	for (i = 0; i < 256; i++) {
+		_QESCHR["\\" _CHR[i]] = _CHR[i]
+	}
+	for (i = 0; i < 256; i++) {
+		_QESCHR[sprintf("%.2X", i)] = _CHR[i]
+		_QESCHR["\\" sprintf("%.3o", i)] = _CHR[i]
+		if (i < 8) {
+			_QESCHR["\\" sprintf("%.1o", i)] = _CHR[i]
+		}
+		if (i < 64) {
+			_QESCHR["\\" sprintf("%.2o", i)] = _CHR[i]
+		}
+		if (i < 16) {
+			_QESCHR["\\x" sprintf("%.1X", i)] = _QESCHR["\\x" sprintf("%.1x", i)] = _CHR[i]
+		}
+	}
+	i = "a" 7 "b" 8 "f" 12 "n" 10 "r" 13 "t" 9 "v" 11
+	patsplit(i, _FORMATSTRA, /[^0-9]/, _FORMATSTRB)
+	for (i in _FORMATSTRA) {
+		_QESCHR["\\" _FORMATSTRA[i]] = _CHR[_FORMATSTRB[i] + 0]
+	}
+}
+
+#_____________________________________________________________________________
+function _uninit_del(A, i, p0)
+{
+	_del(i)
+}
+
+####################################################################################
+# PUBLIC:
+#_____________________________________________________________________________
+#	var	_SYS_STDOUT			- (by default = "/dev/stdout") standart output pipe filename
+#	var	_SYS_STDERR			- (by default = "/dev/stderr") standart error output pipe filename
+#	var	_SYS_STDCON			- (by default = "CON") standart console output device
+#_____________________________________________________________________________
+#	var	_CHR["CR"]			- return cursor to the position 0 without newline(normally ="\x0D")
+#	var	_CHR["EOL"]			- return cursor to the position 0 & newline (MS:="\x0D\x0A" / UX:="\x0D")
+#	var	_CON_WIDTH 			- console width(columns number)
+#_____________________________________________________________________________
+#	fn	_cmd(c)			- execute shell command c and return output
+#	fn	_err				- output string w\o any addition into _SYS_STDERR device
+#	fn	_errnl			- output string with addition _CHR["EOL"] at the end of the string into _SYS_STDERR device
+#	fn	_out				- output string w\o any addition into _SYS_STDOUT device
+#	fn	_outnl			- output string with addition _CHR["EOL"] at the end of the string into _SYS_STDOUT device
+#_____________________________________________________________________________
+#	fn	_con(text[,tabspace])
+#	fn	_conl(text[,tabspace])
+#	fn	_conline(text[,tabspace])
+#	fn	_constat(status[,tabspace])
+#	fn	_constatpush([status[,tabspace]])
+#	fn	_constatpop()
+#_______________________________________________________________________
+#	var	_constatstr
+####################################################################################
+
+
+function _unstr(t)
+{
+	return gensub(/\\(.)/, "\\1", "G", t)
+}
+
+#_________________________________________________________________
+function _untmp(f, a)
+{
+	if (f = filepath(f)) {
+		if (match(f, /\\$/)) {
+			_deletepfx(_FILEIO_RDTMP, a = toupper(f))
+			_deletepfx(_FILEIO_RDNETMP, a)
 		} else {
-			if (p == 0) {
-				return v
-			}
-			if (v) {
-				return _texclude(v)
-			}
-			return v
+			delete _FILEIO_RDNETMP[toupper(f)]
 		}
+		return f
 	}
-
-	function _wFCHLD(p, v, a)
-	{
-		if (p) {
-			if (v) {
-				if (p == v) {
+	return ""
+}
+
+#_____________________________________________________________________________
+function _val(v, t)
+{
+	if (isarray(v)) {
+		return (_dumparr(v) _ln(t))
+	}
+	if (v == 0 && v == "") {
+		return (_ln("- (ERRNO=" ERRNO ")") _ln(t))
+	}
+	return (_ln(v "'") _ln(t))
+}
+
+#_____________________________________________________________________________
+function _val0(v)
+{
+	if (isarray(v)) {
+		return _dumparr(v)
+	}
+	if (v == 0 && v == "") {
+		return "-"
+	}
+	return ("\"" v "\"")
+}
+
+#_____________________________________________________________________________
+function _var(v, t)
+{
+	if (isarray(v)) {
+		return (_dumparr(v) _ln(t))
+	}
+	if (v == 0 && v == "") {
+		return (_ln("- (ERRNO=" ERRNO ")") _ln(t))
+	}
+	return (_ln(v "'") _ln(t))
+}
+
+#_______________________________________________________________________
+function _verb(t, d, A)
+{
+	if (_ERRLOG_VF) {
+		A["TYPE"] = "VERB"
+		A["TEXT"] = t
+		_log(A, d)
+	}
+}
+
+#_________________________________________________________________
+function _wFBRO(p, v, a)
+{
+	if (p) {
+		if (v) {
+			for (a = p; a in _tPARENT; ) {
+				if ((a = _tPARENT[a]) == v) {
 					return v
 				}
-				for (a = p; a in _tPARENT; ) {
-					if ((a = _tPARENT[a]) == v) {
-						return v
-					}
-				}
+			}
+			if (p in _tPARENT) {
+				p = _tPARENT[p]
 				if (v in _tNEXT) {
 					if (v in _tPREV) {
 						_tPREV[_tNEXT[a] = _tNEXT[v]] = a = _tPREV[v]
@@ -5925,11 +7355,8 @@
 							delete _tPREV[_tNEXT[v]]
 						}
 					}
-					if (p in _tFCHLD) {
-						++_tQCHLD[p]
-						return (_tFCHLD[p] = _tPREV[_tNEXT[v] = _tFCHLD[_tPARENT[v] = p]] = v)
-					}
-					delete _tNEXT[v]
+					++_tQCHLD[p]
+					return (_tFCHLD[p] = _tPREV[_tNEXT[v] = _tFCHLD[_tPARENT[v] = p]] = v)
 				} else {
 					if (v in _tPREV) {
 						if (v in _tPARENT) {
@@ -5953,167 +7380,172 @@
 							delete _tQCHLD[a]
 						}
 					}
-					if (p in _tFCHLD) {
-						++_tQCHLD[p]
-						return (_tFCHLD[p] = _tPREV[_tNEXT[v] = _tFCHLD[_tPARENT[v] = p]] = v)
-					}
+					++_tQCHLD[p]
+					return (_tFCHLD[p] = _tPREV[_tNEXT[v] = _tFCHLD[_tPARENT[v] = p]] = v)
 				}
-				_tQCHLD[p] = 1
-				return (_tFCHLD[_tPARENT[v] = p] = _tLCHLD[p] = v)
 			} else {
-				if (v == 0) {
-					if (p in _tFCHLD) {
-						v = _tFCHLD[p]
-						delete _tFCHLD[p]
-						delete _tLCHLD[p]
-						delete _tQCHLD[p]
-						do {
-							delete _tPARENT[v]
-						} while (v in _tNEXT && (v = _tNEXT[v]))
+				while (p in _tPREV) {
+					p = _tPREV[p]
+				}
+				if (v in _tPREV) {
+					if (v in _tPARENT) {
+						--_tQCHLD[a = _tPARENT[v]]
+						delete _tPARENT[v]
+						if (v in _tNEXT) {
+							_tNEXT[_tPREV[a] = _tPREV[v]] = a = _tNEXT[v]
+						} else {
+							delete _tNEXT[_tLCHLD[a] = _tPREV[v]]
+						}
+					} else {
+						if (v in _tNEXT) {
+							_tNEXT[_tPREV[a] = _tPREV[v]] = a = _tNEXT[v]
+						} else {
+							delete _tNEXT[_tPREV[v]]
+						}
+					}
+					delete _tPREV[v]
+				} else {
+					if (p == v) {
+						return v
+					}
+					if (v in _tPARENT) {
+						if (v in _tNEXT) {
+							delete _tPREV[_tFCHLD[a = _tPARENT[v]] = _tNEXT[v]]
+							--_tQCHLD[a]
+						} else {
+							delete _tLCHLD[a = _tPARENT[v]]
+							delete _tFCHLD[a]
+							delete _tQCHLD[a]
+						}
+						delete _tPARENT[v]
+					} else {
+						if (v in _tNEXT) {
+							delete _tPREV[_tNEXT[v]]
+						}
 					}
 				}
-				return v
+				return (_tPREV[_tNEXT[v] = p] = v)
 			}
 		} else {
-			if (p == 0) {
+			if (v == 0) {
 				return v
 			}
 			return v
 		}
+	} else {
+		if (p == 0) {
+			return v
+		}
+		if (v) {
+			return _texclude(v)
+		}
+		return v
 	}
+}
 
-	function _wLBRO(p, v, a)
-	{
-		if (p) {
-			if (v) {
-				for (a = p; a in _tPARENT; ) {
-					if ((a = _tPARENT[a]) == v) {
-						return v
-					}
+#_________________________________________________________________
+function _wFCHLD(p, v, a)
+{
+	if (p) {
+		if (v) {
+			if (p == v) {
+				return v
+			}
+			for (a = p; a in _tPARENT; ) {
+				if ((a = _tPARENT[a]) == v) {
+					return v
 				}
-				if (p in _tPARENT) {
-					p = _tPARENT[p]
-					if (v in _tPREV) {
-						if (v in _tNEXT) {
-							_tNEXT[_tPREV[a] = _tPREV[v]] = a = _tNEXT[v]
-							delete _tNEXT[v]
-							if (v in _tPARENT) {
-								if (p == (a = _tPARENT[v])) {
-									return (_tLCHLD[p] = _tNEXT[_tPREV[v] = _tLCHLD[p]] = v)
-								}
-								--_tQCHLD[a]
-							}
-						} else {
-							if (v in _tPARENT) {
-								if (p == (a = _tPARENT[v])) {
-									return v
-								}
-								delete _tNEXT[_tLCHLD[a] = _tPREV[v]]
-								--_tQCHLD[a]
-							} else {
-								delete _tNEXT[_tPREV[v]]
-							}
-						}
-						++_tQCHLD[p]
-						return (_tLCHLD[p] = _tNEXT[_tPREV[v] = _tLCHLD[_tPARENT[v] = p]] = v)
-					} else {
-						if (v in _tNEXT) {
-							if (v in _tPARENT) {
-								delete _tPREV[_tFCHLD[a = _tPARENT[v]] = _tNEXT[v]]
-								if (p == a) {
-									delete _tNEXT[v]
-									return (_tLCHLD[p] = _tNEXT[_tPREV[v] = _tLCHLD[p]] = v)
-								}
-								--_tQCHLD[a]
-							} else {
-								delete _tPREV[_tNEXT[v]]
-							}
-							delete _tNEXT[v]
-						} else {
-							if (v in _tPARENT) {
-								if (p == (a = _tPARENT[v])) {
-									return v
-								}
-								delete _tLCHLD[a]
-								delete _tFCHLD[a]
-								delete _tQCHLD[a]
-							}
+			}
+			if (v in _tNEXT) {
+				if (v in _tPREV) {
+					_tPREV[_tNEXT[a] = _tNEXT[v]] = a = _tPREV[v]
+					delete _tPREV[v]
+					if (v in _tPARENT) {
+						if (p == (a = _tPARENT[v])) {
+							return (_tFCHLD[p] = _tPREV[_tNEXT[v] = _tFCHLD[p]] = v)
 						}
-						++_tQCHLD[p]
-						return (_tLCHLD[p] = _tNEXT[_tPREV[v] = _tLCHLD[_tPARENT[v] = p]] = v)
+						--_tQCHLD[a]
 					}
 				} else {
-					while (p in _tNEXT) {
-						p = _tNEXT[p]
+					if (v in _tPARENT) {
+						if (p == (a = _tPARENT[v])) {
+							return v
+						}
+						delete _tPREV[_tFCHLD[a] = _tNEXT[v]]
+						--_tQCHLD[a]
+					} else {
+						delete _tPREV[_tNEXT[v]]
 					}
-					if (v in _tNEXT) {
-						if (v in _tPARENT) {
-							--_tQCHLD[a = _tPARENT[v]]
-							delete _tPARENT[v]
-							if (v in _tPREV) {
-								_tPREV[_tNEXT[a] = _tNEXT[v]] = a = _tPREV[v]
-							} else {
-								delete _tPREV[_tFCHLD[a] = _tNEXT[v]]
-							}
-						} else {
-							if (v in _tPREV) {
-								_tPREV[_tNEXT[a] = _tNEXT[v]] = a = _tPREV[v]
-							} else {
-								delete _tPREV[_tNEXT[v]]
-							}
+				}
+				if (p in _tFCHLD) {
+					++_tQCHLD[p]
+					return (_tFCHLD[p] = _tPREV[_tNEXT[v] = _tFCHLD[_tPARENT[v] = p]] = v)
+				}
+				delete _tNEXT[v]
+			} else {
+				if (v in _tPREV) {
+					if (v in _tPARENT) {
+						delete _tNEXT[_tLCHLD[a = _tPARENT[v]] = _tPREV[v]]
+						if (p == a) {
+							delete _tPREV[v]
+							return (_tFCHLD[p] = _tPREV[_tNEXT[v] = _tFCHLD[p]] = v)
 						}
-						delete _tNEXT[v]
+						--_tQCHLD[a]
 					} else {
-						if (p == v) {
+						delete _tNEXT[_tPREV[v]]
+					}
+					delete _tPREV[v]
+				} else {
+					if (v in _tPARENT) {
+						if (p == (a = _tPARENT[v])) {
 							return v
 						}
-						if (v in _tPARENT) {
-							if (v in _tPREV) {
-								delete _tNEXT[_tLCHLD[a = _tPARENT[v]] = _tPREV[v]]
-								--_tQCHLD[a]
-							} else {
-								delete _tFCHLD[a = _tPARENT[v]]
-								delete _tLCHLD[a]
-								delete _tQCHLD[a]
-							}
-							delete _tPARENT[v]
-						} else {
-							if (v in _tPREV) {
-								delete _tNEXT[_tPREV[v]]
-							}
-						}
+						delete _tFCHLD[a]
+						delete _tLCHLD[a]
+						delete _tQCHLD[a]
 					}
-					return (_tNEXT[_tPREV[v] = p] = v)
 				}
-			} else {
-				if (v == 0) {
-					return v
+				if (p in _tFCHLD) {
+					++_tQCHLD[p]
+					return (_tFCHLD[p] = _tPREV[_tNEXT[v] = _tFCHLD[_tPARENT[v] = p]] = v)
 				}
-				return v
 			}
+			_tQCHLD[p] = 1
+			return (_tFCHLD[_tPARENT[v] = p] = _tLCHLD[p] = v)
 		} else {
-			if (p == 0) {
-				return v
-			}
-			if (v) {
-				return _texclude(v)
+			if (v == 0) {
+				if (p in _tFCHLD) {
+					v = _tFCHLD[p]
+					delete _tFCHLD[p]
+					delete _tLCHLD[p]
+					delete _tQCHLD[p]
+					do {
+						delete _tPARENT[v]
+					} while (v in _tNEXT && (v = _tNEXT[v]))
+				}
 			}
 			return v
 		}
+	} else {
+		if (p == 0) {
+			return v
+		}
+		return v
 	}
+}
 
-	function _wLCHLD(p, v, a)
-	{
-		if (p) {
-			if (v) {
-				if (p == v) {
+#_________________________________________________________________
+function _wLBRO(p, v, a)
+{
+	if (p) {
+		if (v) {
+			for (a = p; a in _tPARENT; ) {
+				if ((a = _tPARENT[a]) == v) {
 					return v
 				}
-				for (a = p; a in _tPARENT; ) {
-					if ((a = _tPARENT[a]) == v) {
-						return v
-					}
-				}
+			}
+			if (p in _tPARENT) {
+				p = _tPARENT[p]
 				if (v in _tPREV) {
 					if (v in _tNEXT) {
 						_tNEXT[_tPREV[a] = _tPREV[v]] = a = _tNEXT[v]
@@ -6135,11 +7567,8 @@
 							delete _tNEXT[_tPREV[v]]
 						}
 					}
-					if (p in _tLCHLD) {
-						++_tQCHLD[p]
-						return (_tLCHLD[p] = _tNEXT[_tPREV[v] = _tLCHLD[_tPARENT[v] = p]] = v)
-					}
-					delete _tPREV[v]
+					++_tQCHLD[p]
+					return (_tLCHLD[p] = _tNEXT[_tPREV[v] = _tLCHLD[_tPARENT[v] = p]] = v)
 				} else {
 					if (v in _tNEXT) {
 						if (v in _tPARENT) {
@@ -6163,596 +7592,763 @@
 							delete _tQCHLD[a]
 						}
 					}
-					if (p in _tLCHLD) {
-						++_tQCHLD[p]
-						return (_tLCHLD[p] = _tNEXT[_tPREV[v] = _tLCHLD[_tPARENT[v] = p]] = v)
-					}
+					++_tQCHLD[p]
+					return (_tLCHLD[p] = _tNEXT[_tPREV[v] = _tLCHLD[_tPARENT[v] = p]] = v)
 				}
-				_tQCHLD[p] = 1
-				return (_tLCHLD[_tPARENT[v] = p] = _tFCHLD[p] = v)
 			} else {
-				if (v == 0) {
-					if (p in _tFCHLD) {
-						v = _tFCHLD[p]
-						delete _tFCHLD[p]
-						delete _tLCHLD[p]
-						delete _tQCHLD[p]
-						do {
-							delete _tPARENT[v]
-						} while (v in _tNEXT && (v = _tNEXT[v]))
+				while (p in _tNEXT) {
+					p = _tNEXT[p]
+				}
+				if (v in _tNEXT) {
+					if (v in _tPARENT) {
+						--_tQCHLD[a = _tPARENT[v]]
+						delete _tPARENT[v]
+						if (v in _tPREV) {
+							_tPREV[_tNEXT[a] = _tNEXT[v]] = a = _tPREV[v]
+						} else {
+							delete _tPREV[_tFCHLD[a] = _tNEXT[v]]
+						}
+					} else {
+						if (v in _tPREV) {
+							_tPREV[_tNEXT[a] = _tNEXT[v]] = a = _tPREV[v]
+						} else {
+							delete _tPREV[_tNEXT[v]]
+						}
+					}
+					delete _tNEXT[v]
+				} else {
+					if (p == v) {
+						return v
+					}
+					if (v in _tPARENT) {
+						if (v in _tPREV) {
+							delete _tNEXT[_tLCHLD[a = _tPARENT[v]] = _tPREV[v]]
+							--_tQCHLD[a]
+						} else {
+							delete _tFCHLD[a = _tPARENT[v]]
+							delete _tLCHLD[a]
+							delete _tQCHLD[a]
+						}
+						delete _tPARENT[v]
+					} else {
+						if (v in _tPREV) {
+							delete _tNEXT[_tPREV[v]]
+						}
 					}
 				}
-				return v
+				return (_tNEXT[_tPREV[v] = p] = v)
 			}
 		} else {
-			if (p == 0) {
+			if (v == 0) {
 				return v
 			}
 			return v
 		}
+	} else {
+		if (p == 0) {
+			return v
+		}
+		if (v) {
+			return _texclude(v)
+		}
+		return v
 	}
+}
 
-	function _wLINK(p, v)
-	{
-		return (_tLINK[p] = v)
-	}
-
-	function _wNEXT(p, v, a, b)
-	{
-		if (p) {
-			if (v) {
-				if (p == v) {
+#_________________________________________________________________
+function _wLCHLD(p, v, a)
+{
+	if (p) {
+		if (v) {
+			if (p == v) {
+				return v
+			}
+			for (a = p; a in _tPARENT; ) {
+				if ((a = _tPARENT[a]) == v) {
 					return v
 				}
-				for (a = p; a in _tPARENT; ) {
-					if ((a = _tPARENT[a]) == v) {
-						return v
-					}
-				}
-				if (v in _tPREV) {
-					if (p == (a = _tPREV[v])) {
-						return v
-					}
-					if (v in _tNEXT) {
-						_tPREV[_tNEXT[a] = _tNEXT[v]] = a
-						if (v in _tPARENT) {
-							--_tQCHLD[_tPARENT[v]]
-						}
-					} else {
-						delete _tNEXT[a]
-						if (v in _tPARENT) {
-							_tLCHLD[b = _tPARENT[v]] = a
-							--_tQCHLD[b]
+			}
+			if (v in _tPREV) {
+				if (v in _tNEXT) {
+					_tNEXT[_tPREV[a] = _tPREV[v]] = a = _tNEXT[v]
+					delete _tNEXT[v]
+					if (v in _tPARENT) {
+						if (p == (a = _tPARENT[v])) {
+							return (_tLCHLD[p] = _tNEXT[_tPREV[v] = _tLCHLD[p]] = v)
 						}
+						--_tQCHLD[a]
 					}
 				} else {
-					if (v in _tNEXT) {
-						if (v in _tPARENT) {
-							delete _tPREV[_tFCHLD[a = _tPARENT[v]] = _tNEXT[v]]
-							--_tQCHLD[a]
-						} else {
-							delete _tPREV[_tNEXT[v]]
+					if (v in _tPARENT) {
+						if (p == (a = _tPARENT[v])) {
+							return v
 						}
+						delete _tNEXT[_tLCHLD[a] = _tPREV[v]]
+						--_tQCHLD[a]
 					} else {
-						if (v in _tPARENT) {
-							delete _tFCHLD[a = _tPARENT[v]]
-							delete _tLCHLD[a]
-							delete _tQCHLD[a]
-						}
+						delete _tNEXT[_tPREV[v]]
 					}
 				}
-				if (p in _tNEXT) {
-					_tPREV[_tNEXT[v] = _tNEXT[p]] = v
-					if (p in _tPARENT) {
-						++_tQCHLD[_tPARENT[v] = _tPARENT[p]]
+				if (p in _tLCHLD) {
+					++_tQCHLD[p]
+					return (_tLCHLD[p] = _tNEXT[_tPREV[v] = _tLCHLD[_tPARENT[v] = p]] = v)
+				}
+				delete _tPREV[v]
+			} else {
+				if (v in _tNEXT) {
+					if (v in _tPARENT) {
+						delete _tPREV[_tFCHLD[a = _tPARENT[v]] = _tNEXT[v]]
+						if (p == a) {
+							delete _tNEXT[v]
+							return (_tLCHLD[p] = _tNEXT[_tPREV[v] = _tLCHLD[p]] = v)
+						}
+						--_tQCHLD[a]
 					} else {
-						delete _tPARENT[v]
+						delete _tPREV[_tNEXT[v]]
 					}
-				} else {
 					delete _tNEXT[v]
-					if (p in _tPARENT) {
-						++_tQCHLD[_tPARENT[_tLCHLD[a] = v] = a = _tPARENT[p]]
-					} else {
-						delete _tPARENT[v]
+				} else {
+					if (v in _tPARENT) {
+						if (p == (a = _tPARENT[v])) {
+							return v
+						}
+						delete _tLCHLD[a]
+						delete _tFCHLD[a]
+						delete _tQCHLD[a]
 					}
 				}
-				return (_tNEXT[_tPREV[v] = p] = v)
-			} else {
-				if (v == 0) {
-					return v
+				if (p in _tLCHLD) {
+					++_tQCHLD[p]
+					return (_tLCHLD[p] = _tNEXT[_tPREV[v] = _tLCHLD[_tPARENT[v] = p]] = v)
 				}
-				return v
 			}
+			_tQCHLD[p] = 1
+			return (_tLCHLD[_tPARENT[v] = p] = _tFCHLD[p] = v)
 		} else {
-			if (p == 0) {
-				return v
-			}
-			if (v) {
-				return _texclude(v)
+			if (v == 0) {
+				if (p in _tFCHLD) {
+					v = _tFCHLD[p]
+					delete _tFCHLD[p]
+					delete _tLCHLD[p]
+					delete _tQCHLD[p]
+					do {
+						delete _tPARENT[v]
+					} while (v in _tNEXT && (v = _tNEXT[v]))
+				}
 			}
 			return v
 		}
-	}
-
-	function _wPARENT(p, v)
-	{
+	} else {
+		if (p == 0) {
+			return v
+		}
 		return v
 	}
+}
 
-	function _wPREV(p, v, a, b)
-	{
-		if (p) {
-			if (v) {
-				if (p == v) {
+#_________________________________________________________________
+function _wLINK(p, v)
+{
+	return (_tLINK[p] = v)
+}
+
+#_________________________________________________________________
+function _wNEXT(p, v, a, b)
+{
+	if (p) {
+		if (v) {
+			if (p == v) {
+				return v
+			}
+			for (a = p; a in _tPARENT; ) {
+				if ((a = _tPARENT[a]) == v) {
 					return v
 				}
-				for (a = p; a in _tPARENT; ) {
-					if ((a = _tPARENT[a]) == v) {
-						return v
-					}
+			}
+			if (v in _tPREV) {
+				if (p == (a = _tPREV[v])) {
+					return v
 				}
 				if (v in _tNEXT) {
-					if (p == (a = _tNEXT[v])) {
-						return v
-					}
-					if (v in _tPREV) {
-						_tNEXT[_tPREV[a] = _tPREV[v]] = a
-						if (v in _tPARENT) {
-							--_tQCHLD[_tPARENT[v]]
-						}
-					} else {
-						delete _tPREV[a]
-						if (v in _tPARENT) {
-							_tFCHLD[b = _tPARENT[v]] = a
-							--_tQCHLD[b]
-						}
+					_tPREV[_tNEXT[a] = _tNEXT[v]] = a
+					if (v in _tPARENT) {
+						--_tQCHLD[_tPARENT[v]]
 					}
 				} else {
-					if (v in _tPREV) {
-						if (v in _tPARENT) {
-							delete _tNEXT[_tLCHLD[a = _tPARENT[v]] = _tPREV[v]]
-							--_tQCHLD[a]
-						} else {
-							delete _tNEXT[_tPREV[v]]
-						}
-					} else {
-						if (v in _tPARENT) {
-							delete _tLCHLD[a = _tPARENT[v]]
-							delete _tFCHLD[a]
-							delete _tQCHLD[a]
-						}
+					delete _tNEXT[a]
+					if (v in _tPARENT) {
+						_tLCHLD[b = _tPARENT[v]] = a
+						--_tQCHLD[b]
 					}
 				}
-				if (p in _tPREV) {
-					_tNEXT[_tPREV[v] = _tPREV[p]] = v
-					if (p in _tPARENT) {
-						++_tQCHLD[_tPARENT[v] = _tPARENT[p]]
+			} else {
+				if (v in _tNEXT) {
+					if (v in _tPARENT) {
+						delete _tPREV[_tFCHLD[a = _tPARENT[v]] = _tNEXT[v]]
+						--_tQCHLD[a]
 					} else {
-						delete _tPARENT[v]
+						delete _tPREV[_tNEXT[v]]
 					}
 				} else {
-					delete _tPREV[v]
-					if (p in _tPARENT) {
-						++_tQCHLD[_tPARENT[_tFCHLD[a] = v] = a = _tPARENT[p]]
-					} else {
-						delete _tPARENT[v]
+					if (v in _tPARENT) {
+						delete _tFCHLD[a = _tPARENT[v]]
+						delete _tLCHLD[a]
+						delete _tQCHLD[a]
 					}
 				}
-				return (_tPREV[_tNEXT[v] = p] = v)
+			}
+			if (p in _tNEXT) {
+				_tPREV[_tNEXT[v] = _tNEXT[p]] = v
+				if (p in _tPARENT) {
+					++_tQCHLD[_tPARENT[v] = _tPARENT[p]]
+				} else {
+					delete _tPARENT[v]
+				}
 			} else {
-				if (v == 0) {
-					return v
+				delete _tNEXT[v]
+				if (p in _tPARENT) {
+					++_tQCHLD[_tPARENT[_tLCHLD[a] = v] = a = _tPARENT[p]]
+				} else {
+					delete _tPARENT[v]
 				}
-				return v
 			}
+			return (_tNEXT[_tPREV[v] = p] = v)
 		} else {
-			if (p == 0) {
+			if (v == 0) {
 				return v
 			}
-			if (v) {
-				return _texclude(v)
-			}
 			return v
 		}
-	}
-
-	function _wQBRO(p, v)
-	{
+	} else {
+		if (p == 0) {
+			return v
+		}
+		if (v) {
+			return _texclude(v)
+		}
 		return v
 	}
+}
 
-	function _wQCHLD(p, v)
-	{
-		if (p) {
-			if (v) {
+#_________________________________________________________________
+function _wPARENT(p, v)
+{
+	return v
+}
+
+#_________________________________________________________________
+function _wPREV(p, v, a, b)
+{
+	if (p) {
+		if (v) {
+			if (p == v) {
+				return v
+			}
+			for (a = p; a in _tPARENT; ) {
+				if ((a = _tPARENT[a]) == v) {
+					return v
+				}
+			}
+			if (v in _tNEXT) {
+				if (p == (a = _tNEXT[v])) {
+					return v
+				}
+				if (v in _tPREV) {
+					_tNEXT[_tPREV[a] = _tPREV[v]] = a
+					if (v in _tPARENT) {
+						--_tQCHLD[_tPARENT[v]]
+					}
+				} else {
+					delete _tPREV[a]
+					if (v in _tPARENT) {
+						_tFCHLD[b = _tPARENT[v]] = a
+						--_tQCHLD[b]
+					}
+				}
 			} else {
-				if (v == 0) {
-					if (p in _tFCHLD) {
-						v = _tFCHLD[p]
-						delete _tFCHLD[p]
-						delete _tLCHLD[p]
-						delete _tQCHLD[p]
-						do {
-							delete _tPARENT[v]
-						} while (v in _tNEXT && (v = _tNEXT[v]))
+				if (v in _tPREV) {
+					if (v in _tPARENT) {
+						delete _tNEXT[_tLCHLD[a = _tPARENT[v]] = _tPREV[v]]
+						--_tQCHLD[a]
+					} else {
+						delete _tNEXT[_tPREV[v]]
+					}
+				} else {
+					if (v in _tPARENT) {
+						delete _tLCHLD[a = _tPARENT[v]]
+						delete _tFCHLD[a]
+						delete _tQCHLD[a]
 					}
 				}
-				return v
 			}
+			if (p in _tPREV) {
+				_tNEXT[_tPREV[v] = _tPREV[p]] = v
+				if (p in _tPARENT) {
+					++_tQCHLD[_tPARENT[v] = _tPARENT[p]]
+				} else {
+					delete _tPARENT[v]
+				}
+			} else {
+				delete _tPREV[v]
+				if (p in _tPARENT) {
+					++_tQCHLD[_tPARENT[_tFCHLD[a] = v] = a = _tPARENT[p]]
+				} else {
+					delete _tPARENT[v]
+				}
+			}
+			return (_tPREV[_tNEXT[v] = p] = v)
 		} else {
-			if (p == 0) {
+			if (v == 0) {
 				return v
 			}
 			return v
 		}
-	}
-
-	function _warning(t, d, A)
-	{
-		if (_ERRLOG_WF) {
-			A["TYPE"] = "WARNING"
-			A["TEXT"] = t
-			_log(A, d)
+	} else {
+		if (p == 0) {
+			return v
 		}
+		if (v) {
+			return _texclude(v)
+		}
+		return v
 	}
+}
 
-	function _wfilerdnehnd(f, t)
-	{
-		if ((f = _filerdne(f)) == "") {
-			return ""
+#_________________________________________________________________
+function _wQBRO(p, v)
+{
+	return v
+}
+
+#_________________________________________________________________
+function _wQCHLD(p, v)
+{
+	if (p) {
+		if (v) {
+		} else {
+			if (v == 0) {
+				if (p in _tFCHLD) {
+					v = _tFCHLD[p]
+					delete _tFCHLD[p]
+					delete _tLCHLD[p]
+					delete _tQCHLD[p]
+					do {
+						delete _tPARENT[v]
+					} while (v in _tNEXT && (v = _tNEXT[v]))
+				}
+			}
+			return v
 		}
-		if (! ((t = _filerd(f)) in _WFILEROOTDIR)) {
-			_cmd("md \"" t "\" 2>NUL")
-			_WFILEROOTDIR[t]
+	} else {
+		if (p == 0) {
+			return v
 		}
-		return f
+		return v
 	}
+}
 
-	function _wonl(t)
-	{
-		wonl = wonl _ln(t)
+#_______________________________________________________________________
+function _warning(t, d, A)
+{
+	if (_ERRLOG_WF) {
+		A["TYPE"] = "WARNING"
+		A["TEXT"] = t
+		_log(A, d)
 	}
+}
 
-	function _wonline(t)
-	{
-		wonl = wonl _ln(substr(" _ " t " _____________________________________________________________________________________________________________________________________", 1, 126))
+#___________________________________________________________
+function _wfilerdnehnd(f, t)
+{
+	if ((f = _filerdne(f)) == "") {
+		return ""
 	}
-
-	function _wr_shortcut(f, S)
-	{
-		if (_shrtcutf0 = _filepath(f)) {
-			ERRNO = ""
-			_shrtcuta0 = _shortcut_fpath " /A:C /F:\"" _shrtcutf0 "\" 2>&1"
-			for (f in _SHORTCUTWSTRUC) {
-				if (f in S) {
-					_shrtcuta0 = _shrtcuta0 " " _SHORTCUTWSTRUC[f] "\"" (gensub(/(\\?)$/, "\\1\\1", 1, S[f])) "\""
-				}
-			}
-			if (_shortcut_nerr(_cmd(_shrtcuta0), _shrtcutf0)) {
-				return 
-			}
-		}
-		return ((ERRNO ? ERRNO = "write shortcut: " ERRNO : _NOP))
+	if (! ((t = _filerd(f)) in _WFILEROOTDIR)) {
+		_cmd("md \"" t "\" 2>NUL")
+		_WFILEROOTDIR[t]
 	}
+	return f
+}
 
-	function _wrfile(f, d, a, b)
-	{
-		if ((f = _wfilerdnehnd(f)) == "" || _filene(f) == "") {
-			ERRNO = "Filename error"
-			return 
-		}
-		a = BINMODE
-		BINMODE = "rw"
-		b = ORS
-		ORS = ""
-		ERRNO = ""
-		print(d) > f
-		if (ERRNO) {
-			return ""
-		}
-		close(f)
-		BINMODE = a
-		ORS = b
-		if (ERRNO) {
-			return ""
-		}
-		return f
-	}
+function _wonl(t)
+{
+	wonl = wonl _ln(t)
+}
 
-	function _wrfile1(f, d, a, b)
-	{
-		if ((f = _wfilerdnehnd(f)) == "" || _filene(f) == "") {
-			ERRNO = "Filename error"
-			return 
-		}
-		a = BINMODE
-		BINMODE = "rw"
-		b = ORS
-		ORS = ""
+function _wonline(t)
+{
+	wonl = wonl _ln(substr(" _ " t " _____________________________________________________________________________________________________________________________________", 1, 126))
+}
+
+#___________________________________________________________
+function _wr_shortcut(f, S)
+{
+	if (_shrtcutf0 = _filepath(f)) {
 		ERRNO = ""
-		print(d) > f
-		if (ERRNO) {
-			return ""
+		_shrtcuta0 = _shortcut_fpath " /A:C /F:\"" _shrtcutf0 "\" 2>&1"
+		for (f in _SHORTCUTWSTRUC) {
+			if (f in S) {
+				_shrtcuta0 = _shrtcuta0 " " _SHORTCUTWSTRUC[f] "\"" (gensub(/(\\?)$/, "\\1\\1", 1, S[f])) "\""
+			}
 		}
-		close(f)
-		BINMODE = a
-		ORS = b
-		if (ERRNO) {
-			return ""
+		if (_shortcut_nerr(_cmd(_shrtcuta0), _shrtcutf0)) {
+			return 
 		}
-		return d
 	}
+	return ((ERRNO ? ERRNO = "write shortcut: " ERRNO : _NOP))
+}
 
-	function _yexport(p)
-	{
-		return _tframe("_yexport_i0", p)
+#_________________________________________________________________
+function _wrfile(f, d, a, b)
+{
+	if ((f = _wfilerdnehnd(f)) == "" || _filene(f) == "") {
+		ERRNO = "Filename error"
+		return 
 	}
+	a = BINMODE
+	BINMODE = "rw"
+	b = ORS
+	ORS = ""
+	ERRNO = ""
+	print(d) > f
+	if (ERRNO) {
+		return ""
+	}
+	close(f)
+	BINMODE = a
+	ORS = b
+	if (ERRNO) {
+		return ""
+	}
+	return f
+}
 
-	function _yexport_i0(p, p0, p1, p2)
-	{
-		if (p in _tLOG) {
-			return ("_ERRLOG: " _Zexparr(_tLOG[p]) "\n")
-		}
-		if (p in _tSTR) {
-			p = _tSTR[p]
-			gsub(/\x1B/, "\033;", p)
-			gsub(/\x0A/, "\033:", p)
-			return (p "\n")
-		}
+#___________________________________________________________
+function _wrfile1(f, d, a, b)
+{
+	if ((f = _wfilerdnehnd(f)) == "" || _filene(f) == "") {
+		ERRNO = "Filename error"
+		return 
 	}
+	a = BINMODE
+	BINMODE = "rw"
+	b = ORS
+	ORS = ""
+	ERRNO = ""
+	print(d) > f
+	if (ERRNO) {
+		return ""
+	}
+	close(f)
+	BINMODE = a
+	ORS = b
+	if (ERRNO) {
+		return ""
+	}
+	return d
+}
+
+#_______________________________________________________________________
+function _yexport(p)
+{
+	return _tframe("_yexport_i0", p)
+}
 
-	function cmp_str_idx(i1, v1, i2, v2)
-	{
-		return ((i1 < i2 ? -1 : 1))
+#_______________________________________________________________________
+function _yexport_i0(p, p0, p1, p2)
+{
+	if (p in _tLOG) {
+		return ("_ERRLOG: " _Zexparr(_tLOG[p]) "\n")
 	}
+	if (p in _tSTR) {
+		p = _tSTR[p]
+		gsub(/\x1B/, "\033;", p)
+		gsub(/\x0A/, "\033:", p)
+		return (p "\n")
+	}
+}
 
-	function filedi(f, d)
-	{
-		if ((f = filerdnehndi(f)) == "") {
-			return _FILEIO_D
-		}
-		if (f in _FILEDIRFL) {
-			return _FILEDIR[f]
-		}
-		if (f in _FILEROOT) {
-			if (d = filegetdrvdir(_FILEROOT[f])) {
-				_FILEDIRFL[f]
-			}
-			return (_FILEDIR[f] = d _FILEDIR[f])
-		}
-		if ((_FILEIO_RD, f) in _FILEDIR) {
-			return _FILEDIR[_FILEIO_RD, f]
+#_________________________________________________________________
+function cmp_str_idx(i1, v1, i2, v2)
+{
+	return ((i1 < i2 ? -1 : 1))
+}
+
+#___________________________________________________________
+function filedi(f, d)
+{
+	if ((f = filerdnehndi(f)) == "") {
+		return _FILEIO_D
+	}
+	if (f in _FILEDIRFL) {
+		return _FILEDIR[f]
+	}
+	if (f in _FILEROOT) {
+		if (d = filegetdrvdir(_FILEROOT[f])) {
+			_FILEDIRFL[f]
 		}
-		return (_FILEDIR[_FILEIO_RD, f] = _FILEIO_D _FILEDIR[f])
+		return (_FILEDIR[f] = d _FILEDIR[f])
+	}
+	if ((_FILEIO_RD, f) in _FILEDIR) {
+		return _FILEDIR[_FILEIO_RD, f]
 	}
+	return (_FILEDIR[_FILEIO_RD, f] = _FILEIO_D _FILEDIR[f])
+}
 
-	function filegetdrvdir(t, r)
-	{
-		if (t in _FILEDRV) {
-			return _FILEDRV[t]
-		}
-		if (match(r = _cmd("cd " t " 2>NUL"), /[^\x00-\x1F]+/)) {
-			r = gensub(/[ \t]*([\\\$\:])[ \t]*/, "\\1", "G", substr(r, RSTART, RLENGTH))
-			gsub(/(^[ \t]*)|([ \t]*$)/, "", r)
-			if (match(r, /\:(.*)/)) {
-				return (_FILEDRV[tolower(t)] = _FILEDRV[toupper(t)] = substr(r, RSTART + 1) ((r ~ /\\$/ ? "" : "\\")))
-			}
+#___________________________________________________________
+function filegetdrvdir(t, r)
+{
+	if (t in _FILEDRV) {
+		return _FILEDRV[t]
+	}
+	if (match(r = _cmd("cd " t " 2>NUL"), /[^\x00-\x1F]+/)) {
+		r = gensub(/[ \t]*([\\\$\:])[ \t]*/, "\\1", "G", substr(r, RSTART, RLENGTH))
+		gsub(/(^[ \t]*)|([ \t]*$)/, "", r)
+		if (match(r, /\:(.*)/)) {
+			return (_FILEDRV[tolower(t)] = _FILEDRV[toupper(t)] = substr(r, RSTART + 1) ((r ~ /\\$/ ? "" : "\\")))
 		}
-		return ""
 	}
+	return ""
+}
 
-	function filegetrootdir(f, dd, d)
-	{
-		if (f in _FILEDIRFL) {
-			if (f in _FILEROOT) {
-				return (_FILEROOT[f] _FILEDIR[f])
-			}
-			if ((dd = (dd ? dd : _FILEIO_RD), f) in _FILEROOT) {
-				return (_FILEROOT[dd, f] _FILEDIR[f])
-			}
-			return ((_FILEROOT[dd, f] = fileri(dd)) _FILEDIR[f])
-		}
+#___________________________________________________________
+function filegetrootdir(f, dd, d)
+{
+	if (f in _FILEDIRFL) {
 		if (f in _FILEROOT) {
-			if (d = filegetdrvdir(_FILEROOT[f])) {
-				_FILEDIRFL[f]
-				return (_FILEROOT[f] (_FILEDIR[f] = d _FILEDIR[f]))
-			} else {
-				return (_FILEROOT[f] _FILEDIR[f])
-			}
+			return (_FILEROOT[f] _FILEDIR[f])
 		}
 		if ((dd = (dd ? dd : _FILEIO_RD), f) in _FILEROOT) {
-			if ((dd, f) in _FILEDIR) {
-				return (_FILEROOT[dd, f] _FILEDIR[dd, f])
-			}
-			if ((d = filedi(dd) _FILEDIR[f]) ~ /^\\/) {
-				return (_FILEROOT[dd, f] (_FILEDIR[dd, f] = d))
-			}
-			return (_FILEROOT[dd, f] d)
+			return (_FILEROOT[dd, f] _FILEDIR[f])
 		}
+		return ((_FILEROOT[dd, f] = fileri(dd)) _FILEDIR[f])
+	}
+	if (f in _FILEROOT) {
+		if (d = filegetdrvdir(_FILEROOT[f])) {
+			_FILEDIRFL[f]
+			return (_FILEROOT[f] (_FILEDIR[f] = d _FILEDIR[f]))
+		} else {
+			return (_FILEROOT[f] _FILEDIR[f])
+		}
+	}
+	if ((dd = (dd ? dd : _FILEIO_RD), f) in _FILEROOT) {
 		if ((dd, f) in _FILEDIR) {
-			return ((_FILEROOT[dd, f] = fileri(dd)) _FILEDIR[dd, f])
+			return (_FILEROOT[dd, f] _FILEDIR[dd, f])
 		}
 		if ((d = filedi(dd) _FILEDIR[f]) ~ /^\\/) {
-			return ((_FILEROOT[dd, f] = fileri(dd)) (_FILEDIR[dd, f] = d))
+			return (_FILEROOT[dd, f] (_FILEDIR[dd, f] = d))
 		}
-		return ((_FILEROOT[dd, f] = fileri(dd)) d)
+		return (_FILEROOT[dd, f] d)
+	}
+	if ((dd, f) in _FILEDIR) {
+		return ((_FILEROOT[dd, f] = fileri(dd)) _FILEDIR[dd, f])
+	}
+	if ((d = filedi(dd) _FILEDIR[f]) ~ /^\\/) {
+		return ((_FILEROOT[dd, f] = fileri(dd)) (_FILEDIR[dd, f] = d))
 	}
+	return ((_FILEROOT[dd, f] = fileri(dd)) d)
+}
 
-	function filerdnehndi(st, a, c, r, d, n, A)
-	{
-		if (st) {
-			if ((c = toupper(st)) in _FILECACHE) {
-				return _FILECACHE[c]
-			}
-			if (match(st, /^[ \t]*\\[ \t]*\\/)) {
-				if (match(substr(st, a = RLENGTH + 1), /^[ \t]*([0-9A-Za-z\-]+)[ \t]*(\\[ \t]*([A-Za-z])[ \t]*\$[ \t]*)?(\\[ \t]*([0-9A-Za-z_\!\+\-\[\]\(\)\{\}\~\.]+( +[0-9A-Za-z_\!\+\-\[\]\(\)\{\}\~\.]+)*[ \t]*\\)*[ \t]*)?(([0-9A-Za-z_\!\+\.\~\-\[\]\{\}\(\)]+( +[0-9A-Za-z_\!\+\.\~\-\[\]\{\}\(\)]+)*)[ \t]*)?/, A)) {
-					a = a + RLENGTH
-					d = ((A[3] ? "\\" A[3] "$" : "")) "\\" A[5]
-					gsub(/[ \t]*\\[ \t]*/, "\\", d)
-					if ((st = toupper((r = "\\\\" A[1]) d (n = A[8]))) in _FILECACHE) {
-						return (_FILECACHE[substr(c, 1, a)] = _FILECACHE[st])
-					}
-					_FILEDIR[c = _FILECACHE[substr(c, 1, a)] = _FILECACHE[st] = ++_file_rootcntr] = d
-					_FILEDIRFL[c]
-					_FILEROOT[c] = r
-				} else {
-					_filepath_err = "UNC"
-					return ""
-				}
-			} else {
-				match(st, /^(([ \t]*\.[ \t]*\\[ \t]*)|(([ \t]*([A-Za-z])[ \t]*(\:)[ \t]*)?([ \t]*(\\)[ \t]*)?))([ \t]*(([ \t]*[0-9A-Za-z_\!\+\-\[\]\(\)\{\}\~\.]+( +[0-9A-Za-z_\!\+\-\[\]\(\)\{\}\~\.]+)*[ \t]*\\)+)[ \t]*)?([ \t]*([0-9A-Za-z_\!\+\.\~\-\[\]\{\}\(\)]+( +[0-9A-Za-z_\!\+\.\~\-\[\]\{\}\(\)]+)*)[ \t]*)?/, A)
-				if (! RLENGTH) {
-					return ""
-				}
-				d = A[8] A[10]
+#___________________________________________________________
+function filerdnehndi(st, a, c, r, d, n, A)
+{
+	if (st) {
+		if ((c = toupper(st)) in _FILECACHE) {
+			return _FILECACHE[c]
+		}
+		if (match(st, /^[ \t]*\\[ \t]*\\/)) {
+			if (match(substr(st, a = RLENGTH + 1), /^[ \t]*([0-9A-Za-z\-]+)[ \t]*(\\[ \t]*([A-Za-z])[ \t]*\$[ \t]*)?(\\[ \t]*([0-9A-Za-z_\!\+\-\[\]\(\)\{\}\~\.]+( +[0-9A-Za-z_\!\+\-\[\]\(\)\{\}\~\.]+)*[ \t]*\\)*[ \t]*)?(([0-9A-Za-z_\!\+\.\~\-\[\]\{\}\(\)]+( +[0-9A-Za-z_\!\+\.\~\-\[\]\{\}\(\)]+)*)[ \t]*)?/, A)) {
+				a = a + RLENGTH
+				d = ((A[3] ? "\\" A[3] "$" : "")) "\\" A[5]
 				gsub(/[ \t]*\\[ \t]*/, "\\", d)
-				if ((st = toupper((r = A[5] A[6]) d (n = A[14]))) in _FILECACHE) {
-					return (_FILECACHE[substr(c, 1, RLENGTH)] = _FILECACHE[st])
-				}
-				_FILEDIR[c = _FILECACHE[substr(c, 1, RLENGTH)] = _FILECACHE[st] = ++_file_rootcntr] = d
-				if (A[8]) {
-					_FILEDIRFL[c]
-				}
-				if (r) {
-					_FILEROOT[c] = r
+				if ((st = toupper((r = "\\\\" A[1]) d (n = A[8]))) in _FILECACHE) {
+					return (_FILECACHE[substr(c, 1, a)] = _FILECACHE[st])
 				}
+				_FILEDIR[c = _FILECACHE[substr(c, 1, a)] = _FILECACHE[st] = ++_file_rootcntr] = d
+				_FILEDIRFL[c]
+				_FILEROOT[c] = r
+			} else {
+				_filepath_err = "UNC"
+				return ""
 			}
-			if (n) {
-				if (match(n, /\.[^\.]*$/)) {
-					_FILEXT[c] = substr(n, RSTART)
-					_FILENAM[c] = substr(n, 1, RSTART - 1)
-				} else {
-					_FILENAM[c] = n
-				}
+		} else {
+			match(st, /^(([ \t]*\.[ \t]*\\[ \t]*)|(([ \t]*([A-Za-z])[ \t]*(\:)[ \t]*)?([ \t]*(\\)[ \t]*)?))([ \t]*(([ \t]*[0-9A-Za-z_\!\+\-\[\]\(\)\{\}\~\.]+( +[0-9A-Za-z_\!\+\-\[\]\(\)\{\}\~\.]+)*[ \t]*\\)+)[ \t]*)?([ \t]*([0-9A-Za-z_\!\+\.\~\-\[\]\{\}\(\)]+( +[0-9A-Za-z_\!\+\.\~\-\[\]\{\}\(\)]+)*)[ \t]*)?/, A)
+			if (! RLENGTH) {
+				return ""
+			}
+			d = A[8] A[10]
+			gsub(/[ \t]*\\[ \t]*/, "\\", d)
+			if ((st = toupper((r = A[5] A[6]) d (n = A[14]))) in _FILECACHE) {
+				return (_FILECACHE[substr(c, 1, RLENGTH)] = _FILECACHE[st])
+			}
+			_FILEDIR[c = _FILECACHE[substr(c, 1, RLENGTH)] = _FILECACHE[st] = ++_file_rootcntr] = d
+			if (A[8]) {
+				_FILEDIRFL[c]
+			}
+			if (r) {
+				_FILEROOT[c] = r
 			}
-			return c
-		}
-		return ""
-	}
-
-	function fileri(f)
-	{
-		if ((f = filerdnehndi(f)) == "") {
-			return _FILEIO_R
-		}
-		if (f in _FILEROOT) {
-			return _FILEROOT[f]
-		}
-		if ((_FILEIO_RD, f) in _FILEROOT) {
-			return _FILEROOT[_FILEIO_RD, f]
 		}
-		return (_FILEROOT[_FILEIO_RD, f] = _FILEIO_R)
-	}
-
-	function hujf(a, b, c)
-	{
-		_conl("hujf(" a "," b "," c ")")
-	}
-
-	function ncmp_str_idx(i1, v1, i2, v2)
-	{
-		return ((i1 < i2 ? 1 : -1))
-	}
-
-	function test_cfg(p, z, AA0, a)
-	{
-		AA0[1]
-		_fclass = _cfguid(p = _getuid(_classys), _NOP, _NOP, _NOP, _NOP, _classys)
-		_conl()
-		_conline()
-		_conl()
-		_drawuid(p)
-		_fclass = _cfguid(p = _getuid(_classys), AA0, AA0, AA0, AA0, _classys)
-		_conl()
-		_conline()
-		_conl()
-		_drawuid(p)
-		a = _getuid(z = _fclass = _cfguid(p = _getuid(_classys), p, "<", ">", "ab", "cd"))
-		_conl("### " a "########")
-		_conline()
-		_conl()
-		_drawuid(p)
-		a = _getuid(_fclass = _cfguid(p = _getuid(_classys), z, 0, 0, _NOP, z))
-		_conl("### " a "########")
-		_conline()
-		_conl()
-		_drawuid(p)
-		a = _getuid(_fclass = _cfguid(p = _getuid(_classys), z, "^", "$", z, _classys))
-		_conl("### " a "########")
-		_conline()
-		_conl()
-		_drawuid(p)
-		_fclass = _cfguid(p = _getuid(_classys), "oblptr", "pfx", "sfx", "abcd")
-		_conl()
-		_conline()
-		_conl()
-		_drawuid(p)
-		_conl("```````````````````" z "'''''''''" ((_isptr(z) ? " ptr" : " not ptr")))
-		_drawuid(z)
-	}
-
-	function test_splitstr(A)
-	{
-		AA0[-1] = "huj"
-		AA0["A"] = "pizda"
-		AA0[1] = "zhopa"
-		delete AB0[AB0[""] = ""]
-		AC0[-1] = "HUJ"
-		AC0["A"] = "PIZDA"
-		AC0[1] = "ZHOPA"
-		_SPLITSTRB0["1"]
-		wonl = ""
-		_tstv(0, A, 0, "_tstv")
-		_conl(wonl)
-		_wrfile("wonl.out", wonl)
-	}
-
-	function test_uid(p, i)
-	{
-		_fclass = _cfguid(p = _getuid(_classys), p, "pfx", "sfx", "abc")
-		_conl("_fclass uid: " _getuid(_fclass))
-		_drawuid(_fclass)
-		_conl("_classys uid: " _getuid(_classys)) _drawuid(_classys)
-		for (i = 1; i < 81; i++) {
-			_conl(i ": " _getuid(_fclass))
-		}
-		_drawuid(_fclass)
-	}
-
-	function tst_splitstr(t, A, R, r)
-	{
-		delete A
-		A["not cleared"]
-		_wonl()
-		_wonline("_splitstr(" ((isarray(t) ? "ARR" ((length(t) > 0 ? "#" ((t[1] != "zhopa" ? "U" : "l")) : "")) : _val0(t))) ",A" ((isarray(R) ? ",        ARR" ((length(R) > 0 ? "#" ((R[1] != "zhopa" ? "U" : "l")) : "")) : ",        " _val0(R))) "):")
-		_wonl(_val0(r = _splitstr(t, A, R)))
-		_wonl("arrary A:")
-		_wonl(_dumparr(A))
-		return r
-	}
-
-	function tts(p, uidel, psfx, cnt, chr, p5, p6, p7, im)
-	{
-		im = "     "
-		im = ".. .."
-		_conl("ret:   " _qparam(im, p, uidel, psfx, cnt, chr, p5, p6, p7) "'")
-		_conl("mask: `" _qparamask "'")
-	}
-
-	function zorr(A, i, r)
-	{
-		if (i in A) {
-			_conl("`" i "' in A")
-		} else {
-			_conl("`" i "' not in A")
+		if (n) {
+			if (match(n, /\.[^\.]*$/)) {
+				_FILEXT[c] = substr(n, RSTART)
+				_FILENAM[c] = substr(n, 1, RSTART - 1)
+			} else {
+				_FILENAM[c] = n
+			}
 		}
-		r = A[i] == "" && A[i] == 0
-		_conl("A[" i "] status is " r)
-		return 
-		a = a + -a
-		_conl("``````````````" a "''''''''''''''''")
-	}
-
-	function zzer()
-	{
+		return c
 	}
+	return ""
+}
+
+#_____________________________________________________
+function fileri(f)
+{
+	if ((f = filerdnehndi(f)) == "") {
+		return _FILEIO_R
+	}
+	if (f in _FILEROOT) {
+		return _FILEROOT[f]
+	}
+	if ((_FILEIO_RD, f) in _FILEROOT) {
+		return _FILEROOT[_FILEIO_RD, f]
+	}
+	return (_FILEROOT[_FILEIO_RD, f] = _FILEIO_R)
+}
+
+function hujf(a, b, c)
+{
+	_conl("hujf(" a "," b "," c ")")
+}
+
+#___________________________________________________________
+function ncmp_str_idx(i1, v1, i2, v2)
+{
+	return ((i1 < i2 ? 1 : -1))
+}
+
+function test_cfg(p, z, AA0, a)
+{
+	AA0[1]
+	_fclass = _cfguid(p = _getuid(_classys), _NOP, _NOP, _NOP, _NOP, _classys)
+	_conl()
+	_conline()
+	_conl()
+	_drawuid(p)
+	_fclass = _cfguid(p = _getuid(_classys), AA0, AA0, AA0, AA0, _classys)
+	_conl()
+	_conline()
+	_conl()
+	_drawuid(p)
+	a = _getuid(z = _fclass = _cfguid(p = _getuid(_classys), p, "<", ">", "ab", "cd"))
+	_conl("### " a "########")
+	_conline()
+	_conl()
+	_drawuid(p)
+	a = _getuid(_fclass = _cfguid(p = _getuid(_classys), z, 0, 0, _NOP, z))
+	_conl("### " a "########")
+	_conline()
+	_conl()
+	_drawuid(p)
+	a = _getuid(_fclass = _cfguid(p = _getuid(_classys), z, "^", "$", z, _classys))
+	_conl("### " a "########")
+	_conline()
+	_conl()
+	_drawuid(p)
+	_fclass = _cfguid(p = _getuid(_classys), "oblptr", "pfx", "sfx", "abcd")
+	_conl()
+	_conline()
+	_conl()
+	_drawuid(p)
+	_conl("```````````````````" z "'''''''''" ((_isptr(z) ? " ptr" : " not ptr")))
+	_drawuid(z)
+}
+
+function test_splitstr(A)
+{
+	AA0[-1] = "huj"
+	AA0["A"] = "pizda"
+	AA0[1] = "zhopa"
+	delete AB0[AB0[""] = ""]
+	AC0[-1] = "HUJ"
+	AC0["A"] = "PIZDA"
+	AC0[1] = "ZHOPA"
+	_SPLITSTRB0["1"]
+	wonl = ""
+	_tstv(0, A, 0, "_tstv")
+	_conl(wonl)
+	_wrfile("wonl.out", wonl)
+}
+
+function test_uid(p, i)
+{
+	#test_cfg()
+	#return
+	
+	_fclass = _cfguid(p = _getuid(_classys), p, "pfx", "sfx", "abc")
+	#_fclass=_cfguid(p=_getuid(_classys),_NOP,_NOP,_NOP,"",_classys)
+	_conl("_fclass uid: " _getuid(_fclass))
+	_drawuid(_fclass)
+	_conl("_classys uid: " _getuid(_classys)) _drawuid(_classys)
+	for (i = 1; i < 81; i++) {
+		_conl(i ": " _getuid(_fclass))
+	}
+	_drawuid(_fclass)
+}
+
+function tst_splitstr(t, A, R, r)
+{
+	delete A
+	A["not cleared"]
+	_wonl()
+	_wonline("_splitstr(" ((isarray(t) ? "ARR" ((length(t) > 0 ? "#" ((t[1] != "zhopa" ? "U" : "l")) : "")) : _val0(t))) ",A" ((isarray(R) ? ",        ARR" ((length(R) > 0 ? "#" ((R[1] != "zhopa" ? "U" : "l")) : "")) : ",        " _val0(R))) "):")
+	_wonl(_val0(r = _splitstr(t, A, R)))
+	_wonl("arrary A:")
+	_wonl(_dumparr(A))
+	return r
+}
+
+function tts(p, uidel, psfx, cnt, chr, p5, p6, p7, im)
+{
+	im = "     "
+	im = ".. .."
+	_conl("ret:   " _qparam(im, p, uidel, psfx, cnt, chr, p5, p6, p7) "'")
+	_conl("mask: `" _qparamask "'")
+}
+
+#			#		- p is array
+#			`		- p is ptr detected in array _CLASSPTR(for _typ); or p is ptr detected in array A(for _typa)
+#			0		- p is undefined
+
+#			2		- p is string==""
+#			3		- p is string!=""
+#			4		- p is number 0
+#			5		- p is any number except 0(positive and negative)
+
+# str:			_typ(p)+0		!_typ(p)+0
+# str/ptr			_typ(p)>0		_typ(p)<1
+# str/arr			"`">_typ(p0) && _t0
+# str/ptr/arr		_typ(p)		!_typ(p)
+# ptr				_typ(p)=="`"	_typ(p)<"`"  ?
+# ptr/arr			_typ(p)+0!=_t0
+# arr				_typ(p)=="#"	_typ(p)>"#"  ?
+
+function zorr(A, i, r)
+{
+	if (i in A) {
+		_conl("`" i "' in A")
+	} else {
+		_conl("`" i "' not in A")
+	}
+	r = A[i] == "" && A[i] == 0
+	_conl("A[" i "] status is " r)
+	return 
+	a = a + -a
+	_conl("``````````````" a "''''''''''''''''")
+}
+
+#_____________________________________________________________________________
+function zzer()
+{
+}
diff --git a/test/profile6.awk b/test/profile6.awk
new file mode 100644
index 00000000..754f8ae6
--- /dev/null
+++ b/test/profile6.awk
@@ -0,0 +1,7 @@
+BEGIN {
+	x = 3
+	print -(-x)
+	Q = "|"
+	print -3 Q (-4)
+	print -3 Q (-4) (-5)
+}
diff --git a/test/profile6.ok b/test/profile6.ok
new file mode 100644
index 00000000..0c9486c7
--- /dev/null
+++ b/test/profile6.ok
@@ -0,0 +1,10 @@
+	# BEGIN rule(s)
+
+	BEGIN {
+     1  	x = 3
+     1  	print -(-x)
+     1  	Q = "|"
+     1  	print -3 Q (-4)
+     1  	print -3 Q (-4) (-5)
+	}
+
diff --git a/test/profile7.awk b/test/profile7.awk
new file mode 100644
index 00000000..454694f9
--- /dev/null
+++ b/test/profile7.awk
@@ -0,0 +1,12 @@
+BEGIN {
+	print 1 / 10 * 10
+	print 1 / (10 * 10)
+	print 1 % 10 * 10
+	print 1 % (10 * 10)
+	print (10 * 5) / 2
+	print 10 * (5 / 2)
+	a = 5
+	b = 3
+	print a - 1 - b
+	print a + 1 - b
+}
diff --git a/test/profile7.ok b/test/profile7.ok
new file mode 100644
index 00000000..d65afa86
--- /dev/null
+++ b/test/profile7.ok
@@ -0,0 +1,15 @@
+	# BEGIN rule(s)
+
+	BEGIN {
+     1  	print 1 / 10 * 10
+     1  	print 1 / (10 * 10)
+     1  	print 1 % 10 * 10
+     1  	print 1 % (10 * 10)
+     1  	print 10 * 5 / 2
+     1  	print 10 * 5 / 2
+     1  	a = 5
+     1  	b = 3
+     1  	print a - 1 - b
+     1  	print a + 1 - b
+	}
+
diff --git a/test/profile8.awk b/test/profile8.awk
new file mode 100644
index 00000000..16252cea
--- /dev/null
+++ b/test/profile8.awk
@@ -0,0 +1,9 @@
+# Some
+# header
+# comments
+
+# Add up
+{ sum += $1 }
+
+# Print sum
+END { print sum }
diff --git a/test/profile8.ok b/test/profile8.ok
new file mode 100644
index 00000000..34f7a96b
--- /dev/null
+++ b/test/profile8.ok
@@ -0,0 +1,14 @@
+# Some
+# header
+# comments
+
+# Add up
+{
+	sum += $1
+}
+
+# Print sum
+END {
+	print sum
+}
+
diff --git a/test/range1.awk b/test/range1.awk
index aca5db50..aca5db50 100755..100644
--- a/test/range1.awk
+++ b/test/range1.awk
diff --git a/test/regexpbrack.awk b/test/regexpbrack.awk
new file mode 100644
index 00000000..136cd194
--- /dev/null
+++ b/test/regexpbrack.awk
@@ -0,0 +1,2 @@
+/[]+()0-9.,$%/'"-]*$/
+/^[]+()0-9.,$%/'"-]*$/
diff --git a/test/regexpbrack.in b/test/regexpbrack.in
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/regexpbrack.in
diff --git a/test/regexpbrack.ok b/test/regexpbrack.ok
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/regexpbrack.ok
diff --git a/test/sortglos.awk b/test/sortglos.awk
new file mode 100644
index 00000000..e4f910d7
--- /dev/null
+++ b/test/sortglos.awk
@@ -0,0 +1,51 @@
+BEGIN {
+	pr="y";
+	npre=0;
+	po="n";
+	npos=0;
+	}
+
+pr=="y"      { npre++; pre[npre]=$0; }
+$1=="@table" && $2=="@asis" { pr="n";nite++; next; }
+
+po=="y"      { npos++; pos[npos]=$0; }
+$1=="@end" && $2=="table"   {
+	po="y";
+	npos++;
+	pos[npos]=$0;
+	# last item...
+	vec[nite]=nlin;
+}
+
+	{ nite++; }
+
+END {
+	for ( i=1; i<=npre; i++ ) { print pre[i]; }
+	if ( srt=="y" ) {
+		n=asorti(entr,ital);
+		##print "n=",n;
+		for ( i=1; i<=n; i++ ) {
+			#printf("=========> %3.3d %s\n",i,ital[i]);
+			# ital[i] is the sorted key;
+			j=entr[ital[i]];
+			# j is the original item number
+			for ( k=1; k<=vec[j]; k++ ) {
+				print dat[j,k];
+			}
+		}
+	}
+	if ( srt=="n" ) {
+		for ( i=1; i<=nite; i++ ) {
+			printf("=========> %3.3d %2.2d %s\n",i,vec[i],titl[i]);
+			for ( j=1; j<=vec[i]; j++ ) {
+				print dat[i,j];
+			}
+		}
+		print "========================= END";
+	}
+	for ( i=1; i<=npos; i++ ) { print pos[i]; }
+	print "@c npre=" npre;
+	print "@c nite=" nite;
+	print "@c npos=" npos;
+}
+
diff --git a/test/sortglos.in b/test/sortglos.in
new file mode 100644
index 00000000..b24373de
--- /dev/null
+++ b/test/sortglos.in
@@ -0,0 +1,22 @@
+@node Glossario
+@unnumbered Glossario
+
+@table @asis
+@item Azione
+Una serie di istruzioni @command{awk} associate a una regola.  Se
+l'espressione di ricerca della regola individua un record in input,
+@command{awk} esegue su quel record l'azione relativa.  Le azioni sono
+sempre racchiuse fra parentesi graffe.
+(@xref{Panoramica sulle azioni}).
+
+@item Spazio bianco
+Una sequenza di spazi, TAB, o caratteri di "a capo" presenti in un record in
+input o in una stringa.
+@end table
+
+@end ifclear
+
+@c The GNU General Public License.
+
+@c aggiornato alla versione: settembre 2014
+@c ultimo aggiornamento: 14 novembre 2014
diff --git a/test/sortglos.ok b/test/sortglos.ok
new file mode 100644
index 00000000..69ddbe67
--- /dev/null
+++ b/test/sortglos.ok
@@ -0,0 +1,15 @@
+@node Glossario
+@unnumbered Glossario
+
+@table @asis
+@end table
+
+@end ifclear
+
+@c The GNU General Public License.
+
+@c aggiornato alla versione: settembre 2014
+@c ultimo aggiornamento: 14 novembre 2014
+@c npre=4
+@c nite=22
+@c npos=8
diff --git a/test/testext.ok b/test/testext.ok
index 5612e92c..897a7336 100644
--- a/test/testext.ok
+++ b/test/testext.ok
@@ -15,6 +15,7 @@ try_modify_environ: set_array_element of ENVIRON failed
 try_modify_environ: marking element "testext" for deletion
 try_del_environ() could not delete element - pass
 try_del_environ() could not add an element - pass
+var_test: sym_lookup of PROCINFO passed - got a value!
 var_test: sym_lookup of ARGC passed - got a value!
 var_test: sym_update of ARGC failed - correctly
 var_test: sym_update("testvar") succeeded
@@ -22,6 +23,12 @@ var_test() returned 1, test_var = 42
 
 test_errno() returned 1, ERRNO = No child processes
 
+fubar = 9
+rumpus = -5
+uid matches 1
+api_major matches 1
+test_deferred returns 1
+
 length of test_array is 10, should be 10
 test_array_size: incoming size is 10
 test_array_size() returned 1, length is now 0
@@ -68,6 +75,12 @@ test_scalar_reserved: could not update new_value2 for ARGC - pass
 test_indirect_var: sym_lookup of NR passed
 test_indirect_var: value of NR is 3
 test_indirect_var() return 1
+
+test_get_file returned 0
+File [.test.alias] nr [1]: line 1
+File [.test.alias] nr [2]: line 2
+File [.test.alias] nr [3]: line 3
+
 answer_num = 42
 message_string = hello, world
 new_array["hello"] = "world"
diff --git a/test/timeout.awk b/test/timeout.awk
new file mode 100644
index 00000000..ccf4537d
--- /dev/null
+++ b/test/timeout.awk
@@ -0,0 +1,26 @@
+BEGIN {
+	cmd = "echo hello; sleep 1; echo goodbye"
+
+	print "With timeouts"
+	PROCINFO[cmd, "READ_TIMEOUT"] = 300
+	while ((rc = (cmd | getline x)) > 0)
+		print x
+	if (rc < 0)
+		print rc, (PROCINFO["errno"] != 0), (ERRNO != "")
+	print (close(cmd) != 0)
+
+	PROCINFO[cmd, "RETRY"]
+	print ""
+	print "With timeouts and retries"
+	while (((rc = (cmd | getline x)) > 0) || (rc == -2)) {
+		if (rc > 0) {
+			print x
+			n = 0
+		}
+		else
+			print ++n, "timed out; trying again"
+	}
+	if (rc < 0)
+		print rc, (PROCINFO["errno"] != 0), (ERRNO != "")
+	print (close(cmd) != 0)
+}
diff --git a/test/timeout.ok b/test/timeout.ok
new file mode 100644
index 00000000..a388747b
--- /dev/null
+++ b/test/timeout.ok
@@ -0,0 +1,12 @@
+With timeouts
+hello
+-1 1 1
+1
+
+With timeouts and retries
+hello
+1 timed out; trying again
+2 timed out; trying again
+3 timed out; trying again
+goodbye
+0
diff --git a/vms/ChangeLog b/vms/ChangeLog
index 9e055cf4..c7dd4233 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,14 @@
+2014-10-17         John E. Malmberg      <wb8tyw@qsl.net>
+
+	* config_h.com: Use sys$disk: instead of prj_root: for
+	  copying the configure file.
+	* gawk_alias_setup.com: Fix removal of out of date aliases.
+	* vmsbuild.com: Fix a typo for symbol CNAME and a case sensitive
+	  test for "VAX" .eq. "vax" that failed.  Also disable verify
+	  while looking up the actual version.
+	* vmstest.com: Make sure that the test directory exists when
+	  using a search list.
+
 2014-04-18         John E. Malmberg      <wb8tyw@qsl.net>
 
 	* gawk_alias_setup.com: Fix problem with file links on Vax/VMS.
diff --git a/vms/config_h.com b/vms/config_h.com
index c1d3becf..0074a65a 100644
--- a/vms/config_h.com
+++ b/vms/config_h.com
@@ -104,7 +104,7 @@ $! On some platforms, DCL search has problems with searching a file
 $! on a NFS mounted volume.  So copy it to sys$scratch:
 $!
 $if f$search(configure_script) .nes. "" then delete 'configure_script';*
-$copy PRJ_ROOT:configure 'configure_script'
+$copy sys$disk:configure 'configure_script'
 $!
 $!
 $! Write out the header
diff --git a/vms/vmsbuild.com b/vms/vmsbuild.com
index c13e4b57..a46cc2ca 100644
--- a/vms/vmsbuild.com
+++ b/vms/vmsbuild.com
@@ -48,7 +48,7 @@ $   CFLAGS = "/Incl=[]/Obj=[]/Opt=noInline/Def=(''CDEFS')''CCFLAGS'"
 $   LIBS = "sys$share:vaxcrtl.exe/Shareable"
 $  else  !!VAXC
 $!  neither GNUC nor VAXC, assume DECC (same for either VAX or Alpha)
-$ if arch_name .eqs. "vax"
+$ if arch_name .eqs. "VAX"
 $ then
 $   CFLOAT = ""
 $ else
@@ -58,7 +58,7 @@ $   CC = "cc/DECC/Prefix=All"
 $   CNAME = "/NAME=(AS_IS,SHORT)
 $   CINC = "/NESTED_INCLUDE=NONE"
 $   CFLAGS = "/Incl=([],[.vms])/Obj=[]/Def=(''CDEFS')''CINC'''CCFLAGS'"
-$   CFLAGS = CNAMES + CFLOAT + CFLAGS 
+$   CFLAGS = CNAME + CFLOAT + CFLAGS
 $   LIBS = ""	! DECC$SHR instead of VAXCRTL, no special link option needed
 $  endif !VAXC
 $ endif !GNUC
@@ -147,8 +147,8 @@ psect_attr=environ,noshr	!extern [noshare] char **
 stack=48	!preallocate more pages (default is 20)
 iosegment=128	!ditto (default is 32)
 $!
-$ v1 = f$verify(1)
 $ @[.vms]gawk_ident.com
+$ v1 = f$verify(1)
 $ open/append Fopt gawk.opt
 $ write Fopt libs
 $ close Fopt
diff --git a/vms/vmstest.com b/vms/vmstest.com
index 30bdbf22..a2ab9bff 100644
--- a/vms/vmstest.com
+++ b/vms/vmstest.com
@@ -27,6 +27,9 @@ $	gawk = "$sys$disk:[-]gawk"
 $	AWKPATH_srcdir = "define/User AWKPATH sys$disk:[]"
 $	AWKLIBPATH_dir = "define/User AWKLIBPATH sys$disk:[-]"
 $
+$!	Make sure that the default directory exists on a search list.
+$	def_dir = f$environment("default")
+$	create/dir 'def_dir'
 $	listdepth = 0
 $	pipeok = 0
 $	floatmode = -1	! 0: D_float, 1: G_float, 2: IEEE T_float
diff --git a/ylwrap b/ylwrap
index 7befa46d..7c2d927f 100755
--- a/ylwrap
+++ b/ylwrap
@@ -1,9 +1,9 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
 
-scriptversion=2012-07-14.08; # UTC
+scriptversion=2013-01-12.17; # UTC
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
@@ -40,12 +40,13 @@ get_dirname ()
 # guard FILE
 # ----------
 # The CPP macro used to guard inclusion of FILE.
-guard()
+guard ()
 {
-  printf '%s\n' "$from" \
-    | sed \
-        -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-        -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'
+  printf '%s\n' "$1"                                                    \
+    | sed                                                               \
+        -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'   \
+        -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'                        \
+        -e 's/__*/_/g'
 }
 
 # quote_for_sed [STRING]
@@ -95,17 +96,17 @@ esac
 
 
 # The input.
-input="$1"
+input=$1
 shift
 # We'll later need for a correct munging of "#line" directives.
 input_sub_rx=`get_dirname "$input" | quote_for_sed`
-case "$input" in
+case $input in
   [\\/]* | ?:[\\/]*)
     # Absolute path; do nothing.
     ;;
   *)
     # Relative path.  Make it absolute.
-    input="`pwd`/$input"
+    input=`pwd`/$input
     ;;
 esac
 input_rx=`get_dirname "$input" | quote_for_sed`
@@ -121,12 +122,18 @@ fi
 # The parser itself, the first file, is the destination of the .y.c
 # rule in the Makefile.
 parser=$1
+
 # A sed program to s/FROM/TO/g for all the FROM/TO so that, for
 # instance, we rename #include "y.tab.h" into #include "parse.h"
 # during the conversion from y.tab.c to parse.c.
-rename_sed=
-while test "$#" -ne 0; do
-  if test "$1" = "--"; then
+sed_fix_filenames=
+
+# Also rename header guards, as Bison 2.7 for instance uses its header
+# guard in its implementation file.
+sed_fix_header_guards=
+
+while test $# -ne 0; do
+  if test x"$1" = x"--"; then
     shift
     break
   fi
@@ -141,20 +148,19 @@ while test "$#" -ne 0; do
   shift
   to=$1
   shift
-  rename_sed="${rename_sed}s|"`quote_for_sed "$from"`"|$to|g;"
+  sed_fix_filenames="${sed_fix_filenames}s|"`quote_for_sed "$from"`"|$to|g;"
+  sed_fix_header_guards="${sed_fix_header_guards}s|"`guard "$from"`"|"`guard "$to"`"|g;"
 done
 
 # The program to run.
-prog="$1"
+prog=$1
 shift
 # Make any relative path in $prog absolute.
-case "$prog" in
+case $prog in
   [\\/]* | ?:[\\/]*) ;;
-  *[\\/]*) prog="`pwd`/$prog" ;;
+  *[\\/]*) prog=`pwd`/$prog ;;
 esac
 
-# FIXME: add hostname here for parallel makes that run commands on
-# other machines.  But that might take us over the 14-char limit.
 dirname=ylwrap$$
 do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret'
 trap "ret=129; $do_exit" 1
@@ -174,13 +180,13 @@ ret=$?
 if test $ret -eq 0; then
   for from in *
   do
-    to=`printf '%s\n' "$from" | sed "$rename_sed"`
+    to=`printf '%s\n' "$from" | sed "$sed_fix_filenames"`
     if test -f "$from"; then
       # If $2 is an absolute path name, then just use that,
       # otherwise prepend '../'.
       case $to in
         [\\/]* | ?:[\\/]*) target=$to;;
-        *) target="../$to";;
+        *) target=../$to;;
       esac
 
       # Do not overwrite unchanged header files to avoid useless
@@ -189,7 +195,7 @@ if test $ret -eq 0; then
       # output of all other files to a temporary file so we can
       # compare them to existing versions.
       if test $from != $parser; then
-        realtarget="$target"
+        realtarget=$target
         target=tmp-`printf '%s\n' "$target" | sed 's|.*[\\/]||g'`
       fi
 
@@ -197,10 +203,11 @@ if test $ret -eq 0; then
       # debug information point at an absolute srcdir.  Use the real
       # output file name, not yy.lex.c for instance.  Adjust the
       # include guards too.
-      FROM=`guard "$from"`
-      TARGET=`guard "$to"`
-      sed -e "/^#/!b" -e "s|$input_rx|$input_sub_rx|" -e "$rename_sed" \
-          -e "s|$FROM|$TARGET|" "$from" >"$target" || ret=$?
+      sed -e "/^#/!b"                           \
+          -e "s|$input_rx|$input_sub_rx|"       \
+          -e "$sed_fix_filenames"               \
+          -e "$sed_fix_header_guards"           \
+        "$from" >"$target" || ret=$?
 
       # Check whether files must be updated.
       if test "$from" != "$parser"; then