diff -cprP metahtml-5.03/ANNOUNCE-5.04 metahtml-5.04/ANNOUNCE-5.04
*** metahtml-5.03/ANNOUNCE-5.04	Wed Dec 31 16:00:00 1969
--- metahtml-5.04/ANNOUNCE-5.04	Sat Jun 21 12:56:08 1997
***************
*** 0 ****
--- 1,100 ----
+ 
+ 		       Meta-HTML 5.03 Source Release
+ 
+ Version 5.03 of the Meta-HTML Web Language distribution is now
+ available for download from:
+ 
+ 	http://www.metahtml.com/download
+ 
+ It should be available from prep.ai.mit.edu, and other GNU mirror
+ sites within the next two weeks.
+ 
+      ------------------------------------------------------------
+ 
+ 			     What is it?
+ 
+ Meta-HTML is a programming language specifically designed for working
+ within the World Wide Web environment.  Although it is a genuine
+ programming language, suitable for large-scale symbolic manipulation,
+ it provides the most commonly wanted Web functionality as built-in
+ primitives, so you don't have to write them.  You can find out more
+ about the theory of implementation in this white paper
+ [http://www.metahtml.com/documentation/manifesto.html].
+ 
+ Web pages are authored using HTML and Meta-HTML statements freely
+ intermixed.  When a page is requested by a browser, the page is passed
+ through the Meta-HTML interpreter, which dynamically processes any
+ Meta-HTML statements to produce a final HTML page that is delivered
+ to the browser.
+ 
+ The source distribution provides several different interpreter options:
+ 
+ 	* A CGI engine which can be run by any Unix Web server,
+ 	* A FastCGI engine which can be run under FastCGI compliant servers,
+ 	* A full-featured Web server (mhttpd) with the interpreter built in,
+ 	* A standalone processor, much like Perl or Tcl, and
+ 	* An interactive debugger, with a feel similar to GDB (mdb)
+ 
+      ------------------------------------------------------------
+ 
+ 	      Meta-HTML Changes in 5.03 from 5.02
+ 
+ 	* All reported bugs have been fixed.  I'm happy to say that
+ 	  just haven't been many bugs reported!
+ 
+ 	* The server is now able to perform DNS caching -- this should
+ 	  improve request response time for  sites that have client name
+ 	  resolution turned on (the default).  It is controlled by
+ 	  a variable in the server config file.
+ 
+ 	* A new set of documented array operators, including:
+ 	  array-append, array-member, array-size, array-add-unique,
+ 	  array-shift, array-concat, foreach, and a new "sort"
+ 	  function.
+ 
+ 	* Complete support for mSQL 2.x as well as mSQL 1.x.  Many
+ 	  bugs were found and fixed in this code.
+ 
+ 	* Improvements to various functions, documentation for same.
+ 	  Specifically, cgi-exec, sort, with-open-stream, stream-get,
+ 	  page-debug, system-error-output, and debugging-output have
+ 	  all improved.
+ 
+ 	* Dynamically loaded modules allow C language extensions to be
+ 	  added to the running Meta-HTML interpreter.  Several useful
+ 	  examples are included.
+ 
+ 	* FastCGI support for all platforms now built automatically.
+ 
+ 	* Better configuration mechanism allows compilation on many
+ 	  more machine/OS's than before.
+ 
+ 	* Again, more and improved documentation.
+ 
+ 	* More control over cookie manipulation and session IDs.
+ 
+ 	* The ability to include binary representations of Meta-HTML
+ 	  source code directly in the compiled Engine, Server,
+ 	  Debugger, and Standalone Processor.  See libmhtml/bootstrap.mhtml.
+ 
+      ------------------------------------------------------------
+ 
+ 		      E-Mail Addresses and URLs
+ 
+ Bug reports for Meta-HTML should be sent to bug-metahtml@metahtml.com.
+ Bug reports for the documentation should be sent to bug-manual@metahtml.com.
+ 
+ There is a user mailing list: metahtml-users@metahtml.com.  You can
+ subscribe on the Web [http://www.metahtml.com/E-Mail/], or by
+ sending mail to metahtml-users-request@metahtml.com.
+  
+      ------------------------------------------------------------
+ 
+ 		       Authors and Maintenance
+ 
+ Meta-HTML was designed and implemented by Brian J. Fox (bfox@ai.mit.edu).
+ Meta-HTML is owned by Universal Access Inc., and is released under
+ terms nearly identical to the GPL.  The code and utilities are
+ maintained by Brian J. Fox and Jarlath O' Carroll at Universal Access
+ Inc.
+      ------------------------------------------------------------
diff -cprP metahtml-5.03/Makefile.in metahtml-5.04/Makefile.in
*** metahtml-5.03/Makefile.in	Fri Jun 13 07:51:49 1997
--- metahtml-5.04/Makefile.in	Sat Jun 21 12:55:07 1997
***************
*** 30,36 ****
  
  # The version number of this package.
  PACKNAME= metahtml
! PACKVER = 5.03
  
  # Items that were filled in by configure.
  VPATH	= @srcdir@
--- 30,36 ----
  
  # The version number of this package.
  PACKNAME= metahtml
! PACKVER = 5.04
  
  # Items that were filled in by configure.
  VPATH	= @srcdir@
diff -cprP metahtml-5.03/README.download metahtml-5.04/README.download
*** metahtml-5.03/README.download	Tue May 20 05:56:49 1997
--- metahtml-5.04/README.download	Sun Jun 22 12:58:47 1997
***************
*** 1,7 ****
  
  			      Meta-HTML
  		  Copyright 1995, 1996 Brian J. Fox
! 		Copyright 1996, Universal Access Inc.
  		Written by Brian J. Fox (bfox@ua.com)
  
  This is the README file for various Meta-HTML binary distributions.
--- 1,7 ----
  
  			      Meta-HTML
  		  Copyright 1995, 1996 Brian J. Fox
! 	     Copyright 1996, 1997, Universal Access Inc.
  		Written by Brian J. Fox (bfox@ua.com)
  
  This is the README file for various Meta-HTML binary distributions.
*************** General Instructions for Installation
*** 10,19 ****
  -------------------------------------
  
  There are distribution specific instructions located in the
! directories Server, Engine, and Processor.  You may have only one of
! these directories if you elected to obtain only the Server, Engine, or
! Stand-Alone Processor, or, you may have all of them if you received
! the Meta-HTML Suite distribution.
  
  
  Installing Your First Web Server:
--- 10,16 ----
  -------------------------------------
  
  There are distribution specific instructions located in the
! directories `server', `engine', and `mhc'.
  
  
  Installing Your First Web Server:
*************** Installing Your First Web Server:
*** 48,55 ****
        4) Copy "release" to <wwwroot>/docs/.
  	 (cp -r release /usr/www/docs/)
  
!       5) Copy "server/conf/*" to <wwwroot>/conf.
! 	 (cp -r server/conf/* /usr/www/conf/)
  
        6) Create the file "<wwwroot>/conf/identity.local", and place
  	 the following Meta-HTML commands in it to tell the server
--- 45,52 ----
        4) Copy "release" to <wwwroot>/docs/.
  	 (cp -r release /usr/www/docs/)
  
!       5) Copy "server/conf" to <wwwroot>/conf.
! 	 (cp -r server/conf /usr/www/conf)
  
        6) Create the file "<wwwroot>/conf/identity.local", and place
  	 the following Meta-HTML commands in it to tell the server
*************** Installing the Meta-HTML CGI Engine:
*** 109,115 ****
      on-line documentation discussing the specifics of server
      configuration:
  
! 	    http://www.metahtml.com/meta-html/manual/install.mhtml
  
  
  Installing the Meta-HTML Stand-Alone Processor:
--- 106,112 ----
      on-line documentation discussing the specifics of server
      configuration:
  
! 	    http://www.metahtml.com/documentation/manual/install.mhtml
  
  
  Installing the Meta-HTML Stand-Alone Processor:
diff -cprP metahtml-5.03/engine/Makefile.in metahtml-5.04/engine/Makefile.in
*** metahtml-5.03/engine/Makefile.in	Thu Jun 12 09:31:09 1997
--- metahtml-5.04/engine/Makefile.in	Tue Jun 24 13:22:14 1997
***************
*** 1,4 ****
! # Makefile.in: -*- Text -*-  Source for configure to make a Makefile from.
  #
  # Author: Brian J. Fox (bfox@ai.mit.edu).
  # This file is part of <Meta-HTML>(tm), a system for the rapid deployment
--- 1,4 ----
! 93# Makefile.in: -*- Text -*-  Source for configure to make a Makefile from.
  #
  # Author: Brian J. Fox (bfox@ai.mit.edu).
  # This file is part of <Meta-HTML>(tm), a system for the rapid deployment
*************** FCGI_ENGINE	= nph-fcgi-engine$(EXE)
*** 90,96 ****
  PROGS		= $(ENGINE) $(ISP_ENGINE) $(FCGI_ENGINE)
  REQLIBS		= $(LIBTIMESTAMP) $(LIBREGISTER) $(LIBMHTML) \
  		  $(LIBUTILS) $(LIBSERVER) $(LIBSSL)
! 		  
  TARGETS		= $(PROGS)
  
  .c.o:
--- 90,96 ----
  PROGS		= $(ENGINE) $(ISP_ENGINE) $(FCGI_ENGINE)
  REQLIBS		= $(LIBTIMESTAMP) $(LIBREGISTER) $(LIBMHTML) \
  		  $(LIBUTILS) $(LIBSERVER) $(LIBSSL)
! 
  TARGETS		= $(PROGS)
  
  .c.o:
diff -cprP metahtml-5.03/install-site metahtml-5.04/install-site
*** metahtml-5.03/install-site	Fri Jun 20 12:17:33 1997
--- metahtml-5.04/install-site	Sat Jun 21 15:18:43 1997
*************** echo "Okay, we are about to install the 
*** 204,210 ****
  echo ""
  echo "|---------------------------------------------------------------------|"
  echo "|  Please check the following locations, and make sure that they are  |"
! echo "|  correct.  If you are happy with the locations, type \"yes\" as     |"
  echo "|  your answer.  ANYTHING ELSE means that you aren't ready, or need   |"
  echo "|  to change the values that you have entered.                        |"
  echo "|---------------------------------------------------------------------|"
--- 204,210 ----
  echo ""
  echo "|---------------------------------------------------------------------|"
  echo "|  Please check the following locations, and make sure that they are  |"
! echo "|  correct.  If you are happy with the locations, type \"yes\" as       |"
  echo "|  your answer.  ANYTHING ELSE means that you aren't ready, or need   |"
  echo "|  to change the values that you have entered.                        |"
  echo "|---------------------------------------------------------------------|"
*************** echo "done."
*** 310,316 ****
  if [ ! -d PowerStrip ]; then
     if [ -d ./doc ]; then
        ${ECHO_N} "   Installing the documentation...${ECHO_C}"
!       cp -r ./doc ${docdir}/release/5.03/documentation
        echo "done."
     fi
  fi
--- 310,316 ----
  if [ ! -d PowerStrip ]; then
     if [ -d ./doc ]; then
        ${ECHO_N} "   Installing the documentation...${ECHO_C}"
!       cp -r ./doc ${docdir}/release/5.04/documentation
        echo "done."
     fi
  fi
diff -cprP metahtml-5.03/libmhtml/Makefile.in metahtml-5.04/libmhtml/Makefile.in
*** metahtml-5.03/libmhtml/Makefile.in	Fri Jun 20 21:23:43 1997
--- metahtml-5.04/libmhtml/Makefile.in	Mon Jun 23 18:36:17 1997
*************** LIB_OBJS = symbols.o forms.o pages.o pag
*** 104,115 ****
  	   $(MSQLFUNCS_O) $(CRYPTFUNCS_O) prims.o symdump.o cgi-exec.o \
  	   require.o parser.o initfuncs.o sessionfuncs.o dbmfuncs.o \
  	   rewriter.o $(MODFUNCS_O) lockname.o bootstrapper.o \
! 	   bootstrapcode.o dbmfuncs.o cleaner.o arrayfuncs.o
  
  XFUNCFILES = $(MSQLFUNCS_O) $(CRYPTFUNCS_O) $(MODFUNCS_O)
  FUNCFILES = simplefuncs.o pagefuncs.o streamfuncs.o dbfuncs.o filefuncs.o \
  	    prims.o cgi-exec.o require.o sessionfuncs.o $(XFUNCFILES) \
! 	    dbmfuncs.o rewriter.o cleaner.o arrayfuncs.o
  T=tagsets
  STANDARD_TAGS = \
  	$(T)/characters.mhtml $(T)/dirfuns.mhtml $(T)/dump-package.mhtml \
--- 104,115 ----
  	   $(MSQLFUNCS_O) $(CRYPTFUNCS_O) prims.o symdump.o cgi-exec.o \
  	   require.o parser.o initfuncs.o sessionfuncs.o dbmfuncs.o \
  	   rewriter.o $(MODFUNCS_O) lockname.o bootstrapper.o \
! 	   bootstrapcode.o dbmfuncs.o cleaner.o arrayfuncs.o flowfuncs.o
  
  XFUNCFILES = $(MSQLFUNCS_O) $(CRYPTFUNCS_O) $(MODFUNCS_O)
  FUNCFILES = simplefuncs.o pagefuncs.o streamfuncs.o dbfuncs.o filefuncs.o \
  	    prims.o cgi-exec.o require.o sessionfuncs.o $(XFUNCFILES) \
! 	    dbmfuncs.o rewriter.o cleaner.o arrayfuncs.o flowfuncs.o
  T=tagsets
  STANDARD_TAGS = \
  	$(T)/characters.mhtml $(T)/dirfuns.mhtml $(T)/dump-package.mhtml \
*************** bootstrapcode.o: bootstrapcode.c bootstr
*** 158,164 ****
  
  bootstrap.lib: bootstrap.mhtml $(STANDARD_TAGS)
  	@if [ -x ../mhc/mhc ]; then \
! 	   ../mhc/mhc ../utilities/mklib -o bootstrap.lib bootstrap.mhtml; \
  	else \
  	  (\
  	   echo ""; \
--- 158,164 ----
  
  bootstrap.lib: bootstrap.mhtml $(STANDARD_TAGS)
  	@if [ -x ../mhc/mhc ]; then \
! 	   ../mhc/mhc -z ../utilities/mklib -o bootstrap.lib bootstrap.mhtml; \
  	else \
  	  (\
  	   echo ""; \
diff -cprP metahtml-5.03/libmhtml/arrayfuncs.c metahtml-5.04/libmhtml/arrayfuncs.c
*** metahtml-5.03/libmhtml/arrayfuncs.c	Fri Jun 20 21:01:55 1997
--- metahtml-5.04/libmhtml/arrayfuncs.c	Sat Jun 21 13:02:08 1997
*************** pf_array_shift (PFunArgs)
*** 278,284 ****
    xfree (start_var);
  }
  
! /* <foreach elementvar arrayvar start=X end=X> body </foreach>
     Perform body with ELEMENTVAR bound to successive memebers of
     ARRAYVAR, starting with the element at START (default 0), and
     ending at END (default <array-size ARRAYVAR>). */
--- 278,284 ----
    xfree (start_var);
  }
  
! /* <foreach elementvar arrayvar [start=X] [end=X]> body </foreach>
     Perform body with ELEMENTVAR bound to successive memebers of
     ARRAYVAR, starting with the element at START (default 0), and
     ending at END (default <array-size ARRAYVAR>). */
*************** pf_foreach (PFunArgs)
*** 342,360 ****
  		    ((start_index > end_index) && (i >= end_index)));
  		   i += step)
  		{
- 		  char *result;
  		  Symbol *element = symbol_remove (element_var);
  
  		  symbol_free (element);
  		  element = symbol_intern (element_var);
  		  symbol_add_value (element, array->values[i]);
! 		  result = mhtml_evaluate_string (body->buffer);
  
! 		  if (result != (char *)NULL)
  		    {
! 		      bprintf_insert (page, start, "%s", result);
! 		      start += strlen (result);
! 		      free (result);
  		    }
  		}
  	    }
--- 342,368 ----
  		    ((start_index > end_index) && (i >= end_index)));
  		   i += step)
  		{
  		  Symbol *element = symbol_remove (element_var);
+ 		  PAGE *code;
  
  		  symbol_free (element);
  		  element = symbol_intern (element_var);
  		  symbol_add_value (element, array->values[i]);
! 		  code = page_copy_page (body);
! 		  page_process_page_internal (code);
  
! 		  if (code != (PAGE *)NULL)
  		    {
! 		      int broken = (code->attachment != (void *)NULL);
! 
! 		      if (code->bindex != 0)
! 			{
! 			  bprintf_insert (page, start, "%s", code->buffer);
! 			  start += (code->bindex);
! 			}
! 
! 		      page_free_page (code);
! 		      if (broken) break;
  		    }
  		}
  	    }
Binary files metahtml-5.03/libmhtml/bootstrap.lib and metahtml-5.04/libmhtml/bootstrap.lib differ
diff -cprP metahtml-5.03/libmhtml/flowfuncs.c metahtml-5.04/libmhtml/flowfuncs.c
*** metahtml-5.03/libmhtml/flowfuncs.c	Wed Dec 31 16:00:00 1969
--- metahtml-5.04/libmhtml/flowfuncs.c	Sat Jun 21 13:52:02 1997
***************
*** 0 ****
--- 1,342 ----
+ /* flowfuncs.c: -*- C -*-  Flow control functions for Meta-HTML */
+ 
+ /*  Copyright (c) 1997 Brian J. Fox
+     Author: Brian J. Fox (bfox@ai.mit.edu) Sat Jun 21 12:02:48 1997.
+ 
+    This file is part of <Meta-HTML>(tm), a system for the rapid deployment
+    of Internet and Intranet applications via the use of the Meta-HTML
+    language.
+ 
+    Copyright (c) 1995, 1996, Brian J. Fox (bfox@ai.mit.edu).
+    Copyright (c) 1996, Universal Access Inc. (http://www.ua.com).
+ 
+    Meta-HTML is free software; you can redistribute it and/or modify
+    it under the terms of the UAI Free Software License as published
+    by Universal Access Inc.; either version 1, 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
+    UAI Free Software License for more details.
+ 
+    You should have received a copy of the UAI Free Software License
+    along with this program; if you have not, you may obtain one by
+    writing to:
+ 
+    Universal Access Inc.
+    129 El Paseo Court
+    Santa Barbara, CA
+    93101  */
+ 
+ #include "language.h"
+ 
+ /************************************************************/
+ /*							    */
+ /*			Flow Control Functions		    */
+ /*							    */
+ /************************************************************/
+ 
+ /* <if test then else> If eval (test) produces non-zero length text, then... */
+ static void pf_if (PFunArgs);
+ 
+ /* <ifeq this that then else> If eval (this) = eval (that), then, else */
+ static void pf_ifeq (PFunArgs);
+ 
+ /* <when TEST> body </when> */
+ static void pf_when (PFunArgs);
+ 
+ /* <var-case [this=that do-this] ...> Do-this where <get-var THIS> == THAT. */
+ static void pf_var_case (PFunArgs);
+ 
+ /* <while test>  body-text ... </while> Do BODY-TEXT while TEST
+    produces non-zero length text. */
+ #define PAGE_ITERATOR_MAX_COUNT 500 /* No more than this many times. */
+ static void pf_while (PFunArgs);
+ 
+ /* <break> Only valid inside of <while> or <foreach>. */
+ static void pf_break (PFunArgs);
+ 
+ /* <set-var x=hello>
+    <with x=1 z=<get-var foo>> <get-var x> </with> --> 1
+    <get-var x> --> hello */
+ static void pf_with (PFunArgs);
+ 
+ static PFunDesc func_table[] =
+ {
+   { "IF",		0, 0, pf_if },
+   { "IFEQ",		0, 0, pf_ifeq },
+   { "WHEN",		1, 0, pf_when },
+   { "VAR-CASE",		0, 0, pf_var_case },
+   { "WHILE",		1, 0, pf_while },
+   { "BREAK",		0, 0, pf_break },
+   { "WITH",		1, 0, pf_with },
+ 
+   { (char *)NULL,	0, 0, (PFunHandler *)NULL }
+ };
+ 
+ PACKAGE_INITIALIZER (initialize_flowfunc_functions)
+ 
+ void
+ initialize_flowfunc_functions (Package *package)
+ {
+   register int i;
+   Symbol *sym;
+ 
+   for (i = 0; func_table[i].tag != (char *)NULL; i++)
+     {
+       sym = symbol_intern_in_package (package, func_table[i].tag);
+       sym->type = symtype_FUNCTION;
+       sym->values = (char **)(&func_table[i]);
+     }
+ }
+ 
+ static void
+ pf_if (PFunArgs)
+ {
+   char *test_clause = mhtml_evaluate_string (get_positional_arg (vars, 0));
+   char *then_clause = get_positional_arg (vars, 1);
+   char *else_clause = get_positional_arg (vars, 2);
+   char *consequence;
+ 
+   if (!empty_string_p (test_clause))
+     consequence = then_clause;
+   else
+     consequence = else_clause;
+ 
+   if (consequence != (char *)NULL)
+     bprintf_insert (page, start, "%s", consequence);
+ 
+   xfree (test_clause);
+ }
+ 
+ static void
+ pf_ifeq (PFunArgs)
+ {
+   char *left_clause = mhtml_evaluate_string (get_positional_arg (vars, 0));
+   char *right_clause = mhtml_evaluate_string (get_positional_arg (vars, 1));
+   char *then_clause = get_positional_arg (vars, 2);
+   char *else_clause = get_positional_arg (vars, 3);
+   int caseless_p = var_present_p (vars, "CASELESS");
+   char *consequence;
+ 
+   if (((empty_string_p (left_clause)) && (empty_string_p (right_clause))) ||
+       ((left_clause && right_clause) &&
+        (((!caseless_p) && (strcmp (left_clause, right_clause) == 0)) ||
+ 	((caseless_p) && (strcasecmp (left_clause, right_clause) == 0)))))
+     consequence = then_clause;
+   else
+     consequence = else_clause;
+ 
+   if (consequence != (char *)NULL)
+     bprintf_insert (page, start, "%s", consequence);
+ 
+   xfree (left_clause);
+   xfree (right_clause);
+ }
+ 
+ static void
+ pf_when (PFunArgs)
+ {
+   char *test = mhtml_evaluate_string (get_positional_arg (vars, 0));
+ 
+   if (!empty_string_p (test))
+     bprintf_insert (page, start, "%s", body->buffer);
+ 
+   if (test) free (test);
+ }
+ 
+ static void
+ pf_break (PFunArgs)
+ {
+   page->attachment = (void *)bprintf_create_buffer ();
+   page->bindex = start;
+   page->buffer[start] = '\0';
+ }
+ 
+ static void
+ pf_while (PFunArgs)
+ {
+   char *test = get_positional_arg (vars, 0);
+   int iteration_count = 0;
+   char *limit_string = pagefunc_get_variable ("mhtml::iteration-limit");
+   int limit = limit_string ? atoi (limit_string) : PAGE_ITERATOR_MAX_COUNT;
+ 
+   while (1)
+     {
+       char *result = mhtml_evaluate_string (test);
+       int empty = empty_string_p (result);
+       PAGE *code;
+ 
+       xfree (result);
+       iteration_count++;
+ 
+       if (empty || (iteration_count > limit))
+ 	break;
+ 
+       code = page_copy_page (body);
+       page_process_page_internal (code);
+ 
+       if (code != (PAGE *)NULL)
+ 	{
+ 	  int broken = (code->attachment != (void *)NULL);
+ 
+ 	  if (code->bindex != 0)
+ 	    {
+ 	      bprintf_insert (page, start, "%s", code->buffer);
+ 	      start += (code->bindex);
+ 
+ 	      *newstart = start;
+ 	    }
+ 
+ 	  page_free_page (code);
+ 	  if (broken)
+ 	    break;
+ 	}
+     }
+ }
+ 
+ static void
+ pf_var_case (PFunArgs)
+ {
+   register int i = 0;
+   char **names = get_vars_names (vars);
+   char **vals = get_vars_vals (vars);
+   static char *nullval = "";
+   char *default_action = (char *)NULL;
+   int clause_found = 0;
+ 
+   if (names != (char **)NULL)
+     {
+       while (1)
+ 	{
+ 	  char *name = (char *)NULL;
+ 	  char *case_value = (char *)NULL;
+ 	  char *page_value = (char *)NULL;
+ 	  char *action = (char *)NULL;
+ 
+ 	  if ((names[i] == (char *)NULL) || (names[i + 1] == (char *)NULL))
+ 	    break;
+ 
+ 	  name = mhtml_evaluate_string (names[i]);
+ 	  case_value = mhtml_evaluate_string (vals[i]);
+ 	  page_value = pagefunc_get_variable (name);
+ 	  action = names[i + 1];
+ 	  i += 2;
+ 
+ 	  if (name != (char *)NULL)
+ 	    {
+ 	      /* Check for special "default" case. */
+ 	      if (strcasecmp (name, "default") == 0)
+ 		{
+ 		  default_action = action;
+ 		  if (case_value) free (case_value);
+ 		  if (page_value) free (page_value);
+ 		  free (name);
+ 		  continue;
+ 		}
+ 	      free (name);
+ 	    }
+ 
+ 	  /* Check the value against the page value. */
+ 	  if (empty_string_p (page_value))
+ 	    {
+ 	      page_value = nullval;
+ 	    }
+ 
+ 	  if (empty_string_p (case_value))
+ 	    {
+ 	      if (case_value) free (case_value);
+ 	      case_value = nullval;
+ 	    }
+ 
+ 	  if ((page_value == case_value) ||
+ 	      (strcasecmp (page_value, case_value) == 0))
+ 	    {
+ 	      clause_found = 1;
+ 	      if (action != (char *)NULL)
+ 		bprintf_insert (page, start, "%s", action);
+ 
+ 	      if (case_value != nullval) free (case_value);
+ 	      break;
+ 	    }
+ 
+ 	  if (case_value != nullval) free (case_value);
+ 	}
+ 
+       if (default_action && !clause_found)
+ 	bprintf_insert (page, start, "%s", default_action);
+     }
+ }
+ 
+ /* <set-var x=hello>
+    <with x=1 z=<get-var foo>> <get-var x> </with> --> 1
+    <get-var x> --> hello */
+ static void
+ pf_with (PFunArgs)
+ {
+   register int i = 0;
+   Package *saved_vars = symbol_get_package ((char *)NULL);
+   Package *pack = CurrentPackage;
+   char *packname = pack && pack->name ? strdup (pack->name) : (char *)NULL;
+   char **names = get_vars_names (vars);
+   char **vals = get_vars_vals (vars);
+   int jump_again = 0;
+ 
+   /* Save the current variables in our local package, and bind those
+      variables to their new values. */
+   for (i = 0; ((names != (char **)NULL) && (names[i] != (char *)NULL)); i++)
+     {
+       char *canonical_name = symbol_canonical_name (names[i]);
+       Symbol *sym = symbol_intern (canonical_name);
+       symbol_copy (sym, saved_vars);
+   
+       pagefunc_set_variable (names[i], vals[i]);
+       free (canonical_name);
+     }
+ 
+   /* Execute the body. */
+   {
+     PageEnv *page_environ;
+     PAGE *body_code = page_copy_page (body);
+ 
+     page_environ = pagefunc_save_environment ();
+ 
+     if ((jump_again = setjmp (page_jmp_buffer)) == 0)
+       page_process_page_internal (body_code);
+     pagefunc_restore_environment (page_environ);
+ 
+     if (body_code != (PAGE *)NULL)
+       {
+ 	if (!jump_again && (body_code->buffer != (char *)NULL))
+ 	  {
+ 	    bprintf_insert (page, start, "%s", body_code->buffer);
+ 	    *newstart = start + (body_code->bindex);
+ 	  }
+ 
+ 	page_free_page (body_code);
+       }
+   }
+ 
+   /* If the package had a name before, get the named package again, because
+      the body code might have deleted it!  If it had no name, there isn't
+      any way that the body code could delete it, so trust that it exists. */
+   if (packname)
+     {
+       pack = symbol_get_package (packname);
+       free (packname);
+     }
+ 
+   /* Restore the values. */
+   for (i = 0; ((names != (char **)NULL) && (names[i] != (char *)NULL)); i++)
+     {
+       char *canonical_name = symbol_canonical_name (names[i]);
+       Symbol *sym = symbol_intern_in_package (saved_vars, canonical_name);
+ 
+       symbol_copy (sym, pack);
+       free (canonical_name);
+     }
+ 
+   if (jump_again) longjmp (page_jmp_buffer, 1);
+ }
+ 
diff -cprP metahtml-5.03/libmhtml/pagefuncs.c metahtml-5.04/libmhtml/pagefuncs.c
*** metahtml-5.03/libmhtml/pagefuncs.c	Thu Jun 19 02:51:11 1997
--- metahtml-5.04/libmhtml/pagefuncs.c	Sat Jun 21 12:40:33 1997
*************** static void pf_alist_to_package (PFunArg
*** 91,105 ****
  static void pf_in_package (PFunArgs);
  static void pf_with_local_package (PFunArgs);
  
- /* <if test then else> If eval (test) produces non-zero length text, then... */
- static void pf_if (PFunArgs);
- 
- /* <ifeq this that then else> If eval (this) = eval (that), then, else */
- static void pf_ifeq (PFunArgs);
- 
- /* <when TEST> body </when> */
- static void pf_when (PFunArgs);
- 
  /* <not TEST> --> "true" if TEST is empty, "" otherwise. */
  static void pf_not (PFunArgs);
  
--- 91,96 ----
*************** static void pf_and (PFunArgs);
*** 110,118 ****
     all are false. */
  static void pf_or (PFunArgs);
  
- /* <var-case [this=that do-this] ...> Do-this where <get-var THIS> == THAT. */
- static void pf_var_case (PFunArgs);
- 
  /* <defmacro macro-name> body </defmacro>
     Store MACRO-NAME as a complex tag.
     Do replacements on %1..%9 and %body in BODY at invocation time. */
--- 101,106 ----
*************** static void pf_undef (PFunArgs);
*** 143,153 ****
  /* <function-def foo bar> --> Prints out function defs. */
  static void pf_function_def (PFunArgs);
  
- /* <while test>  body-text ... </while> Do BODY-TEXT while TEST
-    produces non-zero length text. */
- #define PAGE_ITERATOR_MAX_COUNT 500 /* No more than this many times. */
- static void pf_while (PFunArgs);
- 
  /* <increment VAR [BY=xx]>  Change the value of VAR by XX. */
  static void pf_increment (PFunArgs);
  
--- 131,136 ----
*************** PFunDesc pagefunc_table[] = {
*** 291,304 ****
    { "PACKAGE-DELETE",	0, 0, pf_package_delete },
    { "INCREMENT",	0, 0, pf_increment },
    { "DECREMENT",	0, 0, pf_decrement },
-   { "IF",		0, 0, pf_if },
-   { "IFEQ",		0, 0, pf_ifeq },
-   { "WHEN",		1, 0, pf_when },
    { "NOT",		0, 0, pf_not },
    { "AND",		0, 0, pf_and },
    { "OR",		0, 0, pf_or },
-   { "VAR-CASE",		0, 0, pf_var_case },
-   { "WHILE",		1, 0, pf_while },
    { "DEFMACRO",		1, 0, pf_defmacro },
    { "DEFWEAKMACRO",	1, 0, pf_defweakmacro },
    { "DEFINE-CONTAINER",	1, 0, pf_defmacro },
--- 274,282 ----
*************** pf_package_delete (PFunArgs)
*** 957,1006 ****
      }
  }
  
- static void
- pf_if (PFunArgs)
- {
-   char *test_clause = mhtml_evaluate_string (get_positional_arg (vars, 0));
-   char *then_clause = get_positional_arg (vars, 1);
-   char *else_clause = get_positional_arg (vars, 2);
-   char *consequence;
- 
-   if (!empty_string_p (test_clause))
-     consequence = then_clause;
-   else
-     consequence = else_clause;
- 
-   if (consequence != (char *)NULL)
-     bprintf_insert (page, start, "%s", consequence);
- 
-   xfree (test_clause);
- }
- 
- static void
- pf_ifeq (PFunArgs)
- {
-   char *left_clause = mhtml_evaluate_string (get_positional_arg (vars, 0));
-   char *right_clause = mhtml_evaluate_string (get_positional_arg (vars, 1));
-   char *then_clause = get_positional_arg (vars, 2);
-   char *else_clause = get_positional_arg (vars, 3);
-   int caseless_p = var_present_p (vars, "CASELESS");
-   char *consequence;
- 
-   if (((empty_string_p (left_clause)) && (empty_string_p (right_clause))) ||
-       ((left_clause && right_clause) &&
-        (((!caseless_p) && (strcmp (left_clause, right_clause) == 0)) ||
- 	((caseless_p) && (strcasecmp (left_clause, right_clause) == 0)))))
-     consequence = then_clause;
-   else
-     consequence = else_clause;
- 
-   if (consequence != (char *)NULL)
-     bprintf_insert (page, start, "%s", consequence);
- 
-   xfree (left_clause);
-   xfree (right_clause);
- }
- 
  #if defined (MHTML_ARITHMETIC)
  
  /* Arithmetic operations.  This is pretty ugly. */
--- 935,940 ----
*************** pf_random (PFunArgs)
*** 1379,1395 ****
  
    bprintf_insert (page, start, "%d", result);
  }
-   
- static void
- pf_when (PFunArgs)
- {
-   char *test = mhtml_evaluate_string (get_positional_arg (vars, 0));
- 
-   if (!empty_string_p (test))
-     bprintf_insert (page, start, "%s", body->buffer);
- 
-   if (test) free (test);
- }
  
  static void
  pf_not (PFunArgs)
--- 1313,1318 ----
*************** pf_or (PFunArgs)
*** 1459,1576 ****
      {
        bprintf_insert (page, start, "%s", result);
        free (result);
-     }
- }
- 
- static void
- pf_while (PFunArgs)
- {
-   char *test = get_positional_arg (vars, 0);
-   int iteration_count = 0;
-   char *limit_string = pagefunc_get_variable ("mhtml::iteration-limit");
-   int limit = limit_string ? atoi (limit_string) : PAGE_ITERATOR_MAX_COUNT;
-   char *result;
- 
-   while (((result = mhtml_evaluate_string (test)) != (char *)NULL) &&
- 	 (result[0] != '\0'))
-     {
-       PAGE *code;
- 
-       iteration_count++;
- 
-       if (iteration_count > limit)
- 	break;
- 
-       code = page_copy_page (body);
-       page_process_page_internal (code);
- 
-       if ((code != (PAGE *)NULL) && (code->bindex != 0))
- 	{
- 	  bprintf_insert (page, start, "%s", code->buffer);
- 	  start += (code->bindex);
- 
- 	  *newstart = start;
- 	}
- 
-       if (code != (PAGE *)NULL)
- 	page_free_page (code);
- 
-       free (result);
-     }
- 
-   if (result) free (result);
- }
- 
- static void
- pf_var_case (PFunArgs)
- {
-   register int i = 0;
-   char **names = get_vars_names (vars);
-   char **vals = get_vars_vals (vars);
-   static char *nullval = "";
-   char *default_action = (char *)NULL;
-   int clause_found = 0;
- 
-   if (names != (char **)NULL)
-     {
-       while (1)
- 	{
- 	  char *name = (char *)NULL;
- 	  char *case_value = (char *)NULL;
- 	  char *page_value = (char *)NULL;
- 	  char *action = (char *)NULL;
- 
- 	  if ((names[i] == (char *)NULL) || (names[i + 1] == (char *)NULL))
- 	    break;
- 
- 	  name = mhtml_evaluate_string (names[i]);
- 	  case_value = mhtml_evaluate_string (vals[i]);
- 	  page_value = pagefunc_get_variable (name);
- 	  action = names[i + 1];
- 	  i += 2;
- 
- 	  if (name != (char *)NULL)
- 	    {
- 	      /* Check for special "default" case. */
- 	      if (strcasecmp (name, "default") == 0)
- 		{
- 		  default_action = action;
- 		  if (case_value) free (case_value);
- 		  if (page_value) free (page_value);
- 		  free (name);
- 		  continue;
- 		}
- 	      free (name);
- 	    }
- 
- 	  /* Check the value against the page value. */
- 	  if (empty_string_p (page_value))
- 	    {
- 	      page_value = nullval;
- 	    }
- 
- 	  if (empty_string_p (case_value))
- 	    {
- 	      if (case_value) free (case_value);
- 	      case_value = nullval;
- 	    }
- 
- 	  if ((page_value == case_value) ||
- 	      (strcasecmp (page_value, case_value) == 0))
- 	    {
- 	      clause_found = 1;
- 	      if (action != (char *)NULL)
- 		bprintf_insert (page, start, "%s", action);
- 
- 	      if (case_value != nullval) free (case_value);
- 	      break;
- 	    }
- 
- 	  if (case_value != nullval) free (case_value);
- 	}
- 
-       if (default_action && !clause_found)
- 	bprintf_insert (page, start, "%s", default_action);
      }
  }
  
--- 1382,1387 ----
diff -cprP metahtml-5.03/libmhtml/parser.c metahtml-5.04/libmhtml/parser.c
*** metahtml-5.03/libmhtml/parser.c	Fri May 16 02:55:57 1997
--- metahtml-5.04/libmhtml/parser.c	Sat Jun 21 13:58:57 1997
*************** mhtml_execute_function (UserFunction *uf
*** 1618,1623 ****
--- 1618,1625 ----
  	      if (strcmp (packname, "local") == 0)
  		{
  		  Package *current_package = CurrentPackage;
+ 		  char *packname = current_package->name ?
+ 		    strdup (current_package->name) : (char *)NULL;
  		  char *x;
  
  		  CurrentPackage = symbol_get_package ((char *)NULL);
*************** mhtml_execute_function (UserFunction *uf
*** 1634,1640 ****
--- 1636,1649 ----
  		      bprintf_insert (page, start, "%s", x);
  		      *newstart += strlen (x);
  		    }
+ 
  		  xfree (x);
+ 		  if (packname)
+ 		    {
+ 		      current_package = symbol_get_package (packname);
+ 		      free (packname);
+ 		    }
+ 
  		  CurrentPackage = current_package;
  		}
  	      else
diff -cprP metahtml-5.03/libmhtml/symbols.c metahtml-5.04/libmhtml/symbols.c
*** metahtml-5.03/libmhtml/symbols.c	Fri Jun 20 20:42:49 1997
--- metahtml-5.04/libmhtml/symbols.c	Sat Jun 21 13:46:19 1997
*************** symbol_store_array (char *name, char **a
*** 1022,1027 ****
--- 1022,1057 ----
      }
  }
  
+ /* Return the canonicalized version of NAME.  This just strips out
+    array brackets.  Always returns a new string, unless the input
+    string is NULL. */
+ char *
+ symbol_canonical_name (char *name)
+ {
+   char *result = (char *)NULL;
+ 
+   if (name != (char *)NULL)
+     {
+       register int i;
+ 
+       result = strdup (name);
+ 
+       for (i = 0; ((name[i] != '\0') && (name[i] != '[')); i++);
+ 
+       /* If there is an open-bracket here, see if there is a close. */
+       if (name[i] == '[')
+ 	{
+ 	  int zero = i;
+ 
+ 	  for (; ((name[i] != '\0') && (name[i] != ']')); i++);
+ 	  if (name[i] == ']')
+ 	    name[zero] = '\0';
+ 	}
+     }
+ 
+   return (result);
+ }
+ 
  #if defined (TEST)
  
  int
diff -cprP metahtml-5.03/libmhtml/symbols.h metahtml-5.04/libmhtml/symbols.h
*** metahtml-5.03/libmhtml/symbols.h	Sat Jun 14 12:21:41 1997
--- metahtml-5.04/libmhtml/symbols.h	Sat Jun 21 13:46:32 1997
*************** extern void symbol_notify_value (Symbol 
*** 211,216 ****
--- 211,221 ----
     pointed to by ARRAY. */
  extern void symbol_store_array (char *name, char **array);
  
+ /* Return the canonicalized version of NAME.  This just strips out
+    array brackets.  Always returns a new string, unless the input
+    string is NULL. */
+ extern char *symbol_canonical_name (char *name);
+ 
  extern int symbol_get_flags (Symbol *symbol);
  extern int symbol_get_flag (Symbol *symbol, int flag);
  extern void symbol_set_flag (Symbol *symbol, int flag);
diff -cprP metahtml-5.03/libmhtml/tagsets/general.mhtml metahtml-5.04/libmhtml/tagsets/general.mhtml
*** metahtml-5.03/libmhtml/tagsets/general.mhtml	Fri Jun 20 21:01:28 1997
--- metahtml-5.04/libmhtml/tagsets/general.mhtml	Mon Jun 23 18:36:39 1997
***************
*** 10,15 ****
--- 10,19 ----
  ;;; <array-size>, <array-member>, <array-append>, and <array-add-unique>
  ;;; are now all written as primitives.
  
+ <defsubst content-length whitespace=delete>
+   <subst-in-string <symbol-info %0> "(.*\n)(.*$)" "\\2">
+ </defsubst>
+ 
  <defun copy-package src dest>
    <alist-to-package <package-to-alist <get-var src> strip=true> <get-var dest>>
  </defun>
***************
*** 102,120 ****
    <alist-to-package <get-var temp> <get-var package>>
  </defun>
  
- <defun package-merge source dest>
-   <alist-to-package <package-to-alist <get-var source>> <get-var dest>>
- </defun>
- 
  ;;; <make-innocuous [package]> turns the contents of PACKAGE into
  ;;; non-executable text.
  <defun make-innocuous package>
    <set-var names[]=<package-vars <get-var package>>>
!   <set-var i=0>
!   <while <get-var-once names[i]>>
!     <subst-in-var <get-var-once names[i]> "&" "&amp;" "<" "&lt;" ">" "&gt;">
!     <increment i>
!   </while>
  </defun>
  
  <defsubst apply><%0 %1></defsubst>
--- 106,118 ----
    <alist-to-package <get-var temp> <get-var package>>
  </defun>
  
  ;;; <make-innocuous [package]> turns the contents of PACKAGE into
  ;;; non-executable text.
  <defun make-innocuous package>
    <set-var names[]=<package-vars <get-var package>>>
!   <foreach var names>
!     <subst-in-var <get-var var> "&" "&amp;" "<" "&lt;" ">" "&gt;">
!   </foreach>
  </defun>
  
  <defsubst apply><%0 %1></defsubst>
diff -cprP metahtml-5.03/mhc/mhc.c metahtml-5.04/mhc/mhc.c
*** metahtml-5.03/mhc/mhc.c	Fri Jun 13 09:39:45 1997
--- metahtml-5.04/mhc/mhc.c	Mon Jun 23 18:38:09 1997
*************** static char *mhtml_version_string = "";
*** 39,44 ****
--- 39,46 ----
  static char *mhtml_version_string = MHTML_VERSION_STRING;
  #endif
  
+ static int call_bootstrap = 1;
+ 
  #if !defined (macintosh)
  extern char **environ;
  #endif /* !macintosh */
*************** prep_for_page_process (PAGE *page, int a
*** 100,106 ****
  {
    register int i;
  
!   bootstrap_metahtml (0);
  
    if (page && page->buffer)
      {
--- 102,109 ----
  {
    register int i;
  
!   if (call_bootstrap)
!     bootstrap_metahtml (0);
  
    if (page && page->buffer)
      {
*************** parse_program_args (int argc, char *argv
*** 179,185 ****
  
  	  pagefunc_set_variable (name, value);
  	}
!       else if (!filename && (*arg != "-"))
  	filename = arg;
        else if (filename)
  	{
--- 182,190 ----
  
  	  pagefunc_set_variable (name, value);
  	}
!       else if (!filename && (strcmp (arg, "-z") == 0))
! 	call_bootstrap = 0;
!       else if (!filename && (*arg != '-'))
  	filename = arg;
        else if (filename)
  	{
Only in metahtml-5.03/release: 5.03
diff -cprP metahtml-5.03/release/5.04/ANNOUNCE-5.04 metahtml-5.04/release/5.04/ANNOUNCE-5.04
*** metahtml-5.03/release/5.04/ANNOUNCE-5.04	Wed Dec 31 16:00:00 1969
--- metahtml-5.04/release/5.04/ANNOUNCE-5.04	Fri Jun 20 09:36:49 1997
***************
*** 0 ****
--- 1,100 ----
+ 
+ 		       Meta-HTML 5.03 Source Release
+ 
+ Version 5.03 of the Meta-HTML Web Language distribution is now
+ available for download from:
+ 
+ 	http://www.metahtml.com/download
+ 
+ It should be available from prep.ai.mit.edu, and other GNU mirror
+ sites within the next two weeks.
+ 
+      ------------------------------------------------------------
+ 
+ 			     What is it?
+ 
+ Meta-HTML is a programming language specifically designed for working
+ within the World Wide Web environment.  Although it is a genuine
+ programming language, suitable for large-scale symbolic manipulation,
+ it provides the most commonly wanted Web functionality as built-in
+ primitives, so you don't have to write them.  You can find out more
+ about the theory of implementation in this white paper
+ [http://www.metahtml.com/documentation/manifesto.html].
+ 
+ Web pages are authored using HTML and Meta-HTML statements freely
+ intermixed.  When a page is requested by a browser, the page is passed
+ through the Meta-HTML interpreter, which dynamically processes any
+ Meta-HTML statements to produce a final HTML page that is delivered
+ to the browser.
+ 
+ The source distribution provides several different interpreter options:
+ 
+ 	* A CGI engine which can be run by any Unix Web server,
+ 	* A FastCGI engine which can be run under FastCGI compliant servers,
+ 	* A full-featured Web server (mhttpd) with the interpreter built in,
+ 	* A standalone processor, much like Perl or Tcl, and
+ 	* An interactive debugger, with a feel similar to GDB (mdb)
+ 
+      ------------------------------------------------------------
+ 
+ 	      Meta-HTML Changes in 5.03 from 5.02
+ 
+ 	* All reported bugs have been fixed.  I'm happy to say that
+ 	  just haven't been many bugs reported!
+ 
+ 	* The server is now able to perform DNS caching -- this should
+ 	  improve request response time for  sites that have client name
+ 	  resolution turned on (the default).  It is controlled by
+ 	  a variable in the server config file.
+ 
+ 	* A new set of documented array operators, including:
+ 	  array-append, array-member, array-size, array-add-unique,
+ 	  array-shift, array-concat, foreach, and a new "sort"
+ 	  function.
+ 
+ 	* Complete support for mSQL 2.x as well as mSQL 1.x.  Many
+ 	  bugs were found and fixed in this code.
+ 
+ 	* Improvements to various functions, documentation for same.
+ 	  Specifically, cgi-exec, sort, with-open-stream, stream-get,
+ 	  page-debug, system-error-output, and debugging-output have
+ 	  all improved.
+ 
+ 	* Dynamically loaded modules allow C language extensions to be
+ 	  added to the running Meta-HTML interpreter.  Several useful
+ 	  examples are included.
+ 
+ 	* FastCGI support for all platforms now built automatically.
+ 
+ 	* Better configuration mechanism allows compilation on many
+ 	  more machine/OS's than before.
+ 
+ 	* Again, more and improved documentation.
+ 
+ 	* More control over cookie manipulation and session IDs.
+ 
+ 	* The ability to include binary representations of Meta-HTML
+ 	  source code directly in the compiled Engine, Server,
+ 	  Debugger, and Standalone Processor.  See libmhtml/bootstrap.mhtml.
+ 
+      ------------------------------------------------------------
+ 
+ 		      E-Mail Addresses and URLs
+ 
+ Bug reports for Meta-HTML should be sent to bug-metahtml@metahtml.com.
+ Bug reports for the documentation should be sent to bug-manual@metahtml.com.
+ 
+ There is a user mailing list: metahtml-users@metahtml.com.  You can
+ subscribe on the Web [http://www.metahtml.com/E-Mail/], or by
+ sending mail to metahtml-users-request@metahtml.com.
+  
+      ------------------------------------------------------------
+ 
+ 		       Authors and Maintenance
+ 
+ Meta-HTML was designed and implemented by Brian J. Fox (bfox@ai.mit.edu).
+ Meta-HTML is owned by Universal Access Inc., and is released under
+ terms nearly identical to the GPL.  The code and utilities are
+ maintained by Brian J. Fox and Jarlath O' Carroll at Universal Access
+ Inc.
+      ------------------------------------------------------------
diff -cprP metahtml-5.03/release/5.04/footer.mhtml metahtml-5.04/release/5.04/footer.mhtml
*** metahtml-5.03/release/5.04/footer.mhtml	Wed Dec 31 16:00:00 1969
--- metahtml-5.04/release/5.04/footer.mhtml	Fri Jun 20 10:05:37 1997
***************
*** 0 ****
--- 1,17 ----
+ ;;; footer.mhtml: -*- Meta-HTML -*-  DESCRIPTIVE TEXT.
+ ;;;
+ ;;;  Copyright (c) 1997 Brian J. Fox
+ ;;;  Author: Brian J. Fox (bfox@ai.mit.edu) Sun Jun 15 08:45:15 1997.
+ </td></tr></table>
+ <p>
+ <br>
+ <center>
+   <font size=-1>
+   <a href="<get-var mhtml::http-to-host>/">
+     Site design by
+   </a>
+   <a href="http://www.ua.com/">Universal Access Inc.</a> <br>
+   Implemented in <a href="http://www.metahtml.com/"><meta-html></a>
+ </center>
+ </body>
+ </html>
diff -cprP metahtml-5.03/release/5.04/header.mhtml metahtml-5.04/release/5.04/header.mhtml
*** metahtml-5.03/release/5.04/header.mhtml	Wed Dec 31 16:00:00 1969
--- metahtml-5.04/release/5.04/header.mhtml	Fri Jun 20 10:13:33 1997
***************
*** 0 ****
--- 1,21 ----
+ ;;; header.mhtml: -*- Meta-HTML -*-  DESCRIPTIVE TEXT.
+ ;;;
+ ;;;  Copyright (c) 1997 Brian J. Fox
+ ;;;  Author: Brian J. Fox (bfox@ai.mit.edu) Sun Jun 15 08:39:23 1997.
+ <html>
+ <body bgcolor="#FFFFFF" text="#000000" background=images/bg.gif>
+ <table width=575>
+   <tr>
+     <td width=40>
+     </td>
+     <td width=<sub 575 40> align=left>
+       <center>
+ 	<concat <a href="/release/<get-var mhtml::version>/">
+ 		<img src=images/top-banner.gif border=0>
+ 		</a>>
+ 	<br>
+ [ <a href="/">Home</a> ]
+ [ <a href="/release/<get-var mhtml::version>/">Release</a> ]
+ [ <a href="/release/<get-var mhtml::version>/documentation">Reference</a> ]
+       </center>
+ <p><br>
Binary files metahtml-5.03/release/5.04/images/bg.gif and metahtml-5.04/release/5.04/images/bg.gif differ
Binary files metahtml-5.03/release/5.04/images/top-banner.gif and metahtml-5.04/release/5.04/images/top-banner.gif differ
diff -cprP metahtml-5.03/release/5.04/show-announce.mhtml metahtml-5.04/release/5.04/show-announce.mhtml
*** metahtml-5.03/release/5.04/show-announce.mhtml	Wed Dec 31 16:00:00 1969
--- metahtml-5.04/release/5.04/show-announce.mhtml	Fri Jun 20 10:09:43 1997
***************
*** 0 ****
--- 1,13 ----
+ ;;; show-announce.mhtml: -*- Meta-HTML -*-  DESCRIPTIVE TEXT.
+ ;;; 
+ ;;;  Copyright (c) 1997 Brian J. Fox
+ ;;;  Author: Brian J. Fox (bfox@ai.mit.edu) Fri Jun 20 10:06:25 1997.
+ <set-var title="Release Announcement for v<get-var mhtml::version>">
+ <include header.mhtml>
+ 
+ <set-var expr=
+   "<%plain-text><include ANNOUNCE-<get-var mhtml::version>></plain-text>">
+ <subst-in-var expr "^<%" "<">
+ <get-var expr>
+ 
+ <include footer.mhtml>
diff -cprP metahtml-5.03/release/5.04/support/COPYING.html metahtml-5.04/release/5.04/support/COPYING.html
*** metahtml-5.03/release/5.04/support/COPYING.html	Wed Dec 31 16:00:00 1969
--- metahtml-5.04/release/5.04/support/COPYING.html	Fri Jun 20 09:33:55 1997
***************
*** 0 ****
--- 1,191 ----
+ <html>
+ <body bgcolor="#ffffff">
+ 
+ <div align=center>
+   <h2>UAI FREE SOFTWARE LICENSE</h2>
+   <h3>Version 1, August, 1996</h3>
+ </div>
+ <p>
+ <br>
+ <div align=center>
+   <h3> TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION </h3>
+ </div>
+ <p>
+ <ol type="0">
+  <li>This License applies to any program or other work created by
+      Universal Access Inc. ("UAI"), which contains a notice placed by UAI saying
+      it may be distributed under the terms of the UAI Free Software License.
+ <p>
+      As used herein, the term "Program", below, means any
+      program or work provided by UAI under the UAI Free Software
+      License, and a "work based on the Program" means either the
+      Program or any "derivative work" as defined by U.S. copyright law: i.e.,
+      a work containing the Program or a portion of it, either
+      verbatim or with modifications and/or translated into another
+      language.  Hereinafter, translation is included without
+      limitation in the term "modification". Each licensee of the
+      Program, or any work based on the Program, is referred to as "you".
+ <p> 
+      Activities other than copying, distribution and modification are not
+      covered by this License; they are outside its scope.  The act of
+      running the Program is not restricted, and the output from the Program
+      is covered only if its contents constitute a work based on the
+      Program (independent of having been made by running the Program).
+ <p><br>
+  <li>You may copy and distribute verbatim copies of the Program's
+      source code as you receive it, in any medium, provided that you
+      conspicuously and appropriately publish on each copy an appropriate
+      copyright notice and disclaimer of warranty; keep intact all the
+      notices that refer to this License and to the absence of any warranty;
+      and give any other recipients of the Program a copy of this License
+      along with the Program.
+ <p>
+      You may charge a fee for the physical act of transferring a copy, and
+      you may at your option offer warranty protection in exchange for a fee.
+ <p><br>
+  <li>You may modify your copy or copies of the Program or any portion of
+      it, thus forming a work based on the Program, and copy and distribute
+      such modifications or work under the terms of Section 1 above,
+      provided that you also meet all of these conditions:
+ <p>
+ <ol type="a">
+     <li>You must cause the modified files to carry prominent notices
+ 	stating that you changed the files and the date of any change.
+ <p>
+     <li>You must cause any work that you distribute or publish, that in
+ 	whole or in part contains or is derived from the Program or any
+ 	part thereof, to be licensed as a whole at no charge to all third
+ 	parties under the terms of this License.
+ <p>
+     <li>If the modified program normally reads commands interactively
+ 	when run, you must cause it, when started running for such
+ 	interactive use in the most ordinary way, to print or display an
+ 	announcement including an appropriate copyright notice and a
+ 	notice that there is no warranty (or else, saying that you provide
+ 	a warranty) and that users may redistribute the program under
+ 	these conditions, and telling the user how to view a copy of this
+ 	License.  (Exception: if the Program itself is interactive but
+ 	does not normally print such an announcement, your work based on
+ 	the Program is not required to print an announcement.)
+ </ol>
+ <p>
+      These requirements apply to the modified work as a whole.  If
+      identifiable sections of that work are not derived from the Program,
+      and can be reasonably considered independent and separate works in
+      themselves, then this License, and its terms, do not apply to those
+      sections when you distribute them as separate works.  But when you
+      distribute the same sections as part of a whole which is a work based
+      on the Program, the distribution of the whole must be on the terms of
+      this License, whose permissions for other licensees extend to the
+      entire whole, and thus to each and every part regardless of who wrote it.
+ <p><br>
+ 
+  <li>You may copy and distribute the Program (or a work based on it,
+      under Section 2) in object code or executable form under the terms of
+      Sections 1 and 2 above provided that you also do one of the following:
+ <p>
+ <ol type="a">
+     <li>Accompany it with the complete corresponding machine-readable
+ 	source code, which must be distributed under the terms of Sections
+ 	1 and 2 above on a medium customarily used for software interchange;
+ 	or,
+ <p>
+     <li>Accompany it with a written offer, valid for at least three
+ 	years, to give any third party, for a charge no more than your cost
+ 	of physically performing source distribution, a complete
+ 	machine-readable copy of the corresponding source code, to be
+ 	distributed under the terms of Sections 1 and 2 above on a medium
+ 	customarily used for software interchange; or,
+ <p>
+     <li>Accompany it with the information you received as to the offer
+ 	to distribute corresponding source code.  (This alternative is
+ 	allowed only for noncommercial distribution and only if you
+ 	received the program in object code or executable form with such
+ 	an offer, in accord with Subsection b above.)
+ </ol>
+ <p>
+ The source code for a work means the preferred form of the work for making
+ modifications to it.  For an executable work, complete source code means
+ all the source code for all modules it contains, plus any associated
+ interface definition files, plus the scripts used to control compilation
+ and installation of the executable.  However, as a special exception, the
+ source code distributed need not include anything that is normally
+ distributed (in either source or binary form) with the major components
+ (compiler, kernel, and so on) of the operating system on which the
+ executable runs, unless that component itself accompanies the executable.
+ <p>
+ If distribution of executable or object code is made by offering access to
+ copy from a designated place, then offering equivalent access to copy the
+ source code from the same place counts as distribution of the source code,
+ even though third parties are not compelled to copy the source along with
+ the object code.
+ <p><br>
+ 
+  <li>You may not copy, modify, sublicense, or distribute the Program
+      except as expressly provided under this License.  Any attempt
+      otherwise to copy, modify, sublicense or distribute the Program is
+      void, and will automatically terminate your rights under this License.
+      However, parties who have received copies, or rights, from you under
+      this License will not have their licenses terminated so long as such
+      parties remain in full compliance.
+ <p><br>
+  <li>You are not required to accept this License, since you have not
+      signed it.  However, nothing else grants you permission to modify or
+      distribute the Program or its derivative works.  These actions are
+      prohibited by law if you do not accept this License.  Therefore, by
+      modifying or distributing the Program (or any work based on the
+      Program), you indicate your acceptance of this License to do so, and
+      all its terms and conditions for copying, distributing or modifying
+      the Program or works based on it.
+ <p><br>
+  <li>Each time you redistribute the Program (or any work based on the
+      Program), the recipient automatically receives a license from the
+      original licensor to copy, distribute or modify the Program subject to
+      these terms and conditions.  You may not impose any further
+      restrictions on the recipients' exercise of the rights granted herein.
+      You are not responsible for enforcing compliance by third parties to
+      this License.
+ <p><br>
+  <li>If, as a consequence of a court judgment or allegation of patent
+      infringement or for any other reason (not limited to patent issues),
+      conditions are imposed on you (whether by court order, agreement or
+      otherwise) that contradict the conditions of this License, they do not
+      excuse you from the conditions of this License.  If you cannot
+      distribute so as to satisfy simultaneously your obligations under this
+      License and any other pertinent obligations, then as a consequence you
+      may not distribute the Program at all.  For example, if a patent
+      license would not permit royalty-free redistribution of the Program by
+      all those who receive copies directly or indirectly through you, then
+      the only way you could satisfy both it and this License would be to
+      refrain entirely from distribution of the Program.
+ <p><br>
+ 
+ <div align=center>
+   <h3>NO WARRANTY</h3>
+ </div>
+ <p>
+  <li>BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, UAI PROVIDES THE
+   PROGRAM "AS IS", AND MAKES NO WARRANTY, EXPRESS OR IMPLIED, WITH
+   RESPECT TO THE PROGRAM, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+      MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+      TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+      PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+      REPAIR OR CORRECTION.
+ <p><br>
+ <div align=center>
+   <h3>LIMITATION OF LIABLILITY</h3>
+ </div>
+ 
+  <li>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+      WILL UAI OR ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+      REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
+      DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
+      DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
+      (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+      INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
+      THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
+      OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ </ol>
+ 
+ </body>
+ </html>
diff -cprP metahtml-5.03/release/5.04/welcome.mhtml metahtml-5.04/release/5.04/welcome.mhtml
*** metahtml-5.03/release/5.04/welcome.mhtml	Wed Dec 31 16:00:00 1969
--- metahtml-5.04/release/5.04/welcome.mhtml	Fri Jun 20 10:07:49 1997
***************
*** 0 ****
--- 1,15 ----
+ ;;; welcome.mhtml: -*- Meta-HTML -*-  DESCRIPTIVE TEXT.
+ ;;;
+ ;;;  Copyright (c) 1997 Brian J. Fox
+ ;;;  Author: Brian J. Fox (bfox@ai.mit.edu) Sun Jun 15 08:38:09 1997.
+ <set-var title="Release Notes for Meta-HTML <get-var mhtml::version>">
+ <include header.mhtml>
+ 
+ <plain-text>
+   <menu "Release <get-var mhtml::version> Menu">
+     Release Announcement: show-announce.mhtml
+     Reference Manual: documentation/
+     The Meta-HTML Site: http://www.metahtml.com/
+     E-Mail List Archives: http://www.metahtml.com/E-Mail/archives/
+   </menu>
+ <include footer.mhtml>
diff -cprP metahtml-5.03/tagsets/general.mhtml metahtml-5.04/tagsets/general.mhtml
*** metahtml-5.03/tagsets/general.mhtml	Fri Jun 20 21:01:28 1997
--- metahtml-5.04/tagsets/general.mhtml	Mon Jun 23 18:36:39 1997
***************
*** 10,15 ****
--- 10,19 ----
  ;;; <array-size>, <array-member>, <array-append>, and <array-add-unique>
  ;;; are now all written as primitives.
  
+ <defsubst content-length whitespace=delete>
+   <subst-in-string <symbol-info %0> "(.*\n)(.*$)" "\\2">
+ </defsubst>
+ 
  <defun copy-package src dest>
    <alist-to-package <package-to-alist <get-var src> strip=true> <get-var dest>>
  </defun>
***************
*** 102,120 ****
    <alist-to-package <get-var temp> <get-var package>>
  </defun>
  
- <defun package-merge source dest>
-   <alist-to-package <package-to-alist <get-var source>> <get-var dest>>
- </defun>
- 
  ;;; <make-innocuous [package]> turns the contents of PACKAGE into
  ;;; non-executable text.
  <defun make-innocuous package>
    <set-var names[]=<package-vars <get-var package>>>
!   <set-var i=0>
!   <while <get-var-once names[i]>>
!     <subst-in-var <get-var-once names[i]> "&" "&amp;" "<" "&lt;" ">" "&gt;">
!     <increment i>
!   </while>
  </defun>
  
  <defsubst apply><%0 %1></defsubst>
--- 106,118 ----
    <alist-to-package <get-var temp> <get-var package>>
  </defun>
  
  ;;; <make-innocuous [package]> turns the contents of PACKAGE into
  ;;; non-executable text.
  <defun make-innocuous package>
    <set-var names[]=<package-vars <get-var package>>>
!   <foreach var names>
!     <subst-in-var <get-var var> "&" "&amp;" "<" "&lt;" ">" "&gt;">
!   </foreach>
  </defun>
  
  <defsubst apply><%0 %1></defsubst>
diff -cprP metahtml-5.03/utilities/mklib metahtml-5.04/utilities/mklib
*** metahtml-5.03/utilities/mklib	Thu Mar 27 13:28:47 1997
--- metahtml-5.04/utilities/mklib	Mon Jun 23 08:19:44 1997
***************
*** 1,4 ****
! #!/www/bin/mhc
  ;;; mklib: -*- Meta-HTML -*- Build a binary package file from input.
  ;;;
  ;;;  Copyright (c) 1996 Brian J. Fox
--- 1,4 ----
! #!/www/bin/mhc -z
  ;;; mklib: -*- Meta-HTML -*- Build a binary package file from input.
  ;;;
  ;;;  Copyright (c) 1996 Brian J. Fox